Only in openoffice-new: MacosxEnv.Set diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/automation/prj/d.lst openoffice-new/automation/prj/d.lst --- openoffice-clean/automation/prj/d.lst Tue Sep 25 08:24:22 2001 +++ openoffice-new/automation/prj/d.lst Thu Feb 21 19:53:55 2002 @@ -2,6 +2,7 @@ ..\%__SRC%\bin\sts?????.dll %_DEST%\bin%_EXT%\sts?????.dll ..\%__SRC%\lib\libsts* %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\automation.lib %_DEST%\lib%_EXT%\automation.lib hedabu: ..\inc\automation.hxx %_DEST%\inc%_EXT%\automation\automation.hxx Only in openoffice-new/berkeleydb: build diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/berkeleydb/db-3.2.9.patch openoffice-new/berkeleydb/db-3.2.9.patch --- openoffice-clean/berkeleydb/db-3.2.9.patch Mon Jun 11 07:09:22 2001 +++ openoffice-new/berkeleydb/db-3.2.9.patch Fri Feb 22 11:57:04 2002 @@ -1,45 +1,646 @@ -*** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp Thu Jan 11 19:28:22 2001 ---- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp Mon Jun 11 15:50:55 2001 -*************** -*** 7,12 **** ---- 7,14 ---- - - #include "db_config.h" - -+ #include -+ - #ifndef lint - static const char revid[] = "$Id: cxx_app.cpp,v 11.38 2000/12/21 20:30:18 dda Exp $"; - #endif /* not lint */ -*** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_table.cpp Thu Jan 11 19:28:22 2001 ---- build/unxsols3.pro/db-3.2.9/cxx/cxx_table.cpp Mon Jun 11 15:51:59 2001 -*************** -*** 7,12 **** ---- 7,14 ---- - - #include "db_config.h" - -+ #include -+ - #ifndef lint - static const char revid[] = "$Id: cxx_table.cpp,v 11.35 2001/01/11 18:19:49 bostic Exp $"; - #endif /* not lint */ -*** ./unxsols3.pro/misc/db-3.2.9/dist/Makefile.in Fri Dec 1 00:07:33 2000 ---- build/unxsols3.pro/db-3.2.9/dist/Makefile.in Mon Jun 11 15:39:41 2001 -*************** -*** 8,14 **** - ################################################## - CPPFLAGS= -I$(builddir) -I$(srcdir)/include @CPPFLAGS@ - CFLAGS= -c $(CPPFLAGS) @CFLAGS@ -! CXXFLAGS= -c $(CPPFLAGS) @CXXFLAGS@ - - CC= @MAKEFILE_CC@ - CCLINK= @MAKEFILE_CCLINK@ ---- 8,14 ---- - ################################################## - CPPFLAGS= -I$(builddir) -I$(srcdir)/include @CPPFLAGS@ - CFLAGS= -c $(CPPFLAGS) @CFLAGS@ -! CXXFLAGS= -c $(SOLARINC) $(CPPFLAGS) @CXXFLAGS@ - - CC= @MAKEFILE_CC@ - CCLINK= @MAKEFILE_CCLINK@ +diff -u -r /Users/peterlin/db-3.2.9/cxx/cxx_app.cpp build/unxmacxp.pro/db-3.2.9/cxx/cxx_app.cpp +--- /Users/peterlin/db-3.2.9/cxx/cxx_app.cpp Thu Jan 11 10:28:22 2001 ++++ build/unxmacxp.pro/db-3.2.9/cxx/cxx_app.cpp Sat Dec 1 11:35:16 2001 +@@ -7,6 +7,8 @@ + + #include "db_config.h" + ++#include ++ + #ifndef lint + static const char revid[] = "$Id: cxx_app.cpp,v 11.38 2000/12/21 20:30:18 dda Exp $"; + #endif /* not lint */ +Only in build/unxmacxp.pro/db-3.2.9/cxx: cxx_app.cpp~ +diff -u -r /Users/peterlin/db-3.2.9/cxx/cxx_table.cpp build/unxmacxp.pro/db-3.2.9/cxx/cxx_table.cpp +--- /Users/peterlin/db-3.2.9/cxx/cxx_table.cpp Thu Jan 11 10:28:22 2001 ++++ build/unxmacxp.pro/db-3.2.9/cxx/cxx_table.cpp Sat Dec 1 11:35:16 2001 +@@ -7,6 +7,8 @@ + + #include "db_config.h" + ++#include ++ + #ifndef lint + static const char revid[] = "$Id: cxx_table.cpp,v 11.35 2001/01/11 18:19:49 bostic Exp $"; + #endif /* not lint */ +Only in build/unxmacxp.pro/db-3.2.9/cxx: cxx_table.cpp~ +Only in build/unxmacxp.pro/db-3.2.9/dist: Makefile +diff -u -r /Users/peterlin/db-3.2.9/dist/Makefile.in build/unxmacxp.pro/db-3.2.9/dist/Makefile.in +--- /Users/peterlin/db-3.2.9/dist/Makefile.in Thu Nov 30 15:07:33 2000 ++++ build/unxmacxp.pro/db-3.2.9/dist/Makefile.in Sat Dec 1 11:35:16 2001 +@@ -8,7 +8,7 @@ + ################################################## + CPPFLAGS= -I$(builddir) -I$(srcdir)/include @CPPFLAGS@ + CFLAGS= -c $(CPPFLAGS) @CFLAGS@ +-CXXFLAGS= -c $(CPPFLAGS) @CXXFLAGS@ ++CXXFLAGS= -c $(SOLARINC) $(CPPFLAGS) @CXXFLAGS@ + + CC= @MAKEFILE_CC@ + CCLINK= @MAKEFILE_CCLINK@ +Only in build/unxmacxp.pro/db-3.2.9/dist: Makefile.in~ +Only in build/unxmacxp.pro/db-3.2.9/dist: config.cache +Only in build/unxmacxp.pro/db-3.2.9/dist: config.log +Only in build/unxmacxp.pro/db-3.2.9/dist: config.status +diff -u -r /Users/peterlin/db-3.2.9/dist/configure build/unxmacxp.pro/db-3.2.9/dist/configure +--- /Users/peterlin/db-3.2.9/dist/configure Wed Jan 24 07:16:18 2001 ++++ build/unxmacxp.pro/db-3.2.9/dist/configure Sun Dec 23 21:31:39 2001 +@@ -1781,17 +1781,31 @@ + echo "$ac_t""$JAVACABS" 1>&6 + done + JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +- if test -f "$JTOPDIR/include/jni.h"; then +- CPPFLAGS="$CPPFLAGSS -I$JTOPDIR/include" ++ ++# [ed] 12/23/01 On OS X/darwin the java include directory is named the traditional Headers ++# name and not include ++ ++ if test "$host_os" = "darwin5.2"; then ++ JFRAMEDIR=`echo "$JTOPDIR" | sed -e 's:JavaVM.framework.*$:JavaVM.framework:'` ++ echo "$JFRAMEDIR" ++ if test -f "$JFRAMEDIR/Headers/jni.h"; then ++ CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers" ++ else ++ { echo "configure: error: cannot find java include files (Darwin: $JFRAMEDIR/Headers/jni.h)" 1>&2; exit 1; } ++ fi + else +- JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'` + if test -f "$JTOPDIR/include/jni.h"; then + CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include" + else +- { echo "configure: error: cannot find java include files" 1>&2; exit 1; } ++ JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'` ++ if test -f "$JTOPDIR/include/jni.h"; then ++ CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include" ++ else ++ { echo "configure: error: cannot find java include files" 1>&2; exit 1; } ++ fi + fi + fi +- ++ + case "$host_os" in + solaris*) JINCSUBDIRS="solaris";; + linux*) JINCSUBDIRS="linux genunix";; +Only in build/unxmacxp.pro/db-3.2.9/dist: db.h +Only in build/unxmacxp.pro/db-3.2.9/dist: db_config.h +Only in build/unxmacxp.pro/db-3.2.9/dist: db_int.h +Only in build/unxmacxp.pro/db-3.2.9/dist: include.tcl +diff -u -r /Users/peterlin/db-3.2.9/dist/ltconfig build/unxmacxp.pro/db-3.2.9/dist/ltconfig +--- /Users/peterlin/db-3.2.9/dist/ltconfig Fri Oct 13 13:23:00 2000 ++++ build/unxmacxp.pro/db-3.2.9/dist/ltconfig Sat Jan 5 17:44:55 2002 +@@ -678,6 +678,11 @@ + cygwin* | mingw* | os2*) + # We can build DLLs from non-PIC. + ;; ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ pic_flag='-fno-common' ++ ;; + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, +@@ -773,8 +778,8 @@ + echo "int some_variable = 0;" > conftest.c + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $pic_flag -DPIC" +- echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5 +- if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then ++ echo "$progname:781: checking if $compiler PIC flag $pic_flag works" >&5 ++ if { (eval echo $progname:782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then + # Append any warnings to the config.log. + cat conftest.err 1>&5 + +@@ -826,8 +831,8 @@ + chmod -w . + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -o out/conftest2.o" +-echo "$progname:829: checking if $compiler supports -c -o file.o" >&5 +-if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then ++echo "$progname:834: checking if $compiler supports -c -o file.o" >&5 ++if { (eval echo $progname:835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then + + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -859,8 +864,8 @@ + echo "int some_variable = 0;" > conftest.c + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -c -o conftest.lo" +- echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5 +-if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then ++ echo "$progname:867: checking if $compiler supports -c -o file.lo" >&5 ++if { (eval echo $progname:868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then + + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -911,8 +916,8 @@ + echo "int some_variable = 0;" > conftest.c + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c" +- echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +- if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then ++ echo "$progname:919: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++ if { (eval echo $progname:920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then + + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -955,8 +960,8 @@ + echo 'main(){return(0);}' > conftest.c + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $link_static_flag" +-echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5 +-if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++echo "$progname:963: checking if $compiler static flag $link_static_flag works" >&5 ++if { (eval echo $progname:964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + echo "$ac_t$link_static_flag" 1>&6 + else + echo "$ac_t"none 1>&6 +@@ -988,7 +993,7 @@ + if test "$with_gcc" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6 +- echo "$progname:991: checking for ld used by GCC" >&5 ++ echo "$progname:996: checking for ld used by GCC" >&5 + ac_prog=`($CC -print-prog-name=ld) 2>&5` + case "$ac_prog" in + # Accept absolute paths. +@@ -1012,10 +1017,10 @@ + esac + elif test "$with_gnu_ld" = yes; then + echo $ac_n "checking for GNU ld... $ac_c" 1>&6 +- echo "$progname:1015: checking for GNU ld" >&5 ++ echo "$progname:1020: checking for GNU ld" >&5 + else + echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 +- echo "$progname:1018: checking for non-GNU ld" >&5 ++ echo "$progname:1023: checking for non-GNU ld" >&5 + fi + + if test -z "$LD"; then +@@ -1304,11 +1309,7 @@ + allow_undefined_flag=' ${wl}-berok' + archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' + archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' +- #### local change for Sleepycat DB: +- # On AIX 4.3.2 (at least), -bexpall exports too much, +- # causing symbol conflicts. This was: +- # case "$host_os" in aix4.[01]|aix4.[01].*) +- case "$host_os" in aix4.*) ++ case "$host_os" in aix4.[01]|aix4.[01].*) + # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on + always_export_symbols=yes ;; + esac +@@ -1371,6 +1372,23 @@ + hardcode_shlibpath_var=no + ;; + ++ darwin* | rhapsody*) ++ case "$host_os" in ++ rhapsody* | darwin1.[012]) ++ allow_undefined_flag='-undefined suppress' ++ ;; ++ *) # Darwin 1.3 on ++ allow_undefined_flag='-flat_namespace -undefined suppress' ++ ;; ++ esac ++ archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $verstring' ++ # We need to add '_' to the symbols in $export_symbols first ++ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ whole_archive_flag_spec='-all_load $convenience' ++ ;; ++ + hpux9* | hpux10* | hpux11*) + case "$host_os" in + hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; +@@ -1443,12 +1461,6 @@ + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; +- rhapsody*) +- archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts' +- hardcode_libdir_flags_spec='-L$libdir' +- hardcode_direct=yes +- hardcode_shlibpath_var=no +- ;; + + sco3.2v5*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' +@@ -1654,11 +1666,11 @@ + main(){nm_test_var='a';nm_test_func();return(0);} + EOF + +- echo "$progname:1653: checking if global_symbol_pipe works" >&5 +- if { (eval echo $progname:1654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then ++ echo "$progname:1669: checking if global_symbol_pipe works" >&5 ++ if { (eval echo $progname:1670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then + # Now try to grab the symbols. + nlist=conftest.nm +- if { echo "$progname:1657: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then ++ if { echo "$progname:1673: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then + + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then +@@ -1710,7 +1722,7 @@ + save_CFLAGS="$CFLAGS" + LIBS="conftstm.$objext" + CFLAGS="$CFLAGS$no_builtin_flag" +- if { (eval echo $progname:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++ if { (eval echo $progname:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + pipe_works=yes + else + echo "$progname: failed program was:" >&5 +@@ -1919,6 +1931,27 @@ + esac + ;; + ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ deplibs_check_method='file_magic Mach-O dynamically linked shared library' ++ file_magic_cmd='/usr/bin/file -L' ++ case "$host_os" in ++ rhapsody* | darwin1.[012]) ++ file_magic_test_file='/System/Library/Frameworks/System.framework/System' ++ ;; ++ *) # Darwin 1.3 on ++ file_magic_test_file='/usr/lib/libSystem.dylib' ++ ;; ++ esac ++ library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' ++ soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ ;; ++ + gnu*) + version_type=linux + need_lib_prefix=no +@@ -1941,14 +1974,14 @@ + soname_spec='${libname}${release}.sl$major' + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' +- +- #### local change for Sleepycat DB: [#1990] +- # The following 3 lines added, otherwise dependent libraries are not allowed +- # on HP. We use dependent libraries in a very straightforward way, to +- # incorporate -lnsl into libtcl.sl, and for testing only. +- deplibs_check_method='file_magic PA-RISC[1-9][0-9.]* shared library' +- file_magic_cmd=/usr/bin/file +- file_magic_test_file=`echo /lib/libc.sl*` ++ case "$host_os" in ++ hpux10.20*) ++ # TODO: Does this work for hpux-11 too? ++ deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' ++ file_magic_cmd=/usr/bin/file ++ file_magic_test_file=/usr/lib/libc.sl ++ ;; ++ esac + ;; + + irix5* | irix6*) +@@ -2057,23 +2090,11 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +-rhapsody*) +- version_type=sunos +- library_names_spec='${libname}.so' +- soname_spec='${libname}.so' +- shlibpath_var=DYLD_LIBRARY_PATH +- deplibs_check_method=pass_all +- ;; +- + sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' + shlibpath_var=LD_LIBRARY_PATH +- #### local change for Sleepycat DB: +- # The following line added, otherwise dependent libraries are not allowed +- # on SCO. We use dependent libraries in a very straightforward way. +- deplibs_check_method='pass_all' + ;; + + solaris*) +@@ -2153,19 +2174,6 @@ + fi + ;; + +-#### local change for Sleepycat DB: +-# Add in the QNX support from QNX. +-nto-qnx) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' +- soname_spec='${libname}${release}.so$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- deplibs_check_method='pass_all' +- ;; +- + *) + dynamic_linker=no + ;; +@@ -2266,7 +2274,7 @@ + if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then + lt_cv_dlopen=no lt_cv_dlopen_libs= + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "$progname:2248: checking for dlopen in -ldl" >&5 ++echo "$progname:2277: checking for dlopen in -ldl" >&5 + ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2274,7 +2282,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo $progname:2298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -2306,12 +2314,12 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dlopen""... $ac_c" 1>&6 +-echo "$progname:2288: checking for dlopen" >&5 ++echo "$progname:2317: checking for dlopen" >&5 + if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -2336,7 +2344,7 @@ + + ; return 0; } + EOF +-if { (eval echo $progname:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo $progname:2347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_dlopen=yes" + else +@@ -2353,7 +2361,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 +-echo "$progname:2335: checking for dld_link in -ldld" >&5 ++echo "$progname:2364: checking for dld_link in -ldld" >&5 + ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2361,7 +2369,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldld $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo $progname:2385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -2393,12 +2401,12 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for shl_load""... $ac_c" 1>&6 +-echo "$progname:2375: checking for shl_load" >&5 ++echo "$progname:2404: checking for shl_load" >&5 + if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < +@@ -2423,7 +2431,7 @@ + + ; return 0; } + EOF +-if { (eval echo $progname:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo $progname:2434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_shl_load=yes" + else +@@ -2441,7 +2449,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 +-echo "$progname:2423: checking for shl_load in -ldld" >&5 ++echo "$progname:2452: checking for shl_load in -ldld" >&5 + ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2449,7 +2457,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldld $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo $progname:2474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -2506,17 +2514,17 @@ + for ac_hdr in dlfcn.h; do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "$progname:2488: checking for $ac_hdr" >&5 ++echo "$progname:2517: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + int fnord = 0; + EOF + ac_try="$ac_compile >/dev/null 2>conftest.out" +-{ (eval echo $progname:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo $progname:2527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -2544,7 +2552,7 @@ + LIBS="$lt_cv_dlopen_libs $LIBS" + + echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 +-echo "$progname:2526: checking whether a program can dlopen itself" >&5 ++echo "$progname:2555: checking whether a program can dlopen itself" >&5 + if test "${lt_cv_dlopen_self+set}" = set; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2552,7 +2560,7 @@ + lt_cv_dlopen_self=cross + else + cat > conftest.c < +@@ -2598,7 +2606,7 @@ + if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } + + EOF +-if { (eval echo $progname:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null ++if { (eval echo $progname:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null + then + lt_cv_dlopen_self=yes + else +@@ -2617,7 +2625,7 @@ + if test "$lt_cv_dlopen_self" = yes; then + LDFLAGS="$LDFLAGS $link_static_flag" + echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 +-echo "$progname:2599: checking whether a statically linked program can dlopen itself" >&5 ++echo "$progname:2628: checking whether a statically linked program can dlopen itself" >&5 + if test "${lt_cv_dlopen_self_static+set}" = set; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2625,7 +2633,7 @@ + lt_cv_dlopen_self_static=cross + else + cat > conftest.c < +@@ -2671,7 +2679,7 @@ + if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } + + EOF +-if { (eval echo $progname:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null ++if { (eval echo $progname:2682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null + then + lt_cv_dlopen_self_static=yes + else +@@ -3133,4 +3141,3 @@ + # mode:shell-script + # sh-indentation:2 + # End: +-#! /bin/bash +Only in build/unxmacxp.pro/db-3.2.9/dist: ltconfig~ +diff -u -r /Users/peterlin/db-3.2.9/dist/ltmain.sh build/unxmacxp.pro/db-3.2.9/dist/ltmain.sh +--- /Users/peterlin/db-3.2.9/dist/ltmain.sh Sun Aug 6 11:32:00 2000 ++++ build/unxmacxp.pro/db-3.2.9/dist/ltmain.sh Sat Jan 5 17:44:58 2002 +@@ -1079,6 +1079,11 @@ + # These systems don't actually have c library (as such) + continue + ;; ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody C library is in the System framework ++ deplibs="$deplibs -framework System" ++ continue ++ ;; + esac + elif test "$arg" = "-lm"; then + case "$host" in +@@ -1086,6 +1091,11 @@ + # These systems don't actually have math library (as such) + continue + ;; ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody math library is in the System framework ++ deplibs="$deplibs -framework System" ++ continue ++ ;; + esac + fi + deplibs="$deplibs $arg" +@@ -1753,6 +1763,16 @@ + versuffix="-$major-$age-$revision" + ;; + ++ darwin) ++ # Like Linux, but with the current version available in ++ # verstring for coding it into the library header ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" ++ # Darwin ld doesn't like 0 for these options... ++ minor_current=`expr $current + 1` ++ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ++ ;; ++ + *) + $echo "$modename: unknown library version type \`$version_type'" 1>&2 + echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 +@@ -1763,7 +1783,16 @@ + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= +- verstring="0.0" ++ case "$version_type" in ++ darwin) ++ # we can't check for "0.0" in archive_cmds due to quoting ++ # problems, so we reset it completely ++ verstring="" ++ ;; ++ *) ++ verstring="0.0" ++ ;; ++ esac + if test "$need_version" = no; then + versuffix= + else +@@ -1795,14 +1824,10 @@ + *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) + # these systems don't actually have a c library (as such)! + ;; +- +- #### local change for Sleepycat DB: [#2380] +- # The following case is added, since the linker's -pthread +- # option implicitly controls use of -lc or -lc_r. +- *freebsd*) +- # defer to whether the user wants -lc, or -lc_r ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody C library is in the System framework ++ deplibs="$deplibs -framework System" + ;; +- + *) + # Add libc to deplibs on all other systems. + deplibs="$deplibs -lc" +@@ -4026,4 +4051,3 @@ + # mode:shell-script + # sh-indentation:2 + # End: +-#! /bin/bash +Only in build/unxmacxp.pro/db-3.2.9/dist: ltmain.sh~ +Only in build/unxmacxp.pro/db-3.2.9/java: classes +Only in build/unxmacxp.pro/db-3.2.9: out Only in openoffice-new/berkeleydb: log.log diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/berkeleydb/makefile.mk openoffice-new/berkeleydb/makefile.mk --- openoffice-clean/berkeleydb/makefile.mk Wed Jun 20 11:43:52 2001 +++ openoffice-new/berkeleydb/makefile.mk Fri Feb 22 11:57:10 2002 @@ -85,7 +85,7 @@ BUILD_DIR=$(CONFIGURE_DIR) BUILD_ACTION=make -OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*.so +OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST) OUT2BIN=java$/classes$/db.jar Only in openoffice-new/berkeleydb: makefile.mk~ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/berkeleydb/prj/d.lst openoffice-new/berkeleydb/prj/d.lst --- openoffice-clean/berkeleydb/prj/d.lst Thu Jun 14 05:37:48 2001 +++ openoffice-new/berkeleydb/prj/d.lst Sat Feb 23 03:14:52 2002 @@ -11,6 +11,10 @@ ..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so ..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so +..\%__SRC%\lib\libdb-3.2.dylib %_DEST%\lib%_EXT%\libdb-3.2.dylib +..\%__SRC%\lib\libdb_java-3.2.dylib %_DEST%\lib%_EXT%\libdb_java-3.2.dylib +..\%__SRC%\lib\libdb_cxx-3.2.dylib %_DEST%\lib%_EXT%\libdb_cxx-3.2.dylib + ..\%__SRC%\bin\libdb32.dll %_DEST%\bin%_EXT%\libdb32.dll ..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll Only in openoffice-new: bootstrap Only in openoffice-new/config_office: config.cache Only in openoffice-new/config_office: config.log Only in openoffice-new/config_office: config.status diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/config_office/configure openoffice-new/config_office/configure --- openoffice-clean/config_office/configure Tue Sep 4 11:06:24 2001 +++ openoffice-new/config_office/configure Thu Feb 21 21:33:26 2002 @@ -2503,13 +2503,27 @@ echo "configure: warning: Windows does not have tcsh" 1>&2 TCSH="NO_TCSH" fi -if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then + +if test "$_os" = "Darwin" -a "x$with_x" != "xyes" -a "x$x_includes" = "x" -a "x$x_libraries" = "x"; then + echo $ac_n "checking for /System/Library/Frameworks/AppKit.framework""... $ac_c" 1>&6 +echo "configure:2510: checking for /System/Library/Frameworks/AppKit.framework" >&5 + if test -d "/System/Library/Frameworks/AppKit.framework/"; then + echo "$ac_t""yes" 1>&6 + x_includes="no_x_includes" + x_libraries="no_x_libraries" + else + echo "$ac_t""no" 1>&6 + fi +fi + +if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then + elif test "$_os" != "WINNT" ; then # If we find X, set shell vars x_includes and x_libraries to the # paths, otherwise set no_x=yes. # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:2513: checking for X" >&5 +echo "configure:2527: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -2571,12 +2585,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2645,14 +2659,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -2758,17 +2772,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:2762: checking whether -R must be followed by a space" >&5 +echo "configure:2776: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -2784,14 +2798,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -2823,7 +2837,7 @@ # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:2827: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2841: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2831,7 +2845,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2867,7 +2881,7 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:2871: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2885: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2875,7 +2889,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2918,12 +2932,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:2922: checking for gethostbyname" >&5 +echo "configure:2936: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2970,7 +2984,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2974: checking for gethostbyname in -lnsl" >&5 +echo "configure:2988: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2978,7 +2992,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3022,12 +3036,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3026: checking for connect" >&5 +echo "configure:3040: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -3074,7 +3088,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3078: checking for connect in -lsocket" >&5 +echo "configure:3092: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3082,7 +3096,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3120,12 +3134,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:3124: checking for remove" >&5 +echo "configure:3138: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -3172,7 +3186,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:3176: checking for remove in -lposix" >&5 +echo "configure:3190: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3180,7 +3194,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3218,12 +3232,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:3222: checking for shmat" >&5 +echo "configure:3236: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -3270,7 +3284,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:3274: checking for shmat in -lipc" >&5 +echo "configure:3288: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3278,7 +3292,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3325,7 +3339,7 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:3329: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:3343: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3333,7 +3347,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3371,6 +3385,7 @@ fi + if test "x$x_includes" = "x"; then x_includes="/usr/include" fi @@ -3386,7 +3401,7 @@ CFLAGS=$X_CFLAGS LDFLAGS="$X_LDFLAGS $X_LIBS" echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:3390: checking for XOpenDisplay in -lX11" >&5 +echo "configure:3405: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3394,7 +3409,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3435,7 +3450,7 @@ fi if test "$_os" = "Linux"; then echo $ac_n "checking for gnu_get_libc_version in -lc""... $ac_c" 1>&6 -echo "configure:3439: checking for gnu_get_libc_version in -lc" >&5 +echo "configure:3454: checking for gnu_get_libc_version in -lc" >&5 ac_lib_var=`echo c'_'gnu_get_libc_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3443,7 +3458,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3478,7 +3493,7 @@ fi echo $ac_n "checking the installed libc is at least version 2.1.1""... $ac_c" 1>&6 -echo "configure:3482: checking the installed libc is at least version 2.1.1" >&5 +echo "configure:3497: checking the installed libc is at least version 2.1.1" >&5 if test "$HAVE_LIBC"; then echo "$ac_t""checked" 1>&6 else @@ -3488,7 +3503,7 @@ # Extract the first word of "bison", so it can be a program name with args. set dummy bison; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3492: checking for $ac_word" >&5 +echo "configure:3507: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3526,7 +3541,7 @@ # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3530: checking for $ac_word" >&5 +echo "configure:3545: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3564,7 +3579,7 @@ # Extract the first word of "patch", so it can be a program name with args. set dummy patch; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3568: checking for $ac_word" >&5 +echo "configure:3583: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATCH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3603,7 +3618,7 @@ # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3607: checking for $ac_word" >&5 +echo "configure:3622: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CYGWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3642,7 +3657,7 @@ # Extract the first word of "ml.exe", so it can be a program name with args. set dummy ml.exe; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3646: checking for $ac_word" >&5 +echo "configure:3661: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ML_EXE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3688,7 +3703,7 @@ # Extract the first word of "unzip.exe", so it can be a program name with args. set dummy unzip.exe; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3692: checking for $ac_word" >&5 +echo "configure:3707: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_UNZIP_EXE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/config_office/configure.in openoffice-new/config_office/configure.in --- openoffice-clean/config_office/configure.in Tue Sep 4 11:06:24 2001 +++ openoffice-new/config_office/configure.in Thu Feb 21 21:33:22 2002 @@ -864,12 +864,31 @@ dnl =================================================================== dnl Checks for libraries. dnl =================================================================== + +dnl Check for Mac OS X native GUI, which may be used instead of X11. +if test "$_os" = "Darwin" -a "x$with_x" != "xyes" -a "x$x_includes" = "x" -a "x$x_libraries" = "x"; then + dnl System is either Mac OS X or pure Darwin, and --with-x was not specified + dnl Default to Aqua graphics if available. + AC_MSG_CHECKING([for /System/Library/Frameworks/AppKit.framework]) + if test -d "/System/Library/Frameworks/AppKit.framework/"; then + AC_MSG_RESULT([yes]) + x_includes="no_x_includes" + x_libraries="no_x_libraries" + else + AC_MSG_RESULT([no]) + dnl Probably a pure Darwin system. Check for X11 below. + fi +fi + dnl *************************************** dnl testing for X libraries and includes... dnl *************************************** -if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then +if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then + dnl Mac OS X using Aqua graphics. Don't check for X11. +elif test "$_os" != "WINNT" ; then AC_PATH_X AC_PATH_XTRA + if test "x$x_includes" = "x"; then x_includes="/usr/include" fi Only in openoffice-new/config_office: set_soenv diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/config_office/set_soenv.1 openoffice-new/config_office/set_soenv.1 --- openoffice-clean/config_office/set_soenv.1 Thu Sep 20 06:20:01 2001 +++ openoffice-new/config_office/set_soenv.1 Thu Feb 21 22:28:19 2002 @@ -463,7 +463,6 @@ $CVER = "C295"; $DLLSUFFIX = "mxp"; $GUI = "UNX"; - $GUIBASE = "unx"; $GUIENV = "sal"; $GVER = "VCL"; $OUTPATH = "unxmacxp"; @@ -472,6 +471,7 @@ $OS = "MACOSX"; $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; + # GUIBASE is set below; may be "aqua" or "unx". } if ($platform eq $Winnt) { $comment = "rem"; # Windows script comment character @@ -694,6 +694,11 @@ # Macosx only variables. if ( $platform eq "$Macosx" ) { $FRAMEWORKSHOME = $ds."System".$ds."Library".$ds."Frameworks"; + if ( $XLIB eq "no_x_libraries" ) { + $GUIBASE = "aqua"; + } else { + $GUIBASE = "unx"; + } } # Same as UPD, used in the buildproces. @@ -1014,7 +1019,12 @@ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. $L.'$STLPORT4'.$LIB. - $L.$USR_LIB.'"'; + $L.$USR_LIB; + if ($GUIBASE eq "unx") { + $SOLARLIB .= $L.$XLIB.'"'; + } else { + $SOLARLIB .= '"'; + } } # Location of the compiler include search directory paths. $SOLARINC = '"'.$I.$cur_dir. @@ -1098,7 +1108,12 @@ } elsif ($platform eq "$Macosx") { $SOLARINC .= $I.'$STLPORT4'.$ds."stlport". - $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers".'"'; + $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers"; + if ($GUIBASE eq "unx") { + $SOLARINC .= $I.$XINC.'"'; + } else { + $SOLARINC .= '"'; + } } @@ -1209,6 +1224,9 @@ ToFile( "TF_FILTER", "TRUE", "e" ); if ( $platform ne "$Macosx" ) { ToFile( "PSPRINT", "TRUE", "e" ); +} elsif ( $GUIBASE eq "unx" ) { +# Mac OS X hack: avoid build errors in printing code in X11 +ToFile( "USE_XPRINT", "TRUE", "e" ); } ToFile( "MKDEPENDSOLVER", "TRUE", "e" ); # Only in openoffice-new/config_office: warn Only in openoffice-clean/connectivity/source/drivers/mozaddressbook: makefile.mk Only in openoffice-clean/connectivity/source/drivers/mozaddressbook/mozillasrc: makefile.mk diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/cppu/source/uno/lbenv.cxx openoffice-new/cppu/source/uno/lbenv.cxx --- openoffice-clean/cppu/source/uno/lbenv.cxx Wed Aug 1 03:13:12 2001 +++ openoffice-new/cppu/source/uno/lbenv.cxx Thu Feb 21 21:37:45 2002 @@ -1034,7 +1034,7 @@ aLibName.appendAscii( RTL_CONSTASCII_STRINGPARAM("lib") ); aLibName.append( rEnvTypeName ); #ifdef MACOSX - aLibName.appendAscii( RTL_CONSTASCII_STRINGPARAM("_uno.dylib.framework") ); + aLibName.appendAscii( RTL_CONSTASCII_STRINGPARAM("_uno.dylib") ); #else aLibName.appendAscii( RTL_CONSTASCII_STRINGPARAM("_uno.so") ); #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/cppu/source/uno/lbmap.cxx openoffice-new/cppu/source/uno/lbmap.cxx --- openoffice-clean/cppu/source/uno/lbmap.cxx Mon Jul 2 04:43:51 2001 +++ openoffice-new/cppu/source/uno/lbmap.cxx Thu Feb 21 21:37:56 2002 @@ -362,7 +362,7 @@ aLibName.appendAscii( RTL_CONSTASCII_STRINGPARAM("lib") ); aLibName.append( rBridgeName ); #ifdef MACOSX - aLibName.appendAscii( RTL_CONSTASCII_STRINGPARAM(".dylib.framework") ); + aLibName.appendAscii( RTL_CONSTASCII_STRINGPARAM(".dylib") ); #else aLibName.appendAscii( RTL_CONSTASCII_STRINGPARAM(".so") ); #endif Only in openoffice-new/cppuhelper: log3.log Only in openoffice-new/cppuhelper/source: cfg_registry_wrapper diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/cppuhelper/source/component_context.cxx openoffice-new/cppuhelper/source/component_context.cxx --- openoffice-clean/cppuhelper/source/component_context.cxx Mon Jun 25 07:25:21 2001 +++ openoffice-new/cppuhelper/source/component_context.cxx Fri Feb 22 22:09:23 2002 @@ -99,6 +99,12 @@ { //================================================================================================== + +#if defined(MACOSX) +// Initialize static template data here to break circular reference to libstatic +ClassData1 WeakImplHelper1< lang::XEventListener >::s_aCD(1); +#endif + class Disposer_Impl : public WeakImplHelper1< lang::XEventListener > { @@ -127,6 +133,12 @@ Mutex m_mutex; }; //================================================================================================== + +#if defined(MACOSX) +// Initialize static template data here to break circular reference to libstatic +ClassData1 WeakComponentImplHelper1< XComponentContext >::s_aCD(1); +#endif + class ComponentContext : public MutexHolder , public WeakComponentImplHelper1< XComponentContext > diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/cppuhelper/source/factory.cxx openoffice-new/cppuhelper/source/factory.cxx --- openoffice-clean/cppuhelper/source/factory.cxx Wed Jul 4 01:50:23 2001 +++ openoffice-new/cppuhelper/source/factory.cxx Fri Feb 22 22:09:21 2002 @@ -875,6 +875,10 @@ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- +#if defined(MACOSX) +// Initialize static template data here to break circular reference to libstatic +ClassData3 WeakImplHelper3< XServiceInfo, XSingleServiceFactory, XUnloadingPreference >::s_aCD(3); +#endif class OFactoryProxyHelper : public WeakImplHelper3< XServiceInfo, XSingleServiceFactory, XUnloadingPreference > diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/cppuhelper/source/implbase.cxx openoffice-new/cppuhelper/source/implbase.cxx --- openoffice-clean/cppuhelper/source/implbase.cxx Thu Jun 7 04:11:29 2001 +++ openoffice-new/cppuhelper/source/implbase.cxx Fri Feb 22 22:12:44 2002 @@ -80,6 +80,33 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; +#if defined(MACOSX) +// Initialize static template data here to break circular reference to libstatic +#include +#include +#include +#include +#include +#include +#include +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +typelib_TypeDescriptionReference * com::sun::star::uno::Sequence >::s_pType; +#endif + namespace cppu { //================================================================================================== diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/cppuhelper/source/propshlp.cxx openoffice-new/cppuhelper/source/propshlp.cxx --- openoffice-clean/cppuhelper/source/propshlp.cxx Thu May 10 13:24:59 2001 +++ openoffice-new/cppuhelper/source/propshlp.cxx Fri Feb 22 22:12:50 2002 @@ -106,6 +106,12 @@ /** * The class which implements the PropertySetInfo interface. */ + +#if defined(MACOSX) +// Initialize static template data here to break circular reference to libstatic +ClassData1 WeakImplHelper1< ::com::sun::star::beans::XPropertySetInfo >::s_aCD(1); +#endif + class OPropertySetHelperInfo_Impl : public WeakImplHelper1< ::com::sun::star::beans::XPropertySetInfo > { diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/cppuhelper/source/shlib.cxx openoffice-new/cppuhelper/source/shlib.cxx --- openoffice-clean/cppuhelper/source/shlib.cxx Thu Jun 28 02:37:48 2001 +++ openoffice-new/cppuhelper/source/shlib.cxx Fri Feb 22 22:02:46 2002 @@ -271,19 +271,16 @@ #if defined( SAL_UNX ) #if defined( MACOSX ) - sal_Int32 nEnd = endsWith( rLibName, OUString( RTL_CONSTASCII_USTRINGPARAM(".dylib.framework") ) ); + const char suffix[] = ".dylib"; #else - sal_Int32 nEnd = endsWith( rLibName, OUString( RTL_CONSTASCII_USTRINGPARAM(".so") ) ); + const char suffix[] = ".so"; #endif + sal_Int32 nEnd = endsWith( rLibName, OUString( RTL_CONSTASCII_USTRINGPARAM(suffix) ) ); if (nEnd < 0) // !endsWith { buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("lib") ); buf.append( rLibName ); -#if defined( MACOSX ) - buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(".dylib.framework") ); -#else - buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(".so") ); -#endif + buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(suffix) ); } else // name is completely pre/postfixed { Only in openoffice-new/cppuhelper/test: cfg_data diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/cppuhelper/test/testhelper.cxx openoffice-new/cppuhelper/test/testhelper.cxx --- openoffice-clean/cppuhelper/test/testhelper.cxx Fri Jun 1 04:47:11 2001 +++ openoffice-new/cppuhelper/test/testhelper.cxx Thu Feb 21 21:48:26 2002 @@ -112,7 +112,7 @@ #ifdef UNX #define REG_PREFIX "lib" #ifdef MACOSX -#define DLL_POSTFIX ".dylib.framework" +#define DLL_POSTFIX ".dylib" #else #define DLL_POSTFIX ".so" #endif Only in openoffice-new/cppuhelper/test: testlib diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/dbaccess/prj/d.lst openoffice-new/dbaccess/prj/d.lst --- openoffice-clean/dbaccess/prj/d.lst Tue Sep 25 08:24:24 2001 +++ openoffice-new/dbaccess/prj/d.lst Thu Feb 21 21:55:31 2002 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/dbaccess/source/core/dataaccess/datasource.cxx openoffice-new/dbaccess/source/core/dataaccess/datasource.cxx --- openoffice-clean/dbaccess/source/core/dataaccess/datasource.cxx Thu Jul 26 02:15:31 2001 +++ openoffice-new/dbaccess/source/core/dataaccess/datasource.cxx Thu Feb 21 21:54:43 2002 @@ -909,7 +909,10 @@ OConnection* pObjectImpl = NULL; if (xTunnel.is()) { - static Sequence aTunnelId = OConnection::getUnoTunnelImplementationId(); +#ifndef MACOSX + static +#endif + Sequence aTunnelId = OConnection::getUnoTunnelImplementationId(); pObjectImpl = reinterpret_cast (xTunnel->getSomething(aTunnelId)); } if(pObjectImpl) diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/desktop/prj/d.lst openoffice-new/desktop/prj/d.lst --- openoffice-clean/desktop/prj/d.lst Tue Sep 25 08:24:24 2001 +++ openoffice-new/desktop/prj/d.lst Tue Feb 26 14:12:38 2002 @@ -16,6 +16,7 @@ ..\%__SRC%\bin\soffice.exe %_DEST%\bin%_EXT%\soffice.exe ..\%__SRC%\bin\wrp?????.dll %_DEST%\bin%_EXT%\wrp?????.dll ..\%__SRC%\lib\libwrp?????.so %_DEST%\lib%_EXT%\libwrp?????.so +..\%__SRC%\lib\libwrp*.dylib %_DEST%\lib%_EXT%\libwrp*.dylib ..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice.bin ..\%__SRC%\bin\sweb %_DEST%\bin%_EXT%\sweb.bin @@ -24,5 +25,3 @@ ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res ..\res\s*.exe %_DEST%\bin%_EXT%\s*.exe - - Only in openoffice-new/dmake: dmake Only in openoffice-new/dmake: objects Only in openoffice-new/dmake/startup: config.mk diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/dtrans/source/X11/makefile.mk openoffice-new/dtrans/source/X11/makefile.mk --- openoffice-clean/dtrans/source/X11/makefile.mk Mon Mar 12 22:22:44 2001 +++ openoffice-new/dtrans/source/X11/makefile.mk Thu Feb 21 22:27:44 2002 @@ -76,12 +76,12 @@ # ------------------------------------------------------------------ -.IF "$(OS)"=="MACOSX" +.IF "$(GUIBASE)"!="unx" dummy: - @echo "Nothing to build for Mac OS X" + @echo "Nothing to build for GUIBASE $(GUIBASE)" -.ELSE # "$(OS)"=="MACOSX" +.ELSE # "$(GUIBASE)"!="unx" SLOFILES=\ $(SLO)$/X11_dndcontext.obj \ @@ -112,7 +112,11 @@ $(CPPUHELPERLIB) \ $(SALLIB) -.ENDIF # "$(OS)"=="MACOSX" +.IF "$(OS)"=="MACOSX" +APP1STDLIBS+= -lX11 +.ENDIF + +.ENDIF # "$(GUIBASE)"!="unx" # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/dtrans/source/aqua/makefile.mk openoffice-new/dtrans/source/aqua/makefile.mk --- openoffice-clean/dtrans/source/aqua/makefile.mk Tue Apr 10 05:04:38 2001 +++ openoffice-new/dtrans/source/aqua/makefile.mk Thu Feb 21 22:31:34 2002 @@ -78,17 +78,15 @@ # ------------------------------------------------------------------ -.IF "$(OS)"!="MACOSX" +.IF "$(GUIBASE)"!="aqua" dummy: - @echo "Nothing to build for this platform" + @echo "Nothing to build for GUIBASE $(GUIBASE)" -.ELSE # "$(OS)"!="MACOSX" +.ELSE # "$(GUIBASE)"!="aqua" .INCLUDE : ..$/cppumaker.mk -SYMBOLPREFIX=$(TARGET)$(UPD)$(DLLPOSTFIX) - SLOFILES= \ $(SLO)$/aqua_service.obj \ $(SLO)$/aqua_clipboard.obj @@ -115,13 +113,13 @@ $(CPPUHELPERLIB) \ -framework Cocoa -.ENDIF # "$(OS)"!="MACOSX" +.ENDIF # "$(GUIBASE)"!="aqua" # --- Targets ------------------------------------------------------ #.IF "$(depend)" == "" ALL : ALLTAR - +deliver + +deliver.pl +regcomp -register -r $(BIN)$/$(COMP1TYPELIST).rdb -c $(SHL1TARGET) .INCLUDE : target.mk diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/eventattacher/prj/d.lst openoffice-new/eventattacher/prj/d.lst --- openoffice-clean/eventattacher/prj/d.lst Tue Sep 25 08:24:24 2001 +++ openoffice-new/eventattacher/prj/d.lst Thu Feb 21 22:33:12 2002 @@ -1,4 +1,5 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/extensions/prj/d.lst openoffice-new/extensions/prj/d.lst --- openoffice-clean/extensions/prj/d.lst Tue Sep 25 08:24:24 2001 +++ openoffice-new/extensions/prj/d.lst Thu Feb 21 22:36:14 2002 @@ -1,6 +1,7 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin ..\%__SRC%\misc\*.hid %_DEST%\bin%_EXT%\*.hid diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/extensions/source/dbpilots/makefile.mk openoffice-new/extensions/source/dbpilots/makefile.mk --- openoffice-clean/extensions/source/dbpilots/makefile.mk Mon Mar 5 06:53:13 2001 +++ openoffice-new/extensions/source/dbpilots/makefile.mk Thu Feb 21 22:39:29 2002 @@ -90,6 +90,12 @@ # --- Files -------------------------------------------------------- +.IF "$(OS)"=="MACOSX" +# Mac OS X static data initializer script generates bad headers in here... +dummy: + @echo "Skipping on Mac OS X because of bug in static data script" +.ELSE + CXXFILES= dbptools.cxx \ gridwizard.cxx \ listcombowizard.cxx \ @@ -151,6 +157,7 @@ DEF1NAME= $(SHL1TARGET) DEF1EXPORTFILE= exports.dxp +.ENDIF # $(OS)==MACOSX # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/extensions/source/plugin/unx/unxmgr.cxx openoffice-new/extensions/source/plugin/unx/unxmgr.cxx --- openoffice-clean/extensions/source/plugin/unx/unxmgr.cxx Thu Jun 7 02:56:27 2001 +++ openoffice-new/extensions/source/plugin/unx/unxmgr.cxx Sun Feb 24 18:49:14 2002 @@ -158,8 +158,13 @@ struct dirent aEntry; struct dirent* pEntry; - while( pDIR && readdir_r( pDIR, &aEntry, &pEntry ) ) - { +#if defined MACOSX + // No readdir_r on Mac OS X; readdir is thread-safe + while( pDIR && ( pEntry = readdir(pDIR) ) ) { + aEntry = *pEntry; +#else + while( pDIR && readdir_r( pDIR, &aEntry, &pEntry ) ) { +#endif if( strncmp( aEntry.d_name, "libnullplugin", 13 ) && strcmp( aEntry.d_name, "npnrvp.so" ) && strcmp( aEntry.d_name, "libnprvp.so" ) ) diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/extensions/source/plugin/util/makefile.mk openoffice-new/extensions/source/plugin/util/makefile.mk --- openoffice-clean/extensions/source/plugin/util/makefile.mk Thu Dec 7 11:29:03 2000 +++ openoffice-new/extensions/source/plugin/util/makefile.mk Thu Feb 21 22:43:38 2002 @@ -110,6 +110,13 @@ $(CPPULIB) \ $(SALLIB) +.IF "$(OS)"=="MACOSX" +SHL1STDLIBS += -ldl +.IF "$(GUIBASE)"=="unx" +SHL1STDLIBS += -lX11 +.ENDIF +.ENDIF + #SHL1DEPN= $(SLB)/sfx.lib $(L)$/itools.lib $(L)$/ivcl.lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1IMPLIB = i$(TARGET) diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/extensions/source/scanner/makefile.mk openoffice-new/extensions/source/scanner/makefile.mk --- openoffice-clean/extensions/source/scanner/makefile.mk Mon Sep 18 09:16:52 2000 +++ openoffice-new/extensions/source/scanner/makefile.mk Thu Feb 21 22:44:48 2002 @@ -135,6 +135,10 @@ SHL1STDLIBS+=$(SVTOOLLIB) .ENDIF +.IF "$(OS)"=="MACOSX" +SHL1STDLIBS += -ldl +.ENDIF + SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1IMPLIB=i$(TARGET) SHL1LIBS=$(SLB)$/$(TARGET).lib Only in openoffice-new/external/download: expat.tar Only in openoffice-new/external/expat: expat.pat.tar Only in openoffice-new/external/expat: patchinf Only in openoffice-new/external/expat/rtufiles/xmlparse: hashtable.c Only in openoffice-new/external/expat/rtufiles/xmlparse: hashtable.h Only in openoffice-new/external/expat/rtufiles/xmlparse: makefile.mk Only in openoffice-new/external/expat/rtufiles/xmlparse: xmlparse.c Only in openoffice-new/external/expat/rtufiles/xmlparse: xmlparse.h Only in openoffice-new/external/expat/rtufiles/xmltok: asciitab.h Only in openoffice-new/external/expat/rtufiles/xmltok: dllmain.c Only in openoffice-new/external/expat/rtufiles/xmltok: iasciitab.h Only in openoffice-new/external/expat/rtufiles/xmltok: latin1tab.h Only in openoffice-new/external/expat/rtufiles/xmltok: makefile.mk Only in openoffice-new/external/expat/rtufiles/xmltok: nametab.h Only in openoffice-new/external/expat/rtufiles/xmltok: utf8tab.h Only in openoffice-new/external/expat/rtufiles/xmltok: xmldef.h Only in openoffice-new/external/expat/rtufiles/xmltok: xmlrole.c Only in openoffice-new/external/expat/rtufiles/xmltok: xmlrole.h Only in openoffice-new/external/expat/rtufiles/xmltok: xmltok.c Only in openoffice-new/external/expat/rtufiles/xmltok: xmltok.h Only in openoffice-new/external/expat/rtufiles/xmltok: xmltok_impl.c Only in openoffice-new/external/expat/rtufiles/xmltok: xmltok_impl.h Only in openoffice-new/external/expat/rtufiles/xmltok: xmltok_ns.c Only in openoffice-new/external/freetype: freetype-2.0.2 Only in openoffice-new/external/glibc: patchinf Only in openoffice-new/external/glibc/rtufiles: config.h Only in openoffice-new/external/glibc/rtufiles: getopt.c Only in openoffice-new/external/glibc/rtufiles: getopt.h Only in openoffice-new/external/glibc/rtufiles: getopt1.c Only in openoffice-new/external/glibc/rtufiles: makefile.mk Only in openoffice-new/external/glibc/rtufiles: readdir_r.c Only in openoffice-new/external/gpc: VERSIONS.TXT Only in openoffice-new/external/gpc: gpc.c Only in openoffice-new/external/gpc: gpc.h Only in openoffice-new/external/jpeg: patchinf Only in openoffice-new/external/jpeg/rtufiles: jcapimin.c Only in openoffice-new/external/jpeg/rtufiles: jcapistd.c Only in openoffice-new/external/jpeg/rtufiles: jccoefct.c Only in openoffice-new/external/jpeg/rtufiles: jccolor.c Only in openoffice-new/external/jpeg/rtufiles: jcdctmgr.c Only in openoffice-new/external/jpeg/rtufiles: jchuff.c Only in openoffice-new/external/jpeg/rtufiles: jchuff.h Only in openoffice-new/external/jpeg/rtufiles: jcinit.c Only in openoffice-new/external/jpeg/rtufiles: jcmainct.c Only in openoffice-new/external/jpeg/rtufiles: jcmarker.c Only in openoffice-new/external/jpeg/rtufiles: jcmaster.c Only in openoffice-new/external/jpeg/rtufiles: jcomapi.c Only in openoffice-new/external/jpeg/rtufiles: jconfig.h Only in openoffice-new/external/jpeg/rtufiles: jcparam.c Only in openoffice-new/external/jpeg/rtufiles: jcphuff.c Only in openoffice-new/external/jpeg/rtufiles: jcprepct.c Only in openoffice-new/external/jpeg/rtufiles: jcsample.c Only in openoffice-new/external/jpeg/rtufiles: jdapimin.c Only in openoffice-new/external/jpeg/rtufiles: jdapistd.c Only in openoffice-new/external/jpeg/rtufiles: jdatadst.c Only in openoffice-new/external/jpeg/rtufiles: jdatasrc.c Only in openoffice-new/external/jpeg/rtufiles: jdcoefct.c Only in openoffice-new/external/jpeg/rtufiles: jdcolor.c Only in openoffice-new/external/jpeg/rtufiles: jdct.h Only in openoffice-new/external/jpeg/rtufiles: jddctmgr.c Only in openoffice-new/external/jpeg/rtufiles: jdhuff.c Only in openoffice-new/external/jpeg/rtufiles: jdhuff.h Only in openoffice-new/external/jpeg/rtufiles: jdinput.c Only in openoffice-new/external/jpeg/rtufiles: jdmainct.c Only in openoffice-new/external/jpeg/rtufiles: jdmarker.c Only in openoffice-new/external/jpeg/rtufiles: jdmaster.c Only in openoffice-new/external/jpeg/rtufiles: jdmerge.c Only in openoffice-new/external/jpeg/rtufiles: jdphuff.c Only in openoffice-new/external/jpeg/rtufiles: jdpostct.c Only in openoffice-new/external/jpeg/rtufiles: jdsample.c Only in openoffice-new/external/jpeg/rtufiles: jdtrans.c Only in openoffice-new/external/jpeg/rtufiles: jerror.c Only in openoffice-new/external/jpeg/rtufiles: jerror.h Only in openoffice-new/external/jpeg/rtufiles: jfdctflt.c Only in openoffice-new/external/jpeg/rtufiles: jfdctfst.c Only in openoffice-new/external/jpeg/rtufiles: jfdctint.c Only in openoffice-new/external/jpeg/rtufiles: jidctflt.c Only in openoffice-new/external/jpeg/rtufiles: jidctfst.c Only in openoffice-new/external/jpeg/rtufiles: jidctint.c Only in openoffice-new/external/jpeg/rtufiles: jidctred.c Only in openoffice-new/external/jpeg/rtufiles: jinclude.h Only in openoffice-new/external/jpeg/rtufiles: jmemmgr.c Only in openoffice-new/external/jpeg/rtufiles: jmemnobs.c Only in openoffice-new/external/jpeg/rtufiles: jmemsys.h Only in openoffice-new/external/jpeg/rtufiles: jmorecfg.h Only in openoffice-new/external/jpeg/rtufiles: jpeg.h Only in openoffice-new/external/jpeg/rtufiles: jpegc.c Only in openoffice-new/external/jpeg/rtufiles: jpegint.h Only in openoffice-new/external/jpeg/rtufiles: jpeglib.h Only in openoffice-new/external/jpeg/rtufiles: jquant1.c Only in openoffice-new/external/jpeg/rtufiles: jquant2.c Only in openoffice-new/external/jpeg/rtufiles: jutils.c Only in openoffice-new/external/jpeg/rtufiles: jversion.h Only in openoffice-new/external/jpeg/rtufiles: makefile.mk Only in openoffice-new/external/neon: patchinf Only in openoffice-new/external/neon/rtufiles: base64.c Only in openoffice-new/external/neon/rtufiles: base64.h Only in openoffice-new/external/neon/rtufiles: config.h Only in openoffice-new/external/neon/rtufiles: dates.c Only in openoffice-new/external/neon/rtufiles: dates.h Only in openoffice-new/external/neon/rtufiles: dav_207.c Only in openoffice-new/external/neon/rtufiles: dav_207.h Only in openoffice-new/external/neon/rtufiles: dav_basic.c Only in openoffice-new/external/neon/rtufiles: dav_basic.h Only in openoffice-new/external/neon/rtufiles: dav_locks.c Only in openoffice-new/external/neon/rtufiles: dav_locks.h Only in openoffice-new/external/neon/rtufiles: dav_props.c Only in openoffice-new/external/neon/rtufiles: dav_props.h Only in openoffice-new/external/neon/rtufiles: hip_xml.c Only in openoffice-new/external/neon/rtufiles: hip_xml.h Only in openoffice-new/external/neon/rtufiles: http_auth.c Only in openoffice-new/external/neon/rtufiles: http_auth.h Only in openoffice-new/external/neon/rtufiles: http_basic.c Only in openoffice-new/external/neon/rtufiles: http_basic.h Only in openoffice-new/external/neon/rtufiles: http_cookies.c Only in openoffice-new/external/neon/rtufiles: http_cookies.h Only in openoffice-new/external/neon/rtufiles: http_private.h Only in openoffice-new/external/neon/rtufiles: http_redirect.c diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/external/neon/rtufiles/http_redirect.h openoffice-new/external/neon/rtufiles/http_redirect.h --- openoffice-clean/external/neon/rtufiles/http_redirect.h Wed Feb 7 01:17:31 2001 +++ openoffice-new/external/neon/rtufiles/http_redirect.h Fri Feb 22 11:45:53 2002 @@ -1,6 +1,6 @@ /* HTTP-redirect support - Copyright (C) 2000, Joe Orton + Copyright (C) 1999-2001, Joe Orton This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -17,7 +17,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - $Id: http_redirect.h,v 1.2 2001/02/07 09:17:31 armin Exp $ */ #ifndef HTTP_REDIRECT_H @@ -25,6 +24,16 @@ #include "http_request.h" +BEGIN_NEON_DECLS + +/* The redirect code does not handle redirects to a different server. + * For a redirect to a different server, the request fails and returns + * HTTP_REDIRECT. You can then retrieve the redirect location using the + * call http_redirect_location. + * + * (you must have called http_redirect_register for this to happen). + * */ + /* Get confirmation from the user that a redirect from * URI 'src' to URI 'dest' is acceptable. Should return: * Non-Zero to FOLLOW the redirect @@ -56,5 +65,10 @@ http_redirect_confirm confirm, http_redirect_notify notify, void *userdata); + +/* Return location of last redirect. */ +const char *http_redirect_location(http_session *sess); + +END_NEON_DECLS #endif /* HTTP_REDIRECT_H */ Only in openoffice-new/external/neon/rtufiles: http_request.c Only in openoffice-new/external/neon/rtufiles: http_request.h Only in openoffice-new/external/neon/rtufiles: http_utils.c Only in openoffice-new/external/neon/rtufiles: http_utils.h Only in openoffice-new/external/neon/rtufiles: makefile.mk Only in openoffice-new/external/neon/rtufiles: md5.c Only in openoffice-new/external/neon/rtufiles: ne_alloc.c Only in openoffice-new/external/neon/rtufiles: ne_alloc.h Only in openoffice-new/external/neon/rtufiles: neon_defs.h Only in openoffice-new/external/neon/rtufiles: neon_i18n.c Only in openoffice-new/external/neon/rtufiles: neon_i18n.h Only in openoffice-new/external/neon/rtufiles: neon_md5.h Only in openoffice-new/external/neon/rtufiles: nsocket.h Only in openoffice-new/external/neon/rtufiles: socket.c Only in openoffice-new/external/neon/rtufiles: sslcerts.c Only in openoffice-new/external/neon/rtufiles: string_utils.c Only in openoffice-new/external/neon/rtufiles: string_utils.h Only in openoffice-new/external/neon/rtufiles: uri.c Only in openoffice-new/external/neon/rtufiles: uri.h Only in openoffice-new/external/npsdk: patchinf Only in openoffice-new/external/npsdk/rtufiles: jri.h Only in openoffice-new/external/npsdk/rtufiles: jri_md.h Only in openoffice-new/external/npsdk/rtufiles: jritypes.h Only in openoffice-new/external/npsdk/rtufiles: makefile.mk Only in openoffice-new/external/npsdk/rtufiles: npapi.h Only in openoffice-new/external/npsdk/rtufiles: npmac.cpp Only in openoffice-new/external/npsdk/rtufiles: npunix.c Only in openoffice-new/external/npsdk/rtufiles: npupp.h Only in openoffice-new/external/npsdk/rtufiles: npwin.cpp Only in openoffice-new/external/odbc: patchinf Only in openoffice-new/external/odbc/rtufiles: qeodbc.h Only in openoffice-new/external/odbc/rtufiles: sql.h Only in openoffice-new/external/odbc/rtufiles: sqlext.h Only in openoffice-new/external/odbc/rtufiles: sqltypes.h Only in openoffice-new/external/psprint: delzip Only in openoffice-new/external/psprint/ppds: delzip Only in openoffice-new/external/sane: patchinf Only in openoffice-new/external/sane: sane.h Only in openoffice-new/external/twain: patchinf Only in openoffice-new/external/twain: twain.h Only in openoffice-new/external/zlib: patchinf Only in openoffice-new/external/zlib/rtufiles: adler32.c Only in openoffice-new/external/zlib/rtufiles: crc32.c Only in openoffice-new/external/zlib/rtufiles: deflate.c Only in openoffice-new/external/zlib/rtufiles: deflate.h Only in openoffice-new/external/zlib/rtufiles: infblock.c Only in openoffice-new/external/zlib/rtufiles: infblock.h Only in openoffice-new/external/zlib/rtufiles: infcodes.c Only in openoffice-new/external/zlib/rtufiles: infcodes.h Only in openoffice-new/external/zlib/rtufiles: inffast.c Only in openoffice-new/external/zlib/rtufiles: inffast.h Only in openoffice-new/external/zlib/rtufiles: inflate.c Only in openoffice-new/external/zlib/rtufiles: inftrees.c Only in openoffice-new/external/zlib/rtufiles: inftrees.h Only in openoffice-new/external/zlib/rtufiles: infutil.c Only in openoffice-new/external/zlib/rtufiles: infutil.h Only in openoffice-new/external/zlib/rtufiles: makefile.mk Only in openoffice-new/external/zlib/rtufiles: trees.c Only in openoffice-new/external/zlib/rtufiles: zconf.h Only in openoffice-new/external/zlib/rtufiles: zlib.h Only in openoffice-new/external/zlib/rtufiles: zutil.c Only in openoffice-new/external/zlib/rtufiles: zutil.h Only in openoffice-new/extras/source/migration: delzip Only in openoffice-new/extras/source/migration/lang: delzip diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/forms/prj/d.lst openoffice-new/forms/prj/d.lst --- openoffice-clean/forms/prj/d.lst Tue Sep 25 08:24:25 2001 +++ openoffice-new/forms/prj/d.lst Thu Feb 21 22:46:36 2002 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/forms/util/makefile.mk openoffice-new/forms/util/makefile.mk --- openoffice-clean/forms/util/makefile.mk Sun Jul 22 23:27:47 2001 +++ openoffice-new/forms/util/makefile.mk Thu Feb 21 22:47:48 2002 @@ -121,10 +121,10 @@ RESLIB1SRSFILES=$(RES1FILELIST) .IF "$(GUI)"=="UNX" - +.IF "$(GUIBASE)"=="unx" SHL1STDLIBS +=\ -lX11 -lXt -lXmu - +.ENDIF .ENDIF # --- Targets ---------------------------------- diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/framework/prj/d.lst openoffice-new/framework/prj/d.lst --- openoffice-clean/framework/prj/d.lst Tue Sep 25 08:24:26 2001 +++ openoffice-new/framework/prj/d.lst Fri Feb 22 12:09:42 2002 @@ -5,6 +5,7 @@ ..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\* ..\%__SRC%\bin\login %_DEST%\bin%_EXT%\login.bin ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\dtd\menubar.dtd %_DEST%\bin%_EXT%\menubar.dtd ..\dtd\toolbar.dtd %_DEST%\bin%_EXT%\toolbar.dtd diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/goodies/prj/d.lst openoffice-new/goodies/prj/d.lst --- openoffice-clean/goodies/prj/d.lst Tue Sep 25 08:24:26 2001 +++ openoffice-new/goodies/prj/d.lst Tue Feb 26 03:23:44 2002 @@ -75,6 +75,7 @@ ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib mkdir: %_DEST%\inc%_EXT%\goodies hedabu: ..\inc\grfmgr.hxx %_DEST%\inc%_EXT%\goodies\grfmgr.hxx Only in openoffice-new/helpcontent/unx/common: delzip Only in openoffice-new/helpcontent/unx/sbasic: delzip Only in openoffice-new/helpcontent/unx/scalc: delzip Only in openoffice-new/helpcontent/unx/schart: delzip Only in openoffice-new/helpcontent/unx/sdraw: delzip Only in openoffice-new/helpcontent/unx/simpress: delzip Only in openoffice-new/helpcontent/unx/smath: delzip Only in openoffice-new/helpcontent/unx/swriter: delzip diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/idlc/source/makefile.mk openoffice-new/idlc/source/makefile.mk --- openoffice-clean/idlc/source/makefile.mk Wed Apr 18 04:04:25 2001 +++ openoffice-new/idlc/source/makefile.mk Thu Feb 21 22:50:15 2002 @@ -132,6 +132,10 @@ $(SALLIB) \ $(SALHELPERLIB) +.IF "$(OS)"=="MACOSX" +APP1STDLIBS += $(REGLIB) +.ENDIF + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/inet/source/api/wrapper.cxx openoffice-new/inet/source/api/wrapper.cxx --- openoffice-clean/inet/source/api/wrapper.cxx Mon Mar 19 03:27:12 2001 +++ openoffice-new/inet/source/api/wrapper.cxx Thu Feb 21 22:52:34 2002 @@ -98,6 +98,11 @@ using rtl::OUString; +#ifdef MACOSX +// This definition isn't automatically added by the static initializer script. +NAMESPACE_VOS(ORealDynamicLoader) *NAMESPACE_VOS(ODynamicLoader)::m_pStaticLoader = NULL; +#endif + /*======================================================================== * * INetWrapper internals. diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/javaunohelper/prj/d.lst openoffice-new/javaunohelper/prj/d.lst --- openoffice-clean/javaunohelper/prj/d.lst Tue Sep 25 08:24:27 2001 +++ openoffice-new/javaunohelper/prj/d.lst Thu Feb 21 22:53:42 2002 @@ -1,5 +1,6 @@ ..\%__SRC%\class\juh.jar %_DEST%\bin%_EXT%\juh.jar ..\%__SRC%\bin\juh.dll %_DEST%\bin%_EXT%\juh.dll ..\%__SRC%\lib\libjuh.so %_DEST%\lib%_EXT%\libjuh.so +..\%__SRC%\lib\libjuh.dylib %_DEST%\lib%_EXT%\libjuh.dylib Only in openoffice-new/javaunohelper/prj: d.lst.rej diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/lingucomponent/prj/d.lst openoffice-new/lingucomponent/prj/d.lst --- openoffice-clean/lingucomponent/prj/d.lst Thu Sep 13 09:04:17 2001 +++ openoffice-new/lingucomponent/prj/d.lst Fri Feb 22 12:10:02 2002 @@ -6,12 +6,12 @@ ..\%__SRC%\bin\lth* %_DEST%\bin%_EXT%\lth* ..\%__SRC%\lib\ilth* %_DEST%\lib%_EXT%\ilth* ..\%__SRC%\lib\liblth.a %_DEST%\lib%_EXT%\liblth.a -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib +..\%__SRC%\lib\liblth*.dylib %_DEST%\lib%_EXT%\liblth*.dylib ..\%__SRC%\lib\liblth*.so %_DEST%\lib%_EXT%\liblth*.so ..\%__SRC%\bin\spell* %_DEST%\bin%_EXT%\spell* ..\%__SRC%\lib\ilspell* %_DEST%\lib%_EXT%\ilspell* ..\%__SRC%\lib\libspell.a %_DEST%\lib%_EXT%\libspell.a -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib +..\%__SRC%\lib\libspell*.dylib %_DEST%\lib%_EXT%\libspell*.dylib ..\%__SRC%\lib\libspell*.so %_DEST%\lib%_EXT%\libspell*.so Only in openoffice-new/lingucomponent/source/thesaurus/parser: trimthes.txt Only in openoffice-new/lingucomponent/source/thesaurus/parser: wordlist.txt Only in openoffice-new: makefile.mk Only in openoffice-clean/moz/zipped: makefile.mk diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/odk/examples/cpp/officeclient/makefile.mk openoffice-new/odk/examples/cpp/officeclient/makefile.mk --- openoffice-clean/odk/examples/cpp/officeclient/makefile.mk Thu Jul 26 01:20:08 2001 +++ openoffice-new/odk/examples/cpp/officeclient/makefile.mk Fri Feb 22 12:02:28 2002 @@ -78,11 +78,20 @@ DLLPOSTFIX=.dll DLLPREFIX= .ELSE +.IF "$(OS)"=="MACOSX" +DLLPOSTFIX=.dylib +DLLPREFIX=lib +.ELSE DLLPOSTFIX=.so DLLPREFIX=lib .ENDIF +.ENDIF # --- Files -------------------------------------------------------- +.IF "$(OS)"=="MACOSX" +dummy: + @echo "Nothing to be done for Mac OS X" +.ELSE ALLIDLFILES = test_bridge.idl #CPPUMAKERFLAGS += -C @@ -112,7 +121,7 @@ DEF1NAME= $(SHL1TARGET) DEF1EXPORTFILE= exports.dxp - +.ENDIF # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/offmgr/prj/d.lst openoffice-new/offmgr/prj/d.lst --- openoffice-clean/offmgr/prj/d.lst Tue Sep 25 08:24:28 2001 +++ openoffice-new/offmgr/prj/d.lst Thu Feb 21 22:57:04 2002 @@ -10,6 +10,7 @@ touch: ..\%__SRC%\misc\ofa.hid %_DEST%\bin%_EXT%\ofa.hid ..\%__SRC%\lib\_ofa.lib %_DEST%\lib%_EXT%\aofa.lib ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a ..\%__SRC%\lib\_xl.lib %_DEST%\lib%_EXT%\ixl.lib ..\%__SRC%\lib\xapp.lib %_DEST%\lib%_EXT%\xapp.lib diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/package/prj/d.lst openoffice-new/package/prj/d.lst --- openoffice-clean/package/prj/d.lst Tue Sep 25 08:24:28 2001 +++ openoffice-new/package/prj/d.lst Thu Feb 21 22:57:43 2002 @@ -2,6 +2,7 @@ ..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\dtd\*.dtd %_DEST%\bin%_EXT%\*.* diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/padmin/source/makefile.mk openoffice-new/padmin/source/makefile.mk --- openoffice-clean/padmin/source/makefile.mk Mon Jul 9 08:46:37 2001 +++ openoffice-new/padmin/source/makefile.mk Sat Feb 23 14:37:06 2002 @@ -71,6 +71,10 @@ # --- Files -------------------------------------------------------- +.IF "$(OS)"=="MACOSX" + @echo "Skipping on Mac OS X" +.ELSE + SRCFILES=padialog.src filedlg2.src rtsetup.src RESLIB1NAME=spa @@ -131,6 +135,8 @@ -l$(SHL1TARGET) \ $(SHL1STDLIBS) \ -lXext -lX11 + +.ENDIF # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/product/examples/cpp/remoteclient/makefile.mk openoffice-new/product/examples/cpp/remoteclient/makefile.mk --- openoffice-clean/product/examples/cpp/remoteclient/makefile.mk Thu Jul 26 01:18:04 2001 +++ openoffice-new/product/examples/cpp/remoteclient/makefile.mk Thu Feb 21 23:05:19 2002 @@ -76,11 +76,20 @@ DLLPOSTFIX=.dll DLLPREFIX= .ELSE +.IF "$(OS)"=="MACOSX" +DLLPOSTFIX=.dylib +DLLPREFIX=lib +.ELSE DLLPOSTFIX=.so DLLPREFIX=lib .ENDIF +.ENDIF # --- Files -------------------------------------------------------- +.IF "$(OS)"=="MACOSX" +dummy: + @echo "Nothing to be done for Mac OS X" +.ELSE ALLIDLFILES = test_bridge.idl @@ -109,7 +118,7 @@ DEF1NAME= $(SHL1TARGET) DEF1EXPORTFILE= exports.dxp - +.ENDIF # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/product/inc/scp/udk_basefiles.scp openoffice-new/product/inc/scp/udk_basefiles.scp --- openoffice-clean/product/inc/scp/udk_basefiles.scp Tue Aug 21 07:47:38 2001 +++ openoffice-new/product/inc/scp/udk_basefiles.scp Thu Feb 21 23:06:43 2002 @@ -3,7 +3,7 @@ File gid_File_Lib_Sal BIN_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT6(libsal.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO)); + Name = STRING(CONCAT8(libsal,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO)); #else Name = STRING(CONCAT3(sal,UDK_MAJOR,.dll)); #endif @@ -15,7 +15,7 @@ Shortcut gid_Shortcut_Lib_Sal FileID = gid_File_Lib_Sal; Dir = GCFG_BINARY_DIR; - Name = STRING(CONCAT2(libsal.so.,UDK_MAJOR)); + Name = STRING(CONCAT4(libsal,UNXSUFFIX,.,UDK_MAJOR)); Styles = (NETWORK,RELATIVE); End #endif @@ -23,7 +23,7 @@ File gid_File_Lib_Sto BIN_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT6(libstore.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO)); + Name = STRING(CONCAT8(libstore,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO)); #else Name = STRING(CONCAT3(store,UDK_MAJOR,.dll)); #endif @@ -35,7 +35,7 @@ Shortcut gid_Shortcut_Lib_Sto FileID = gid_File_Lib_Sto; Dir = GCFG_BINARY_DIR; - Name = STRING(CONCAT2(libstore.so.,UDK_MAJOR)); + Name = STRING(CONCAT4(libstore,UNXSUFFIX,.,UDK_MAJOR)); Styles = (NETWORK,RELATIVE); End #endif @@ -43,7 +43,7 @@ File gid_File_Lib_Reg BIN_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT6(libreg.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO)); + Name = STRING(CONCAT8(libreg,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO)); #else Name = STRING(CONCAT3(reg,UDK_MAJOR,.dll)); #endif @@ -55,7 +55,7 @@ Shortcut gid_Shortcut_Lib_Reg FileID = gid_File_Lib_Reg; Dir = GCFG_BINARY_DIR; - Name = STRING(CONCAT2(libreg.so.,UDK_MAJOR)); + Name = STRING(CONCAT4(libreg,UNXSUFFIX,.,UDK_MAJOR)); Styles = (NETWORK,RELATIVE); End #endif @@ -63,7 +63,7 @@ File gid_File_Lib_Cppu BIN_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT6(libcppu.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO)); + Name = STRING(CONCAT8(libcppu,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO)); #else Name = STRING(CONCAT3(cppu,UDK_MAJOR,.dll)); #endif @@ -75,7 +75,7 @@ Shortcut gid_Shortcut_Lib_Cppu FileID = gid_File_Lib_Cppu; Dir = GCFG_BINARY_DIR; - Name = STRING(CONCAT2(libcppu.so.,UDK_MAJOR)); + Name = STRING(CONCAT4(libcppu,UNXSUFFIX,.,UDK_MAJOR)); Styles = (NETWORK,RELATIVE); End #endif @@ -102,7 +102,7 @@ #endif #ifdef GCC #undef GCC - Name = STRING(CONCAT5(libcppuhelper,UDK_MAJOR,GCC,.,so)); + Name = STRING(CONCAT4(libcppuhelper,UDK_MAJOR,GCC,UNXSUFFIX)); #define GCC 1 #endif #ifdef WNT @@ -130,7 +130,7 @@ #endif #ifdef GCC #undef GCC - Name = STRING(CONCAT5(libsalhelper,UDK_MAJOR,GCC,.,so)); + Name = STRING(CONCAT4(libsalhelper,UDK_MAJOR,GCC,UNXSUFFIX)); #define GCC 1 #endif #ifdef WNT @@ -147,7 +147,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libcpld.so"; + Name = STRING(CONCAT2(libcpld,UNXSUFFIX)); #else Name = "cpld.dll"; #endif @@ -159,7 +159,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libdefreg.so"; + Name = STRING(CONCAT2(libdefreg,UNXSUFFIX)); #else Name = "defreg.dll"; #endif @@ -171,7 +171,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libimpreg.so"; + Name = STRING(CONCAT2(libimpreg,UNXSUFFIX)); #else Name = "impreg.dll"; #endif @@ -183,7 +183,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "librdbtdp.so"; + Name = STRING(CONCAT2(librdbtdp,UNXSUFFIX)); #else Name = "rdbtdp.dll"; #endif @@ -195,7 +195,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libsimreg.so"; + Name = STRING(CONCAT2(libsimreg,UNXSUFFIX)); #else Name = "simreg.dll"; #endif @@ -207,7 +207,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libsmgr.so"; + Name = STRING(CONCAT2(libsmgr,UNXSUFFIX)); #else Name = "smgr.dll"; #endif @@ -219,7 +219,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libtdmgr.so"; + Name = STRING(CONCAT2(libtdmgr,UNXSUFFIX)); #else Name = "tdmgr.dll"; #endif @@ -242,7 +242,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libstm.so"; + Name = STRING(CONCAT2(libstm,UNXSUFFIX)); #else Name = "stm.dll"; #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/product/inc/scp/udk_bridgesfiles.scp openoffice-new/product/inc/scp/udk_bridgesfiles.scp --- openoffice-clean/product/inc/scp/udk_bridgesfiles.scp Mon Jul 9 08:10:14 2001 +++ openoffice-new/product/inc/scp/udk_bridgesfiles.scp Sun Feb 24 15:08:18 2002 @@ -32,6 +32,18 @@ #endif +#ifdef MACOSX + +File gid_File_Lib_Gcc2_Uno + BIN_FILE_BODY; + Styles = (PACKED); + Name = "libgcc2_uno.dylib"; + Dir = GCFG_BINARY_DIR; +End + +#endif + + #ifdef SOLARIS File gid_File_Lib_Sunpro5_Uno diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/product/inc/scp/udk_completefiles.scp openoffice-new/product/inc/scp/udk_completefiles.scp --- openoffice-clean/product/inc/scp/udk_completefiles.scp Wed Jun 27 07:13:02 2001 +++ openoffice-new/product/inc/scp/udk_completefiles.scp Thu Feb 21 23:07:04 2002 @@ -6,7 +6,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libcorefl.so"; + Name = STRING(CONCAT2(libcorefl,UNXSUFFIX)); #else Name = "corefl.dll"; #endif @@ -18,7 +18,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libinsp.so"; + Name = STRING(CONCAT2(libinsp,UNXSUFFIX)); #else Name = "insp.dll"; #endif @@ -30,7 +30,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libinv.so"; + Name = STRING(CONCAT2(libinv,UNXSUFFIX)); #else Name = "inv.dll"; #endif @@ -42,7 +42,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libinvadp.so"; + Name = STRING(CONCAT2(libinvadp,UNXSUFFIX)); #else Name = "invadp.dll"; #endif @@ -54,7 +54,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libnamingservice.so"; + Name = STRING(CONCAT2(libnamingservice,UNXSUFFIX)); #else Name = "namingservice.dll"; #endif @@ -66,7 +66,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libproxyfac.so"; + Name = STRING(CONCAT2(libproxyfac,UNXSUFFIX)); #else Name = "proxyfac.dll"; #endif @@ -78,7 +78,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libtcv.so"; + Name = STRING(CONCAT2(libtcv,UNXSUFFIX)); #else Name = "tcv.dll"; #endif @@ -91,7 +91,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libstm.so"; + Name = STRING(CONCAT2(libstm,UNXSUFFIX)); #else Name = "stm.dll"; #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/product/inc/scp/udk_javafiles.scp openoffice-new/product/inc/scp/udk_javafiles.scp --- openoffice-clean/product/inc/scp/udk_javafiles.scp Wed Jun 27 07:13:02 2001 +++ openoffice-new/product/inc/scp/udk_javafiles.scp Thu Feb 21 23:07:20 2002 @@ -6,7 +6,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libjavaloader.so"; + Name = STRING(CONCAT2(libjavaloader,UNXSUFFIX)); #else Name = "javaloader.dll"; #endif @@ -18,7 +18,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libjen.so"; + Name = STRING(CONCAT2(libjen,UNXSUFFIX)); #else Name = "jen.dll"; #endif @@ -28,7 +28,7 @@ Styles = (PACKED); Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libjava_uno.so"; + Name = STRING(CONCAT2(libjava_uno,UNXSUFFIX)); #else Name = "java_uno.dll"; #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/product/inc/scp/udk_remotefiles.scp openoffice-new/product/inc/scp/udk_remotefiles.scp --- openoffice-clean/product/inc/scp/udk_remotefiles.scp Tue Aug 21 07:47:49 2001 +++ openoffice-new/product/inc/scp/udk_remotefiles.scp Thu Feb 21 23:07:52 2002 @@ -5,7 +5,7 @@ Styles = (PACKED); Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = STRING(CONCAT6(librmcxt.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO)); + Name = STRING(CONCAT8(librmcxt,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO)); #else Name = STRING(CONCAT3(rmcxt,UDK_MAJOR,.dll)); #endif @@ -15,7 +15,7 @@ Shortcut gid_Shortcut_Lib_Rmcxt FileID = gid_File_Lib_Rmcxt; Dir = GCFG_BINARY_DIR; - Name = STRING(CONCAT2(librmcxt.so.,UDK_MAJOR)); + Name = STRING(CONCAT4(librmcxt,UNXSUFFIX,.,UDK_MAJOR)); Styles = (NETWORK,RELATIVE); End #endif @@ -25,7 +25,7 @@ Styles = (PACKED,DONT_OVERWRITE); Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libiiop_uno.so"; + Name = STRING(CONCAT2(libiiop_uno,UNXSUFFIX)); #else Name = "iiop_uno.dll"; #endif @@ -37,7 +37,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libremotebridge.so"; + Name = STRING(CONCAT2(libremotebridge,UNXSUFFIX)); #else Name = "remotebridge.dll"; #endif @@ -49,7 +49,7 @@ Styles = (PACKED); Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "liburp_uno.so"; + Name = STRING(CONCAT2(liburp_uno,UNXSUFFIX)); #else Name = "urp_uno.dll"; #endif @@ -61,7 +61,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libacceptor.so"; + Name = STRING(CONCAT2(libacceptor,UNXSUFFIX)); #else Name = "acceptor.dll"; #endif @@ -73,7 +73,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libbrdgfctr.so"; + Name = STRING(CONCAT2(libbrdgfctr,UNXSUFFIX)); #else Name = "brdgfctr.dll"; #endif @@ -85,7 +85,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libconnectr.so"; + Name = STRING(CONCAT2(libconnectr,UNXSUFFIX)); #else Name = "connectr.dll"; #endif @@ -97,7 +97,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libuuresolver.so"; + Name = STRING(CONCAT2(libuuresolver,UNXSUFFIX)); #else Name = "uuresolver.dll"; #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/product/util/makefile.mk openoffice-new/product/util/makefile.mk --- openoffice-clean/product/util/makefile.mk Tue Aug 7 08:16:52 2001 +++ openoffice-new/product/util/makefile.mk Thu Feb 21 23:08:11 2002 @@ -49,10 +49,17 @@ # UNX ONLY ##################### DLLOUT=$(SOLARLIBDIR) +.IF "$(OS)"=="MACOSX" +MY_DLLPOSTFIX=.dylib +MY_VERSION_DLLPOSTFIX=.dylib.$(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) +MY_VERSION_LINKPOSTFIX=.dylib.$(UDK_MAJOR) +MY_VERSION_LINKTARGETPOSTFIX=.$(UDK_MINOR).$(UDK_MICRO) +.ELSE MY_DLLPOSTFIX=.so MY_VERSION_DLLPOSTFIX=.so.$(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) MY_VERSION_LINKPOSTFIX=.so.$(UDK_MAJOR) MY_VERSION_LINKTARGETPOSTFIX=.$(UDK_MINOR).$(UDK_MICRO) +.ENDIF MY_MAJOR= MY_DLLPREFIX=lib EXEPOSTFIX= @@ -101,6 +108,16 @@ STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=gcc2_uno +.ELIF "$(OS)"=="MACOSX" +########### +# MACOSX +########### +DESTDIRBIN=$(DESTDIR)$/macosx$/bin +DESTDIRLIB=$(DESTDIR)$/macosx$/lib +DESTDIRDLL=$(DESTDIRLIB) +STLPORTLIBNAME=libstlport_gcc.dylib +BINDINGDLL=gcc2_uno + .ELIF "$(OS)"=="WNT" ############### # WINDOWS @@ -332,30 +349,30 @@ $(MKDIRHIER) $@ $(DESTDIRBIN)$/udkapi.rdb : $(BINOUT)$/udkapi.rdb $(DESTDIRBIN) - $(GNUCOPY) -p $(BINOUT)$/udkapi.rdb $@ + -$(GNUCOPY) -p $(BINOUT)$/udkapi.rdb $@ $(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT)$/%$(EXEPOSTFIX) $(DIRLIST) - $(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ + -$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ .IF "$(STLPORTDEST)" != "" #OOo build environment $(STLPORTDEST) : $(STLPORTOUT) $(DIRLIST) - $(GNUCOPY) -p $(STLPORTOUT) $@ + -$(GNUCOPY) -p $(STLPORTOUT) $@ .ENDIF $(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX) $(DIRLIST) - $(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ + -$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST) - $(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ + -$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST) +ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ +ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db) $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) - $(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ + -$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ $(DESTDIRXML)$/%.xml : $(XMLOUT)$/%.xml $(DIRLIST) $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ @@ -364,7 +381,7 @@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@ $(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib $(DIRLIST) - $(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@ + -$(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@ $(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk $(DIRLIST) +-rm -f $@ >& $(NULLDEV) @@ -376,7 +393,7 @@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ $(DESTDIREXAMPLES)$/README : $(PRJ)$/examples$/README - $(GNUCOPY) -p $(PRJ)$/examples$/README $@ + -$(GNUCOPY) -p $(PRJ)$/examples$/README $@ $(DESTDIRIDL)$/% : $(IDLOUT)$/% +-rm -f $@ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/registry/source/reflread.cxx openoffice-new/registry/source/reflread.cxx --- openoffice-clean/registry/source/reflread.cxx Wed May 30 08:08:16 2001 +++ openoffice-new/registry/source/reflread.cxx Thu Feb 21 23:11:24 2002 @@ -89,6 +89,10 @@ ORealDynamicLoader* ODynamicLoader::m_pLoader = NULL; #endif +#if defined(MACOSX) +ORealDynamicLoader* ODynamicLoader::m_pStaticLoader = NULL; +#endif + /************************************************************************** class BlopObject diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/registry/source/reflwrit.cxx openoffice-new/registry/source/reflwrit.cxx --- openoffice-clean/registry/source/reflwrit.cxx Wed Mar 14 01:36:00 2001 +++ openoffice-new/registry/source/reflwrit.cxx Thu Feb 21 23:11:41 2002 @@ -90,6 +90,10 @@ ORealDynamicLoader* ODynamicLoader::m_pLoader = NULL; #endif +#if defined(MACOSX) +ORealDynamicLoader* ODynamicLoader::m_pStaticLoader = NULL; +#endif + #define BLOP_OFFSET_MAGIC 0 #define BLOP_OFFSET_SIZE (BLOP_OFFSET_MAGIC + sizeof(sal_uInt32)) #define BLOP_OFFSET_MINOR (BLOP_OFFSET_SIZE + sizeof(sal_uInt32)) diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/registry/source/registry.cxx openoffice-new/registry/source/registry.cxx --- openoffice-clean/registry/source/registry.cxx Wed Mar 14 01:36:00 2001 +++ openoffice-new/registry/source/registry.cxx Thu Feb 21 23:12:13 2002 @@ -91,6 +91,10 @@ ORealDynamicLoader* ODynamicLoader::m_pLoader = NULL; #endif +#if defined(MACOSX) +ORealDynamicLoader* ODynamicLoader::m_pStaticLoader = NULL; +#endif + OString getTempName() { static OUString TMP(RTL_CONSTASCII_USTRINGPARAM("TMP")); diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/rsc/source/rscpp/cpp3.c openoffice-new/rsc/source/rscpp/cpp3.c --- openoffice-clean/rsc/source/rscpp/cpp3.c Wed Apr 18 03:31:56 2001 +++ openoffice-new/rsc/source/rscpp/cpp3.c Fri Feb 22 12:02:52 2002 @@ -79,7 +79,9 @@ #if defined(DEBUG) && (HOST == SYS_VMS || HOST == SYS_UNIX) #include +#ifndef MACOSX /* [ed] 1/13/02 Use the standard definition of signal for OS X */ extern int abort(); /* For debugging */ +#endif #endif void InitCpp3() diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sablot/Sablot-0.52.patch openoffice-new/sablot/Sablot-0.52.patch --- openoffice-clean/sablot/Sablot-0.52.patch Wed Sep 26 05:18:19 2001 +++ openoffice-new/sablot/Sablot-0.52.patch Fri Feb 22 12:03:10 2002 @@ -86,11 +86,11 @@ ! .ENDIF ! ! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" -! CFLAGS+= -DHAVE_UNISTD_H +! CFLAGS+= -DHAVE_UNISTD_H -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! CFLAGS+= -DHAVE_ISNAN -DHAVE_FINITE ! .ENDIF ! ! CFLAGS+= -I$(SOLARINCDIR)$/external$/expat Only in openoffice-new/sablot: build Only in openoffice-new/sablot: log.log diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sal/inc/osl/module.h openoffice-new/sal/inc/osl/module.h --- openoffice-clean/sal/inc/osl/module.h Mon Oct 1 20:55:14 2001 +++ openoffice-new/sal/inc/osl/module.h Fri Feb 22 15:40:07 2002 @@ -86,7 +86,7 @@ #elif defined(SAL_UNX) #if defined(MACOSX) -#define SAL_MODULENAME_WITH_VERSION(name, version) SAL_DLLPREFIX name ".dylib." version ".framework" +#define SAL_MODULENAME_WITH_VERSION(name, version) SAL_DLLPREFIX name ".dylib." version #else #define SAL_MODULENAME_WITH_VERSION(name, version) SAL_DLLPREFIX name SAL_DLLEXTENSION "." version #endif @@ -105,10 +105,10 @@ void* pModule; sal_Char* pModuleName; }; -typedef struct _oslModule; -#endif +typedef struct _oslModule *oslModule; +#else typedef void* oslModule; - +#endif /** Load a module.
@param strModuleName denotes the name of the module to be loaded. diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sal/inc/sal/config.h openoffice-new/sal/inc/sal/config.h --- openoffice-clean/sal/inc/sal/config.h Wed Sep 26 04:14:15 2001 +++ openoffice-new/sal/inc/sal/config.h Thu Feb 21 23:15:28 2002 @@ -125,7 +125,7 @@ #ifdef MACOSX #define SAL_UNX -#define SAL_DLLEXTENSION ".dylib.framework" +#define SAL_DLLEXTENSION ".dylib" #define SAL_DLLPREFIX "lib" #define SAL_PRGEXTENSION ".bin" #define SAL_PATHSEPARATOR ':' diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sal/osl/unx/module.c openoffice-new/sal/osl/unx/module.c --- openoffice-clean/sal/osl/unx/module.c Wed Sep 26 04:14:16 2001 +++ openoffice-new/sal/osl/unx/module.c Tue Feb 26 15:51:13 2002 @@ -136,111 +136,87 @@ oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode) { #ifdef MACOSX + // GrP use dyld APIs so dylibs don't have to be in framework bundles - CFStringRef pPath=0; - CFURLRef pURL=0; - CFBundleRef pLib=0; - sal_Char *searchPath=0; - sal_Char path[PATH_MAX + 1]; - sal_Char *pszModulePath=0; + int len; + const struct mach_header *pLib = NULL; + oslModule pModule; + sal_Char buf[PATH_MAX + 1]; OSL_ASSERT(pszModuleName); if ( ! pszModuleName || *pszModuleName == '\0' ) return NULL; - /* - * Try to construct the absolute path to the module name by searching - * for the module name in the directories specified in the - * DYLD_LIBRARY_PATH environment variable. - */ - if ( osl_searchPath( pszModuleName, "DYLD_LIBRARY_PATH", '\0', path, sizeof(path) ) == osl_Process_E_None ) - pszModulePath = path; - - /* Try checking in the system directories */ - if ( ! pszModulePath ) - { - strcpy( path, "/System/Library/Frameworks/" ); - strcat( path, pszModuleName ); - pszModulePath = path; - } - - if ( pszModulePath ) - { #ifndef NO_DL_FUNCTIONS - /* Convert path in strModulePath to CFStringRef */ - pPath = CFStringCreateWithCString( NULL, pszModulePath, - kCFStringEncodingUTF8 ); - - /* Get the framework's CFURLRef using its path */ - if ( ! (pURL = CFURLCreateWithFileSystemPath( kCFAllocatorDefault, - pPath, kCFURLPOSIXPathStyle, true) ) ) - { -#ifdef DEBUG - fprintf( stderr, - "osl_loadModule: cannot load module %s for reason: %s\n", - pszModulePath, "path does not exist" ); -#endif - CFRelease(pPath); - return NULL; - } - - /* Load the framework */ - if ( ! ( pLib = CFBundleCreate( NULL, pURL) ) ) - { + + // Check if module is already loaded + strncpy(buf, pszModuleName, sizeof(buf)); + buf[sizeof(buf)-1] = '\0'; + pLib = NSAddImage(buf, NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED | + NSADDIMAGE_OPTION_RETURN_ON_ERROR); + + if (!pLib) { + // Module not already loaded. Try to load the module using + // the name as given (search includes DYLD_LIBRARY_PATH) + strncpy(buf, pszModuleName, sizeof(buf)); + buf[sizeof(buf)-1] = '\0'; + pLib = NSAddImage(buf, NSADDIMAGE_OPTION_WITH_SEARCHING | + NSADDIMAGE_OPTION_RETURN_ON_ERROR); + } + + if (!pLib && pszModuleName[0] != '/') { + // Didn't find module in DYLD_LIBRARY_PATH. Try looking + // in application's bundle. + // But don't bother if the name is an absolute path. + strncpy(buf, "@executable_path/", sizeof(buf)); + strncat(buf, pszModuleName, sizeof(buf) - strlen(buf)); + buf[sizeof(buf)-1] = '\0'; + pLib = NSAddImage(buf, NSADDIMAGE_OPTION_WITH_SEARCHING | + NSADDIMAGE_OPTION_RETURN_ON_ERROR); + } + + if (!pLib) { + // Still couldn't find it - give up #ifdef DEBUG - fprintf( stderr, - "osl_loadModule: cannot load module %s for reason: %s\n", - pszModulePath, "path is not a bundle" ); + // fixme use NSLinkEditError() to get a better error message + fprintf( stderr, + "osl_loadModule: cannot load module %s for reason: %s\n", + pszModuleName, "file does not exist or is not a library (tried DYLD_LIBRARY_PATH and @executable_path)" ); #endif - CFRelease( pPath ); - CFRelease( pURL ); - return NULL; - } - - /* Load the library in the framework */ - if ( CFBundleLoadExecutable( pLib ) ) - { - oslModule pModule=0; - - CFRelease( pPath ); - CFRelease( pURL ); - pModule = (oslModule)malloc( sizeof( struct _oslModule ) ); - - if ( pModule ) - { - // ignore trailing ".dylib*" - int len = strlen( pszModuleName ) - 6; - pModule->pModule = pLib; - // find last ".dylib" - for ( ; len > 0 ; len-- ) - { - if ( !strncmp( pszModuleName + len - 1, ".dylib", 6 ) ) - break; - } - pModule->pModuleName = (sal_Char *)malloc( len ); - strncpy( pModule->pModuleName, pszModuleName, len ); - pModule->pModuleName[len - 1] = '\0'; - } - - return pModule; - } - else - { + return NULL; + } + + pModule = (oslModule)malloc( sizeof( struct _oslModule ) ); + if (!pModule) { #ifdef DEBUG - fprintf( stderr, - "osl_loadModule: cannot load module %s for reason: %s\n", - pszModulePath, "bundle does not contain a valid library" ); + fprintf( stderr, + "osl_loadModule: cannot load module %s for reason: %s\n", + pszModuleName, "out of memory!" ); #endif - CFRelease( pPath ); - CFRelease( pURL ); - CFRelease( pLib ); - return NULL; - } + return NULL; + } + + // Calculate module name = file name without trailing .dylib* + for ( len = strlen(pszModuleName) - 6; len > 0 ; len-- ) + { + if ( !strncmp( pszModuleName + len, ".dylib", 6 ) ) + break; + } + pModule->pModuleName = (sal_Char *)malloc( len + 1 ); + strncpy( pModule->pModuleName, pszModuleName, len + 1 ); + pModule->pModuleName[len] = '\0'; + pModule->pModule = pLib; + return pModule; + +#else /* NO_DL_FUNCTIONS */ + fprintf( stderr, + "osl_loadModule: cannot load module %s for reason: %s\n", + pszModuleName, "not compiled with dynamic library support" ); + return NULL; +#endif /* NO_DL_FUNCTIONS */ + -#endif - } - return NULL; #else /* MACOSX */ @@ -285,18 +261,7 @@ #ifdef MACOSX - - if (hModule) - { - if ( hModule->pModule ) - { - CFBundleUnloadExecutable((CFBundleRef)(hModule->pModule)); - CFRelease((CFBundleRef)(hModule->pModule)); - } - if ( hModule->pModuleName ) - free( hModule->pModuleName ); - free( hModule ); - } + // Unloading dylibs is not yet supported on Mac OS X. #else /* MACOSX */ @@ -368,50 +333,27 @@ { #ifdef MACOSX - CFMutableStringRef pMutSymbolName=0; - CFStringRef pSymbolName=0; - void *pSymbol=0; - OSL_ASSERT(hModule); OSL_ASSERT(pszSymbolName); if (hModule && hModule->pModule && pszSymbolName) { #ifndef NO_DL_FUNCTIONS - /* The need to concat the library name and function name is caused - by a bug in MACOSX's loader */ - if ( hModule->pModuleName ) /* if module name is not null */ - { - /* Convert char pointer to CFStringRef, make it mutable and - append the symbol */ - pSymbolName = CFStringCreateWithCString(NULL, hModule->pModuleName, kCFStringEncodingUTF8); - pMutSymbolName = CFStringCreateMutableCopy(NULL, 0, pSymbolName); - CFStringAppendCString(pMutSymbolName, pszSymbolName, kCFStringEncodingUTF8); - /* Try to get the symbol */ - pSymbol = CFBundleGetFunctionPointerForName((CFBundleRef)(hModule->pModule), (CFStringRef)pMutSymbolName); - /* Release CFStringRef */ - if ( pSymbolName ) - CFRelease(pSymbolName); - /* Release CFMutableStringRef */ - if ( pMutSymbolName ) - CFRelease(pMutSymbolName); - } - - /* If a symbol with the module name as a prefix was not found, try to - load the symbol without any prefix */ - if ( !pSymbol ) - { - /* Convert char pointer to CFStringRef */ - pSymbolName = CFStringCreateWithCString(NULL, pszSymbolName, kCFStringEncodingUTF8); - - /* Try to get the symbol */ - pSymbol = CFBundleGetFunctionPointerForName((CFBundleRef)(hModule->pModule), pSymbolName); - /* Release CFStringRef */ - if ( pSymbolName ) - CFRelease(pSymbolName); - } + struct mach_header *pLib; + NSSymbol pSymbol; - return pSymbol; + // Prefix symbol name with '_' + char *name = malloc(1+strlen(pszSymbolName)+1); + strcpy(name, "_"); + strcat(name, pszSymbolName); + + pLib = (struct mach_header *)hModule->pModule; + // fixme need to BIND_FULLY or BIND_NOW? + pSymbol = NSLookupSymbolInImage(pLib, name, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND); + free(name); + if (pSymbol) { + return NSAddressOfSymbol(pSymbol); + } #endif } return NULL; diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sal/osl/unx/process.c openoffice-new/sal/osl/unx/process.c --- openoffice-clean/sal/osl/unx/process.c Sun Jul 29 11:21:56 2001 +++ openoffice-new/sal/osl/unx/process.c Thu Feb 21 23:27:37 2002 @@ -179,10 +179,39 @@ * *****************************************************************************/ +#if defined(MACOSX) +// Can't access environ and __progname directly when linking two-level. +static sal_Char *getCmdLine() +{ + int i; + int len = 0; + sal_Char *result; + int the_argc = *_NSGetArgc(); + char **the_argv = *_NSGetArgv(); + + for (i = 0; i < the_argc; i++) { + len += 1 + strlen(the_argv[i]); + } + + result = calloc(len + 1, sizeof(sal_Char)); + if (result) { + sal_Char *dst = result; + for (i = 0; i < the_argc; i++) { + strcpy(dst, the_argv[i]); + dst += 1 + strlen(the_argv[i]); + } + *dst = '\0'; + return result; + } + + return NULL; +} + +#endif #if defined(CMD_ARG_PRG) && defined(CMD_ARG_ENV) /* - * mfe: used by FreeBSD, NetBSD, HP-UX, IRIX, MacOS X + * mfe: used by FreeBSD, NetBSD, HP-UX, IRIX * (and which other Unix flavours?) */ static sal_Char *getCmdLine() diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sal/osl/unx/system.h openoffice-new/sal/osl/unx/system.h --- openoffice-clean/sal/osl/unx/system.h Mon May 14 08:30:58 2001 +++ openoffice-new/sal/osl/unx/system.h Thu Feb 21 23:31:10 2002 @@ -396,8 +396,9 @@ # include # include # include +/* fixme are premac and postmac still needed here? */ # include -# include +# include # include # if BYTE_ORDER == LITTLE_ENDIAN # define _LITTLE_ENDIAN @@ -408,8 +409,8 @@ # endif # define IOCHANNEL_TRANSFER_BSD_RENO # define NO_PTHREAD_RTL -# define CMD_ARG_PRG __progname -# define CMD_ARG_ENV environ +/* for NSGetArgc/Argv/Environ */ +# include #endif #if !defined(_WIN32) && !defined(_WIN16) && !defined(OS2) && \ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/scaddins/prj/d.lst openoffice-new/scaddins/prj/d.lst --- openoffice-clean/scaddins/prj/d.lst Tue Sep 25 08:24:30 2001 +++ openoffice-new/scaddins/prj/d.lst Thu Feb 21 23:32:59 2002 @@ -1,6 +1,7 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin ..\%__SRC%\misc\*.hid %_DEST%\bin%_EXT%\*.hid diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/scaddins/source/analysis/makefile.mk openoffice-new/scaddins/source/analysis/makefile.mk --- openoffice-clean/scaddins/source/analysis/makefile.mk Thu Jun 21 05:57:48 2001 +++ openoffice-new/scaddins/source/analysis/makefile.mk Thu Feb 21 23:33:20 2002 @@ -110,8 +110,8 @@ $(SLO)$/financial.obj \ $(SLO)$/analysishelper.obj -# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols -.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" +# SCO: the linker does know about weak symbols, but we can't ignore multiple defined symbols +.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" SLOFILES+=$(SLO)$/staticmb.obj .ENDIF diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sch/source/ui/inc/ChXDiagram.hxx openoffice-new/sch/source/ui/inc/ChXDiagram.hxx --- openoffice-clean/sch/source/ui/inc/ChXDiagram.hxx Mon Aug 6 04:54:42 2001 +++ openoffice-new/sch/source/ui/inc/ChXDiagram.hxx Fri Feb 22 12:07:37 2002 @@ -124,6 +124,10 @@ class ChartModel; class SchChartDocShell; +// GrP gcc 2.95.2 on Mac OS X chokes on this huge template class. +// Expand the template by hand. +#if !defined(MACOSX) + // Construct a WeakImplHelper14 with the emphasis on 14. // Fourteen interfaces are two to many to use the newer template definition // of WeakImplHelper. @@ -143,10 +147,126 @@ __IFC_WRITEOFFSET(13) __IFC_WRITEOFFSET(14) __DEF_IMPLHELPER_POST(14) +// !defined(MACOSX) +#else +// defined(MACOSX) + +namespace cppu { + struct ClassData14 : public ClassDataBase + { + Type_Offset arType2Offset[ 14 ]; + ClassData14( ) SAL_THROW( () ) + : ClassDataBase( 14 ) + {} + }; + + class SAL_NO_VTABLE ImplHelperBase14 + : public ::com::sun::star::lang::XTypeProvider + , public com::sun::star::chart::XDiagram, + public com::sun::star::chart::XAxisZSupplier, + public com::sun::star::chart::XTwoAxisXSupplier, + public com::sun::star::chart::XTwoAxisYSupplier, + public com::sun::star::chart::XStatisticDisplay, + public com::sun::star::chart::X3DDisplay, + public com::sun::star::beans::XPropertySet, + public com::sun::star::beans::XMultiPropertySet, + public com::sun::star::beans::XPropertyState, + public com::sun::star::beans::XMultiPropertyStates, + public com::sun::star::lang::XServiceInfo, + public com::sun::star::lang::XUnoTunnel, + public com::sun::star::lang::XComponent, + public com::sun::star::lang::XEventListener + { + protected: + ClassData & SAL_CALL getClassData( ClassDataBase & s_aCD ) SAL_THROW( () ) + { + ClassData & rCD = * static_cast< ClassData * >( &s_aCD ); + if (! rCD.bOffsetsInit) + { + ::osl::MutexGuard aGuard( getImplHelperInitMutex() ); + if (! rCD.bOffsetsInit) + { + char * pBase = (char *)this; + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > *)0 ), + (char *)(com::sun::star::chart::XDiagram *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< com::sun::star::chart::XAxisZSupplier > *)0 ), + (char *)(com::sun::star::chart::XAxisZSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< com::sun::star::chart::XTwoAxisXSupplier > *)0 ), + (char *)(com::sun::star::chart::XTwoAxisXSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< com::sun::star::chart::XTwoAxisYSupplier > *)0 ), + (char *)(com::sun::star::chart::XTwoAxisYSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< com::sun::star::chart::XStatisticDisplay > *)0 ), + (char *)(com::sun::star::chart::XStatisticDisplay *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< com::sun::star::chart::X3DDisplay > *)0 ), + (char *)(com::sun::star::chart::X3DDisplay *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > *)0 ), + (char *)(com::sun::star::beans::XPropertySet *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< com::sun::star::beans::XMultiPropertySet > *)0 ), + (char *)(com::sun::star::beans::XMultiPropertySet *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertyState > *)0 ), + (char *)(com::sun::star::beans::XPropertyState *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< com::sun::star::beans::XMultiPropertyStates > *)0 ), + (char *)(com::sun::star::beans::XMultiPropertyStates *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< com::sun::star::lang::XServiceInfo > *)0 ), + (char *)(com::sun::star::lang::XServiceInfo *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< com::sun::star::lang::XUnoTunnel > *)0 ), + (char *)(com::sun::star::lang::XUnoTunnel *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< com::sun::star::lang::XComponent > *)0 ), + (char *)(com::sun::star::lang::XComponent *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > *)0 ), + (char *)(com::sun::star::lang::XEventListener *)this - pBase ); + rCD.bOffsetsInit = sal_True; + } + } + return rCD; + } + }; + + + class SAL_NO_VTABLE ImplHelper14 + : public ImplHelperBase14 + { + static ClassData14 s_aCD; + public: + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).query( rType, (ImplHelperBase14 *)this ); } + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getTypes(); } + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getImplementationId(); } + }; + + + class SAL_NO_VTABLE WeakImplHelper14 + : public ::cppu::OWeakObject + , public ImplHelperBase14 + { + static ClassData14 s_aCD; + public: + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException) + { + ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase14 *)this ) ); + return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); + } + virtual void SAL_CALL acquire() throw () + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw () + { OWeakObject::release(); } + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getTypes(); } + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getImplementationId(); } + }; + // namespace ::cppu +} +// defined(MACOSX) +#endif -class ChXDiagram : public cppu::WeakImplHelper14< +class ChXDiagram : public cppu::WeakImplHelper14 +#if !defined(MACOSX) +< com::sun::star::chart::XDiagram, com::sun::star::chart::XAxisZSupplier, com::sun::star::chart::XTwoAxisXSupplier, // : XAxisXSupplier @@ -161,6 +281,7 @@ com::sun::star::lang::XUnoTunnel, com::sun::star::lang::XComponent, com::sun::star::lang::XEventListener> +#endif { private: ::rtl::OUString maServiceName; diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sch/source/ui/unoidl/ChXDiagram.cxx openoffice-new/sch/source/ui/unoidl/ChXDiagram.cxx --- openoffice-clean/sch/source/ui/unoidl/ChXDiagram.cxx Tue Aug 21 05:54:44 2001 +++ openoffice-new/sch/source/ui/unoidl/ChXDiagram.cxx Fri Feb 22 12:08:02 2002 @@ -159,6 +159,9 @@ extern SchUnoPropertyMapProvider aSchMapProvider; +static cppu::ClassData14 cppu::ImplHelper14::s_aCD; +static cppu::ClassData14 cppu::WeakImplHelper14::s_aCD; + #define MATRIX4D_TO_HOMOGEN_MATRIX( m, h ) \ h.Line1.Column1 = m[0][0]; \ h.Line1.Column2 = m[0][1]; \ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/scp/inc/gcfg.inc openoffice-new/scp/inc/gcfg.inc --- openoffice-clean/scp/inc/gcfg.inc Wed Aug 29 11:24:19 2001 +++ openoffice-new/scp/inc/gcfg.inc Thu Feb 21 23:36:38 2002 @@ -247,6 +247,10 @@ #define CONCAT5( x, y, z, a, b ) DOCONCAT5(x,y,z,a,b) #define DOCONCAT6( x, y, z, a, b, c ) x##y##z##a##b##c #define CONCAT6( x, y, z, a, b, c ) DOCONCAT6(x,y,z,a,b,c) +#define DOCONCAT7( x, y, z, a, b, c, d ) x##y##z##a##b##c##d +#define CONCAT7( x, y, z, a, b, c, d ) DOCONCAT8(x,y,z,a,b,c,d) +#define DOCONCAT8( x, y, z, a, b, c, d, e ) x##y##z##a##b##c##d##e +#define CONCAT8( x, y, z, a, b, c, d, e ) DOCONCAT8(x,y,z,a,b,c,d,e) /* --------------------------------------------------*/ @@ -275,8 +279,13 @@ /* --------------------------------------------------*/ #ifdef UNX -#define LIBNAME(name) STRING(CONCAT5(lib,name,SUPD,DLLSUFFIX,.so)) -#define LIBSHORTNAME(name) STRING(CONCAT4(lib,name,DLLSUFFIX,.so)) +#ifdef MACOSX +#define UNXSUFFIX .dylib +#else +#define UNXSUFFIX .so +#endif +#define LIBNAME(name) STRING(CONCAT5(lib,name,SUPD,DLLSUFFIX,UNXSUFFIX)) +#define LIBSHORTNAME(name) STRING(CONCAT4(lib,name,DLLSUFFIX,UNXSUFFIX)) #define FILTER_LIBNAME(name) LIBNAME(name) #define EXENAME(name) STRING(name) #define PROFILENAME(name) STRING(CONCAT2(name,rc)) Only in openoffice-new/scp: log.log Only in openoffice-new/scp: log2.log Only in openoffice-new/scp: log5 diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/scp/source/calc/files_calc.scp openoffice-new/scp/source/calc/files_calc.scp --- openoffice-clean/scp/source/calc/files_calc.scp Wed Jun 27 07:29:58 2001 +++ openoffice-new/scp/source/calc/files_calc.scp Thu Feb 21 23:37:20 2002 @@ -93,7 +93,7 @@ #ifdef WNT #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll)) #else -#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so)) +#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX)) #endif #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/scp/source/chart/files_chart.scp openoffice-new/scp/source/chart/files_chart.scp --- openoffice-clean/scp/source/chart/files_chart.scp Wed Jun 27 07:30:38 2001 +++ openoffice-new/scp/source/chart/files_chart.scp Thu Feb 21 23:37:42 2002 @@ -93,7 +93,7 @@ #ifdef WNT #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll)) #else -#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so)) +#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX)) #endif #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/scp/source/draw/files_draw.scp openoffice-new/scp/source/draw/files_draw.scp --- openoffice-clean/scp/source/draw/files_draw.scp Wed Jun 27 07:32:05 2001 +++ openoffice-new/scp/source/draw/files_draw.scp Thu Feb 21 23:37:58 2002 @@ -93,7 +93,7 @@ #ifdef WNT #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll)) #else -#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so)) +#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX)) #endif #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/scp/source/fonts/files_fonts.scp openoffice-new/scp/source/fonts/files_fonts.scp --- openoffice-clean/scp/source/fonts/files_fonts.scp Thu Aug 30 03:07:05 2001 +++ openoffice-new/scp/source/fonts/files_fonts.scp Thu Feb 21 23:38:13 2002 @@ -155,7 +155,7 @@ #ifdef WNT #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll)) #else -#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so)) +#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX)) #endif #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/scp/source/global/setupzip.scp openoffice-new/scp/source/global/setupzip.scp --- openoffice-clean/scp/source/global/setupzip.scp Wed Aug 15 07:54:21 2001 +++ openoffice-new/scp/source/global/setupzip.scp Thu Feb 21 23:39:36 2002 @@ -10,7 +10,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libmcnttype.so"; + Name = STRING(CONCAT2(libmcnttype,UNXSUFFIX)); #else Name = "mcnttype.dll"; #endif @@ -27,7 +27,7 @@ Dir = GCFG_BINARY_DIR; #endif #ifdef UNX - Name = STRING(CONCAT4(libvcl,SUPD,DLLSUFFIX,.so)); + Name = STRING(CONCAT4(libvcl,SUPD,DLLSUFFIX,UNXSUFFIX)); #else Name = STRING(CONCAT4(vcl,SUPD,DLLSUFFIX,.dll)); #endif @@ -58,7 +58,7 @@ File GID_FILE_LIB_LOCALEDATA_ASCII BIN_FILE_BODY; #ifdef UNX - Name = "liblocaledata_ascii.so"; + Name = STRING(CONCAT2(liblocaledata_ascii,UNXSUFFIX)); #else Name = "localedata_ascii.dll"; #endif @@ -71,7 +71,7 @@ File GID_FILE_LIB_LOCALEDATA_CJK BIN_FILE_BODY; #ifdef UNX - Name = "liblocaledata_CJK.so"; + Name = STRING(CONCAT2(liblocaledata_CJK,UNXSUFFIX)); #else Name = "localedata_CJK.dll"; #endif @@ -103,10 +103,10 @@ Styles = (PACKED, SETUPZIP); Dir = GCFG_BINARY_DIR; #ifdef SOLARIS - Name = "libstlport_sunpro.so"; + Name = STRING(CONCAT2(libstlport_sunpro,UNXSUFFIX)); #endif #ifdef GCC - Name = "libstlport_gcc.so"; + Name = STRING(CONCAT2(libstlport_gcc,UNXSUFFIX)); #endif End @@ -117,7 +117,7 @@ File GID_FILE_LIB_COLLATOR BIN_FILE_BODY; #ifdef UNX - Name = "libcollator.so"; + Name = STRING(CONCAT2(libcollator,UNXSUFFIX)); #else Name = "collator.dll"; #endif @@ -133,15 +133,15 @@ Styles = (PACKED, SETUPZIP); #ifdef SOLARIS #ifdef C42 - Name = "libucbhelper1C42.so"; + Name = STRING(CONCAT2(libucbhelper1C42,UNXSUFFIX)); #elif defined C50 - Name = "libucbhelper1C50.so"; + Name = STRING(CONCAT2(libucbhelper1C50,UNXSUFFIX)); #else - Name = "libucbhelper1C52.so"; + Name = STRING(CONCAT2(libucbhelper1C52,UNXSUFFIX)); #endif #endif #ifdef GCC - Name = "libucbhelper1GCC.so"; + Name = STRING(CONCAT2(libucbhelper1GCC,UNXSUFFIX)); #endif #ifdef WNT Name = "ucbhelper1MSC.dll"; @@ -216,7 +216,7 @@ File GID_FILE_LIB_J BIN_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT6(lib,j,SUPD,DLLSUFFIX,_g,.so)); + Name = STRING(CONCAT6(lib,j,SUPD,DLLSUFFIX,_g,UNXSUFFIX)); #else Name = STRING(CONCAT5(j,SUPD,DLLSUFFIX,_g,.dll)); #endif @@ -229,7 +229,7 @@ File GID_FILE_LIB_COMPHELPER2 BIN_FILE_BODY; #ifdef UNX - Name = "libcomphelp2.so"; + Name = STRING(CONCAT2(libcomphelp2,UNXSUFFIX)); #else Name = "comphelp2.dll"; #endif @@ -246,15 +246,15 @@ BIN_FILE_BODY; #ifdef SOLARIS #ifdef C42 - Name = "libvos2C42.so"; + Name = STRING(CONCAT2(libvos2C42,UNXSUFFIX)); #elif defined C50 - Name = "libvos2C50.so"; + Name = STRING(CONCAT2(libvos2C50,UNXSUFFIX)); #else - Name = "libvos2C52.so"; + Name = STRING(CONCAT2(libvos2C52,UNXSUFFIX)); #endif #endif #ifdef GCC - Name = "libvos2GCC.so"; + Name = STRING(CONCAT2(libvos2GCC,UNXSUFFIX)); #endif #ifdef WNT Name = "vos2MSC.dll"; @@ -326,7 +326,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = STRING(CONCAT4(libdtransX11,SUPD,DLLSUFFIX,.so)); + Name = STRING(CONCAT4(libdtransX11,SUPD,DLLSUFFIX,UNXSUFFIX)); #else Name = "sysdtrans.dll"; #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/scp/source/grafikfilter/files_grafik.scp openoffice-new/scp/source/grafikfilter/files_grafik.scp --- openoffice-clean/scp/source/grafikfilter/files_grafik.scp Mon Jul 9 06:49:30 2001 +++ openoffice-new/scp/source/grafikfilter/files_grafik.scp Thu Feb 21 23:40:14 2002 @@ -93,7 +93,7 @@ #ifdef WNT #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll)) #else -#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so)) +#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX)) #endif #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/scp/source/impress/files_impress.scp openoffice-new/scp/source/impress/files_impress.scp --- openoffice-clean/scp/source/impress/files_impress.scp Wed Jun 27 07:33:33 2001 +++ openoffice-new/scp/source/impress/files_impress.scp Thu Feb 21 23:40:34 2002 @@ -93,7 +93,7 @@ #ifdef WNT #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll)) #else -#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so)) +#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX)) #endif #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/scp/source/math/files_math.scp openoffice-new/scp/source/math/files_math.scp --- openoffice-clean/scp/source/math/files_math.scp Mon Aug 6 01:22:00 2001 +++ openoffice-new/scp/source/math/files_math.scp Thu Feb 21 23:40:46 2002 @@ -93,7 +93,7 @@ #ifdef WNT #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll)) #else -#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so)) +#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX)) #endif #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/scp/source/office/files.scp openoffice-new/scp/source/office/files.scp --- openoffice-clean/scp/source/office/files.scp Thu Sep 20 01:23:20 2001 +++ openoffice-new/scp/source/office/files.scp Thu Feb 21 23:41:14 2002 @@ -93,7 +93,7 @@ #ifdef WNT #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll)) #else -#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so)) +#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX)) #endif #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \ @@ -336,11 +336,11 @@ File GID_FILE_LIB_WPS2STAR BIN_FILE_BODY; #ifdef LINUX - Name = "libwps2starli.so"; + Name = STRING(CONCAT2(libwps2starli,UNXSUFFIX)); #elif defined (SOLARIS) && defined (SPARC) - Name = "libwps2starss.so"; + Name = STRING(CONCAT2(libwps2starss,UNXSUFFIX)); #elif defined (SOLARIS) && defined (INTEL) - Name = "libwps2starsi.so"; + Name = STRING(CONCAT2(libwps2starsi,UNXSUFFIX)); #else Name = "WPS2Star.dll"; #endif @@ -367,7 +367,7 @@ File GID_FILE_LIB_UCPCHELP1 BIN_FILE_BODY; #ifdef UNX - Name = "libucpchelp1.so"; + Name = STRING(CONCAT2(libucpchelp1,UNXSUFFIX)); #else Name = "ucpchelp1.dll"; #endif @@ -397,7 +397,7 @@ File GID_FILE_LIB_DBT BIN_FILE_BODY; #ifdef UNX - Name = "libdbtools2.so"; + Name = STRING(CONCAT2(libdbtools2,UNXSUFFIX)); #else Name = "dbtools2.dll"; #endif @@ -410,7 +410,7 @@ File GID_FILE_LIB_DBODBCBASE BIN_FILE_BODY; #ifdef UNX - Name = "libodbcbase2.so"; + Name = STRING(CONCAT2(libodbcbase2,UNXSUFFIX)); #else Name = "odbcbase2.dll"; #endif @@ -483,7 +483,7 @@ File GID_FILE_LIB_DICT_JA_JP BIN_FILE_BODY; #ifdef UNX - Name = "libdict_ja_JP.so"; + Name = STRING(CONCAT2(libdict_ja_JP,UNXSUFFIX)); #else Name = "dict_ja_JP.dll"; #endif @@ -494,7 +494,7 @@ File GID_FILE_LIB_DICT_ZH_CN BIN_FILE_BODY; #ifdef UNX - Name = "libdict_zh_CN.so"; + Name = STRING(CONCAT2(libdict_zh_CN,UNXSUFFIX)); #else Name = "dict_zh_CN.dll"; #endif @@ -505,7 +505,7 @@ File GID_FILE_LIB_DICT_ZH_TW BIN_FILE_BODY; #ifdef UNX - Name = "libdict_zh_TW.so"; + Name = STRING(CONCAT2(libdict_zh_TW,UNXSUFFIX)); #else Name = "dict_zh_TW.dll"; #endif @@ -526,7 +526,7 @@ Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE); RegistryID = GID_STARREGISTRY_APPLICAT_RDB; #ifdef UNX - Name = "libportal.so"; + Name = STRING(CONCAT2(libportal,UNXSUFFIX)); #else Name = "portal.dll"; #endif @@ -536,7 +536,7 @@ File GID_PORTAL_FILE_LIB_PORTALCONNECT BIN_FILE_BODY; #ifdef UNX - Name = "libportalconnect.so"; + Name = STRING(CONCAT2(libportalconnect,UNXSUFFIX)); #else Name = "portalconnect.dll"; #endif @@ -554,7 +554,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libucprmt1.so"; + Name = STRING(CONCAT2(libucprmt1,UNXSUFFIX)); #else Name = "ucprmt1.dll"; #endif @@ -751,7 +751,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libadabas2.so"; + Name = STRING(CONCAT2(libadabas2,UNXSUFFIX)); #else Name = "adabas2.dll"; #endif @@ -765,7 +765,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libjdbc2.so"; + Name = STRING(CONCAT2(libjdbc2,UNXSUFFIX)); #else Name = "jdbc2.dll"; #endif @@ -777,7 +777,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libodbc2.so"; + Name = STRING(CONCAT2(libodbc2,UNXSUFFIX)); #else Name = "odbc2.dll"; #endif @@ -789,7 +789,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libsdbc2.so"; + Name = STRING(CONCAT2(libsdbc2,UNXSUFFIX)); #else Name = "sdbc2.dll"; #endif @@ -801,7 +801,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libdbpool2.so"; + Name = STRING(CONCAT2(libdbpool2,UNXSUFFIX)); #else Name = "dbpool2.dll"; #endif @@ -857,7 +857,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libcached1.so"; + Name = STRING(CONCAT2(libcached1,UNXSUFFIX)); #else Name = "cached1.dll"; #endif @@ -869,7 +869,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libucb1.so"; + Name = STRING(CONCAT2(libucb1,UNXSUFFIX)); #else Name = "ucb1.dll"; #endif @@ -881,7 +881,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libsax.so"; + Name = STRING(CONCAT2(libsax,UNXSUFFIX)); #else Name = "sax.dll"; #endif @@ -893,7 +893,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libevtatt.so"; + Name = STRING(CONCAT2(libevtatt,UNXSUFFIX)); #else Name = "evtatt.dll"; #endif @@ -905,7 +905,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libproxyset.so"; + Name = STRING(CONCAT2(libproxyset,UNXSUFFIX)); #else Name = "proxyset.dll"; #endif @@ -937,7 +937,7 @@ Styles = (PACKED); Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libdb-3.2.so"; + Name = STRING(CONCAT2(libdb-3.2,UNXSUFFIX)); #else Name = "libdb32.dll"; #endif @@ -948,7 +948,7 @@ Styles = (PACKED); Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libdb_java-3.2.so"; + Name = STRING(CONCAT2(libdb_java-3.2,UNXSUFFIX)); #else Name = "libdb_java32.dll"; #endif @@ -960,7 +960,7 @@ BIN_FILE_BODY; Styles = (PACKED); Dir = GID_DIR_PROGRAM; - Name = "libdb_cxx-3.2.so"; + Name = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX)); End #endif @@ -1305,7 +1305,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libtvhlp1.so"; + Name = STRING(CONCAT2(libtvhlp1,UNXSUFFIX)); #else Name = "tvhlp1.dll"; #endif @@ -1425,7 +1425,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GID_DIR_PROGRAM; #ifdef UNX - Name = "libcfgmgr2.so"; + Name = STRING(CONCAT2(libcfgmgr2,UNXSUFFIX)); #else Name = "cfgmgr2.dll"; #endif @@ -2506,9 +2506,9 @@ File GID_FILE_LIB_SUNPRO5_UNO PACKED_LIB_FILE_BODY; #ifdef GCC - Name = "libgcc2_uno.so"; + Name = STRING(CONCAT2(libgcc2_uno,UNXSUFFIX)); #else - Name = "libsunpro5_uno.so"; + Name = STRING(CONCAT2(libsunpro5_uno,UNXSUFFIX)); #endif End @@ -2527,7 +2527,7 @@ File GID_FILE_LIB_GCC2_UNO PACKED_LIB_FILE_BODY; - Name = "libgcc2_uno.so"; + Name = STRING(CONCAT2(libgcc2_uno,UNXSUFFIX)); End #endif // ACHUNG: Hier Ende für reine Linux-Dateien @@ -2931,7 +2931,7 @@ File GID_FILE_S1W_SYNC_LIB_PORTALSA BIN_FILE_BODY; #if defined UNX - Name = "libportalSA.so"; + Name = STRING(CONCAT2(libportalSA,UNXSUFFIX)); #else // UNX Name = "portalSA.dll"; #endif // UNX @@ -2942,7 +2942,7 @@ File GID_FILE_S1W_SYNC_LIB_SML BIN_FILE_BODY; #if defined UNX - Name = "libsml.so"; + Name = STRING(CONCAT2(libsml,UNXSUFFIX)); #else // UNX Name = "sml.dll"; #endif // UNX @@ -2953,7 +2953,7 @@ File GID_FILE_S1W_SYNC_LIB_XPT BIN_FILE_BODY; #if defined UNX - Name = "libxpt.so"; + Name = STRING(CONCAT2(libxpt,UNXSUFFIX)); #else // UNX Name = "xpt.dll"; #endif // UNX @@ -2964,7 +2964,7 @@ File GID_FILE_S1W_SYNC_LIB_XPTHTTP BIN_FILE_BODY; #if defined UNX - Name = "libxpthttp.so"; + Name = STRING(CONCAT2(libxpthttp,UNXSUFFIX)); #else // UNX Name = "xpthttp.dll"; #endif // UNX diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/scp/source/player/player.scp openoffice-new/scp/source/player/player.scp --- openoffice-clean/scp/source/player/player.scp Tue Aug 28 08:00:48 2001 +++ openoffice-new/scp/source/player/player.scp Thu Feb 21 23:41:47 2002 @@ -356,7 +356,7 @@ File GID_FILE_LIB_LOCALEDATA_ASCII BIN_FILE_BODY; #ifdef UNX - Name = "liblocaledata_ascii.so"; + Name = STRING(CONCAT2(liblocaledata_ascii,UNXSUFFIX)); #else Name = "localedata_ascii.dll"; #endif @@ -367,7 +367,7 @@ File GID_FILE_LIB_LOCALEDATA_CJK BIN_FILE_BODY; #ifdef UNX - Name = "liblocaledata_CJK.so"; + Name = STRING(CONCAT2(liblocaledata_CJK,UNXSUFFIX)); #else Name = "localedata_CJK.dll"; #endif @@ -383,7 +383,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libcfgmgr2.so"; + Name = STRING(CONCAT2(libcfgmgr2,UNXSUFFIX)); #else Name = "cfgmgr2.dll"; #endif @@ -397,7 +397,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libsrtrs1.so"; + Name = STRING(CONCAT2(libsrtrs1,UNXSUFFIX)); #else Name = "srtrs1.dll"; #endif @@ -410,7 +410,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libsax.so"; + Name = STRING(CONCAT2(libsax,UNXSUFFIX)); #else Name = "sax.dll"; #endif @@ -422,7 +422,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libtcv.so"; + Name = STRING(CONCAT2(libtcv,UNXSUFFIX)); #else Name = "tcv.dll"; #endif @@ -434,7 +434,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libucb1.so"; + Name = STRING(CONCAT2(libucb1,UNXSUFFIX)); #else Name = "ucb1.dll"; #endif @@ -446,7 +446,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libucpfile1.so"; + Name = STRING(CONCAT2(libucpfile1,UNXSUFFIX)); #else Name = "ucpfile1.dll"; #endif @@ -458,7 +458,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libucpdav1.so"; + Name = STRING(CONCAT2(libucpdav1,UNXSUFFIX)); #else Name = "ucpdav1.dll"; #endif @@ -470,7 +470,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libucppkg1.so"; + Name = STRING(CONCAT2(libucppkg1,UNXSUFFIX)); #else Name = "ucppkg1.dll"; #endif @@ -482,7 +482,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libpackage2.so"; + Name = STRING(CONCAT2(libpackage2,UNXSUFFIX)); #else Name = "package2.dll"; #endif @@ -1149,7 +1149,7 @@ RegistryID = GID_STARREGISTRY_APPLICAT_RDB; Dir = GCFG_BINARY_DIR; #ifdef UNX - Name = "libdnd.so"; + Name = STRING(CONCAT2(libdnd,UNXSUFFIX)); #else Name = "dnd.dll"; #endif @@ -1191,7 +1191,7 @@ File GID_FILE_LIB_SUNPRO5_UNO BIN_FILE_BODY; Styles = (PACKED); - Name = "libsunpro5_uno.so"; + Name = STRING(CONCAT2(libsunpro5_uno,UNXSUFFIX)); Dir = GCFG_BINARY_DIR; End @@ -1202,7 +1202,7 @@ File GID_FILE_LIB_GCC2_UNO BIN_FILE_BODY; Styles = (PACKED); - Name = "libgcc2_uno.so"; + Name = STRING(CONCAT2(libgcc2_uno,UNXSUFFIX)); Dir = GCFG_BINARY_DIR; End diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/scp/source/psprint/files_psprint.scp openoffice-new/scp/source/psprint/files_psprint.scp --- openoffice-clean/scp/source/psprint/files_psprint.scp Wed Jul 25 09:27:39 2001 +++ openoffice-new/scp/source/psprint/files_psprint.scp Thu Feb 21 23:42:08 2002 @@ -93,7 +93,7 @@ #ifdef WNT #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll)) #else -#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so)) +#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX)) #endif #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/setup2/aqua/source/loader/makefile.mk openoffice-new/setup2/aqua/source/loader/makefile.mk --- openoffice-clean/setup2/aqua/source/loader/makefile.mk Sat Mar 10 14:40:12 2001 +++ openoffice-new/setup2/aqua/source/loader/makefile.mk Thu Feb 21 23:50:00 2002 @@ -75,12 +75,12 @@ # --- Files -------------------------------------------------------- -.IF "$(OS)"!="MACOSX" +.IF "$(GUIBASE)"!="aqua" dummy: - @echo "Nothing to build for this platform" + @echo "Nothing to build for GUIBASE $(GUIBASE)" -.ELSE # "$(OS)"!="MACOSX" +.ELSE # "$(GUIBASE)"!="aqua" OBJFILES = $(OBJ)$/loader.obj @@ -88,7 +88,7 @@ APP1OBJS= $(OBJFILES) APP1STDLIBS= $(SVUNZIPLIB) -framework Cocoa -.ENDIF # "$(OS)"!="MACOSX" +.ENDIF # "$(GUIBASE)"!="aqua" # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/setup2/aqua/source/system/makefile.mk openoffice-new/setup2/aqua/source/system/makefile.mk --- openoffice-clean/setup2/aqua/source/system/makefile.mk Wed Sep 27 15:51:52 2000 +++ openoffice-new/setup2/aqua/source/system/makefile.mk Thu Feb 21 23:50:47 2002 @@ -74,12 +74,12 @@ # --- Files -------------------------------------------------------- -.IF "$(OS)"!="MACOSX" +.IF "$(GUIBASE)"!="aqua" dummy: - @echo "Nothing to build for this platform" + @echo "Nothing to build for GUIBASE $(GUIBASE)" -.ELSE # "$(OS)"!="MACOSX" +.ELSE # "$(GUIBASE)"!="aqua" CXXFILES = aquaos.cxx @@ -88,7 +88,7 @@ LIB1TARGET= $(SLB)$/$(TARGET).lib LIB1OBJFILES= $(SLOFILES) -.ENDIF # "$(OS)"!="MACOSX" +.ENDIF # "$(GUIBASE)"!="aqua" # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/setup2/mow/source/loader/loader.c openoffice-new/setup2/mow/source/loader/loader.c --- openoffice-clean/setup2/mow/source/loader/loader.c Tue Jun 19 08:22:05 2001 +++ openoffice-new/setup2/mow/source/loader/loader.c Thu Feb 21 23:51:19 2002 @@ -77,7 +77,7 @@ #ifdef LINUX # include # define statvfs statfs -#elif defined(NETBSD) || defined(FREEBSD) +#elif defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) # include # include # define statvfs statfs @@ -1075,7 +1075,7 @@ nMinTempSize /= KBYTE; statvfs( strTmpPath, &buf); - #if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + #if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) nSize = buf.f_bsize; #else nSize = (buf.f_frsize ? buf.f_frsize : buf.f_bsize); diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/setup2/mow/source/loader/makefile.mk openoffice-new/setup2/mow/source/loader/makefile.mk --- openoffice-clean/setup2/mow/source/loader/makefile.mk Wed Dec 6 04:15:03 2000 +++ openoffice-new/setup2/mow/source/loader/makefile.mk Thu Feb 21 23:52:33 2002 @@ -73,12 +73,12 @@ # --- Files -------------------------------------------------------- -.IF "$(OS)"=="MACOSX" +.IF "$(GUIBASE)"!="unx" dummy: - @echo "Nothing to build for Mac OS X" + @echo "Nothing to build for GUIBASE $(GUIBASE)" -.ELSE # "$(OS)"=="MACOSX" +.ELSE # "$(GUIBASE)"!="unx" OBJFILES= $(OBJ)$/loader.obj APP1NOSAL=TRUE @@ -86,7 +86,11 @@ APP1OBJS= $(OBJFILES) APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -.ENDIF # "$(OS)"=="MACOSX" +.IF "$(OS)"=="MACOSX" +APP1STDLIBS += -lX11 +.ENDIF + +.ENDIF # "$(GUIBASE)"!="unx" # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/setup2/mow/source/system/makefile.mk openoffice-new/setup2/mow/source/system/makefile.mk --- openoffice-clean/setup2/mow/source/system/makefile.mk Mon Sep 25 15:19:32 2000 +++ openoffice-new/setup2/mow/source/system/makefile.mk Thu Feb 21 23:53:07 2002 @@ -74,12 +74,12 @@ # --- Files -------------------------------------------------------- -.IF "$(OS)"=="MACOSX" +.IF "$(GUIBASE)"!="unx" dummy: - @echo "Nothing to build for Mac OS X" + @echo "Nothing to build for GUIBASE $(GUIBASE)" -.ELSE # "$(OS)"=="MACOSX" +.ELSE # "$(GUIBASE)"!="unx" CXXFILES = \ mowos.cxx @@ -91,7 +91,7 @@ LIB1TARGET= $(SLB)$/$(TARGET).lib LIB1OBJFILES= $(SLOFILES) -.ENDIF # "$(OS)"=="MACOSX" +.ENDIF # "$(GUIBASE)"!="unx" # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/setup2/mow/source/system/mowos.cxx openoffice-new/setup2/mow/source/system/mowos.cxx --- openoffice-clean/setup2/mow/source/system/mowos.cxx Tue May 1 17:59:34 2001 +++ openoffice-new/setup2/mow/source/system/mowos.cxx Thu Feb 21 23:53:35 2002 @@ -82,7 +82,7 @@ #ifdef LINUX #include #define statvfs statfs -#elif (defined(NETBSD) || defined(FREEBSD)) +#elif (defined(NETBSD) || defined(FREEBSD) || defined(MACOSX)) #include #include #define statvfs statfs @@ -106,6 +106,8 @@ // // Hier stehen die Funktionen, die auf allen Plattformen vorhanden sind, // aber unterschiedlich implementiert werden. +// Here are the methods availble on all platforms but might be implemented +// differently const char* OS::GetAllFilesWildCard() { @@ -187,7 +189,8 @@ } //! warum? erstmal fuer alle Plattformen den selben CODE -#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) +//! why? first we use the same CODE for all platforms +#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) const ULONG nSize = buf.f_bsize; //#elif defined AIX || defined SCO // // immer 512 Byte Bloecke ??? @@ -214,7 +217,7 @@ return 512; } -#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) +#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) return buf.f_bsize; #else return (buf.f_frsize ? buf.f_frsize : buf.f_bsize); @@ -308,28 +311,30 @@ // --------------------------------------------------------------------------- // Unix-spezifische Methoden ------------------------------------------------- +// Unix-specific methods ----------------------------------------------------- // --------------------------------------------------------------------------- void UnixOS::SetRights(ByteString const& aFile, int nRights) // pre: nRights ist eine dezimal codierte Oktalzahl // post: Rechte der Datei aFile wurden gesetzt +// pre: nRights is a decimal encoded octal number +// post: access rights of file aFile have been set { int nOctal = 0; - // nRights z.B. 644 + // nRights e.g. 644 nOctal = nRights / 100; // nOctal = 110 nRights %= 100; - // nRights jetzt 44 + // nRights now 44 nOctal *= 8; // nOctal = 110000 nOctal += nRights / 10; // nOctal = 110100 nRights %= 10; - // nRights jetzt 4 + // nRights now 4 nOctal *= 8; // nOctal = 110100000 nOctal += nRights; // nOctal = 110100100 = -rw-r--r-- - // Rechte setzen chmod(aFile.GetBuffer(), nOctal); } diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/setup2/script/serverstartup.sh openoffice-new/setup2/script/serverstartup.sh --- openoffice-clean/setup2/script/serverstartup.sh Mon May 7 11:56:37 2001 +++ openoffice-new/setup2/script/serverstartup.sh Mon Feb 25 21:42:30 2002 @@ -65,7 +65,8 @@ case $sd_platform in SCO_SV) test=/bin/test ;; NetBSD) test=/bin/test ;; - FreeBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; + Darwin) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/setup2/script/setup.sh openoffice-new/setup2/script/setup.sh --- openoffice-clean/setup2/script/setup.sh Fri Jun 29 04:58:17 2001 +++ openoffice-new/setup2/script/setup.sh Thu Feb 21 23:55:31 2002 @@ -66,7 +66,8 @@ case $sd_platform in SCO_SV) test=/bin/test ;; NetBSD) test=/bin/test ;; - FreeBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; + Darwin) test=/bin/test ;; *) test=/usr/bin/test ;; esac @@ -124,6 +125,10 @@ FreeBSD) LD_LIBRARY_PATH=./local:.:..:$LD_LIBRARY_PATH export LD_LIBRARY_PATH + ;; + Darwin) + DYLD_LIBRARY_PATH=./local:.:..:$sd_archive_path:$DYLD_LIBRARY_PATH + export DYLD_LIBRARY_PATH ;; *) ;; diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/setup2/script/setupserver openoffice-new/setup2/script/setupserver --- openoffice-clean/setup2/script/setupserver Fri Nov 17 03:29:29 2000 +++ openoffice-new/setup2/script/setupserver Mon Feb 25 21:42:11 2002 @@ -234,6 +234,9 @@ sd_platform=`uname -s` case $sd_platform in SCO_SV) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; + Darwin) test=/bin/test ;; *) test=/usr/bin/test ;; esac sd_cwd="`pwd`" diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/setup2/script/websnooper openoffice-new/setup2/script/websnooper --- openoffice-clean/setup2/script/websnooper Mon May 7 11:52:01 2001 +++ openoffice-new/setup2/script/websnooper Mon Feb 25 21:42:07 2002 @@ -6,7 +6,8 @@ case $sd_platform in SCO_SV) test=/bin/test ;; NetBSD) test=/bin/test ;; - FreeBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; + Darwin) test=/bin/test ;; *) test=/usr/bin/test ;; esac diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/setup2/source/ui/makefile.mk openoffice-new/setup2/source/ui/makefile.mk --- openoffice-clean/setup2/source/ui/makefile.mk Mon Feb 12 19:06:33 2001 +++ openoffice-new/setup2/source/ui/makefile.mk Thu Feb 21 23:56:07 2002 @@ -103,7 +103,7 @@ $(OBJ)$/textani.obj \ .IF "$(GUI)"=="UNX" -.IF "$(OS)"!="MACOSX" +.IF "$(GUIBASE)"=="unx" OBJFILES += $(OBJ)$/unxmain.obj .ENDIF .ENDIF diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/setup2/util/makefile.mk openoffice-new/setup2/util/makefile.mk --- openoffice-clean/setup2/util/makefile.mk Tue Jul 31 07:25:06 2001 +++ openoffice-new/setup2/util/makefile.mk Sat Feb 23 17:04:06 2002 @@ -104,9 +104,10 @@ LIB1FILES += $(SLB)$/os2os.lib .ENDIF .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="MACOSX" +.IF "$(GUIBASE)"=="aqua" LIB1FILES += $(SLB)$/aquaos.lib -.ELSE +.ENDIF +.IF "$(GUIBASE)"=="unx" LIB1FILES += $(SLB)$/mowos.lib .ENDIF .ENDIF @@ -138,7 +139,7 @@ $(SALHELPERLIB) .IF "$(GUI)"=="UNX" -.IF "$(OS)"!="MACOSX" +.IF "$(GUIBASE)"=="unx" SHL1STDLIBS += \ -Bdynamic $(THREADLIB) \ -lXt \ @@ -183,9 +184,6 @@ $(LB)$/ui.lib \ $(LB)$/dialog.lib \ $(LB)$/iset.lib -.IF "$(OS)"=="MACOSX" -APP2LIBS+=$(LIB1FILES) -.ENDIF APP2STDLIBS=\ $(COMPHELPERLIB) $(CPPUHELPERLIB) $(CPPULIB) $(VOSLIB) $(SALLIB) $(SOTLIB) $(UNOLIB) \ @@ -216,6 +214,15 @@ $(CPPULIB) .ENDIF +.IF "$(OS)"=="MACOSX" +APP2STDLIBS+= \ + $(RTLLIB) \ + $(TECLIB) \ + $(TKLIB) \ + $(CPPULIB) \ + $(SALHELPERLIB) +.ENDIF + .IF "$(OS)" == "SOLARIS" APP2STDLIBS += \ -lset$(UPD)$(DLLPOSTFIX) \ @@ -239,6 +246,19 @@ -lICE .ENDIF +.IF "$(OS)"=="MACOSX" +.IF "$(GUIBASE)"=="unx" +APP2STDLIBS+= \ + -lset$(UPD)$(DLLPOSTFIX) \ + -lXt \ + -lX11 \ + -lXext \ + -lXmu \ + -lSM \ + -lICE +.ENDIF +.ENDIF + .ENDIF APP2DEPN+=\ @@ -358,10 +378,14 @@ regcomp -register -r $@ -c ftransl.dll regcomp -register -r $@ -c dnd.dll .ELSE -.IF "$(GUI)"=="MACOSX" +.IF "$(OS)"=="MACOSX" regcomp -register -r $@ -c libi18n$(UPD)mxp.dylib - regcomp -register -r $@ -c libdtransX11$(UPD)mxp.dylib regcomp -register -r $@ -c libmcnttype.dylib +.IF "$(GUIBASE)"=="aqua" + regcomp -register -r $@ -c libdtransaqua$(UPD)mxp.dylib +.ELSE + regcomp -register -r $@ -c libdtransX11$(UPD)mxp.dylib +.ENDIF .ELSE @echo "**********************************************************" diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sfx2/util/makefile.mk openoffice-new/sfx2/util/makefile.mk --- openoffice-clean/sfx2/util/makefile.mk Mon Aug 20 09:42:38 2001 +++ openoffice-new/sfx2/util/makefile.mk Fri Feb 22 00:02:05 2002 @@ -165,6 +165,10 @@ $(CPPUHELPERLIB) .ENDIF +.IF "$(OS)"=="MACOSX" +SHL1STDLIBS += $(INETLIB) +.ENDIF + .IF "$(SOLAR_JAVA)" != "" SHL1STDLIBS+=\ $(SJLIB) diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/shell/source/proxysettings/soprxsettings.cxx openoffice-new/shell/source/proxysettings/soprxsettings.cxx --- openoffice-clean/shell/source/proxysettings/soprxsettings.cxx Tue May 29 22:40:18 2001 +++ openoffice-new/shell/source/proxysettings/soprxsettings.cxx Fri Feb 22 00:03:22 2002 @@ -87,7 +87,9 @@ #include #endif +#ifndef MACOSX #include +#endif #include #include diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sip/util/makefile.mk openoffice-new/sip/util/makefile.mk --- openoffice-clean/sip/util/makefile.mk Tue Jul 31 05:19:39 2001 +++ openoffice-new/sip/util/makefile.mk Fri Feb 22 00:04:16 2002 @@ -117,6 +117,10 @@ $(UNOTOOLSLIB) \ $(COMPHELPERLIB) +.IF "$(OS)"=="MACOSX" +APP1STDLIBS += $(SFXLIB) +.ENDIF + .IF "$(USE_NAMESPACE)"!="" APP1STDLIBS+=$(CPPULIB) .ENDIF diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sj2/source/jscpp/sjapplet_impl.cxx openoffice-new/sj2/source/jscpp/sjapplet_impl.cxx --- openoffice-clean/sj2/source/jscpp/sjapplet_impl.cxx Wed Aug 15 04:21:55 2001 +++ openoffice-new/sj2/source/jscpp/sjapplet_impl.cxx Fri Feb 22 12:08:22 2002 @@ -59,10 +59,10 @@ * ************************************************************************/ - - - #ifdef UNX +#ifdef MACOSX + +#else #include #include @@ -82,7 +82,8 @@ #undef KeyCode #undef Region #undef Cursor -#endif +#endif // MACOSX +#endif // UNX #include "sjapplet_impl.hxx" @@ -115,7 +116,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; - static void testJavaException(JNIEnv * pEnv) throw(com::sun::star::uno::RuntimeException) { jthrowable jtThrowable = pEnv->ExceptionOccurred(); @@ -138,15 +138,27 @@ } } -#ifdef UNX struct EmbeddedWindow { jobject _joWindow; +#ifdef UNX ::osl::Module _jawt; - +#endif EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) throw(com::sun::star::uno::RuntimeException); void dispose(JNIEnv * pEnv); }; +#ifdef UNX +#ifdef MACOSX +EmbeddedWindow::EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) throw(com::sun::star::uno::RuntimeException) +{ + jclass jcFrame = pEnv->FindClass("java/awt/Frame"); testJavaException(pEnv); + jmethodID jmFrame_rinit = pEnv->GetMethodID(jcFrame, "", "()V"); testJavaException(pEnv); + jobject joFrame = pEnv->AllocObject(jcFrame); testJavaException(pEnv); + pEnv->CallVoidMethod(joFrame, jmFrame_rinit); testJavaException(pEnv); + + _joWindow = pEnv->NewGlobalRef(joFrame); +} +#else static Atom getStateAtom(Display* pDisplay) { static Atom nWM_State = XInternAtom (pDisplay, "WM_STATE", False); @@ -183,7 +195,6 @@ } #ifdef DEBUG - static void spaces(int count) { for(int i = 0; i < count; ++ i) fprintf(stderr, " "); @@ -273,7 +284,6 @@ jmethodID jmCanvas_show = pEnv->GetMethodID(jcCanvas, "show", "()V" ); testJavaException(pEnv); pEnv->CallVoidMethod(joCanvas, jmCanvas_show); testJavaException(pEnv); - // create window and add the canvas jclass jcFrame = pEnv->FindClass("java/awt/Frame"); testJavaException(pEnv); jmethodID jmFrame_rinit = pEnv->GetMethodID(jcFrame, "", "()V" ); testJavaException(pEnv); @@ -288,7 +298,6 @@ pEnv->CallVoidMethod(joWindow, jmWindow_rinit, joFrame); testJavaException(pEnv); // joWindow = joFrame; - jmethodID jmWindow_setLayout = pEnv->GetMethodID(jcWindow, "setLayout", "(Ljava/awt/LayoutManager;)V"); testJavaException(pEnv); pEnv->CallVoidMethod(joWindow, jmWindow_setLayout, 0); testJavaException(pEnv); @@ -302,8 +311,6 @@ pEnv->CallVoidMethod(joWindow, jmWindow_show); testJavaException(pEnv); - - typedef jboolean (JNICALL * fptr_JAWT_GetAWT)( JNIEnv * env, JAWT * awt ); fptr_JAWT_GetAWT s_fGetAWT = 0; @@ -341,7 +348,6 @@ if (!widget) throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("EmbeddedWindow::EmbeddedWindow - couldn't get DrawingSurface widget")), Reference()); - Widget appletWidget = getAppletWidget(widget); if(!appletWidget) throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("EmbeddedWindow::EmbeddedWindow - can't find AppletWidget")), Reference()); @@ -394,17 +400,10 @@ _joWindow = pEnv->NewGlobalRef(joWindow); } +#endif // MACOSX #else - -struct EmbeddedWindow { - jobject _joWindow; - - EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) throw(com::sun::star::uno::RuntimeException); - void dispose(JNIEnv * pEnv); -}; - - #ifdef WNT + EmbeddedWindow::EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) throw(com::sun::star::uno::RuntimeException) { jclass jcFrame = pEnv->FindClass("sun/awt/windows/WEmbeddedFrame"); testJavaException(pEnv); @@ -428,9 +427,8 @@ _joWindow = pEnv->NewGlobalRef(joFrame); } -#endif - -#endif +#endif // WNT +#endif // UNX void EmbeddedWindow::dispose(JNIEnv * pEnv) { @@ -443,8 +441,6 @@ _joWindow = 0; } - - SjApplet2_Impl::SjApplet2_Impl() throw(com::sun::star::uno::RuntimeException) : _pJVM(NULL), _joAppletExecutionContext(0), @@ -489,7 +485,6 @@ url = tmp; } } - #ifdef DEBUG OString tmp = OUStringToOString(url, RTL_TEXTENCODING_ASCII_US); Only in openoffice-new/solenv/inc: #unxmacxp.mk# diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/solenv/inc/_tg_shl.mk openoffice-new/solenv/inc/_tg_shl.mk --- openoffice-clean/solenv/inc/_tg_shl.mk Wed Sep 26 08:56:12 2001 +++ openoffice-new/solenv/inc/_tg_shl.mk Fri Feb 22 13:31:15 2002 @@ -265,8 +265,8 @@ .ENDIF # "$(BOTH)"!="" .IF "$(COM)"=="GCC" @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd @+echo $(SHL1STDLIBS) $(STDSHL) $(SHL1RES) >> $(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd .ELSE @@ -388,11 +388,11 @@ @strip -i -r -u -S -s $(SHL1VERSIONMAP) $@ .ENDIF .ENDIF - @echo "Making: $@.framework" + @echo "Making: $@.jnilib" @create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL1NOCHECK)"=="" - +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL1TARGETN).framework + +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL1TARGETN) .ENDIF # "$(SHL1NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" @@ -694,8 +694,8 @@ .ENDIF # "$(BOTH)"!="" .IF "$(COM)"=="GCC" @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd @+echo $(SHL2STDLIBS) $(STDSHL) $(SHL2RES) >> $(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd .ELSE @@ -817,11 +817,11 @@ @strip -i -r -u -S -s $(SHL2VERSIONMAP) $@ .ENDIF .ENDIF - @echo "Making: $@.framework" + @echo "Making: $@.jnilib" @create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL2NOCHECK)"=="" - +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL2TARGETN).framework + +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL2TARGETN) .ENDIF # "$(SHL2NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" @@ -1123,8 +1123,8 @@ .ENDIF # "$(BOTH)"!="" .IF "$(COM)"=="GCC" @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd @+echo $(SHL3STDLIBS) $(STDSHL) $(SHL3RES) >> $(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd .ELSE @@ -1246,11 +1246,11 @@ @strip -i -r -u -S -s $(SHL3VERSIONMAP) $@ .ENDIF .ENDIF - @echo "Making: $@.framework" + @echo "Making: $@.jnilib" @create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL3NOCHECK)"=="" - +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL3TARGETN).framework + +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL3TARGETN) .ENDIF # "$(SHL3NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" @@ -1552,8 +1552,8 @@ .ENDIF # "$(BOTH)"!="" .IF "$(COM)"=="GCC" @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd @+echo $(SHL4STDLIBS) $(STDSHL) $(SHL4RES) >> $(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd .ELSE @@ -1675,11 +1675,11 @@ @strip -i -r -u -S -s $(SHL4VERSIONMAP) $@ .ENDIF .ENDIF - @echo "Making: $@.framework" + @echo "Making: $@.jnilib" @create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL4NOCHECK)"=="" - +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL4TARGETN).framework + +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL4TARGETN) .ENDIF # "$(SHL4NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" @@ -1981,8 +1981,8 @@ .ENDIF # "$(BOTH)"!="" .IF "$(COM)"=="GCC" @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd @+echo $(SHL5STDLIBS) $(STDSHL) $(SHL5RES) >> $(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd .ELSE @@ -2104,11 +2104,11 @@ @strip -i -r -u -S -s $(SHL5VERSIONMAP) $@ .ENDIF .ENDIF - @echo "Making: $@.framework" + @echo "Making: $@.jnilib" @create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL5NOCHECK)"=="" - +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL5TARGETN).framework + +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL5TARGETN) .ENDIF # "$(SHL5NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" @@ -2410,8 +2410,8 @@ .ENDIF # "$(BOTH)"!="" .IF "$(COM)"=="GCC" @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd @+echo $(SHL6STDLIBS) $(STDSHL) $(SHL6RES) >> $(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd .ELSE @@ -2533,11 +2533,11 @@ @strip -i -r -u -S -s $(SHL6VERSIONMAP) $@ .ENDIF .ENDIF - @echo "Making: $@.framework" + @echo "Making: $@.jnilib" @create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL6NOCHECK)"=="" - +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL6TARGETN).framework + +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL6TARGETN) .ENDIF # "$(SHL6NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" @@ -2839,8 +2839,8 @@ .ENDIF # "$(BOTH)"!="" .IF "$(COM)"=="GCC" @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd @+echo $(SHL7STDLIBS) $(STDSHL) $(SHL7RES) >> $(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd .ELSE @@ -2962,11 +2962,11 @@ @strip -i -r -u -S -s $(SHL7VERSIONMAP) $@ .ENDIF .ENDIF - @echo "Making: $@.framework" + @echo "Making: $@.jnilib" @create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL7NOCHECK)"=="" - +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL7TARGETN).framework + +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL7TARGETN) .ENDIF # "$(SHL7NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" @@ -3268,8 +3268,8 @@ .ENDIF # "$(BOTH)"!="" .IF "$(COM)"=="GCC" @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd @+echo $(SHL8STDLIBS) $(STDSHL) $(SHL8RES) >> $(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd .ELSE @@ -3391,11 +3391,11 @@ @strip -i -r -u -S -s $(SHL8VERSIONMAP) $@ .ENDIF .ENDIF - @echo "Making: $@.framework" + @echo "Making: $@.jnilib" @create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL8NOCHECK)"=="" - +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL8TARGETN).framework + +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL8TARGETN) .ENDIF # "$(SHL8NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" @@ -3697,8 +3697,8 @@ .ENDIF # "$(BOTH)"!="" .IF "$(COM)"=="GCC" @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd @+echo $(SHL9STDLIBS) $(STDSHL) $(SHL9RES) >> $(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd .ELSE @@ -3820,11 +3820,11 @@ @strip -i -r -u -S -s $(SHL9VERSIONMAP) $@ .ENDIF .ENDIF - @echo "Making: $@.framework" + @echo "Making: $@.jnilib" @create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL9NOCHECK)"=="" - +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL9TARGETN).framework + +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL9TARGETN) .ENDIF # "$(SHL9NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" @@ -4126,8 +4126,8 @@ .ENDIF # "$(BOTH)"!="" .IF "$(COM)"=="GCC" @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd @+echo $(SHL10STDLIBS) $(STDSHL) $(SHL10RES) >> $(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd .ELSE @@ -4249,11 +4249,11 @@ @strip -i -r -u -S -s $(SHL10VERSIONMAP) $@ .ENDIF .ENDIF - @echo "Making: $@.framework" + @echo "Making: $@.jnilib" @create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL10NOCHECK)"=="" - +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL10TARGETN).framework + +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL10TARGETN) .ENDIF # "$(SHL10NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/solenv/inc/unxmacxp.mk openoffice-new/solenv/inc/unxmacxp.mk --- openoffice-clean/solenv/inc/unxmacxp.mk Thu Oct 4 20:32:08 2001 +++ openoffice-new/solenv/inc/unxmacxp.mk Fri Feb 22 00:07:37 2002 @@ -2,9 +2,9 @@ # # $RCSfile: unxmacxp.mk,v $ # -# $Revision: 1.39.10.2 $ +# $Revision: 1.39.10.1 $ # -# last change: $Author: pluby $ $Date: 2001/10/05 03:32:08 $ +# last change: $Author: svesik $ $Date: 2001/09/26 13:04:29 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -73,25 +73,6 @@ # _PTHREADS is needed for the stl CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY -DSTLPORT_VERSION=400 -D_USE_NAMESPACE=1 -# Workaround for Mac OS X duplicate symbol plugin bug -.IF "$(SYMBOLPREFIX)"=="" -SYMBOLPREFIX=$(TARGET) -.ENDIF -.IF "$(SYMBOLPREFIX)"!="" -CDEFS+=-Dcomponent_getImplementationEnvironment=lib$(SYMBOLPREFIX)component_getImplementationEnvironment \ - -Dcomponent_writeInfo=lib$(SYMBOLPREFIX)component_writeInfo \ - -Dcomponent_getFactory=lib$(SYMBOLPREFIX)component_getFactory \ - -Dcomponent_getDescriptionFunc=lib$(SYMBOLPREFIX)component_getDescriptionFunc \ - -Dcomponent_canUnload=lib$(SYMBOLPREFIX)component_canUnload \ - -Duno_initEnvironment=lib$(SYMBOLPREFIX)uno_initEnvironment \ - -Duno_ext_getMapping=lib$(SYMBOLPREFIX)uno_ext_getMapping -.ENDIF -.IF "$(PRJNAME)"=="registry" -CDEFS+=-DinitRegistry_Api=lib$(REGLIB:s/-l//)initRegistry_Api \ - -DinitRegistryTypeReader_Api=lib$(REGLIB:s/-l//)initRegistryTypeReader_Api \ - -DinitRegistryTypeWriter_Api=lib$(REGLIB:s/-l//)initRegistryTypeWriter_Api -.ENDIF - # Name of library where static data members are initialized STATICLIBNAME=static$(DLLPOSTFIX) STATICLIB=-l$(STATICLIBNAME) @@ -106,14 +87,14 @@ cc=cc objc=cc CFLAGS=-c $(INCLUDE) -CFLAGSCC=-pipe -traditional-cpp +CFLAGSCC=-pipe -traditional-cpp -fno-common OBJCFLAGS=-no-precomp CFLAGSEXCEPTIONS=-fexceptions CFLAGS_NO_EXCEPTIONS=-fno-exceptions -CFLAGSCXX=-pipe -fno-for-scope -fpermissive -fno-operator-names -fno-coalesce +CFLAGSCXX=-pipe -fno-for-scope -fpermissive -fno-operator-names -fno-coalesce -fno-common CFLAGSOBJGUIST=-fPIC CFLAGSOBJCUIST=-fPIC @@ -139,33 +120,34 @@ .ENDIF CFLAGSOUTOBJ=-o -SOLARVERSHLLIBS=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).[0-9] 2>/dev/null | grep -E -v 'lib\w+static'") +# GrP needed in vcl/unx +CDEFS+= -DNO_AUDIO -DPRINTER_DUMMY + +SOLARVERSHLLIBS=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).[0-9] 2>/dev/null | grep -E -v 'lib\w+static' | grep -v cppuhelper") .IF "$(STLPORT4)"!="" SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(STLPORT4)$/lib$/*$(DLLPOST) $(STLPORT4)$/lib$/*$(DLLPOST).[0-9] 2>/dev/null") .ENDIF +# GrP mega-hack! no cppuhelper for cppuhelper +.IF "$(PRJNAME)"!="cppuhelper" +SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).[0-9] 2>/dev/null | grep -E -v 'lib\w+static' | grep cppuhelper") +.ENDIF +# GrP remove -U options (can't use for two-level) LINK=cc -.IF "$(DARWIN_VERSION)">="10400" -LINKFLAGS=-dynamic -flat_namespace -framework System -framework CoreFoundation -lcc_dynamic -lstdc++ -.ELSE -LINKFLAGS=-dynamic -framework System -framework CoreFoundation -lcc_dynamic -lstdc++ -.ENDIF -LINKFLAGS+=$(foreach,i,$(SOLARVERSHLLIBS) -dylib_file @executable_path$/$(i:f):$i) -L$(MISC) -LINKFLAGSAPPGUI=-Wl,-u,__objcInit +LINKFLAGS=-dynamic -framework System -framework CoreFoundation -lcc_dynamic -lstdc++ \ + $(foreach,i,$(SOLARVERSHLLIBS) -dylib_file @executable_path$/$(i:f):$i) \ + -L$(MISC) +LINKFLAGSAPPGUI= .IF "$(UNIXVERSIONNAMES)"!="" -LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)' \ - -Wl,-U,___progname -Wl,-U,_environ +LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)' .ELSE -LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f)' \ - -Wl,-U,___progname -Wl,-U,_environ +LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f)' .ENDIF LINKFLAGSAPPCUI=-Wl,-u,__objcInit .IF "$(UNIXVERSIONNAMES)"!="" -LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)' \ - -Wl,-U,___progname -Wl,-U,_environ +LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)' .ELSE -LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f)' \ - -Wl,-U,___progname -Wl,-U,_environ +LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f)' .ENDIF LINKFLAGSTACK= LINKFLAGSPROF= Only in openoffice-new/solenv/unxmacxp/bin: copyprj diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/solenv/unxmacxp/bin/create-bundle openoffice-new/solenv/unxmacxp/bin/create-bundle --- openoffice-clean/solenv/unxmacxp/bin/create-bundle Wed Sep 26 06:04:29 2001 +++ openoffice-new/solenv/unxmacxp/bin/create-bundle Fri Feb 22 00:10:45 2002 @@ -81,7 +81,8 @@ # libraries. # # The output for each executable will be a bundle named .app and -# the output for each shared library will be a bundle named .framework. +# the output for each shared library will be a symlink from libfoo.jnilib +# back to libfoo.dylib. # These output directories will be in the same directory as the executable or # shared library. @@ -196,13 +197,6 @@ elif printf "$filetype" | grep -q 'Mach-O dynamically linked shared library ppc'; then # Screen out lib\w+static libraries as they are not used directly if ! printf "$inputfilename" | grep -q -x -E 'lib\w+static.*\.dylib'; then - # Create bundle directories - if [ ! -L "$outputdir/$inputfilename.framework/$inputfilename" ]; then - rm -Rf "$outputdir/$inputfilename.framework" - mkdir -p "$outputdir/$inputfilename.framework" - fi - # Link executable into bundle directory - ln -sf "../$inputfilename" "$outputdir/$inputfilename.framework/$inputfilename" # Create jnilib link inputjnilibname="`basename $inputfilename .dylib`.jnilib" if [ ! -L "$outputdir/$inputjnilibname" ]; then @@ -211,7 +205,7 @@ # Link jnilib ln -sf "$inputfilename" "$outputdir/$inputjnilibname" - printf "create-bundle: $outputdir/$inputfilename.framework successfully created\n" + printf "create-bundle: $outputdir/$inputjnilibname successfully created\n" fi else printf "create-bundle: error: file is not an executable or shared library.\n" >&2 Only in openoffice-new/solenv/unxmacxp/bin: dmake Only in openoffice-new/solenv/unxmacxp/bin: i_server Only in openoffice-new/solenv/unxmacxp/bin: makedepend Only in openoffice-new/solenv/unxmacxp/bin: mkcreate Only in openoffice-new/solenv/unxmacxp/bin: mksvconf Only in openoffice-new/solenv/unxmacxp/bin: mkunroll Only in openoffice-new/solenv/unxmacxp/bin: rscdep Only in openoffice-new/solenv/unxmacxp/bin: rscpp Only in openoffice-new/solenv/unxmacxp/bin: setsolar Only in openoffice-new/solenv/unxmacxp/bin: sspretty Only in openoffice-new/solenv/unxmacxp/bin: zipdep Only in openoffice-new/solenv/unxmacxp/inc: dlfcn.h diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/solenv/unxmacxp/inc/makefile.mk openoffice-new/solenv/unxmacxp/inc/makefile.mk --- openoffice-clean/solenv/unxmacxp/inc/makefile.mk Wed Sep 26 06:04:29 2001 +++ openoffice-new/solenv/unxmacxp/inc/makefile.mk Fri Feb 22 00:12:59 2002 @@ -78,13 +78,14 @@ CPPUHELPERLIBNAME=$(DLLPRE)$(CPPUHELPERLIB:s/-l//)$(DLLPOST) .IF "$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(CPPUHELPERLIBNAME) $(LB)$/$(CPPUHELPERLIBNAME) 2>/dev/null")"!="" LINKFLAGSSHL+=$(CPPUHELPERLIB) -.ELSE -LINKFLAGSSHL+=-Wl,-U,__._Q24cppu13ClassDataBase \ - -Wl,-U,___Q24cppu13ClassDataBasel \ - -Wl,-U,___tiQ24cppu11OWeakObject \ - -Wl,-U,___tiQ24cppu14OWeakAggObject \ - -Wl,-U,___tiQ24cppu27WeakComponentImplHelperBase .ENDIF + +# sal needs to be on the static data link list after is it created. +SALLIBNAME=$(DLLPRE)$(SALLIB:s/-l//)$(DLLPOST) +.IF "$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(SALLIBNAME) $(LB)$/$(SALLIBNAME) 2>/dev/null")"!="" +LINKFLAGSSHL+=$(SALLIB) +.ENDIF + # Update, compile and link static data member library. Note that we do all of # these steps in our custom recipes. This avoids dependency and recursion Only in openoffice-new/solenv/unxmacxp/inc: poll.h Only in openoffice-new/solenv/unxmacxp/inc: poll.h~ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/soltools/checkdll/checkdll.c openoffice-new/soltools/checkdll/checkdll.c --- openoffice-clean/soltools/checkdll/checkdll.c Tue Aug 28 04:15:18 2001 +++ openoffice-new/soltools/checkdll/checkdll.c Fri Feb 22 00:22:32 2002 @@ -65,7 +65,7 @@ #include #include #ifdef MACOSX -#include +#include #else #include #endif @@ -90,10 +90,7 @@ { int rc; #ifdef MACOSX - CFStringRef bundlePath; - CFURLRef bundleURL; - CFBundleRef bundle; - CFStringRef symbolName; + struct mach_header *pLib; #else void *phandle; #endif @@ -115,45 +112,39 @@ #ifdef MACOSX - /* Convert char pointers to CFStringRefs */ - bundlePath = CFStringCreateWithCStringNoCopy(NULL, argv[1], - CFStringGetSystemEncoding(), kCFAllocatorNull); - symbolName = CFStringCreateWithCStringNoCopy(NULL, psymbol, - CFStringGetSystemEncoding(), kCFAllocatorNull); - - /* Get the framework's URL using its path */ - if ((bundleURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, - bundlePath, kCFURLPOSIXPathStyle, true)) != NULL) { - /* Load the framework */ - if ((bundle = CFBundleCreate( kCFAllocatorDefault, - bundleURL)) != NULL) { - /* Load the shared library */ - if (CFBundleLoadExecutable(bundle)) { - if ((pfun = CFBundleGetFunctionPointerForName(bundle, - symbolName)) != NULL) { - printf(": ok\n"); - CFRelease(bundlePath); - CFRelease(bundleURL); - CFRelease(bundle); - CFRelease(symbolName); - return 0; - } - else - printf(": ERROR: symbol %s not found\n", psymbol); - } - /* No message printed since CFLog prints its own message */ - } - else - printf(": ERROR: %s is not a bundle\n", argv[1]); - } - else - printf(": ERROR: %s is not a valid bundle name\n", argv[1]); - - CFRelease(bundlePath); - if (bundleURL != NULL) CFRelease(bundleURL); - if (bundle != NULL) CFRelease(bundle); - CFRelease(symbolName); + // Check if library is already loaded + pLib = NSAddImage(argv[1], NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED); + if (!pLib) { + // Check DYLD_LIBRARY_PATH + pLib = NSAddImage(argv[1], NSADDIMAGE_OPTION_WITH_SEARCHING); + } + if (pLib) { + // Prefix symbol name with '_' + char *name = malloc(1+strlen(psymbol)+1); + NSSymbol *symbol; + void *address = NULL; + strcpy(name, "_"); + strcat(name, psymbol); + symbol = NSLookupSymbolInImage(pLib, name, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND); + free(name); + if (symbol) address = NSAddressOfSymbol(symbol); + if (address != NULL) { + printf(": ok\n"); +#ifdef NO_UNLOAD_CHECK + _exit(0); +#else + // Mac OS X can't unload dylibs +#endif + return 0; + } else { + printf(": ERROR: symbol %s not found\n", psymbol); + } + } else { + printf(": ERROR: %s is not a valid dylib name\n", argv[1]); + } return 3; + + // fixme use NSLinkEditError() for better error messages #else /* MACOSX */ Only in openoffice-new: solver diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sot/prj/d.lst openoffice-new/sot/prj/d.lst --- openoffice-clean/sot/prj/d.lst Tue Sep 25 08:24:35 2001 +++ openoffice-new/sot/prj/d.lst Fri Feb 22 00:23:45 2002 @@ -24,6 +24,7 @@ ..\%__SRC%\lib\sot.lib %_DEST%\lib%_EXT%\sot.lib ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so ..\%__SRC%\lib\*.so.* %_DEST%\lib%_EXT%\*.so.* +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a ..\%__SRC%\slb\sot.lib %_DEST%\lib%_EXT%\xsot.lib diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/stoc/test/testconv.cxx openoffice-new/stoc/test/testconv.cxx --- openoffice-clean/stoc/test/testconv.cxx Mon Mar 19 04:09:14 2001 +++ openoffice-new/stoc/test/testconv.cxx Fri Feb 22 00:24:46 2002 @@ -706,7 +706,7 @@ #ifdef UNX #define REG_PREFIX "lib" #ifdef MACOSX -#define DLL_POSTFIX ".dylib.framework" +#define DLL_POSTFIX ".dylib" #else #define DLL_POSTFIX ".so" #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/stoc/test/testcorefl.cxx openoffice-new/stoc/test/testcorefl.cxx --- openoffice-clean/stoc/test/testcorefl.cxx Fri Jun 22 09:21:01 2001 +++ openoffice-new/stoc/test/testcorefl.cxx Fri Feb 22 00:24:57 2002 @@ -387,7 +387,7 @@ #ifdef UNX #define REG_PREFIX "lib" #ifdef MACOSX -#define DLL_POSTFIX ".dylib.framework" +#define DLL_POSTFIX ".dylib" #else #define DLL_POSTFIX ".so" #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/stoc/test/testiadapter.cxx openoffice-new/stoc/test/testiadapter.cxx --- openoffice-clean/stoc/test/testiadapter.cxx Wed May 9 08:42:43 2001 +++ openoffice-new/stoc/test/testiadapter.cxx Fri Feb 22 00:25:06 2002 @@ -1003,7 +1003,7 @@ #ifdef UNX #define REG_PREFIX "lib" #ifdef MACOSX -#define DLL_POSTFIX ".dylib.framework" +#define DLL_POSTFIX ".dylib" #else #define DLL_POSTFIX ".so" #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/stoc/test/testintrosp.cxx openoffice-new/stoc/test/testintrosp.cxx --- openoffice-clean/stoc/test/testintrosp.cxx Fri Jun 22 09:21:01 2001 +++ openoffice-new/stoc/test/testintrosp.cxx Fri Feb 22 00:25:18 2002 @@ -1602,7 +1602,7 @@ libName = OUString::createFromAscii("corefl.dll"); #else #ifdef MACOSX - libName = OUString::createFromAscii("libcorefl.dylib.framework"); + libName = OUString::createFromAscii("libcorefl.dylib"); #else libName = OUString::createFromAscii("libcorefl.so"); #endif @@ -1620,7 +1620,7 @@ libName = OUString::createFromAscii("insp.dll"); #else #ifdef MACOSX - libName = OUString::createFromAscii("libinsp.dylib.framework"); + libName = OUString::createFromAscii("libinsp.dylib"); #else libName = OUString::createFromAscii("libinsp.so"); #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/stoc/test/testloader.cxx openoffice-new/stoc/test/testloader.cxx --- openoffice-clean/stoc/test/testloader.cxx Fri Jun 22 09:21:02 2001 +++ openoffice-new/stoc/test/testloader.cxx Fri Feb 22 00:25:25 2002 @@ -128,7 +128,7 @@ OUString dllName( OUString::createFromAscii("cpld.dll") ); #else #ifdef MACOSX - OUString dllName( OUString::createFromAscii("libcpld.dylib.framework") ); + OUString dllName( OUString::createFromAscii("libcpld.dylib") ); #else OUString dllName( OUString::createFromAscii("libcpld.so") ); #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/stoc/test/testproxyfac.cxx openoffice-new/stoc/test/testproxyfac.cxx --- openoffice-clean/stoc/test/testproxyfac.cxx Fri Jun 22 09:21:02 2001 +++ openoffice-new/stoc/test/testproxyfac.cxx Fri Feb 22 00:25:32 2002 @@ -196,7 +196,7 @@ #ifdef UNX #define REG_PREFIX "lib" #ifdef MACOSX -#define DLL_POSTFIX ".dylib.framework" +#define DLL_POSTFIX ".dylib" #else #define DLL_POSTFIX ".so" #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/stoc/test/testregistry.cxx openoffice-new/stoc/test/testregistry.cxx --- openoffice-clean/stoc/test/testregistry.cxx Fri Jun 22 09:21:02 2001 +++ openoffice-new/stoc/test/testregistry.cxx Fri Feb 22 00:25:39 2002 @@ -193,7 +193,7 @@ OUString dllName( OUString::createFromAscii("simreg.dll") ); #else #ifdef MACOSX - OUString dllName( OUString::createFromAscii("libsimreg.dylib.framework") ); + OUString dllName( OUString::createFromAscii("libsimreg.dylib") ); #else OUString dllName( OUString::createFromAscii("libsimreg.so") ); #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/stoc/test/testsmgr_cpnt/testsmgr_cpnt.cxx openoffice-new/stoc/test/testsmgr_cpnt/testsmgr_cpnt.cxx --- openoffice-clean/stoc/test/testsmgr_cpnt/testsmgr_cpnt.cxx Mon Mar 19 03:18:42 2001 +++ openoffice-new/stoc/test/testsmgr_cpnt/testsmgr_cpnt.cxx Fri Feb 22 00:25:50 2002 @@ -257,7 +257,7 @@ OUString atUModule2( OUString::createFromAscii("at.dll") ); #else #ifdef MACOSX - OUString atUModule2( OUString::createFromAscii("libat.dylib.framework") ); + OUString atUModule2( OUString::createFromAscii("libat.dylib") ); #else OUString atUModule2( OUString::createFromAscii("libat.so") ); #endif Only in openoffice-new/svtools/bmpmaker: bmpmaker..dpr Only in openoffice-new/svtools/source/plugapp: plugapp..dpr diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/svx/inc/xoutx.hxx openoffice-new/svx/inc/xoutx.hxx --- openoffice-clean/svx/inc/xoutx.hxx Wed May 9 05:21:01 2001 +++ openoffice-new/svx/inc/xoutx.hxx Fri Feb 22 00:29:37 2002 @@ -121,6 +121,11 @@ |* \************************************************************************/ +#ifdef MACOSX +static Brush aBrush; +static Pen aPen; +#endif + class XOutputDevice { // pLinePattern enthaelt das aus einem XDash erzeugte Linienmuster @@ -272,10 +277,20 @@ #ifndef NOOLDSV // Nur Temporaer - const Pen& GetPen() const { static Pen aPen; aPen = pOut->GetPen(); return aPen; } + const Pen& GetPen() const { +#ifndef MACOSX + static Pen aPen; +#endif + aPen = pOut->GetPen(); return aPen; + } void SetPen( const Pen& rPen ) { pOut->SetPen( rPen ); } - const Brush& GetBrush() const { static Brush aBrush; aBrush = pOut->GetFillInBrush(); return aBrush; } + const Brush& GetBrush() const { +#ifndef MACOSX + static Brush aBrush; +#endif + aBrush = pOut->GetFillInBrush(); return aBrush; + } void SetFillInBrush( const Brush& rBrush ) { pOut->SetFillInBrush( rBrush ); } // StarView-Pen und -FillInBrush temporaer ueberschreiben, z.B. fuer diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/svx/source/dialog/graphctl.cxx openoffice-new/svx/source/dialog/graphctl.cxx --- openoffice-clean/svx/source/dialog/graphctl.cxx Tue Jul 10 03:27:34 2001 +++ openoffice-new/svx/source/dialog/graphctl.cxx Fri Feb 22 00:30:22 2002 @@ -62,12 +62,12 @@ #if defined( OS2 ) || defined( WIN ) || defined( UNX ) || defined( WNT ) #include //wegen fcvt #endif -#if defined(MAC) || defined(NETBSD) -#if defined(NETBSD) +#if defined(MAC) || defined(NETBSD) || defined(MACOSX) +#if defined(NETBSD) || defined(MACOSX) extern "C" { #endif char *fcvt(double value, int ndigit, int *decpt, int *sign); -#if defined(NETBSD) +#if defined(NETBSD) || defined(MACOSX) } #endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/svx/source/editeng/editundo.hxx openoffice-new/svx/source/editeng/editundo.hxx --- openoffice-clean/svx/source/editeng/editundo.hxx Fri Feb 23 05:05:25 2001 +++ openoffice-new/svx/source/editeng/editundo.hxx Sun Feb 24 00:57:46 2002 @@ -182,8 +182,15 @@ TYPEINFO(); EditUndoRemoveChars( ImpEditEngine* pImpEE, const EPaM& rEPaM, const String& rStr ); +#ifndef MACOSX const EPaM& GetEPaM() { return aEPaM; } String& GetStr() { return aText; } +#else + // implementations moved to impedit2.cxx + // fixme revisit after gcc3 + const EPaM& GetEPaM(); + String& GetStr(); +#endif virtual void Undo(); virtual void Redo(); diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/svx/source/editeng/impedit2.cxx openoffice-new/svx/source/editeng/impedit2.cxx --- openoffice-clean/svx/source/editeng/impedit2.cxx Fri Aug 17 03:51:35 2001 +++ openoffice-new/svx/source/editeng/impedit2.cxx Fri Feb 22 00:32:08 2002 @@ -125,6 +125,11 @@ #include +#ifdef MACOSX +// moved from editundo.hxx +const EPaM& EditUndoRemoveChars::GetEPaM() { return aEPaM; } +String& EditUndoRemoveChars::GetStr() { return aText; } +#endif using namespace ::com::sun::star; diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/cellatr.hxx openoffice-new/sw/inc/cellatr.hxx --- openoffice-clean/sw/inc/cellatr.hxx Mon Sep 18 10:14:24 2000 +++ openoffice-new/sw/inc/cellatr.hxx Mon Feb 25 13:40:29 2002 @@ -159,20 +159,26 @@ //*************************************************************************** +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(BOOL bInP) const { return (const SwTblBoxNumFormat&)Get( RES_BOXATR_FORMAT,bInP); } inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(BOOL bInP) const { return (const SwTblBoxFormula&)Get( RES_BOXATR_FORMULA,bInP); } inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(BOOL bInP) const { return (const SwTblBoxValue&)Get( RES_BOXATR_VALUE, bInP); } +#endif //*************************************************************************** +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(BOOL bInP) const { return aSet.GetTblBoxNumFmt(bInP); } inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(BOOL bInP) const { return aSet.GetTblBoxFormula(bInP); } inline const SwTblBoxValue &SwFmt::GetTblBoxValue(BOOL bInP) const { return aSet.GetTblBoxValue(bInP); } +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/charatr.hxx openoffice-new/sw/inc/charatr.hxx --- openoffice-clean/sw/inc/charatr.hxx Tue May 15 02:56:28 2001 +++ openoffice-new/sw/inc/charatr.hxx Mon Feb 25 13:41:18 2002 @@ -108,8 +108,12 @@ { return (const SvxFontHeightItem&)Get( RES_CHRATR_CTL_FONTSIZE,bInP); } inline const SvxPropSizeItem &SwAttrSet::GetPropSize(BOOL bInP) const { return (const SvxPropSizeItem&)Get( RES_CHRATR_PROPORTIONALFONTSIZE,bInP); } + +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SvxFontItem &SwAttrSet::GetFont(BOOL bInP) const { return (const SvxFontItem&)Get( RES_CHRATR_FONT,bInP); } +#endif inline const SvxFontItem &SwAttrSet::GetCJKFont(BOOL bInP) const { return (const SvxFontItem&)Get( RES_CHRATR_CJK_FONT,bInP); } inline const SvxFontItem &SwAttrSet::GetCTLFont(BOOL bInP) const @@ -172,8 +176,11 @@ { return aSet.GetSize(bInP); } inline const SvxPropSizeItem &SwFmt::GetPropSize(BOOL bInP) const { return aSet.GetPropSize(bInP); } +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SvxFontItem &SwFmt::GetFont(BOOL bInP) const { return aSet.GetFont(bInP); } +#endif inline const SvxFontItem &SwFmt::GetCJKFont(BOOL bInP) const { return aSet.GetCJKFont(bInP); } inline const SvxColorItem &SwFmt::GetColor(BOOL bInP) const diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmtanchr.hxx openoffice-new/sw/inc/fmtanchr.hxx --- openoffice-clean/sw/inc/fmtanchr.hxx Sat May 12 20:32:47 2001 +++ openoffice-new/sw/inc/fmtanchr.hxx Mon Feb 25 13:42:00 2002 @@ -121,10 +121,14 @@ void SetAnchor( const SwPosition *pPos ); }; +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtAnchor &SwAttrSet::GetAnchor(BOOL bInP) const - { return (const SwFmtAnchor&)Get( RES_ANCHOR,bInP); } + { return (const SwFmtAnchor&)Get( RES_ANCHOR,bInP); } + + inline const SwFmtAnchor &SwFmt::GetAnchor(BOOL bInP) const + { return aSet.GetAnchor(bInP); } +#endif -inline const SwFmtAnchor &SwFmt::GetAnchor(BOOL bInP) const - { return aSet.GetAnchor(bInP); } #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmtclbl.hxx openoffice-new/sw/inc/fmtclbl.hxx --- openoffice-clean/sw/inc/fmtclbl.hxx Sat May 12 20:32:47 2001 +++ openoffice-new/sw/inc/fmtclbl.hxx Mon Feb 25 13:42:24 2002 @@ -92,11 +92,15 @@ */ virtual USHORT GetVersion( USHORT nFFVer ) const; }; + +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(BOOL bInP) const { return (const SwFmtNoBalancedColumns&)Get( RES_COLUMNBALANCE, bInP ); } inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(BOOL bInP) const { return aSet.GetBalancedColumns( bInP ); } +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmtclds.hxx openoffice-new/sw/inc/fmtclds.hxx --- openoffice-clean/sw/inc/fmtclds.hxx Sat May 12 20:32:47 2001 +++ openoffice-new/sw/inc/fmtclds.hxx Mon Feb 25 13:42:42 2002 @@ -212,11 +212,14 @@ USHORT CalcPrtColWidth( USHORT nCol, USHORT nAct ) const; }; +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtCol &SwAttrSet::GetCol(BOOL bInP) const { return (const SwFmtCol&)Get( RES_COL,bInP); } inline const SwFmtCol &SwFmt::GetCol(BOOL bInP) const { return aSet.GetCol(bInP); } +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmtcnct.hxx openoffice-new/sw/inc/fmtcnct.hxx --- openoffice-clean/sw/inc/fmtcnct.hxx Sat May 12 20:32:47 2001 +++ openoffice-new/sw/inc/fmtcnct.hxx Mon Feb 25 13:43:19 2002 @@ -123,11 +123,14 @@ } +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtChain &SwAttrSet::GetChain(BOOL bInP) const { return (const SwFmtChain&)Get( RES_CHAIN,bInP); } inline const SwFmtChain &SwFmt::GetChain(BOOL bInP) const { return aSet.GetChain(bInP); } +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmtcntnt.hxx openoffice-new/sw/inc/fmtcntnt.hxx --- openoffice-clean/sw/inc/fmtcntnt.hxx Mon Sep 18 10:14:25 2000 +++ openoffice-new/sw/inc/fmtcntnt.hxx Mon Feb 25 13:43:50 2002 @@ -98,11 +98,14 @@ void SetNewCntntIdx( const SwNodeIndex *pIdx ); }; +#ifndef MACOSX +// GrP moved to gcc_outl.hxx; revisit with gcc3 inline const SwFmtCntnt &SwAttrSet::GetCntnt(BOOL bInP) const { return (const SwFmtCntnt&)Get( RES_CNTNT,bInP); } inline const SwFmtCntnt &SwFmt::GetCntnt(BOOL bInP) const { return aSet.GetCntnt(bInP); } +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmteiro.hxx openoffice-new/sw/inc/fmteiro.hxx --- openoffice-clean/sw/inc/fmteiro.hxx Sat May 12 20:32:47 2001 +++ openoffice-new/sw/inc/fmteiro.hxx Mon Feb 25 13:44:11 2002 @@ -92,11 +92,14 @@ virtual USHORT GetVersion( USHORT nFFVer ) const; }; +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(BOOL bInP) const { return (const SwFmtEditInReadonly&)Get( RES_EDIT_IN_READONLY,bInP); } inline const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(BOOL bInP) const { return aSet.GetEditInReadonly(bInP); } +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmtfordr.hxx openoffice-new/sw/inc/fmtfordr.hxx --- openoffice-clean/sw/inc/fmtfordr.hxx Mon Sep 18 10:14:26 2000 +++ openoffice-new/sw/inc/fmtfordr.hxx Mon Feb 25 13:44:26 2002 @@ -105,11 +105,14 @@ return *this; } +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtFillOrder &SwAttrSet::GetFillOrder(BOOL bInP) const { return (const SwFmtFillOrder&)Get( RES_FILL_ORDER,bInP); } inline const SwFmtFillOrder &SwFmt::GetFillOrder(BOOL bInP) const { return aSet.GetFillOrder(bInP); } +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmtfsize.hxx openoffice-new/sw/inc/fmtfsize.hxx --- openoffice-clean/sw/inc/fmtfsize.hxx Mon Jul 9 13:10:42 2001 +++ openoffice-new/sw/inc/fmtfsize.hxx Mon Feb 25 13:44:45 2002 @@ -151,11 +151,14 @@ const SvxULSpaceItem *pULSpace ) const; }; +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(BOOL bInP) const { return (const SwFmtFrmSize&)Get( RES_FRM_SIZE,bInP); } inline const SwFmtFrmSize &SwFmt::GetFrmSize(BOOL bInP) const { return aSet.GetFrmSize(bInP); } +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmtftntx.hxx openoffice-new/sw/inc/fmtftntx.hxx --- openoffice-clean/sw/inc/fmtftntx.hxx Sat May 12 20:32:47 2001 +++ openoffice-new/sw/inc/fmtftntx.hxx Mon Feb 25 13:45:06 2002 @@ -166,8 +166,8 @@ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; }; - - +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(BOOL bInP) const { return (const SwFmtFtnAtTxtEnd&)Get( RES_FTN_AT_TXTEND, bInP); } inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(BOOL bInP) const @@ -178,6 +178,7 @@ { return aSet.GetFtnAtTxtEnd(bInP); } inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(BOOL bInP) const { return aSet.GetEndAtTxtEnd(bInP); } +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmthdft.hxx openoffice-new/sw/inc/fmthdft.hxx --- openoffice-clean/sw/inc/fmthdft.hxx Sat May 12 20:32:47 2001 +++ openoffice-new/sw/inc/fmthdft.hxx Mon Feb 25 13:45:24 2002 @@ -146,6 +146,8 @@ void SetActive( BOOL bNew = TRUE ) { bActive = bNew; } }; +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtHeader &SwAttrSet::GetHeader(BOOL bInP) const { return (const SwFmtHeader&)Get( RES_HEADER,bInP); } inline const SwFmtFooter &SwAttrSet::GetFooter(BOOL bInP) const @@ -155,6 +157,7 @@ { return aSet.GetHeader(bInP); } inline const SwFmtFooter &SwFmt::GetFooter(BOOL bInP) const { return aSet.GetFooter(bInP); } +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmtline.hxx openoffice-new/sw/inc/fmtline.hxx --- openoffice-clean/sw/inc/fmtline.hxx Sat May 12 20:32:47 2001 +++ openoffice-new/sw/inc/fmtline.hxx Mon Feb 25 13:45:43 2002 @@ -103,11 +103,14 @@ void SetCountLines( BOOL b ) { bCountLines = b; } }; +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(BOOL bInP) const { return (const SwFmtLineNumber&)Get( RES_LINENUMBER,bInP); } inline const SwFmtLineNumber &SwFmt::GetLineNumber(BOOL bInP) const { return aSet.GetLineNumber(bInP); } +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmtlsplt.hxx openoffice-new/sw/inc/fmtlsplt.hxx --- openoffice-clean/sw/inc/fmtlsplt.hxx Mon Jul 9 13:10:42 2001 +++ openoffice-new/sw/inc/fmtlsplt.hxx Mon Feb 25 13:45:59 2002 @@ -89,11 +89,14 @@ virtual USHORT GetVersion( USHORT nFFVer ) const; }; +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(BOOL bInP) const { return (const SwFmtLayoutSplit&)Get( RES_LAYOUT_SPLIT,bInP); } inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(BOOL bInP) const { return aSet.GetLayoutSplit(bInP); } +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmtornt.hxx openoffice-new/sw/inc/fmtornt.hxx --- openoffice-clean/sw/inc/fmtornt.hxx Mon Jul 9 13:10:42 2001 +++ openoffice-new/sw/inc/fmtornt.hxx Mon Feb 25 13:46:15 2002 @@ -181,6 +181,8 @@ return *this; } +#ifndef MACOSX +// GrP moved to gcc_outl.cxx inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(BOOL bInP) const { return (const SwFmtVertOrient&)Get( RES_VERT_ORIENT,bInP); } inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(BOOL bInP) const @@ -190,7 +192,7 @@ { return aSet.GetVertOrient(bInP); } inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(BOOL bInP) const { return aSet.GetHoriOrient(bInP); } - +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmtpdsc.hxx openoffice-new/sw/inc/fmtpdsc.hxx --- openoffice-clean/sw/inc/fmtpdsc.hxx Mon Jul 9 13:10:42 2001 +++ openoffice-new/sw/inc/fmtpdsc.hxx Mon Feb 25 13:46:32 2002 @@ -136,12 +136,15 @@ void SetDescNameIdx( USHORT n ) { nDescNameIdx = n; } }; + +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(BOOL bInP) const { return (const SwFmtPageDesc&)Get( RES_PAGEDESC,bInP); } inline const SwFmtPageDesc &SwFmt::GetPageDesc(BOOL bInP) const { return aSet.GetPageDesc(bInP); } - +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmtsrnd.hxx openoffice-new/sw/inc/fmtsrnd.hxx --- openoffice-clean/sw/inc/fmtsrnd.hxx Sat May 12 20:32:47 2001 +++ openoffice-new/sw/inc/fmtsrnd.hxx Mon Feb 25 13:46:54 2002 @@ -132,11 +132,14 @@ return *this; } +#ifndef MACOSX +// GrP moved to gcc_outl.hxx; revisit with gcc3 inline const SwFmtSurround &SwAttrSet::GetSurround(BOOL bInP) const { return (const SwFmtSurround&)Get( RES_SURROUND,bInP); } inline const SwFmtSurround &SwFmt::GetSurround(BOOL bInP) const { return aSet.GetSurround(bInP); } +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/fmturl.hxx openoffice-new/sw/inc/fmturl.hxx --- openoffice-clean/sw/inc/fmturl.hxx Sat May 12 20:32:47 2001 +++ openoffice-new/sw/inc/fmturl.hxx Mon Feb 25 13:47:17 2002 @@ -121,11 +121,15 @@ void SetName( const String& rNm ) { sName = rNm; } }; + +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwFmtURL &SwAttrSet::GetURL(BOOL bInP) const { return (const SwFmtURL&)Get( RES_URL,bInP); } inline const SwFmtURL &SwFmt::GetURL(BOOL bInP) const { return aSet.GetURL(bInP); } +#endif #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/format.hxx openoffice-new/sw/inc/format.hxx --- openoffice-clean/sw/inc/format.hxx Tue Apr 10 07:12:50 2001 +++ openoffice-new/sw/inc/format.hxx Mon Feb 25 14:33:05 2002 @@ -204,6 +204,12 @@ nWhichId == RES_DRAWFRMFMT|| nWhichId == RES_FRMFMT; } +#ifdef MACOSX +#define INLINE /* GrP revisit with gcc3 */ +#else +#define INLINE inline +#endif + // GetMethoden: das Bool gibt an, ob nur im Set (FALSE) oder auch in // den Parents gesucht werden soll. Wird nichts gefunden, // wird das deflt. Attribut returnt. @@ -220,7 +226,7 @@ inline const SvxCrossedOutItem &GetCrossedOut( BOOL = TRUE ) const; inline const SvxFontHeightItem &GetSize( BOOL = TRUE ) const; inline const SvxPropSizeItem &GetPropSize( BOOL = TRUE ) const; - inline const SvxFontItem &GetFont( BOOL = TRUE ) const; + INLINE const SvxFontItem &GetFont( BOOL = TRUE ) const; inline const SvxColorItem &GetColor( BOOL = TRUE ) const; inline const SvxCharSetColorItem &GetCharSetColor( BOOL = TRUE ) const; inline const SvxLanguageItem &GetLanguage( BOOL = TRUE ) const; @@ -247,76 +253,41 @@ inline const SvxCharRotateItem &GetCharRotate( BOOL = TRUE ) const; inline const SvxCharReliefItem &GetCharRelief( BOOL = TRUE ) const; - // Frame-Attribute - impl. steht im frmatr.hxx, - // fuer LINUX, SINIX, HPUX auch in gcc_outl.cxx -#if ( defined GCC && defined C272 && \ - ( defined LINUX || defined SINIX || defined HPUX )) - const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const; - const SwFmtFrmSize &GetFrmSize( BOOL = TRUE ) const; - const SwFmtHeader &GetHeader( BOOL = TRUE ) const; - const SwFmtFooter &GetFooter( BOOL = TRUE ) const; - const SwFmtSurround &GetSurround( BOOL = TRUE ) const; - const SwFmtHoriOrient &GetHoriOrient( BOOL = TRUE ) const; - const SwFmtAnchor &GetAnchor( BOOL = TRUE ) const; - const SwFmtCol &GetCol( BOOL = TRUE ) const; -#endif -#if ( defined GCC && defined C272 && defined HPUX ) - const SvxPaperBinItem &GetPaperBin( BOOL = TRUE ) const; - const SvxLRSpaceItem &GetLRSpace( BOOL = TRUE ) const; - const SvxULSpaceItem &GetULSpace( BOOL = TRUE ) const; - const SwFmtCntnt &GetCntnt( BOOL = TRUE ) const; - const SvxPrintItem &GetPrint( BOOL = TRUE ) const; - const SvxOpaqueItem &GetOpaque( BOOL = TRUE ) const; - const SvxProtectItem &GetProtect( BOOL = TRUE ) const; - const SwFmtVertOrient &GetVertOrient( BOOL = TRUE ) const; - const SvxBoxItem &GetBox( BOOL = TRUE ) const; - const SvxFmtKeepItem &GetKeep( BOOL = TRUE ) const; - const SvxBrushItem &GetBackground( BOOL = TRUE ) const; - const SvxShadowItem &GetShadow( BOOL = TRUE ) const; - const SwFmtPageDesc &GetPageDesc( BOOL = TRUE ) const; - const SvxFmtBreakItem &GetBreak( BOOL = TRUE ) const; - const SvxMacroItem &GetMacro( BOOL = TRUE ) const; - const SwFmtURL &GetURL( BOOL = TRUE ) const; -#endif -#if !( defined GCC && defined C272 && \ - ( defined LINUX || defined SINIX || defined HPUX )) - inline const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const; - inline const SwFmtFrmSize &GetFrmSize( BOOL = TRUE ) const; - inline const SwFmtHeader &GetHeader( BOOL = TRUE ) const; - inline const SwFmtFooter &GetFooter( BOOL = TRUE ) const; - inline const SwFmtSurround &GetSurround( BOOL = TRUE ) const; - inline const SwFmtHoriOrient &GetHoriOrient( BOOL = TRUE ) const; - inline const SwFmtAnchor &GetAnchor( BOOL = TRUE ) const; - inline const SwFmtCol &GetCol( BOOL = TRUE ) const; -#endif -#if !( defined GCC && defined C272 && defined HPUX ) - inline const SvxPaperBinItem &GetPaperBin( BOOL = TRUE ) const; - inline const SvxLRSpaceItem &GetLRSpace( BOOL = TRUE ) const; - inline const SvxULSpaceItem &GetULSpace( BOOL = TRUE ) const; - inline const SwFmtCntnt &GetCntnt( BOOL = TRUE ) const; - inline const SvxPrintItem &GetPrint( BOOL = TRUE ) const; - inline const SvxOpaqueItem &GetOpaque( BOOL = TRUE ) const; - inline const SvxProtectItem &GetProtect( BOOL = TRUE ) const; - inline const SwFmtVertOrient &GetVertOrient( BOOL = TRUE ) const; - inline const SvxBoxItem &GetBox( BOOL = TRUE ) const; - inline const SvxFmtKeepItem &GetKeep( BOOL = TRUE ) const; - inline const SvxBrushItem &GetBackground( BOOL = TRUE ) const; - inline const SvxShadowItem &GetShadow( BOOL = TRUE ) const; - inline const SwFmtPageDesc &GetPageDesc( BOOL = TRUE ) const; - inline const SvxFmtBreakItem &GetBreak( BOOL = TRUE ) const; - inline const SvxMacroItem &GetMacro( BOOL = TRUE ) const; - inline const SwFmtURL &GetURL( BOOL = TRUE ) const; - inline const SwFmtEditInReadonly &GetEditInReadonly( BOOL = TRUE ) const; - inline const SwFmtLayoutSplit &GetLayoutSplit( BOOL = TRUE ) const; - inline const SwFmtChain &GetChain( BOOL = TRUE ) const; - inline const SwFmtLineNumber &GetLineNumber( BOOL = TRUE ) const; - inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( BOOL = TRUE ) const; - inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( BOOL = TRUE ) const; - inline const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const; -#endif - + INLINE const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const; + INLINE const SwFmtFrmSize &GetFrmSize( BOOL = TRUE ) const; + INLINE const SwFmtHeader &GetHeader( BOOL = TRUE ) const; + INLINE const SwFmtFooter &GetFooter( BOOL = TRUE ) const; + INLINE const SwFmtSurround &GetSurround( BOOL = TRUE ) const; + INLINE const SwFmtHoriOrient &GetHoriOrient( BOOL = TRUE ) const; + INLINE const SwFmtAnchor &GetAnchor( BOOL = TRUE ) const; + INLINE const SwFmtCol &GetCol( BOOL = TRUE ) const; + + INLINE const SvxPaperBinItem &GetPaperBin( BOOL = TRUE ) const; + INLINE const SvxLRSpaceItem &GetLRSpace( BOOL = TRUE ) const; + INLINE const SvxULSpaceItem &GetULSpace( BOOL = TRUE ) const; + INLINE const SwFmtCntnt &GetCntnt( BOOL = TRUE ) const; + INLINE const SvxPrintItem &GetPrint( BOOL = TRUE ) const; + INLINE const SvxOpaqueItem &GetOpaque( BOOL = TRUE ) const; + INLINE const SvxProtectItem &GetProtect( BOOL = TRUE ) const; + INLINE const SwFmtVertOrient &GetVertOrient( BOOL = TRUE ) const; + INLINE const SvxBoxItem &GetBox( BOOL = TRUE ) const; + INLINE const SvxFmtKeepItem &GetKeep( BOOL = TRUE ) const; + INLINE const SvxBrushItem &GetBackground( BOOL = TRUE ) const; + INLINE const SvxShadowItem &GetShadow( BOOL = TRUE ) const; + INLINE const SwFmtPageDesc &GetPageDesc( BOOL = TRUE ) const; + INLINE const SvxFmtBreakItem &GetBreak( BOOL = TRUE ) const; + INLINE const SvxMacroItem &GetMacro( BOOL = TRUE ) const; + INLINE const SwFmtURL &GetURL( BOOL = TRUE ) const; + INLINE const SwFmtEditInReadonly &GetEditInReadonly( BOOL = TRUE ) const; + INLINE const SwFmtLayoutSplit &GetLayoutSplit( BOOL = TRUE ) const; + INLINE const SwFmtChain &GetChain( BOOL = TRUE ) const; + INLINE const SwFmtLineNumber &GetLineNumber( BOOL = TRUE ) const; + INLINE const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( BOOL = TRUE ) const; + INLINE const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( BOOL = TRUE ) const; + INLINE const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const; + // Grafik-Attribute - impl. steht im grfatr.hxx - inline const SwMirrorGrf &GetMirrorGrf( BOOL = TRUE ) const; + INLINE const SwMirrorGrf &GetMirrorGrf( BOOL = TRUE ) const; inline const SwCropGrf &GetCropGrf( BOOL = TRUE ) const; inline const SwRotationGrf &GetRotationGrf(BOOL = TRUE ) const; inline const SwLuminanceGrf &GetLuminanceGrf(BOOL = TRUE ) const; @@ -346,9 +317,9 @@ inline const SvxParaVertAlignItem &GetParaVertAlign(BOOL = TRUE) const; // TabellenBox-Attribute - impl. steht im cellatr.hxx - inline const SwTblBoxNumFormat &GetTblBoxNumFmt( BOOL = TRUE ) const; - inline const SwTblBoxFormula &GetTblBoxFormula( BOOL = TRUE ) const; - inline const SwTblBoxValue &GetTblBoxValue( BOOL = TRUE ) const; + INLINE const SwTblBoxNumFormat &GetTblBoxNumFmt( BOOL = TRUE ) const; + INLINE const SwTblBoxFormula &GetTblBoxFormula( BOOL = TRUE ) const; + INLINE const SwTblBoxValue &GetTblBoxValue( BOOL = TRUE ) const; }; // --------------- Inline Implementierungen ------------------------ @@ -376,5 +347,6 @@ return aSet.GetItemState( nWhich, bSrchInParent, ppItem ); } +#undef INLINE #endif // _FORMAT_HXX diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/frmatr.hxx openoffice-new/sw/inc/frmatr.hxx --- openoffice-clean/sw/inc/frmatr.hxx Mon Sep 18 10:14:26 2000 +++ openoffice-new/sw/inc/frmatr.hxx Mon Feb 25 13:50:03 2002 @@ -71,6 +71,8 @@ * Implementierung der FrameAttribut Methoden vom SwAttrSet ******************************************************************************/ +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(BOOL bInP) const { return (const SvxPaperBinItem&)Get( RES_PAPER_BIN,bInP); } inline const SvxLRSpaceItem &SwAttrSet::GetLRSpace(BOOL bInP) const @@ -95,17 +97,14 @@ { return (const SvxFmtBreakItem&)Get( RES_BREAK,bInP); } inline const SvxMacroItem &SwAttrSet::GetMacro(BOOL bInP) const { return (const SvxMacroItem&)Get( RES_FRMMACRO,bInP); } - +#endif /****************************************************************************** * Implementierung der FrameAttribut Methoden vom SwFmt ******************************************************************************/ -// impl. fuer LINUX, SINIX, HPUX auch in gcc_outl.cxx -#if !( defined GCC && defined C272 && \ - ( defined LINUX || defined SINIX || defined HPUX )) -#endif -#if !( defined GCC && defined C272 && defined HPUX ) +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SvxPaperBinItem &SwFmt::GetPaperBin(BOOL bInP) const { return aSet.GetPaperBin(bInP); } inline const SvxLRSpaceItem &SwFmt::GetLRSpace(BOOL bInP) const @@ -131,6 +130,5 @@ inline const SvxMacroItem &SwFmt::GetMacro(BOOL bInP) const { return aSet.GetMacro(bInP); } #endif - #endif //_FRMATR_HXX diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/grfatr.hxx openoffice-new/sw/inc/grfatr.hxx --- openoffice-clean/sw/inc/grfatr.hxx Sat May 12 20:32:47 2001 +++ openoffice-new/sw/inc/grfatr.hxx Mon Feb 25 13:50:35 2002 @@ -377,8 +377,11 @@ * Implementierung der GrafikAttribut Methoden vom SwAttrSet ******************************************************************************/ +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(BOOL bInP) const { return (const SwMirrorGrf&)Get( RES_GRFATR_MIRRORGRF,bInP); } +#endif inline const SwCropGrf &SwAttrSet::GetCropGrf(BOOL bInP) const { return (const SwCropGrf&)Get( RES_GRFATR_CROPGRF,bInP); } inline const SwRotationGrf &SwAttrSet::GetRotationGrf(BOOL bInP) const @@ -406,8 +409,11 @@ * Implementierung der GrafikAttribut Methoden vom SwFmt ******************************************************************************/ +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline const SwMirrorGrf &SwFmt::GetMirrorGrf(BOOL bInP) const { return aSet.GetMirrorGrf(bInP); } +#endif inline const SwCropGrf &SwFmt::GetCropGrf(BOOL bInP) const { return aSet.GetCropGrf(bInP); } inline const SwRotationGrf &SwFmt::GetRotationGrf(BOOL bInP) const diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/ndgrf.hxx openoffice-new/sw/inc/ndgrf.hxx --- openoffice-clean/sw/inc/ndgrf.hxx Mon Jul 9 10:42:21 2001 +++ openoffice-new/sw/inc/ndgrf.hxx Mon Feb 25 13:50:54 2002 @@ -215,6 +215,8 @@ // ---------------------------------------------------------------------- // Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !! +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline SwGrfNode *SwNode::GetGrfNode() { return ND_GRFNODE == nNodeType ? (SwGrfNode*)this : 0; @@ -223,6 +225,7 @@ { return ND_GRFNODE == nNodeType ? (const SwGrfNode*)this : 0; } +#endif #ifndef _FESHVIEW_ONLY_INLINE_NEEDED inline BOOL SwGrfNode::IsLinkedFile() const diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/ndnotxt.hxx openoffice-new/sw/inc/ndnotxt.hxx --- openoffice-clean/sw/inc/ndnotxt.hxx Fri May 4 01:34:39 2001 +++ openoffice-new/sw/inc/ndnotxt.hxx Mon Feb 25 13:51:22 2002 @@ -141,6 +141,8 @@ } // Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !! +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline SwNoTxtNode *SwNode::GetNoTxtNode() { return ND_NOTXTNODE & nNodeType ? (SwNoTxtNode*)this : 0; @@ -149,6 +151,6 @@ { return ND_NOTXTNODE & nNodeType ? (const SwNoTxtNode*)this : 0; } - +#endif #endif // _NDNOTXT_HXX diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/ndole.hxx openoffice-new/sw/inc/ndole.hxx --- openoffice-clean/sw/inc/ndole.hxx Thu Mar 8 13:17:20 2001 +++ openoffice-new/sw/inc/ndole.hxx Mon Feb 25 13:51:41 2002 @@ -167,7 +167,10 @@ #endif }; + // Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !! +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline SwOLENode *SwNode::GetOLENode() { return ND_OLENODE == nNodeType ? (SwOLENode*)this : 0; @@ -176,7 +179,7 @@ { return ND_OLENODE == nNodeType ? (const SwOLENode*)this : 0; } - +#endif #endif // _NDOLE_HXX diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/ndtxt.hxx openoffice-new/sw/inc/ndtxt.hxx --- openoffice-clean/sw/inc/ndtxt.hxx Fri Feb 23 06:28:01 2001 +++ openoffice-new/sw/inc/ndtxt.hxx Mon Feb 25 13:52:13 2002 @@ -375,6 +375,8 @@ // fuer den IBM-Compiler nicht inlinen wg. 42876 #ifndef ICC // Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !! +#ifndef MACOSX +// GrP moved to gcc_outl.cxx; revisit with gcc3 inline SwTxtNode *SwNode::GetTxtNode() { return ND_TEXTNODE == nNodeType ? (SwTxtNode*)this : 0; @@ -383,8 +385,9 @@ { return ND_TEXTNODE == nNodeType ? (const SwTxtNode*)this : 0; } - #endif +#endif + inline void SwTxtNode::Cut(SwTxtNode *pDest, const SwIndex &rDestStart, const SwIndex &rStart, xub_StrLen nLen) { diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/node.hxx openoffice-new/sw/inc/node.hxx --- openoffice-clean/sw/inc/node.hxx Mon Nov 6 02:46:12 2000 +++ openoffice-new/sw/inc/node.hxx Mon Feb 25 14:32:44 2002 @@ -113,6 +113,12 @@ class ViewShell; struct SwPosition; +#ifdef MACOSX +#define INLINE /* GrP revisit with gcc3 */ +#else +#define INLINE inline +#endif + // -------------------- // class SwNode // -------------------- @@ -174,21 +180,21 @@ inline SwEndNode *GetEndNode(); inline const SwEndNode *GetEndNode() const; #ifndef ICC - inline + INLINE #endif SwTxtNode *GetTxtNode(); #ifndef ICC - inline + INLINE #endif const SwTxtNode *GetTxtNode() const; #ifndef COMPACT - inline SwOLENode *GetOLENode(); - inline const SwOLENode *GetOLENode() const; - inline SwNoTxtNode *GetNoTxtNode(); - inline const SwNoTxtNode *GetNoTxtNode() const; - inline SwGrfNode *GetGrfNode(); - inline const SwGrfNode *GetGrfNode() const; + INLINE SwOLENode *GetOLENode(); + INLINE const SwOLENode *GetOLENode() const; + INLINE SwNoTxtNode *GetNoTxtNode(); + INLINE const SwNoTxtNode *GetNoTxtNode() const; + INLINE SwGrfNode *GetGrfNode(); + INLINE const SwGrfNode *GetGrfNode() const; #endif inline SwTableNode *GetTableNode(); inline const SwTableNode *GetTableNode() const; @@ -725,6 +731,6 @@ } - +#undef INLINE #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/swatrset.hxx openoffice-new/sw/inc/swatrset.hxx --- openoffice-clean/sw/inc/swatrset.hxx Tue Apr 10 07:13:28 2001 +++ openoffice-new/sw/inc/swatrset.hxx Mon Feb 25 14:32:56 2002 @@ -171,6 +171,11 @@ class SwTblBoxFormula; class SwTblBoxValue; +#ifdef MACOSX +#define INLINE /* GrP revisit with gcc3 */ +#else +#define INLINE inline +#endif class SwAttrPool : public SfxItemPool { @@ -259,7 +264,7 @@ inline const SvxCrossedOutItem &GetCrossedOut( BOOL = TRUE ) const; inline const SvxFontHeightItem &GetSize( BOOL = TRUE ) const; inline const SvxPropSizeItem &GetPropSize( BOOL = TRUE ) const; - inline const SvxFontItem &GetFont( BOOL = TRUE ) const; + INLINE const SvxFontItem &GetFont( BOOL = TRUE ) const; inline const SvxColorItem &GetColor( BOOL = TRUE ) const; inline const SvxCharSetColorItem &GetCharSetColor( BOOL = TRUE ) const; inline const SvxLanguageItem &GetLanguage( BOOL = TRUE ) const; @@ -286,40 +291,40 @@ inline const SvxCharReliefItem &GetCharRelief( BOOL = TRUE ) const; // Frame-Attribute - impl. steht im frmatr.hxx - inline const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const; - inline const SwFmtFrmSize &GetFrmSize( BOOL = TRUE ) const; - inline const SvxPaperBinItem &GetPaperBin( BOOL = TRUE ) const; - inline const SvxLRSpaceItem &GetLRSpace( BOOL = TRUE ) const; - inline const SvxULSpaceItem &GetULSpace( BOOL = TRUE ) const; - inline const SwFmtCntnt &GetCntnt( BOOL = TRUE ) const; - inline const SwFmtHeader &GetHeader( BOOL = TRUE ) const; - inline const SwFmtFooter &GetFooter( BOOL = TRUE ) const; - inline const SvxPrintItem &GetPrint( BOOL = TRUE ) const; - inline const SvxOpaqueItem &GetOpaque( BOOL = TRUE ) const; - inline const SvxProtectItem &GetProtect( BOOL = TRUE ) const; - inline const SwFmtSurround &GetSurround( BOOL = TRUE ) const; - inline const SwFmtVertOrient &GetVertOrient( BOOL = TRUE ) const; - inline const SwFmtHoriOrient &GetHoriOrient( BOOL = TRUE ) const; - inline const SwFmtAnchor &GetAnchor( BOOL = TRUE ) const; - inline const SvxBoxItem &GetBox( BOOL = TRUE ) const; - inline const SvxFmtKeepItem &GetKeep( BOOL = TRUE ) const; - inline const SvxBrushItem &GetBackground( BOOL = TRUE ) const; - inline const SvxShadowItem &GetShadow( BOOL = TRUE ) const; - inline const SwFmtPageDesc &GetPageDesc( BOOL = TRUE ) const; - inline const SvxFmtBreakItem &GetBreak( BOOL = TRUE ) const; - inline const SwFmtCol &GetCol( BOOL = TRUE ) const; - inline const SvxMacroItem &GetMacro( BOOL = TRUE ) const; - inline const SwFmtURL &GetURL( BOOL = TRUE ) const; - inline const SwFmtEditInReadonly &GetEditInReadonly( BOOL = TRUE ) const; - inline const SwFmtLayoutSplit &GetLayoutSplit( BOOL = TRUE ) const; - inline const SwFmtChain &GetChain( BOOL = TRUE ) const; - inline const SwFmtLineNumber &GetLineNumber( BOOL = TRUE ) const; - inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( BOOL = TRUE ) const; - inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( BOOL = TRUE ) const; - inline const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const; + INLINE const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const; + INLINE const SwFmtFrmSize &GetFrmSize( BOOL = TRUE ) const; + INLINE const SvxPaperBinItem &GetPaperBin( BOOL = TRUE ) const; + INLINE const SvxLRSpaceItem &GetLRSpace( BOOL = TRUE ) const; + INLINE const SvxULSpaceItem &GetULSpace( BOOL = TRUE ) const; + INLINE const SwFmtCntnt &GetCntnt( BOOL = TRUE ) const; + INLINE const SwFmtHeader &GetHeader( BOOL = TRUE ) const; + INLINE const SwFmtFooter &GetFooter( BOOL = TRUE ) const; + INLINE const SvxPrintItem &GetPrint( BOOL = TRUE ) const; + INLINE const SvxOpaqueItem &GetOpaque( BOOL = TRUE ) const; + INLINE const SvxProtectItem &GetProtect( BOOL = TRUE ) const; + INLINE const SwFmtSurround &GetSurround( BOOL = TRUE ) const; + INLINE const SwFmtVertOrient &GetVertOrient( BOOL = TRUE ) const; + INLINE const SwFmtHoriOrient &GetHoriOrient( BOOL = TRUE ) const; + INLINE const SwFmtAnchor &GetAnchor( BOOL = TRUE ) const; + INLINE const SvxBoxItem &GetBox( BOOL = TRUE ) const; + INLINE const SvxFmtKeepItem &GetKeep( BOOL = TRUE ) const; + INLINE const SvxBrushItem &GetBackground( BOOL = TRUE ) const; + INLINE const SvxShadowItem &GetShadow( BOOL = TRUE ) const; + INLINE const SwFmtPageDesc &GetPageDesc( BOOL = TRUE ) const; + INLINE const SvxFmtBreakItem &GetBreak( BOOL = TRUE ) const; + INLINE const SwFmtCol &GetCol( BOOL = TRUE ) const; + INLINE const SvxMacroItem &GetMacro( BOOL = TRUE ) const; + INLINE const SwFmtURL &GetURL( BOOL = TRUE ) const; + INLINE const SwFmtEditInReadonly &GetEditInReadonly( BOOL = TRUE ) const; + INLINE const SwFmtLayoutSplit &GetLayoutSplit( BOOL = TRUE ) const; + INLINE const SwFmtChain &GetChain( BOOL = TRUE ) const; + INLINE const SwFmtLineNumber &GetLineNumber( BOOL = TRUE ) const; + INLINE const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( BOOL = TRUE ) const; + INLINE const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( BOOL = TRUE ) const; + INLINE const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const; // Grafik-Attribute - impl. steht im grfatr.hxx - inline const SwMirrorGrf &GetMirrorGrf( BOOL = TRUE ) const; + INLINE const SwMirrorGrf &GetMirrorGrf( BOOL = TRUE ) const; inline const SwCropGrf &GetCropGrf( BOOL = TRUE ) const; inline const SwRotationGrf &GetRotationGrf(BOOL = TRUE ) const; inline const SwLuminanceGrf &GetLuminanceGrf(BOOL = TRUE ) const; @@ -349,9 +354,9 @@ inline const SvxParaVertAlignItem &GetParaVertAlign(BOOL = TRUE) const; // TabellenBox-Attribute - impl. steht im cellatr.hxx - inline const SwTblBoxNumFormat &GetTblBoxNumFmt( BOOL = TRUE ) const; - inline const SwTblBoxFormula &GetTblBoxFormula( BOOL = TRUE ) const; - inline const SwTblBoxValue &GetTblBoxValue( BOOL = TRUE ) const; + INLINE const SwTblBoxNumFormat &GetTblBoxNumFmt( BOOL = TRUE ) const; + INLINE const SwTblBoxFormula &GetTblBoxFormula( BOOL = TRUE ) const; + INLINE const SwTblBoxValue &GetTblBoxValue( BOOL = TRUE ) const; DECL_FIXEDMEMPOOL_NEWDEL(SwAttrSet) }; @@ -425,5 +430,8 @@ New: SwSectItem: Soll der uebergeordnete Bereich aufgebrochen werden? *************************************************************************/ + +#undef INLINE + // #ifndef _SWATRSET_HXX #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/inc/unotxdoc.hxx openoffice-new/sw/inc/unotxdoc.hxx --- openoffice-clean/sw/inc/unotxdoc.hxx Tue Jun 26 04:41:52 2001 +++ openoffice-new/sw/inc/unotxdoc.hxx Mon Feb 25 13:55:04 2002 @@ -185,6 +185,8 @@ #include #endif +#ifndef MACOSX +// GrP Mac OS X internal compiler error; revisit with gcc3 #define __IFC26 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \ Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26 @@ -207,6 +209,8 @@ __IFC_WRITEOFFSET( 21) __IFC_WRITEOFFSET( 22) __IFC_WRITEOFFSET( 23) __IFC_WRITEOFFSET( 24) __IFC_WRITEOFFSET( 25) __IFC_WRITEOFFSET( 26) __DEF_IMPLHELPER_POST( 26 ) +#endif + class SwDoc; class SvxForbiddenCharactersTable; @@ -223,36 +227,172 @@ /****************************************************************************** * ******************************************************************************/ -typedef cppu::WeakImplHelper26 -< - ::com::sun::star::text::XTextDocument, - ::com::sun::star::text::XLineNumberingProperties, - ::com::sun::star::text::XChapterNumberingSupplier, - ::com::sun::star::text::XFootnotesSupplier, - ::com::sun::star::text::XEndnotesSupplier, - ::com::sun::star::util::XReplaceable, - ::com::sun::star::text::XPagePrintable, - ::com::sun::star::text::XReferenceMarksSupplier, - ::com::sun::star::text::XTextTablesSupplier, - ::com::sun::star::text::XTextFramesSupplier, - ::com::sun::star::text::XBookmarksSupplier, - ::com::sun::star::text::XTextSectionsSupplier, - ::com::sun::star::text::XTextGraphicObjectsSupplier, - ::com::sun::star::text::XTextEmbeddedObjectsSupplier, - ::com::sun::star::text::XTextFieldsSupplier, - ::com::sun::star::style::XStyleFamiliesSupplier, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::drawing::XDrawPageSupplier, - ::com::sun::star::text::XDocumentIndexesSupplier, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::beans::XPropertyState, - ::com::sun::star::document::XLinkTargetSupplier, - ::com::sun::star::document::XRedlinesSupplier, - ::com::sun::star::util::XRefreshable, - ::com::sun::star::util::XLinkUpdate, - ::com::sun::star::lang::XUnoTunnel -> -SwXTextDocumentBaseClass; + + + +namespace cppu +{ + struct ClassData26 : public ClassDataBase + { + Type_Offset arType2Offset[ 26 ]; + ClassData26( ) SAL_THROW( () ) + : ClassDataBase( 26 ) + {} + }; + + class SAL_NO_VTABLE ImplHelperBase26 + : public ::com::sun::star::lang::XTypeProvider + , public ::com::sun::star::text::XTextDocument, public ::com::sun::star::text::XLineNumberingProperties, public ::com::sun::star::text::XChapterNumberingSupplier, public ::com::sun::star::text::XFootnotesSupplier, +public ::com::sun::star::text::XEndnotesSupplier, public ::com::sun::star::util::XReplaceable, public ::com::sun::star::text::XPagePrintable, public ::com::sun::star::text::XReferenceMarksSupplier, public ::com::sun::star::text::XTextTablesSupplier, +public ::com::sun::star::text::XTextFramesSupplier, public ::com::sun::star::text::XBookmarksSupplier, public ::com::sun::star::text::XTextSectionsSupplier, public ::com::sun::star::text::XTextGraphicObjectsSupplier, public ::com::sun::star::text::XTextEmbeddedObjectsSupplier, +public ::com::sun::star::text::XTextFieldsSupplier, public ::com::sun::star::style::XStyleFamiliesSupplier, public ::com::sun::star::lang::XServiceInfo, public ::com::sun::star::drawing::XDrawPageSupplier, public ::com::sun::star::text::XDocumentIndexesSupplier, +public ::com::sun::star::beans::XPropertySet, public ::com::sun::star::beans::XPropertyState, public ::com::sun::star::document::XLinkTargetSupplier, public ::com::sun::star::document::XRedlinesSupplier, public ::com::sun::star::util::XRefreshable, +public ::com::sun::star::util::XLinkUpdate, public ::com::sun::star::lang::XUnoTunnel + { + protected: + ClassData & SAL_CALL getClassData( ClassDataBase & s_aCD ) SAL_THROW( () ) + { + ClassData & rCD = * static_cast< ClassData * >( &s_aCD ); + if (! rCD.bOffsetsInit) + { + ::osl::MutexGuard aGuard( getImplHelperInitMutex() ); + if (! rCD.bOffsetsInit) + { + char * pBase = (char *)this; + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > *)0 ), + (char *)(::com::sun::star::text::XTextDocument *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XLineNumberingProperties > *)0 ), + (char *)(::com::sun::star::text::XLineNumberingProperties *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XChapterNumberingSupplier > *)0 ), + (char *)(::com::sun::star::text::XChapterNumberingSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnotesSupplier > *)0 ), + (char *)(::com::sun::star::text::XFootnotesSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XEndnotesSupplier > *)0 ), + (char *)(::com::sun::star::text::XEndnotesSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceable > *)0 ), + (char *)(::com::sun::star::util::XReplaceable *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XPagePrintable > *)0 ), + (char *)(::com::sun::star::text::XPagePrintable *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XReferenceMarksSupplier > *)0 ), + (char *)(::com::sun::star::text::XReferenceMarksSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextTablesSupplier > *)0 ), + (char *)(::com::sun::star::text::XTextTablesSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextFramesSupplier > *)0 ), + (char *)(::com::sun::star::text::XTextFramesSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XBookmarksSupplier > *)0 ), + (char *)(::com::sun::star::text::XBookmarksSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSectionsSupplier > *)0 ), + (char *)(::com::sun::star::text::XTextSectionsSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextGraphicObjectsSupplier > *)0 ), + (char *)(::com::sun::star::text::XTextGraphicObjectsSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextEmbeddedObjectsSupplier > *)0 ), + (char *)(::com::sun::star::text::XTextEmbeddedObjectsSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextFieldsSupplier > *)0 ), + (char *)(::com::sun::star::text::XTextFieldsSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyleFamiliesSupplier > *)0 ), + (char *)(::com::sun::star::style::XStyleFamiliesSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > *)0 ), + (char *)(::com::sun::star::lang::XServiceInfo *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPageSupplier > *)0 ), + (char *)(::com::sun::star::drawing::XDrawPageSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XDocumentIndexesSupplier > *)0 ), + (char *)(::com::sun::star::text::XDocumentIndexesSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ), + (char *)(::com::sun::star::beans::XPropertySet *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > *)0 ), + (char *)(::com::sun::star::beans::XPropertyState *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::document::XLinkTargetSupplier > *)0 ), + (char *)(::com::sun::star::document::XLinkTargetSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::document::XRedlinesSupplier > *)0 ), + (char *)(::com::sun::star::document::XRedlinesSupplier *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > *)0 ), + (char *)(::com::sun::star::util::XRefreshable *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::util::XLinkUpdate > *)0 ), + (char *)(::com::sun::star::util::XLinkUpdate *)this - pBase ); + rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > *)0 ), + (char *)(::com::sun::star::lang::XUnoTunnel *)this - pBase ); + rCD.bOffsetsInit = sal_True; + } + } + return rCD; + } + }; + + + class SAL_NO_VTABLE ImplHelper26 + : public ImplHelperBase26 + { + static ClassData26 s_aCD; + public: + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).query( rType, (ImplHelperBase26 *)this ); } + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getTypes(); } + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getImplementationId(); } + }; + + class SAL_NO_VTABLE WeakImplHelper26 + : public ::cppu::OWeakObject + , public ImplHelperBase26 + { + static ClassData26 s_aCD; + public: + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException) + { + ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase26 *)this ) ); + return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); + } + virtual void SAL_CALL acquire() throw () + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw () + { OWeakObject::release(); } + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getTypes(); } + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getImplementationId(); } + }; + + class SAL_NO_VTABLE WeakAggImplHelper26 + : public ::cppu::OWeakAggObject + , public ImplHelperBase26 + { + static ClassData26 s_aCD; + public: + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException) + { return OWeakAggObject::queryInterface( rType ); } + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException) + { + ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase26 *)this ) ); + return (aRet.hasValue() ? aRet : OWeakAggObject::queryAggregation( rType )); + } + virtual void SAL_CALL acquire() throw () + { OWeakAggObject::acquire(); } + virtual void SAL_CALL release() throw () + { OWeakAggObject::release(); } + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getTypes(); } + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) + { return getClassData( s_aCD ).getImplementationId(); } + }; + +#ifndef MACOSX + template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 > + ClassData12 ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 >::s_aCD = ClassData12( 0 ); + template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 > + ClassData12 WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 >::s_aCD = ClassData12( 1 ); + template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 > + ClassData12 WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 >::s_aCD = ClassData12( 2 ); +#endif + +} + + + + + + +typedef cppu::WeakImplHelper26 SwXTextDocumentBaseClass; class SwXTextDocument : public SwXTextDocumentBaseClass, public SvxFmMSFactory, public SfxBaseModel diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/source/core/bastyp/calc.cxx openoffice-new/sw/source/core/bastyp/calc.cxx --- openoffice-clean/sw/source/core/bastyp/calc.cxx Mon May 28 09:33:11 2001 +++ openoffice-new/sw/source/core/bastyp/calc.cxx Mon Feb 25 13:39:08 2002 @@ -66,7 +66,7 @@ #include -#ifdef MAC +#if defined(MAC) || defined(MACOSX) #include #else #include diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/source/core/doc/gcc_outl.cxx openoffice-new/sw/source/core/doc/gcc_outl.cxx --- openoffice-clean/sw/source/core/doc/gcc_outl.cxx Mon Sep 18 17:08:16 2000 +++ openoffice-new/sw/source/core/doc/gcc_outl.cxx Mon Feb 25 14:01:40 2002 @@ -115,3 +115,246 @@ #endif #endif + + +#ifdef MACOSX +// GrP revisit with gcc3 + +// fmtfordr.hxx + const SwFmtFillOrder &SwAttrSet::GetFillOrder(BOOL bInP) const + { return (const SwFmtFillOrder&)Get( RES_FILL_ORDER,bInP); } + const SwFmtFillOrder &SwFmt::GetFillOrder(BOOL bInP) const + { return aSet.GetFillOrder(bInP); } + +// fmtfsize.hxx + const SwFmtFrmSize &SwAttrSet::GetFrmSize(BOOL bInP) const + { return (const SwFmtFrmSize&)Get( RES_FRM_SIZE,bInP); } + const SwFmtFrmSize &SwFmt::GetFrmSize(BOOL bInP) const + { return aSet.GetFrmSize(bInP); } + +// fmtatr.hxx + const SvxPaperBinItem &SwAttrSet::GetPaperBin(BOOL bInP) const + { return (const SvxPaperBinItem&)Get( RES_PAPER_BIN,bInP); } + const SvxPaperBinItem &SwFmt::GetPaperBin(BOOL bInP) const + { return aSet.GetPaperBin(bInP); } + const SvxLRSpaceItem &SwAttrSet::GetLRSpace(BOOL bInP) const + { return (const SvxLRSpaceItem&)Get( RES_LR_SPACE,bInP); } + const SvxLRSpaceItem &SwFmt::GetLRSpace(BOOL bInP) const + { return aSet.GetLRSpace(bInP); } + const SvxULSpaceItem &SwAttrSet::GetULSpace(BOOL bInP) const + { return (const SvxULSpaceItem&)Get( RES_UL_SPACE,bInP); } + const SvxULSpaceItem &SwFmt::GetULSpace(BOOL bInP) const + { return aSet.GetULSpace(bInP); } + +// fmtcntnt.hxx + const SwFmtCntnt &SwAttrSet::GetCntnt(BOOL bInP) const + { return (const SwFmtCntnt&)Get( RES_CNTNT,bInP); } + const SwFmtCntnt &SwFmt::GetCntnt(BOOL bInP) const + { return aSet.GetCntnt(bInP); } + +// fmthdft.hxx + const SwFmtHeader &SwAttrSet::GetHeader(BOOL bInP) const + { return (const SwFmtHeader&)Get( RES_HEADER,bInP); } + const SwFmtHeader &SwFmt::GetHeader(BOOL bInP) const + { return aSet.GetHeader(bInP); } + const SwFmtFooter &SwAttrSet::GetFooter(BOOL bInP) const + { return (const SwFmtFooter&)Get( RES_FOOTER,bInP); } + const SwFmtFooter &SwFmt::GetFooter(BOOL bInP) const + { return aSet.GetFooter(bInP); } + +// fmtatr.hxx + const SvxPrintItem &SwAttrSet::GetPrint(BOOL bInP) const + { return (const SvxPrintItem&)Get( RES_PRINT,bInP); } + const SvxPrintItem &SwFmt::GetPrint(BOOL bInP) const + { return aSet.GetPrint(bInP); } + const SvxOpaqueItem &SwAttrSet::GetOpaque(BOOL bInP) const + { return (const SvxOpaqueItem&)Get( RES_OPAQUE,bInP); } + const SvxOpaqueItem &SwFmt::GetOpaque(BOOL bInP) const + { return aSet.GetOpaque(bInP); } + const SvxProtectItem &SwAttrSet::GetProtect(BOOL bInP) const + { return (const SvxProtectItem&)Get( RES_PROTECT,bInP); } + const SvxProtectItem &SwFmt::GetProtect(BOOL bInP) const + { return aSet.GetProtect(bInP); } + +// fmtsrnd.hxx + const SwFmtSurround &SwAttrSet::GetSurround(BOOL bInP) const + { return (const SwFmtSurround&)Get( RES_SURROUND,bInP); } + const SwFmtSurround &SwFmt::GetSurround(BOOL bInP) const + { return aSet.GetSurround(bInP); } + +// fmtornt.hxx + const SwFmtVertOrient &SwAttrSet::GetVertOrient(BOOL bInP) const + { return (const SwFmtVertOrient&)Get( RES_VERT_ORIENT,bInP); } + const SwFmtVertOrient &SwFmt::GetVertOrient(BOOL bInP) const + { return aSet.GetVertOrient(bInP); } + const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(BOOL bInP) const + { return (const SwFmtHoriOrient&)Get( RES_HORI_ORIENT,bInP); } + const SwFmtHoriOrient &SwFmt::GetHoriOrient(BOOL bInP) const + { return aSet.GetHoriOrient(bInP); } + +// fmtanchr.hxx +const SwFmtAnchor &SwAttrSet::GetAnchor(BOOL bInP) const + { return (const SwFmtAnchor&)Get( RES_ANCHOR,bInP); } +const SwFmtAnchor &SwFmt::GetAnchor(BOOL bInP) const + { return aSet.GetAnchor(bInP); } + +// fmtatr.hxx + const SvxBoxItem &SwAttrSet::GetBox(BOOL bInP) const + { return (const SvxBoxItem&)Get( RES_BOX,bInP); } + const SvxBoxItem &SwFmt::GetBox(BOOL bInP) const + { return aSet.GetBox(bInP); } + const SvxFmtKeepItem &SwAttrSet::GetKeep(BOOL bInP) const + { return (const SvxFmtKeepItem&)Get( RES_KEEP,bInP); } + const SvxFmtKeepItem &SwFmt::GetKeep(BOOL bInP) const + { return aSet.GetKeep(bInP); } + const SvxBrushItem &SwAttrSet::GetBackground(BOOL bInP) const + { return (const SvxBrushItem&)Get( RES_BACKGROUND,bInP); } + const SvxBrushItem &SwFmt::GetBackground(BOOL bInP) const + { return aSet.GetBackground(bInP); } + const SvxShadowItem &SwAttrSet::GetShadow(BOOL bInP) const + { return (const SvxShadowItem&)Get( RES_SHADOW,bInP); } + const SvxShadowItem &SwFmt::GetShadow(BOOL bInP) const + { return aSet.GetShadow(bInP); } + +// fmtpdsc.hxx + const SwFmtPageDesc &SwAttrSet::GetPageDesc(BOOL bInP) const + { return (const SwFmtPageDesc&)Get( RES_PAGEDESC,bInP); } + const SwFmtPageDesc &SwFmt::GetPageDesc(BOOL bInP) const + { return aSet.GetPageDesc(bInP); } + +// fmtatr.hxx + const SvxFmtBreakItem &SwAttrSet::GetBreak(BOOL bInP) const + { return (const SvxFmtBreakItem&)Get( RES_BREAK,bInP); } + const SvxFmtBreakItem &SwFmt::GetBreak(BOOL bInP) const + { return aSet.GetBreak(bInP); } + +// fmtclds.hxx + const SwFmtCol &SwAttrSet::GetCol(BOOL bInP) const + { return (const SwFmtCol&)Get( RES_COL,bInP); } + const SwFmtCol &SwFmt::GetCol(BOOL bInP) const + { return aSet.GetCol(bInP); } + +// fmtatr.hxx + const SvxMacroItem &SwAttrSet::GetMacro(BOOL bInP) const + { return (const SvxMacroItem&)Get( RES_FRMMACRO,bInP); } + const SvxMacroItem &SwFmt::GetMacro(BOOL bInP) const + { return aSet.GetMacro(bInP); } + +// fmturl.hxx +const SwFmtURL &SwAttrSet::GetURL(BOOL bInP) const + { return (const SwFmtURL&)Get( RES_URL,bInP); } +const SwFmtURL &SwFmt::GetURL(BOOL bInP) const + { return aSet.GetURL(bInP); } + +// fmteiro.hxx + const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(BOOL bInP) const + { return (const SwFmtEditInReadonly&)Get( RES_EDIT_IN_READONLY,bInP); } + const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(BOOL bInP) const + { return aSet.GetEditInReadonly(bInP); } + +// fmtlsplt.hxx + const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(BOOL bInP) const + { return (const SwFmtLayoutSplit&)Get( RES_LAYOUT_SPLIT,bInP); } + const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(BOOL bInP) const + { return aSet.GetLayoutSplit(bInP); } + +// fmtcnct.hxx +const SwFmtChain &SwAttrSet::GetChain(BOOL bInP) const + { return (const SwFmtChain&)Get( RES_CHAIN,bInP); } +const SwFmtChain &SwFmt::GetChain(BOOL bInP) const + { return aSet.GetChain(bInP); } + +// fmtline.hxx + const SwFmtLineNumber &SwAttrSet::GetLineNumber(BOOL bInP) const + { return (const SwFmtLineNumber&)Get( RES_LINENUMBER,bInP); } + const SwFmtLineNumber &SwFmt::GetLineNumber(BOOL bInP) const + { return aSet.GetLineNumber(bInP); } + +// fmtftntx.hxx + const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(BOOL bInP) const + { return (const SwFmtFtnAtTxtEnd&)Get( RES_FTN_AT_TXTEND, bInP); } + const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(BOOL bInP) const + { return aSet.GetFtnAtTxtEnd(bInP); } + const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(BOOL bInP) const + { return (const SwFmtEndAtTxtEnd&)Get( RES_END_AT_TXTEND, bInP); } + const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(BOOL bInP) const + { return aSet.GetEndAtTxtEnd(bInP); } + +// fmtclbl.hxx + const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(BOOL bInP) const + { return (const SwFmtNoBalancedColumns&)Get( RES_COLUMNBALANCE, bInP ); } + const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(BOOL bInP) const + { return aSet.GetBalancedColumns( bInP ); } + +// grfatr.hxx + const SwMirrorGrf &SwAttrSet::GetMirrorGrf(BOOL bInP) const + { return (const SwMirrorGrf&)Get( RES_GRFATR_MIRRORGRF,bInP); } + const SwMirrorGrf &SwFmt::GetMirrorGrf(BOOL bInP) const + { return aSet.GetMirrorGrf(bInP); } + +// cellatr.hxx + const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(BOOL bInP) const + { return (const SwTblBoxNumFormat&)Get( RES_BOXATR_FORMAT,bInP); } + const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(BOOL bInP) const + { return (const SwTblBoxFormula&)Get( RES_BOXATR_FORMULA,bInP); } + const SwTblBoxValue &SwAttrSet::GetTblBoxValue(BOOL bInP) const + { return (const SwTblBoxValue&)Get( RES_BOXATR_VALUE, bInP); } + const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(BOOL bInP) const + { return aSet.GetTblBoxNumFmt(bInP); } + const SwTblBoxFormula &SwFmt::GetTblBoxFormula(BOOL bInP) const + { return aSet.GetTblBoxFormula(bInP); } + const SwTblBoxValue &SwFmt::GetTblBoxValue(BOOL bInP) const + { return aSet.GetTblBoxValue(bInP); } + +// charatr.hxx + const SvxFontItem &SwAttrSet::GetFont(BOOL bInP) const + { return (const SvxFontItem&)Get( RES_CHRATR_FONT,bInP); } + const SvxFontItem &SwFmt::GetFont(BOOL bInP) const + { return aSet.GetFont(bInP); } + + + +#include + +// ndole.hxx + SwOLENode *SwNode::GetOLENode() +{ + return ND_OLENODE == nNodeType ? (SwOLENode*)this : 0; +} + const SwOLENode *SwNode::GetOLENode() const +{ + return ND_OLENODE == nNodeType ? (const SwOLENode*)this : 0; +} + +// ndtxt.hxx + SwTxtNode *SwNode::GetTxtNode() +{ + return ND_TEXTNODE == nNodeType ? (SwTxtNode*)this : 0; +} + const SwTxtNode *SwNode::GetTxtNode() const +{ + return ND_TEXTNODE == nNodeType ? (const SwTxtNode*)this : 0; +} + +// ndnotxt.hxx + SwNoTxtNode *SwNode::GetNoTxtNode() +{ + return ND_NOTXTNODE & nNodeType ? (SwNoTxtNode*)this : 0; +} + const SwNoTxtNode *SwNode::GetNoTxtNode() const +{ + return ND_NOTXTNODE & nNodeType ? (const SwNoTxtNode*)this : 0; +} + +// ndgrf.hxx + SwGrfNode *SwNode::GetGrfNode() +{ + return ND_GRFNODE == nNodeType ? (SwGrfNode*)this : 0; +} + const SwGrfNode *SwNode::GetGrfNode() const +{ + return ND_GRFNODE == nNodeType ? (const SwGrfNode*)this : 0; +} + +// defined MACOSX +#endif Only in openoffice-new/sw/source/core/doc: gcc_outl.cxx.new~ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/source/core/doc/makefile.mk openoffice-new/sw/source/core/doc/makefile.mk --- openoffice-clean/sw/source/core/doc/makefile.mk Thu Jul 19 09:21:30 2001 +++ openoffice-new/sw/source/core/doc/makefile.mk Mon Feb 25 13:39:08 2002 @@ -127,6 +127,10 @@ $(SLO)$/visiturl.obj \ $(SLO)$/htmltbl.obj +.IF "$(OS)"=="MACOSX" +SLOFILES += $(SLO)$/gcc_outl.obj +.ENDIF + # --- Tagets ------------------------------------------------------- .INCLUDE : target.mk diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/source/filter/w4w/w4watr.cxx openoffice-new/sw/source/filter/w4w/w4watr.cxx --- openoffice-clean/sw/source/filter/w4w/w4watr.cxx Mon Nov 20 01:38:31 2000 +++ openoffice-new/sw/source/filter/w4w/w4watr.cxx Mon Feb 25 13:57:38 2002 @@ -316,8 +316,12 @@ return; #ifdef DEBUG + // GrP No SvStream::operator<<(String &) rW4WWrt.Strm() << sW4W_RECBEGIN << "NOP_PageDesc_" - << pPg->GetName() << sW4W_TERMEND; +#ifndef MACOSX + << pPg->GetName() +#endif + << sW4W_TERMEND; #endif if ((( rW4WWrt.GetFilter() != 1 ) // Keiner (?) will ^L im Ascii-Text || (rW4WWrt.GetIniFlags() & 0x10000)) diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/source/filter/ww8/ww8par.hxx openoffice-new/sw/source/filter/ww8/ww8par.hxx --- openoffice-clean/sw/source/filter/ww8/ww8par.hxx Tue Jul 17 06:28:26 2001 +++ openoffice-new/sw/source/filter/ww8/ww8par.hxx Mon Feb 25 13:59:06 2002 @@ -379,8 +379,15 @@ }; - -enum eF_ResT{ F_OK, F_TEXT, F_TAGIGN, F_TAGTXT, F_READ_FSPA }; +// GrP Mac OS X: F_OK defined in sys/unistd.h; using F_SUCCESS instead +// used in ww8par3.cxx and ww8par5.cxx +enum eF_ResT{ + F_SUCCESS, + F_TEXT, + F_TAGIGN, + F_TAGTXT, + F_READ_FSPA +}; struct SwWW8Shade{ Color aColor; diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/source/filter/ww8/ww8par3.cxx openoffice-new/sw/source/filter/ww8/ww8par3.cxx --- openoffice-clean/sw/source/filter/ww8/ww8par3.cxx Thu Jul 26 12:23:34 2001 +++ openoffice-new/sw/source/filter/ww8/ww8par3.cxx Mon Feb 25 13:39:08 2002 @@ -410,12 +410,12 @@ aFormula.sDefault.Erase(); if (pFormImpl->InsertFormula(aFormula)) - return F_OK; + return F_SUCCESS; } } ASSERT(0,"New Formula Code Failed!\n"); BuildInputField( WW8_CT_EDIT, rStr ); - return F_OK; + return F_SUCCESS; } @@ -430,12 +430,12 @@ if( !pFormImpl ) pFormImpl = new SwMSConvertControls(rDoc.GetDocShell(),pPaM); if (pFormImpl->InsertFormula(aFormula)) - return F_OK; + return F_SUCCESS; } } ASSERT(!this,"New Formula Code Failed!\n"); BuildInputField( WW8_CT_CHECKBOX, rStr ); - return F_OK; + return F_SUCCESS; } eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc*, String& rStr ) diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/source/filter/ww8/ww8par5.cxx openoffice-new/sw/source/filter/ww8/ww8par5.cxx --- openoffice-clean/sw/source/filter/ww8/ww8par5.cxx Fri Aug 3 09:00:48 2001 +++ openoffice-new/sw/source/filter/ww8/ww8par5.cxx Mon Feb 25 13:39:08 2002 @@ -978,7 +978,7 @@ switch ( eRes ) { - case F_OK: + case F_SUCCESS: return aF.nLen; // alles OK case F_TEXT: @@ -1162,7 +1162,7 @@ // Noetig z.B. fuer Feld 6 "Set" == "Bestimmen". eF_ResT SwWW8ImplReader::Read_F_Nul( WW8FieldDesc*, String& rStr ) { - return F_OK; + return F_SUCCESS; } eF_ResT SwWW8ImplReader::Read_F_Input( WW8FieldDesc* pF, String& rStr ) @@ -1196,7 +1196,7 @@ aDef, aQ, INP_TXT, 0 ); // sichtbar ( geht z.Zt. nicht anders ) rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } // GetFieldResult alloziert einen String und liest das Feld-Resultat ein @@ -1267,7 +1267,7 @@ rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } // "AUTONR" @@ -1281,7 +1281,7 @@ GetNumberPara( rStr ) ); aFld.SetValue( ++nFldNum ); rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } // "SEQ" @@ -1368,7 +1368,7 @@ } rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } @@ -1513,7 +1513,7 @@ SwDocInfoField aFld( (SwDocInfoFieldType*) rDoc.GetSysFldType( RES_DOCINFOFLD ), nSub|nReg, nFormat ); rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } eF_ResT SwWW8ImplReader::Read_F_Author( WW8FieldDesc*, String& ) @@ -1525,7 +1525,7 @@ rDoc.GetSysFldType( RES_DOCINFOFLD ), DI_CREATE|DI_SUB_AUTHOR ); rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } eF_ResT SwWW8ImplReader::Read_F_TemplName( WW8FieldDesc*, String& ) @@ -1533,7 +1533,7 @@ SwTemplNameField aFld( (SwTemplNameFieldType*) rDoc.GetSysFldType( RES_TEMPLNAMEFLD ), FF_NAME ); rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } // Sowohl das Datum- wie auch das Uhrzeit-Feld kann fuer Datum, fuer Uhrzeit @@ -1573,7 +1573,7 @@ rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); } - return F_OK; + return F_SUCCESS; } eF_ResT SwWW8ImplReader::Read_F_FileName( WW8FieldDesc*, String& ) @@ -1581,7 +1581,7 @@ SwFileNameField aFld( (SwFileNameFieldType*) rDoc.GetSysFldType( RES_FILENAMEFLD ) ); rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } eF_ResT SwWW8ImplReader::Read_F_Anz( WW8FieldDesc* pF, String& rStr ) @@ -1595,7 +1595,7 @@ rDoc.GetSysFldType( RES_DOCSTATFLD ), nSub, GetNumberPara( rStr ) ); rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } eF_ResT SwWW8ImplReader::Read_F_CurPage( WW8FieldDesc*, String& rStr ) @@ -1625,7 +1625,7 @@ rDoc.GetSysFldType( RES_PAGENUMBERFLD ), PG_RANDOM, GetNumberPara( rStr, TRUE ) ); rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, String& rStr ) @@ -1708,7 +1708,7 @@ if( aName.Len() ) pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_FONT ); - return F_OK; + return F_SUCCESS; } @@ -1766,7 +1766,7 @@ pPlcxMan->GetBook()->SetStatus( pF->nSCode, pF->nSCode + pF->nLen, aName, BOOK_IGNORE ); rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } // "REF" @@ -1832,7 +1832,7 @@ rDoc.Insert( *pPaM, SwFmtFld( aFld2 ) ); } } - return F_OK; + return F_SUCCESS; } eF_ResT SwWW8ImplReader::Read_F_NoteReference( WW8FieldDesc*, String& rStr ) @@ -1901,7 +1901,7 @@ pRefFldStck->NewAttr(*pPaM->GetPoint(), SwFmtFld( aFld2 )); } } - return F_OK; + return F_SUCCESS; } // "SEITENREF" @@ -1938,7 +1938,7 @@ REF_PAGE ); rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); } - return F_OK; + return F_SUCCESS; } // "MACROSCHALTFL"ACHE" @@ -1981,7 +1981,7 @@ SwMacroField aFld( (SwMacroFieldType*) rDoc.GetSysFldType( RES_MACROFLD ), aName, aVText ); rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } // "EINF"UGENGRAFIK" @@ -2122,7 +2122,7 @@ aSave.Restore( this ); #endif - return F_OK; + return F_SUCCESS; } // "SERIENDRUCKFELD" @@ -2145,7 +2145,7 @@ SwFieldType* pFT = rDoc.InsertFldType( aD ); SwDBField aFld( (SwDBFieldType*)pFT ); rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } // "N"ACHSTER" @@ -2156,7 +2156,7 @@ SwDBNextSetField aFld( (SwDBNextSetFieldType*)pFT, aEmptyStr, aEmptyStr, SwDBData() ); // Datenbank: Nichts rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } // "DATENSATZ" @@ -2167,7 +2167,7 @@ SwDBSetNumberField aFld( (SwDBSetNumberFieldType*)pFT, SwDBData() ); // Datenbank: Nichts rDoc.Insert( *pPaM, SwFmtFld( aFld ) ); - return F_OK; + return F_SUCCESS; } /* @@ -2187,7 +2187,7 @@ Read_SubF_Combined(aReadParam); else if ('*' == cChar) Read_SubF_Ruby(aReadParam); - return F_OK; + return F_SUCCESS; } void SwWW8ImplReader::Read_SubF_Combined( _ReadFieldParams& rReadParam) @@ -2471,7 +2471,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) { if( nIniFlags & WW8FL_NO_TOX ) - return F_OK; // abgeschaltet -> ignorieren + return F_SUCCESS; // abgeschaltet -> ignorieren if( ( pF->nLRes < 3 ) ) return F_TAGIGN; // Nur Stuss -> ignorieren @@ -2859,12 +2859,12 @@ // Setze Ende in Stack pEndStck->SetAttr( *pPos, RES_FLTR_TOX ); - return F_OK; + return F_SUCCESS; } eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* pF, String& rStr ) { - eF_ResT eRet = F_OK; + eF_ResT eRet = F_SUCCESS; String sURL, sTarget, sMark; BOOL bDataImport=FALSE; @@ -2961,7 +2961,7 @@ pFmtOfJustInsertedGraphicOrOLE->SetAttr( aURL ); pFmtOfJustInsertedGraphicOrOLE = 0; } - eRet = F_OK; + eRet = F_SUCCESS; } else { diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/source/ui/uno/unotxdoc.cxx openoffice-new/sw/source/ui/uno/unotxdoc.cxx --- openoffice-clean/sw/source/ui/uno/unotxdoc.cxx Mon Aug 13 08:07:43 2001 +++ openoffice-new/sw/source/ui/uno/unotxdoc.cxx Mon Feb 25 13:59:51 2002 @@ -264,6 +264,11 @@ using namespace ::com::sun::star::i18n; using namespace ::rtl; +#ifdef MACOSX +static cppu::ClassData26 cppu::ImplHelper26::s_aCD; +static cppu::ClassData26 cppu::WeakImplHelper26::s_aCD; +#endif + /* -----------------------------17.01.01 15:43-------------------------------- ---------------------------------------------------------------------------*/ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/sw/util/makefile.mk openoffice-new/sw/util/makefile.mk --- openoffice-clean/sw/util/makefile.mk Wed Sep 26 10:34:07 2001 +++ openoffice-new/sw/util/makefile.mk Mon Feb 25 13:39:08 2002 @@ -243,9 +243,11 @@ .IF "$(OS)"!="LINUX" .IF "$(OS)"!="FREEBSD" .IF "$(OS)"!="NETBSD" +.IF "$(OS)"!="MACOSX" SHL2OBJS+= \ $(SLO)$/atrfrm.obj \ $(SLO)$/fmtatr2.obj +.ENDIF .ENDIF .ENDIF .ENDIF diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/testtools/prj/d.lst openoffice-new/testtools/prj/d.lst --- openoffice-clean/testtools/prj/d.lst Fri May 4 00:05:17 2001 +++ openoffice-new/testtools/prj/d.lst Fri Feb 22 00:35:03 2002 @@ -1,2 +1,3 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/testtools/source/bridgetest/makefile.mk openoffice-new/testtools/source/bridgetest/makefile.mk --- openoffice-clean/testtools/source/bridgetest/makefile.mk Fri Jun 29 01:06:28 2001 +++ openoffice-new/testtools/source/bridgetest/makefile.mk Fri Feb 22 00:40:23 2002 @@ -21,8 +21,16 @@ BATCH_SUFFIX=.bat GIVE_EXEC_RIGHTS=@echo .ELSE + +.IF "$(OS)"=="MACOSX" +# Mac OS X: regcomp adds prefix and suffix for us +MY_DLLPOSTFIX= +MY_DLLPREFIX= +.ELSE MY_DLLPOSTFIX=.so MY_DLLPREFIX=lib +.ENDIF + DESTDIR=$(OUT)$/lib BATCH_INPROCESS=bridgetest_inprocess GIVE_EXEC_RIGHTS=chmod +x @@ -120,7 +128,23 @@ # I can't make a dependency on shared libraries, because dependent targets # get the .setdir current directory. AAARGGGGGG ! -$(DESTDIR)$/uno_services.rdb .SETDIR=$(DESTDIR) : + +.IF "$(OS)"=="MACOSX" + +$(DESTDIR)$/uno_services.rdb : + deliver.pl + regcomp -register -r uno_services.rdb \ + -c $(MY_DLLPREFIX)bridgetest$(MY_DLLPOSTFIX) \ + -c $(MY_DLLPREFIX)cppobj$(MY_DLLPOSTFIX) \ + -c $(MY_DLLPREFIX)connectr$(MY_DLLPOSTFIX) \ + -c $(MY_DLLPREFIX)acceptor$(MY_DLLPOSTFIX) \ + -c $(MY_DLLPREFIX)brdgfctr$(MY_DLLPOSTFIX) \ + -c $(MY_DLLPREFIX)remotebridge$(MY_DLLPOSTFIX) \ + -c $(MY_DLLPREFIX)uuresolver$(MY_DLLPOSTFIX) + +.ELSE + + $(DESTDIR)$/uno_services.rdb .SETDIR=$(DESTDIR) : regcomp -register -r uno_services.rdb \ -c $(MY_DLLPREFIX)bridgetest$(MY_DLLPOSTFIX) \ -c $(MY_DLLPREFIX)cppobj$(MY_DLLPOSTFIX) \ @@ -129,3 +153,5 @@ -c $(MY_DLLPREFIX)brdgfctr$(MY_DLLPOSTFIX) \ -c $(MY_DLLPREFIX)remotebridge$(MY_DLLPOSTFIX) \ -c $(MY_DLLPREFIX)uuresolver$(MY_DLLPOSTFIX) + +.ENDIF Only in openoffice-new/testtools/source/bridgetest: uno_services.rdb diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/toolkit/util/makefile.mk openoffice-new/toolkit/util/makefile.mk --- openoffice-clean/toolkit/util/makefile.mk Tue May 22 06:50:54 2001 +++ openoffice-new/toolkit/util/makefile.mk Fri Feb 22 00:41:37 2002 @@ -103,11 +103,11 @@ DEF1EXPORTFILE= tk.dxp -.IF "$(OS)"=="MACOSX" -SHL1STDLIBS += -.ELIF "$(GUI)"=="UNX" +.IF "$(GUI)"=="UNX" +.IF "$(GUIBASE)"=="unx" SHL1STDLIBS +=\ -lX11 -lXt -lXmu +.ENDIF .ENDIF .INCLUDE : target.mk Only in openoffice-new/udkapi: .gdb_history diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/unzip/inc/unzip.h openoffice-new/unzip/inc/unzip.h --- openoffice-clean/unzip/inc/unzip.h Tue Nov 7 10:43:36 2000 +++ openoffice-new/unzip/inc/unzip.h Mon Feb 25 21:15:47 2002 @@ -24,6 +24,8 @@ #ifdef MACOSX #define FlushMemory MacOSXFlushMemory +/* need prototype for lseek() */ +#include #endif /*****************************************/ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/unzip/util/makefile.mk openoffice-new/unzip/util/makefile.mk --- openoffice-clean/unzip/util/makefile.mk Fri Sep 29 07:33:00 2000 +++ openoffice-new/unzip/util/makefile.mk Fri Feb 22 00:44:25 2002 @@ -87,13 +87,7 @@ .IF "$(GUI)"=="UNX" SHL1TARGET=zip$(UPD)$(DLLPOSTFIX) SHL1IMPLIB= i$(TARGET) -.IF "$(OS)"=="MACOSX" -# Mac OS X can't compile these object files directly into a shared library, -# so we need to link using the archive instead. -SHL1OBJS=$(LIB2ARCHIV) -.ELSE SHL1LIBS=$(LIB2TARGET) -.ENDIF SHL1DEF= $(MISC)$/$(SHL1TARGET).def .ENDIF diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/aqua/source/app/makefile.mk openoffice-new/vcl/aqua/source/app/makefile.mk --- openoffice-clean/vcl/aqua/source/app/makefile.mk Thu Dec 7 17:28:59 2000 +++ openoffice-new/vcl/aqua/source/app/makefile.mk Fri Feb 22 01:07:50 2002 @@ -74,12 +74,12 @@ # --- Files -------------------------------------------------------- -.IF "$(OS)"!="MACOSX" +.IF "$(GUIBASE)"!="aqua" dummy: - @echo "Nothing to build for this platform" + @echo "Nothing to build for GUIBASE $(GUIBASE)" -.ELSE # "$(OS)"!="MACOSX" +.ELSE # "$(GUIBASE)"!="aqua" OBJFILES= $(OBJ)$/salmain.obj \ $(OBJ)$/VCLApplication.obj \ @@ -98,7 +98,7 @@ EXCEPTIONSFILES=$(SLO)$/salmain.obj \ $(OBJ)$/salmain.obj -.ENDIF # "$(OS)"!="MACOSX" +.ENDIF # "$(GUIBASE)"!="aqua" # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/aqua/source/gdi/makefile.mk openoffice-new/vcl/aqua/source/gdi/makefile.mk --- openoffice-clean/vcl/aqua/source/gdi/makefile.mk Mon Mar 12 15:15:32 2001 +++ openoffice-new/vcl/aqua/source/gdi/makefile.mk Fri Feb 22 01:08:29 2002 @@ -74,12 +74,12 @@ # --- Files -------------------------------------------------------- -.IF "$(OS)"!="MACOSX" +.IF "$(GUIBASE)"!="aqua" dummy: - @echo "Nothing to build for this platform" + @echo "Nothing to build for GUIBASE $(GUIBASE)" -.ELSE # "$(OS)"!="MACOSX" +.ELSE # "$(GUIBASE)"!="aqua" SLOFILES= $(SLO)$/salmathutils.obj \ $(SLO)$/salrectangleutils.obj \ @@ -111,7 +111,7 @@ $(OBJ)$/salogl.obj .ENDIF -.ENDIF # "$(OS)"!="MACOSX" +.ENDIF # "$(GUIBASE)"!="aqua" # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/aqua/source/window/makefile.mk openoffice-new/vcl/aqua/source/window/makefile.mk --- openoffice-clean/vcl/aqua/source/window/makefile.mk Sun Dec 3 16:10:12 2000 +++ openoffice-new/vcl/aqua/source/window/makefile.mk Fri Feb 22 01:09:10 2002 @@ -76,12 +76,12 @@ # --- Files -------------------------------------------------------- -.IF "$(OS)"!="MACOSX" +.IF "$(GUIBASE)"!="aqua" dummy: - @echo "Nothing to build for this platform" + @echo "Nothing to build for GUIBASE $(GUIBASE)" -.ELSE # "$(OS)"!="MACOSX" +.ELSE # "$(GUIBASE)"!="aqua" SLOFILES= \ $(SLO)/salframe.obj \ @@ -97,7 +97,7 @@ $(OBJ)/VCLWindow.obj .ENDIF -.ENDIF # "$(OS)"!="MACOSX" +.ENDIF # "$(GUIBASE)"!="aqua" # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/source/app/svmain.cxx openoffice-new/vcl/source/app/svmain.cxx --- openoffice-clean/vcl/source/app/svmain.cxx Thu Aug 23 08:50:07 2001 +++ openoffice-new/vcl/source/app/svmain.cxx Fri Feb 22 01:10:04 2002 @@ -68,7 +68,7 @@ #include #endif -#if defined UNX && ! defined MACOSX +#if defined UNX #include #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/source/app/unohelp.cxx openoffice-new/vcl/source/app/unohelp.cxx --- openoffice-clean/vcl/source/app/unohelp.cxx Fri Jul 27 01:16:51 2001 +++ openoffice-new/vcl/source/app/unohelp.cxx Fri Feb 22 01:10:32 2002 @@ -244,7 +244,7 @@ aLibName += aDLLSuffix; } #ifdef MACOSX - aLibName += OUString( RTL_CONSTASCII_USTRINGPARAM( ".dylib.framework" )); + aLibName += OUString( RTL_CONSTASCII_USTRINGPARAM( ".dylib" )); #else aLibName += OUString( RTL_CONSTASCII_USTRINGPARAM( ".so" )); #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/inc/prex.h openoffice-new/vcl/unx/inc/prex.h --- openoffice-clean/vcl/unx/inc/prex.h Thu Feb 1 08:04:03 2001 +++ openoffice-new/vcl/unx/inc/prex.h Fri Feb 22 01:12:29 2002 @@ -134,7 +134,8 @@ #define __Ol_OlXlibExt_h__ -#if !defined(_USE_PRINT_EXTENSION_) && ! defined USE_PSPRINT + /* fixme hack for Mac OS X */ +#if !defined(_USE_PRINT_EXTENSION_) && ! defined USE_PSPRINT && !defined(MACOSX) #include #include #elif ! defined USE_PSPRINT diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/inc/saldata.hxx openoffice-new/vcl/unx/inc/saldata.hxx --- openoffice-clean/vcl/unx/inc/saldata.hxx Fri Feb 9 06:46:35 2001 +++ openoffice-new/vcl/unx/inc/saldata.hxx Fri Feb 22 01:12:46 2002 @@ -94,7 +94,7 @@ DECLARE_LIST( SalDisplays, SalDisplay* ) -#if defined SCO || defined LINUX || defined NETBSD || defined AIX || defined HPUX || defined FREEBSD +#if defined SCO || defined LINUX || defined NETBSD || defined AIX || defined HPUX || defined FREEBSD || defined MACOSX #include #else typedef unsigned int pthread_t; diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/inc/salunx.h openoffice-new/vcl/unx/inc/salunx.h --- openoffice-clean/vcl/unx/inc/salunx.h Fri Mar 2 06:23:27 2001 +++ openoffice-new/vcl/unx/inc/salunx.h Fri Feb 22 01:13:00 2002 @@ -73,7 +73,7 @@ #define _SALUNX_H // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#if defined SCO || defined LINUX || defined HPUX || defined FREEBSD || defined NETBSD +#if defined SCO || defined LINUX || defined HPUX || defined FREEBSD || defined NETBSD || defined MACOSX #include #elif defined AIX #include diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/source/app/i18n_ic.cxx openoffice-new/vcl/unx/source/app/i18n_ic.cxx --- openoffice-clean/vcl/unx/source/app/i18n_ic.cxx Tue Aug 28 08:18:56 2001 +++ openoffice-new/vcl/unx/source/app/i18n_ic.cxx Fri Feb 22 01:13:49 2002 @@ -60,7 +60,7 @@ ************************************************************************/ #include -#if defined(NETBSD) || defined(FREEBSD) +#if defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) # include #else # include @@ -356,7 +356,7 @@ if ( mnPreeditStyle != XIMPreeditNone ) { -#if defined LINUX || defined FREEBSD || defined NETBSD +#if defined LINUX || defined FREEBSD || defined NETBSD || defined MACOSX if ( mpPreeditAttributes != NULL ) #endif mpAttributes = XVaAddToNestedList( mpAttributes, @@ -364,7 +364,7 @@ } if ( mnStatusStyle != XIMStatusNone ) { -#if defined LINUX || defined FREEBSD || defined NETBSD +#if defined LINUX || defined FREEBSD || defined NETBSD || defined MACOSX if ( mpStatusAttributes != NULL ) #endif mpAttributes = XVaAddToNestedList( mpAttributes, diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/source/app/i18n_wrp.cxx openoffice-new/vcl/unx/source/app/i18n_wrp.cxx --- openoffice-clean/vcl/unx/source/app/i18n_wrp.cxx Fri Aug 24 03:23:22 2001 +++ openoffice-new/vcl/unx/source/app/i18n_wrp.cxx Fri Feb 22 23:55:48 2002 @@ -65,18 +65,20 @@ char *value; }; -#if !defined(LINUX) && !defined(FREEBSD) && !defined(NETBSD) +#if !defined(LINUX) && !defined(FREEBSD) && !defined(NETBSD) && !defined(MACOSX) #include #else #include #endif -#if defined(NETBSD) || defined(FREEBSD) +#if defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) # include #else # include #endif #include +#if !defined(MACOSX) #include +#endif #include #include #include "XIM.h" @@ -215,7 +217,7 @@ * so count the stuff dangling here */ -#if defined(LINUX) || defined(FREEBSD) || defined(NETBSD) +#if defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) va_start(variable, res_class); #else va_start(variable); @@ -232,7 +234,7 @@ /* * now package it up so we can set it along */ -#if defined(LINUX) || defined(FREEBSD) || defined(NETBSD) +#if defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) va_start(variable, res_class); #else va_start(variable); @@ -240,6 +242,7 @@ XvaGetArgs( variable, args ); va_end(variable); +#if !defined(MACOSX) if (!g_dlmodule) { g_dlmodule = dlopen(XIIIMP_LIB, RTLD_LAZY); @@ -260,6 +263,7 @@ { goto legacy_XIM; } +#endif } legacy_XIM: @@ -282,7 +286,8 @@ XCloseIM(im); s = (im->methods->close)(im); /* we can use the same close module */ #endif - + +#if !defined(MACOSX) if (!g_dlmodule) { /* assuming one XvaOpenIM call */ @@ -290,6 +295,8 @@ g_dlmodule = (void*)0; g_open_im = (OpenFunction)NULL; } +#endif + #if 0 if (im) Xfree((char *)im); diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/source/app/makefile.mk openoffice-new/vcl/unx/source/app/makefile.mk --- openoffice-clean/vcl/unx/source/app/makefile.mk Fri Aug 24 03:22:29 2001 +++ openoffice-new/vcl/unx/source/app/makefile.mk Fri Feb 22 01:15:13 2002 @@ -74,12 +74,12 @@ # --- Files -------------------------------------------------------- -.IF "$(OS)"=="MACOSX" +.IF "$(GUIBASE)"!="unx" dummy: - @echo "Nothing to build for Mac OS X" + @echo "Nothing to build for GUIBASE $(GUIBASE)" -.ELSE # "$(OS)"=="MACOSX" +.ELSE # "$(GUIBASE)"!="unx" .IF "$(remote)"=="" OBJFILES=\ @@ -129,7 +129,7 @@ $(OBJ)$/salmain.obj .ENDIF -.ENDIF # "$(OS)"=="MACOSX" +.ENDIF # "$(GUIBASE)"!="unx" # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/source/app/rptpsound.cxx openoffice-new/vcl/unx/source/app/rptpsound.cxx --- openoffice-clean/vcl/unx/source/app/rptpsound.cxx Mon Sep 18 10:05:42 2000 +++ openoffice-new/vcl/unx/source/app/rptpsound.cxx Fri Feb 22 01:33:38 2002 @@ -58,11 +58,21 @@ * * ************************************************************************/ +#ifdef MACOSX +// No poll() yet on Mac OS X +#define USE_SELECT +#include +#define FD_SETSIZE OPEN_MAX +#include +#include +#include +#else #ifdef SOLARIS #include #else #include #endif +#endif #include #include @@ -176,6 +186,7 @@ int RPTPSound::pending( int nFD, void* pObj ) { +#ifndef USE_SELECT struct pollfd aPollfd; aPollfd.fd = nFD; aPollfd.events = POLLIN; @@ -183,6 +194,15 @@ poll( &aPollfd, 1, 0 ); return aPollfd.revents & POLLIN ? 1 : 0; +#else + struct timeval tv = {0, 0}; + int selected; + fd_set readFDs; + FD_ZERO(&readFDs); + FD_SET(nFD, &readFDs); + selected = select(nFD+1, &readFDs, NULL, NULL, &tv); + return (selected == 1); +#endif } int RPTPSound::queued( int nFD, void* pObj ) diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/source/app/stacktrace.cxx openoffice-new/vcl/unx/source/app/stacktrace.cxx --- openoffice-clean/vcl/unx/source/app/stacktrace.cxx Thu Feb 15 17:12:12 2001 +++ openoffice-new/vcl/unx/source/app/stacktrace.cxx Fri Feb 22 01:18:17 2002 @@ -146,10 +146,11 @@ static ByteString fprintFrame( void* pFrame ) { ByteString aRet; - Dl_info aInfo; char buffer[ 256 ]; void* PC = getPC( pFrame ); +#if !defined(MACOSX) + Dl_info aInfo; if( dladdr( PC, & aInfo ) ) { sprintf( buffer, "ip=\"0x%08p\"", aInfo.dli_saddr ); @@ -165,6 +166,7 @@ aRet += "\""; } else +#endif { aRet = "ip=\"0x00000000\" mapentry=\"unknown\" file=\"unknown\" path=\"unknown\""; } diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/source/gdi/gcach_xpeer.cxx openoffice-new/vcl/unx/source/gdi/gcach_xpeer.cxx --- openoffice-clean/vcl/unx/source/gdi/gcach_xpeer.cxx Wed Jul 11 08:27:23 2001 +++ openoffice-new/vcl/unx/source/gdi/gcach_xpeer.cxx Fri Feb 22 01:20:34 2002 @@ -114,7 +114,8 @@ if( (nEnvAntiAlias & 1) == 0 ) mbForcedAA = false; -#if defined(USE_XRENDER) +#if defined(USE_XRENDER) && !defined(MACOSX) + // Mac OS X fixme: can use Render but the code below won't work. // but we prefer the hardware accelerated solution int nDummy; if( !XQueryExtension( mpDisplay, "RENDER", &nDummy, &nDummy, &nDummy ) ) diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/source/gdi/makefile.mk openoffice-new/vcl/unx/source/gdi/makefile.mk --- openoffice-clean/vcl/unx/source/gdi/makefile.mk Thu Feb 15 07:30:00 2001 +++ openoffice-new/vcl/unx/source/gdi/makefile.mk Fri Feb 22 01:21:23 2002 @@ -73,12 +73,12 @@ # --- Files -------------------------------------------------------- -.IF "$(OS)"=="MACOSX" +.IF "$(GUIBASE)"!="unx" dummy: - @echo "Nothing to build for Mac OS X" + @echo "Nothing to build for GUIBASE $(GUIBASE)" -.ELSE # "$(OS)"=="MACOSX" +.ELSE # "$(GUIBASE)"!="unx" .IF "$(remote)"=="" SLOFILES= \ @@ -121,7 +121,7 @@ .ENDIF -.ENDIF # "$(OS)"=="MACOSX" +.ENDIF # "$(GUIBASE)"!="unx" # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/source/gdi/makefile.unx openoffice-new/vcl/unx/source/gdi/makefile.unx --- openoffice-clean/vcl/unx/source/gdi/makefile.unx Tue Dec 19 05:40:20 2000 +++ openoffice-new/vcl/unx/source/gdi/makefile.unx Fri Feb 22 01:21:54 2002 @@ -1,6 +1,6 @@ #include -#if defined( NETBSD ) || defined( FREEBSD ) +#if defined( NETBSD ) || defined( FREEBSD ) || defined( MACOSX ) CDEFINES += -DPRINTER_DUMMY #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/source/gdi/salgdi3.cxx openoffice-new/vcl/unx/source/gdi/salgdi3.cxx --- openoffice-clean/vcl/unx/source/gdi/salgdi3.cxx Wed Jul 25 10:11:16 2001 +++ openoffice-new/vcl/unx/source/gdi/salgdi3.cxx Sat Feb 23 00:03:18 2002 @@ -68,7 +68,7 @@ #include #include #include -#if !( defined(FREEBSD) || defined(NETBSD) ) +#if !( defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) ) #include #endif @@ -1884,7 +1884,8 @@ maGraphicsData.GetDisplay()->GetVisual()->GetVisual() ); GlyphCache::EnsureInstance( aX11GlyphPeer, false ); GlyphCache& rGC = GlyphCache::GetInstance(); - + +#ifdef USE_PSPRINT const psp::PrintFontManager& rMgr = psp::PrintFontManager::get(); ::std::list< psp::fontID > aList; ::std::list< psp::fontID >::iterator it; @@ -1909,7 +1910,7 @@ } } - +#endif // USE_PSPRINT rGC.FetchFontList( pList ); #endif // USE_BUILTIN_RASTERIZER @@ -2161,6 +2162,7 @@ } return nHavePairs; #else +#ifndef PRINTER_DUMMY // get pair kerning table ( internal data from xprinter ) int i, nCurPair=0; @@ -2196,6 +2198,7 @@ } return nCurPair; +#endif #endif } diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/source/gdi/salogl.cxx openoffice-new/vcl/unx/source/gdi/salogl.cxx --- openoffice-clean/vcl/unx/source/gdi/salogl.cxx Tue Apr 24 09:04:32 2001 +++ openoffice-new/vcl/unx/source/gdi/salogl.cxx Fri Feb 22 01:25:20 2002 @@ -86,13 +86,18 @@ // - Lib-Name - // ------------ +#ifdef MACOSX +#define OGL_LIBNAME "libGL.dylib" +#else #define OGL_LIBNAME "libGL.so" +#endif + // ---------- // - Macros - // ---------- -// NETBSD has neither RTLD_GLOBAL nor RTLD_NOW -#ifdef NETBSD +// NetBSD and Mac OS X have neither RTLD_GLOBAL nor RTLD_NOW +#if defined NETBSD || defined MACOSX #define DLOPEN_MODE 0 #else #define DLOPEN_MODE (RTLD_NOW | RTLD_GLOBAL) diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/source/gdi/salpimpl.cxx openoffice-new/vcl/unx/source/gdi/salpimpl.cxx --- openoffice-clean/vcl/unx/source/gdi/salpimpl.cxx Mon Sep 18 10:05:43 2000 +++ openoffice-new/vcl/unx/source/gdi/salpimpl.cxx Fri Feb 22 01:25:52 2002 @@ -73,9 +73,11 @@ #include #include +#ifndef PRINTER_DUMMY #include // not exported xprinter function: extern "C" int XpSetBitmapCompression( Display*, int ); +#endif #include #include diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/source/gdi/xlfd_attr.cxx openoffice-new/vcl/unx/source/gdi/xlfd_attr.cxx --- openoffice-clean/vcl/unx/source/gdi/xlfd_attr.cxx Mon May 14 06:21:31 2001 +++ openoffice-new/vcl/unx/source/gdi/xlfd_attr.cxx Fri Feb 22 01:26:06 2002 @@ -61,7 +61,7 @@ #include #include #include -#if !( defined(FREEBSD) || defined(NETBSD) ) +#if !( defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) ) #include #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/source/window/makefile.mk openoffice-new/vcl/unx/source/window/makefile.mk --- openoffice-clean/vcl/unx/source/window/makefile.mk Mon Sep 18 10:05:48 2000 +++ openoffice-new/vcl/unx/source/window/makefile.mk Fri Feb 22 01:26:46 2002 @@ -76,19 +76,19 @@ # --- Files -------------------------------------------------------- -.IF "$(OS)"=="MACOSX" +.IF "$(GUIBASE)"!="unx" dummy: - @echo "Nothing to build for Mac OS X" + @echo "Nothing to build for GUIBASE $(GUIBASE)" -.ELSE # "$(OS)"=="MACOSX" +.ELSE # "$(GUIBASE)"!="unx" .IF "$(remote)" SLOFILES= \ $(SLO)/FWS.obj $(SLO)/salframe.obj $(SLO)/salobj.obj .ENDIF -.ENDIF # "$(OS)"=="MACOSX" +.ENDIF # "$(GUIBASE)"!="unx" # --- Targets ------------------------------------------------------ diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/unx/source/window/salframe.cxx openoffice-new/vcl/unx/source/window/salframe.cxx --- openoffice-clean/vcl/unx/source/window/salframe.cxx Tue Aug 28 08:27:00 2001 +++ openoffice-new/vcl/unx/source/window/salframe.cxx Fri Feb 22 01:27:00 2002 @@ -66,7 +66,7 @@ #include #include #include -#if !(defined FREEBSD || defined NETBSD) +#if !(defined FREEBSD || defined NETBSD || defined MACOSX) #include #endif diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/util/makefile.mk openoffice-new/vcl/util/makefile.mk --- openoffice-clean/vcl/util/makefile.mk Wed Jul 25 07:27:53 2001 +++ openoffice-new/vcl/util/makefile.mk Sat Feb 23 00:14:14 2002 @@ -266,6 +266,19 @@ .IF "$(GUI)"=="UNX" +.IF "$(OS)"=="MACOSX" +SHL1STDLIBS += -ldl -lstdc++ -lstlport_gcc +.ENDIF + +.IF "$(GUIBASE)"=="aqua" +SHL1STDLIBS += -framework Cocoa +.ENDIF + +.IF "$(GUIBASE)"=="unx" +.IF "$(OS)"=="MACOSX" +SHL1STDLIBS += -lXext +.ENDIF + # Solaris .IF "$(OS)"=="SOLARIS" @@ -279,14 +292,8 @@ .ENDIF .ENDIF # "$(USE_XPRINT)" == "TRUE" -# MacOSX -.ELSE # "$(OS)"=="SOLARIS" -.IF "$(OS)"=="MACOSX" -SHL1STDLIBS += -framework Cocoa - # Others -.ELSE # "$(OS)"=="MACOSX" - +.ELSE # "$(OS)"=="SOLARIS" .IF "$(USE_XPRINT)" == "TRUE" SHL1STDLIBS += -lXp -lXaw -lXt -lX11 .ELSE @@ -296,8 +303,8 @@ SHL1STDLIBS += -lxp$(UPD)$(DLLPOSTFIX) -lXaw -lXt -lX11 .ENDIF .ENDIF # "$(USE_XPRINT)" == "TRUE" -.ENDIF # "$(OS)"=="MACOSX" .ENDIF # "$(OS)"=="SOLARIS" +.ENDIF # "$(GUIBASE)"=="unx" .IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" SHL1STDLIBS += -laudio diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/vcl/util/makefile.pmk openoffice-new/vcl/util/makefile.pmk --- openoffice-clean/vcl/util/makefile.pmk Wed May 16 01:00:03 2001 +++ openoffice-new/vcl/util/makefile.pmk Fri Feb 22 23:49:12 2002 @@ -63,18 +63,12 @@ PROJECTPCH=vclpch PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch PDBTARGET=vcl -.IF "$(OS)"=="MACOSX" -GUIBASE=aqua -.ENDIF -.IF "$(OS)" != "MACOSX" -.IF "$(USE_XPRINTER)" == "" +.IF "$(USE_XPRINT)" == "" CFLAGSDEFS += -DUSE_PSPRINT PSPRINT=true .ENDIF -.ENDIF -.IF "$(OS)" != "MACOSX" .IF "$(remote)" != "" USE_BUILTIN_RASTERIZER=true .ENDIF @@ -82,7 +76,6 @@ USE_BUILTIN_RASTERIZER=true USE_XRENDER=true ENVCFLAGS += -DUSE_XRENDER -.ENDIF .ENDIF .IF "$(USE_BUILTIN_RASTERIZER)" != "" diff -ur --exclude CVS --exclude unxmacxp.pro openoffice-clean/xmlhelp/prj/d.lst openoffice-new/xmlhelp/prj/d.lst --- openoffice-clean/xmlhelp/prj/d.lst Tue Sep 25 08:24:37 2001 +++ openoffice-new/xmlhelp/prj/d.lst Fri Feb 22 00:47:42 2002 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.* ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.* +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.* ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.* ..\%__SRC%\misc\helpserver.sh %_DEST%\bin%_EXT%\helpserver