diff options
| author | nobody <nobody@gnome.org> | 2005-09-16 12:20:39 +0000 |
|---|---|---|
| committer | nobody <nobody@gnome.org> | 2005-09-16 12:20:39 +0000 |
| commit | aa98552e0bc6969f7cffbdd2ef59aa036387590b (patch) | |
| tree | b8bafb9ead51c093a568c7f2e7de2d4c64d1ac9c | |
| parent | 630792532f4c73a507f316c784768312a695c726 (diff) | |
This commit was manufactured by cvs2svn to create tagOOO_BUILD_1_3_16
'OOO_BUILD_1_3_16'.
24 files changed, 1060 insertions, 299 deletions
diff --git a/bin/build-ooo b/bin/build-ooo index 9e46c4e31..49871449d 100755 --- a/bin/build-ooo +++ b/bin/build-ooo @@ -22,13 +22,13 @@ if test "z$FORCE_GCC33" = "zYES"; then CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS CFLAGS= CXXFLAGS= CC=gcc33 CXX=g++33" fi -./configure $CONFIGURE_OPTIONS || exit 1; +eval "./configure $CONFIGURE_OPTIONS" || exit 1; # Unfortunately, on when forcing gcc33 on x86, RPM attempts to # inject its %{optflags} everywhere. Since gcc33 doesn't support # -mtune, override that here if test "z$FORCE_GCC33" = "zYES"; then - if test "z$DISTRO" = "zRHFedora"; then + if test "z$DISTRO" = "zFedoraCore3" -o "z$DISTRO" = "zRHEL4"; then # Set up x86 optimization flags that gcc33 can deal with ARCH_FLAGS="" if test "z$INPATH" = "zunxlngi4.pro"; then @@ -49,7 +49,7 @@ export LANG="C"; if test "z$ENABLE_JAVA" = "zyes"; then # Many Java's can't cope with the NPTL on Linux. - LD_ASSUME_KERNEL=2.2.5 /bin/true 2> /dev/null || LD_ASSUME_KERNEL=2.4.10 /bin/true 2> /dev/null || LD_ASSUME_KERNEL=2.6.0 2> /dev/null || unset LD_ASSUME_KERNEL + LD_ASSUME_KERNEL=2.2.5 /bin/true 2> /dev/null || LD_ASSUME_KERNEL=2.4.10 /bin/true 2> /dev/null || LD_ASSUME_KERNEL=2.6.0 /bin/true 2> /dev/null || unset LD_ASSUME_KERNEL export LD_ASSUME_KERNEL fi # Don't do a massive painful install @@ -60,7 +60,7 @@ if test "z$HOME" = "z"; then fi cd $OOBUILDDIR # Import all of the OO.o environment -if test "z$DISTRO" = "zWin32"; then +if test "z$BUILD_WIN32" = "zyes"; then . $OOBUILDDIR/*.set.sh else . $OOBUILDDIR/*.Set.sh @@ -76,7 +76,7 @@ echo 'Verifying environment' echo "Path: \'$PATH\'" echo "Shell: \'$SHELL\'" echo "Lang: \'$LANGS\'" -if test "z$DISTRO" != "zWin32"; then +if test "z$BUILD_WIN32" != "zyes"; then echo "Gcc: " gcc -dumpversion fi @@ -90,7 +90,7 @@ EXTRA_BUILD_FLAGS= if test $BUILD_NCPUS -gt 1; then EXTRA_BUILD_FLAGS="-P$BUILD_NCPUS" fi -if test "z$BUILD_WIN32"="z"; then +if test "z$BUILD_WIN32" = "z"; then EXTRA_BUILD_FLAGS="--dlv_switch link $EXTRA_BUILD_FLAGS" fi @@ -104,7 +104,7 @@ fi unset MAKEFLAGS # Accelerate straight-through compiles by not building / using dependencies -export nodep=1 +# export nodep=1 echo "Env:" set diff --git a/doc/internal-libdb-java-issue.txt b/doc/internal-libdb-java-issue.txt new file mode 100644 index 000000000..3c71777c4 --- /dev/null +++ b/doc/internal-libdb-java-issue.txt @@ -0,0 +1,19 @@ +The internal libdb-4.2 makes problems with java on SL 9.2. There is the same +libdb-4.2.so installed on the system which provides one more symbol +(NTPL related path) and OOo setup ends with: + +./javaldx: symbol lookup error: /lib/libnss_ldap.so.2: undefined symbol: __db185 +_open +/usr/lib/ooo-1.1/program/setup.bin: symbol lookup error: /lib/libnss_ldap.so.2: +undefined symbol: __db185_open + +It is because OOo setup sets export LD_LIBRARY_PATH=/usr/lib/ooo-1.1:/usr/lib/ooo-1.1/program, +so the internal libdb is used also for a java call. The external java is linked +against the system libnss_ldap.so.2 which is linked against the system libdb-4.2 +and requires the extra symbol. + +It would be better to build OOo with the system libdb. Another problem is that +SUSE's system libdb does not provide the java part. + +We actualy rename the internal libdb-4.2.so because the system one +provides the required symbols. It is done in the SUSE's spec file.
\ No newline at end of file diff --git a/patches/OOO_1_1/crash-sw-checkbox-field.diff b/patches/OOO_1_1/crash-sw-checkbox-field.diff index c24f15820..731a91bfd 100644 --- a/patches/OOO_1_1/crash-sw-checkbox-field.diff +++ b/patches/OOO_1_1/crash-sw-checkbox-field.diff @@ -35,7 +35,7 @@ diff -u -p -r1.115.68.4 ww8par.hxx + com::sun::star::lang::XMultiServiceFactory> &rServiceFactory, + com::sun::star::uno::Reference < + com::sun::star::form::XFormComponent> &rFComp, -+ com::sun::star::awt::Size &rSz) {} ++ com::sun::star::awt::Size &rSz) { return FALSE; } private: //No copying WW8FormulaControl(const WW8FormulaControl&); diff --git a/patches/OOO_1_1/debian-splash.diff b/patches/OOO_1_1/debian-splash.diff index e88c19005..1ee892bea 100644 --- a/patches/OOO_1_1/debian-splash.diff +++ b/patches/OOO_1_1/debian-splash.diff @@ -6,7 +6,7 @@ diff -urN offmgr-old/source/offapp/intro/ooo.src offmgr/source/offapp/intro/ooo. #define OOO_INTRO "openintro_sun.bmp" #else -//#define OOO_VENDOR "my company" -+#define OOO_VENDOR "the Debian project" ++#define OOO_VENDOR "Debian" #define OOO_LICENSE "LGPL" -#define OOO_INTRO "openintro.bmp" +#define OOO_INTRO "openintro_debian.bmp" diff --git a/patches/OOO_1_1/fpicker-kde-urls.diff b/patches/OOO_1_1/fpicker-kde-urls.diff new file mode 100644 index 000000000..6c3090518 --- /dev/null +++ b/patches/OOO_1_1/fpicker-kde-urls.diff @@ -0,0 +1,35 @@ +--- fpicker/source/unx/kde/kdefilepicker.cxx ++++ fpicker/source/unx/kde/kdefilepicker.cxx +@@ -229,6 +229,8 @@ + case CommandEvent::GetDirectory: + { + QString qDirectory = baseURL().url(); ++ if ( qDirectory.startsWith( "file:/" ) && qDirectory.mid( 6, 1 ) != "/" ) ++ qDirectory.replace( "file:/", "file:///" ); + sendCommand( "currentDirectory " + escapeString( qDirectory ) ); + } + break; +@@ -251,7 +253,10 @@ + for ( KURL::List::const_iterator it = qList.begin(); it != qList.end(); ++it ) + { + qString.append( " " ); +- appendEscaped( qString, addExtension( (*it).url() ) ); ++ QString qUrlStr = (*it).url(); ++ if ( qUrlStr.startsWith( "file:/" ) && qUrlStr.mid( 6, 1 ) != "/" ) ++ qUrlStr.replace( "file:/", "file:///" ); ++ appendEscaped( qString, addExtension( qUrlStr ) ); + } + } + else +@@ -261,7 +266,10 @@ + for ( KFileItemListIterator it( *pItems ); it.current(); ++it ) + { + qString.append( " " ); +- appendEscaped( qString, addExtension( (*it)->url().url() ) ); ++ QString qUrlStr = (*it)->url().url(); ++ if ( qUrlStr.startsWith( "file:/" ) && qUrlStr.mid( 6, 1 ) != "/" ) ++ qUrlStr.replace( "file:/", "file:///" ); ++ appendEscaped( qString, addExtension( qUrlStr ) ); + } + } + diff --git a/patches/OOO_1_1/help-fallback.diff b/patches/OOO_1_1/help-fallback.diff index 177f714be..f9fd7bfee 100644 --- a/patches/OOO_1_1/help-fallback.diff +++ b/patches/OOO_1_1/help-fallback.diff @@ -49,7 +49,7 @@ diff -urN tools.orig/source/rc/resmgr.cxx tools/source/rc/resmgr.cxx else return "99"; } -@@ -1335,6 +1344,16 @@ +@@ -1335,7 +1344,17 @@ const UniString* pAppName, const UniString* pResPath ) { @@ -63,6 +63,7 @@ diff -urN tools.orig/source/rc/resmgr.cxx tools/source/rc/resmgr.cxx + const UniString* pAppName, + const UniString* pResPath ) +{ + osl::Guard<osl::Mutex> aGuard( getResMgrMutex() ); // Suchreihenfolge festlegen const sal_Char* pLang[6]; diff --git a/patches/OOO_1_1/i18n-calc-encoding.diff b/patches/OOO_1_1/i18n-calc-encoding.diff index 15c23ed17..11c0cf3b2 100644 --- a/patches/OOO_1_1/i18n-calc-encoding.diff +++ b/patches/OOO_1_1/i18n-calc-encoding.diff @@ -2,10 +2,11 @@ Index: calc/profile_calc.lng =================================================================== RCS file: /cvs/installation/scp/source/calc/Attic/profile_calc.lng,v retrieving revision 1.49.24.5 -diff -u -r1.49.24.5 profile_calc.lng ---- scp/source/calc/profile_calc.lng 27 Apr 2004 18:15:09 -0000 1.49.24.5 -+++ scp/source/calc/profile_calc.lng 10 Jun 2004 15:28:49 -0000 -@@ -598,7 +598,7 @@ +Index: scp/source/calc/profile_calc.lng +=================================================================== +--- scp/source/calc/profile_calc.lng.orig 2004-09-13 22:31:50.000000000 +0200 ++++ scp/source/calc/profile_calc.lng 2004-09-14 15:49:37.746332016 +0200 +@@ -678,7 +678,7 @@ 82 = "%PRODUCTNAME %PRODUCTVERSION 스프레드시트" 86 = "%PRODUCTNAME %PRODUCTVERSION 工作表" 88 = "%PRODUCTNAME %PRODUCTVERSION 工作表" @@ -14,23 +15,11 @@ diff -u -r1.49.24.5 profile_calc.lng 07 = " %PRODUCTNAME %PRODUCTVERSION" 30 = " %PRODUCTNAME %PRODUCTVERSION" 31 = "%PRODUCTNAME %PRODUCTVERSION Werkblad" -@@ -636,7 +636,7 @@ - 34 = "Hoja de ~clculo" - 55 = "~Planilha" - 48 = "~Arkusz kalkulacyjny" --03 = "Folha de ~cálculo" -+03 = "Folha de ~clculo" - 82 = "스프레드시트(~S)" - 33 = "~Classeur" - 96 = "~Spreadsheet" -Index: impress/profile_impress.lng +Index: scp/source/impress/profile_impress.lng =================================================================== -RCS file: /cvs/installation/scp/source/impress/Attic/profile_impress.lng,v -retrieving revision 1.57.24.5 -diff -u -r1.57.24.5 profile_impress.lng ---- scp/source/impress/profile_impress.lng 27 Apr 2004 18:18:43 -0000 1.57.24.5 -+++ scp/source/impress/profile_impress.lng 10 Jun 2004 15:28:51 -0000 -@@ -639,7 +639,7 @@ +--- scp/source/impress/profile_impress.lng.orig 2004-09-13 22:32:00.000000000 +0200 ++++ scp/source/impress/profile_impress.lng 2004-09-14 15:49:37.749331560 +0200 +@@ -724,7 +724,7 @@ 82 = "%PRODUCTNAME %PRODUCTVERSION 프레젠테이션" 86 = "%PRODUCTNAME %PRODUCTVERSION 演示文稿" 88 = "%PRODUCTNAME %PRODUCTVERSION 簡報" @@ -39,7 +28,7 @@ diff -u -r1.57.24.5 profile_impress.lng 07 = " %PRODUCTNAME %PRODUCTVERSION" 30 = " %PRODUCTNAME %PRODUCTVERSION" 31 = "%PRODUCTNAME %PRODUCTVERSION Presentatie" -@@ -677,7 +677,7 @@ +@@ -767,7 +767,7 @@ 34 = "~Presentacin" 55 = "A~presentao" 48 = "~Prezentacja" @@ -48,7 +37,7 @@ diff -u -r1.57.24.5 profile_impress.lng 82 = "프레젠테이션(~P)" 33 = "~Prsentation" 96 = " ~" -@@ -714,7 +714,7 @@ +@@ -809,7 +809,7 @@ 34 = "~Presentacin..." 55 = "A~presentao..." 48 = "~Prezentacja..." @@ -56,15 +45,12 @@ diff -u -r1.57.24.5 profile_impress.lng +03 = "A~presentao..." 82 = "프레젠테이션(~P)..." 33 = "~Prsentation..." - 96 = "~Presentation..." -Index: math/profile_math.lng + 96 = "~ ..." +Index: scp/source/math/profile_math.lng =================================================================== -RCS file: /cvs/installation/scp/source/math/Attic/profile_math.lng,v -retrieving revision 1.40.24.4 -diff -u -r1.40.24.4 profile_math.lng ---- scp/source/math/profile_math.lng 27 Apr 2004 18:20:23 -0000 1.40.24.4 -+++ scp/source/math/profile_math.lng 10 Jun 2004 15:28:51 -0000 -@@ -80,7 +80,7 @@ +--- scp/source/math/profile_math.lng.orig 2004-09-13 22:32:04.000000000 +0200 ++++ scp/source/math/profile_math.lng 2004-09-14 15:49:37.750331408 +0200 +@@ -90,7 +90,7 @@ 34 = "~Frmula" 55 = "~Frmula" 48 = "F~ormua" @@ -73,14 +59,11 @@ diff -u -r1.40.24.4 profile_math.lng 82 = "수식(~O)" 33 = "F~ormule" 96 = "" -Index: office/profile.lng +Index: scp/source/office/profile.lng =================================================================== -RCS file: /cvs/installation/scp/source/office/Attic/profile.lng,v -retrieving revision 1.58.24.8 -diff -u -r1.58.24.8 profile.lng ---- scp/source/office/profile.lng 4 May 2004 06:48:05 -0000 1.58.24.8 -+++ scp/source/office/profile.lng 10 Jun 2004 15:28:53 -0000 -@@ -1080,7 +1080,7 @@ +--- scp/source/office/profile.lng.orig 2004-09-13 22:32:06.000000000 +0200 ++++ scp/source/office/profile.lng 2004-09-14 15:49:37.756330496 +0200 +@@ -1225,7 +1225,7 @@ 34 = "~Tarjetas de visita" 55 = "Cartes de ~Visita" 48 = "~Wizytwki" @@ -88,8 +71,8 @@ diff -u -r1.58.24.8 profile.lng +03 = "Cartes de ~visita" 82 = "명함(~U)" 33 = "Cartes de ~visite" - 96 = "B~usiness Cards" -@@ -1302,7 +1302,7 @@ + 96 = "~ " +@@ -1477,7 +1477,7 @@ 34 = "Pgina ~Web..." 55 = "Pgina da ~Web..." 48 = "Strona ~WWW..." @@ -97,8 +80,8 @@ diff -u -r1.58.24.8 profile.lng +03 = "Pgina ~Web..." 82 = "웹 페이지(~W)..." 33 = "Page ~Web..." - 96 = "~Web Page..." -@@ -1339,7 +1339,7 @@ + 96 = "~ ..." +@@ -1519,7 +1519,7 @@ 34 = "Formulario..." 55 = "~Formulrio..." 48 = "Fo~rmularz..." @@ -106,8 +89,8 @@ diff -u -r1.58.24.8 profile.lng +03 = "F~ormulrio..." 82 = "양식(~R)..." 33 = "Form~ulaire..." - 96 = "Form..." -@@ -1520,7 +1520,7 @@ + 96 = "~..." +@@ -1725,7 +1725,7 @@ 01 = "Address Data Source..." 44 = "Address Data Source..." 49 = "Adress-Datenquelle..." diff --git a/patches/OOO_1_1/i18n-indic-default-fonts.diff b/patches/OOO_1_1/i18n-indic-default-fonts.diff new file mode 100644 index 000000000..5fb5aabec --- /dev/null +++ b/patches/OOO_1_1/i18n-indic-default-fonts.diff @@ -0,0 +1,110 @@ +--- officecfg/registry/data/org/openoffice/VCL.xcu.indic 2004-10-19 13:56:32.755677016 -0400 ++++ officecfg/registry/data/org/openoffice/VCL.xcu 2004-10-19 14:38:10.975889816 -0400 +@@ -383,7 +383,106 @@ + <value>Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Luxi Sans;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Nimbus Sans L;Helmet;Interface System;Sans Serif</value> + </prop> + </node> +- ++ <node oor:name="hi-IN" oor:op="replace"> ++ <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Nimbus Sans L;Helmet;Interface System;Sans Serif</value> ++ </prop> ++ <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ </node> ++ <node oor:name="bn-IN" oor:op="replace"> ++ <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Nimbus Sans L;Helmet;Interface System;Sans Serif</value> ++ </prop> ++ <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ </node> ++ <node oor:name="gu-IN" oor:op="replace"> ++ <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Nimbus Sans L;Helmet;Interface System;Sans Serif</value> ++ </prop> ++ <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ </node> ++ <node oor:name="pa-IN" oor:op="replace"> ++ <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Nimbus Sans L;Helmet;Interface System;Sans Serif</value> ++ </prop> ++ <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Punjabi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ </node> ++ <node oor:name="ta-IN" oor:op="replace"> ++ <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Nimbus Sans L;Helmet;Interface System;Sans Serif</value> ++ </prop> ++ <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string"> ++ <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> ++ </prop> ++ </node> + <node oor:name="ar" oor:op="replace"> + <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> + <value>Tahoma;Traditional Arabic;Simplified Arabic;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Nimbus Sans L;Helmet;Interface System;Sans Serif</value> diff --git a/patches/OOO_1_1/native-fpicker-not-default.diff b/patches/OOO_1_1/native-fpicker-not-default.diff new file mode 100644 index 000000000..26de5a2de --- /dev/null +++ b/patches/OOO_1_1/native-fpicker-not-default.diff @@ -0,0 +1,17 @@ +Index: Common.xcu +=================================================================== +RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/Common.xcu,v +retrieving revision 1.13.34.2 +diff -u -r1.13.34.2 Common.xcu +--- officecfg/registry/data/org/openoffice/Office/Common.xcu 6 Jul 2004 10:50:06 -0000 1.13.34.2 ++++ officecfg/registry/data/org/openoffice/Office/Common.xcu 21 Dec 2004 15:40:02 -0000 +@@ -437,4 +437,9 @@ + </node> + </node> + </node> ++ <node oor:name="Misc"> ++ <prop oor:name="UseSystemFileDialog" oor:type="xs:boolean"> ++ <value>false</value> ++ </prop> ++ </node> + </oor:component-data> diff --git a/patches/OOO_1_1/psprint-pdf-drivers.diff b/patches/OOO_1_1/psprint-pdf-drivers.diff new file mode 100644 index 000000000..7cfd27cd2 --- /dev/null +++ b/patches/OOO_1_1/psprint-pdf-drivers.diff @@ -0,0 +1,172 @@ +--- psprint_config/configuration/letter/psprint.conf.psprint-pdf-drivers 2002-12-10 06:59:31.000000000 -0500 ++++ psprint_config/configuration/letter/psprint.conf 2003-09-11 13:12:02.000000000 -0400 +@@ -96,3 +96,83 @@ SubstFont_Times New Roman=Times + SubstFont_Thorndale=Times + SubstFont_Timmons=Times + SubstFont_Cumberland=Courier ++ ++; [gghibo] Entries to enable a PDF writer with PDF 1.4 output and ++; bitmap not downsampled (useful for press). ++[PDF 1.4 Converter Screen] ++Printer=ADISTILL/PDF 1.4 Converter Screen ++DefaultPrinter=0 ++Location= ++Comment= ++Command=/usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -sOutputFile="(OUTFILE)" - ++Features=pdf= ++Copies=1 ++Scale=0 ++Orientation=Portrait ++PSLevel=0 ++ColorDevice=0 ++ColorDepth=24 ++MarginAdjust=0,0,0,0 ++PPD_PageSize=Letter ++PerformFontSubstitution=true ++SubstFont_Arial=Helvetica ++SubstFont_Times New Roman=Times ++SubstFont_Cumberland=Courier ++SubstFont_Timmons=Times ++SubstFont_Helmet=Helvetica ++SubstFont_Thorndale=Times ++SubstFont_Albany=Helvetica ++SubstFont_Courier New=Courier ++ ++[PDF 1.4 Converter Press] ++Printer=ADISTILL/PDF 1.4 Converter Press ++DefaultPrinter=0 ++Location= ++Comment= ++Command=/usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dPDFSETTINGS=/prepress -dAutoFilterColorImages=false -sColorImageFilter=FlateEncode -dAutoFilterGrayImages=false -sGrayImageFilter=FlateEncode -sOutputFile="(OUTFILE)" - ++Features=pdf= ++Copies=1 ++Scale=0 ++Orientation=Portrait ++PSLevel=0 ++ColorDevice=0 ++ColorDepth=24 ++MarginAdjust=0,0,0,0 ++PPD_PageSize=Letter ++PerformFontSubstitution=true ++SubstFont_Arial=Helvetica ++SubstFont_Times New Roman=Times ++SubstFont_Cumberland=Courier ++SubstFont_Timmons=Times ++SubstFont_Helmet=Helvetica ++SubstFont_Thorndale=Times ++SubstFont_Albany=Helvetica ++SubstFont_Courier New=Courier ++ ++; [gghibo] entries to produce distillable PostScript output ++; ++[Generic PostScript output (distillable)] ++Printer=ADISTILL/Generic PostScript output (distillable) ++DefaultPrinter=0 ++Location= ++Comment= ++Command= ++Features= ++Copies=1 ++Scale=1 ++Orientation=Portrait ++PSLevel=0 ++ColorDevice=0 ++ColorDepth=24 ++MarginAdjust=0,0,0,0 ++PPD_PageSize=Letter ++PPD_Resolution=600dpi ++PerformFontSubstitution=true ++SubstFont_Arial=Helvetica ++SubstFont_Times New Roman=Times ++SubstFont_Cumberland=Courier ++SubstFont_Timmons=Times ++SubstFont_Helmet=Helvetica ++SubstFont_Thorndale=Times ++SubstFont_Albany=Helvetica ++SubstFont_Courier New=Courier +--- psprint_config/configuration/psprint.conf.psprint-pdf-drivers 2002-02-28 11:05:08.000000000 -0500 ++++ psprint_config/configuration/psprint.conf 2003-09-09 17:39:45.000000000 -0400 +@@ -96,3 +96,83 @@ SubstFont_Times New Roman=Times + SubstFont_Thorndale=Times + SubstFont_Timmons=Times + SubstFont_Cumberland=Courier ++ ++; [gghibo] Entries to enable a PDF writer with PDF 1.4 output and ++; bitmap not downsampled (useful for press). ++[PDF 1.4 Converter Screen] ++Printer=ADISTILL/PDF 1.4 Converter Screen ++DefaultPrinter=0 ++Location= ++Comment= ++Command=/usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -sOutputFile="(OUTFILE)" - ++Features=pdf= ++Copies=1 ++Scale=0 ++Orientation=Portrait ++PSLevel=0 ++ColorDevice=0 ++ColorDepth=24 ++MarginAdjust=0,0,0,0 ++PPD_PageSize=A4 ++PerformFontSubstitution=true ++SubstFont_Arial=Helvetica ++SubstFont_Times New Roman=Times ++SubstFont_Cumberland=Courier ++SubstFont_Timmons=Times ++SubstFont_Helmet=Helvetica ++SubstFont_Thorndale=Times ++SubstFont_Albany=Helvetica ++SubstFont_Courier New=Courier ++ ++[PDF 1.4 Converter Press] ++Printer=ADISTILL/PDF 1.4 Converter Press ++DefaultPrinter=0 ++Location= ++Comment= ++Command=/usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dPDFSETTINGS=/prepress -dAutoFilterColorImages=false -sColorImageFilter=FlateEncode -dAutoFilterGrayImages=false -sGrayImageFilter=FlateEncode -sOutputFile="(OUTFILE)" - ++Features=pdf= ++Copies=1 ++Scale=0 ++Orientation=Portrait ++PSLevel=0 ++ColorDevice=0 ++ColorDepth=24 ++MarginAdjust=0,0,0,0 ++PPD_PageSize=A4 ++PerformFontSubstitution=true ++SubstFont_Arial=Helvetica ++SubstFont_Times New Roman=Times ++SubstFont_Cumberland=Courier ++SubstFont_Timmons=Times ++SubstFont_Helmet=Helvetica ++SubstFont_Thorndale=Times ++SubstFont_Albany=Helvetica ++SubstFont_Courier New=Courier ++ ++; [gghibo] entries to produce distillable PostScript output ++; ++[Generic PostScript output (distillable)] ++Printer=ADISTILL/Generic PostScript output (distillable) ++DefaultPrinter=0 ++Location= ++Comment= ++Command= ++Features= ++Copies=1 ++Scale=1 ++Orientation=Portrait ++PSLevel=0 ++ColorDevice=0 ++ColorDepth=24 ++MarginAdjust=0,0,0,0 ++PPD_PageSize=A4 ++PPD_Resolution=600dpi ++PerformFontSubstitution=true ++SubstFont_Arial=Helvetica ++SubstFont_Times New Roman=Times ++SubstFont_Cumberland=Courier ++SubstFont_Timmons=Times ++SubstFont_Helmet=Helvetica ++SubstFont_Thorndale=Times ++SubstFont_Albany=Helvetica ++SubstFont_Courier New=Courier diff --git a/patches/OOO_1_1/sc-autofilter-empty-nonempty.diff b/patches/OOO_1_1/sc-autofilter-empty-nonempty.diff new file mode 100644 index 000000000..564dd650a --- /dev/null +++ b/patches/OOO_1_1/sc-autofilter-empty-nonempty.diff @@ -0,0 +1,42 @@ +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/view/gridwin.cxx 2003-06-02 12:58:42.000000000 +0530 ++++ sc/source/ui/view/gridwin.cxx 2004-10-11 11:22:24.000000000 +0530 +@@ -159,6 +159,8 @@ + #define SC_AUTOFILTER_ALL 0 + #define SC_AUTOFILTER_CUSTOM 1 + #define SC_AUTOFILTER_TOP10 2 ++#define SC_AUTOFILTER_EMPTY 3 ++#define SC_AUTOFILTER_NOTEMPTY 4 + + // Modi fuer die FilterListBox + enum ScFilterBoxMode +@@ -711,7 +713,7 @@ + long nMaxText = 0; + + // default entries +- static const USHORT nDefIDs[] = { SCSTR_ALL, SCSTR_STDFILTER, SCSTR_TOP10FILTER }; ++ static const USHORT nDefIDs[] = { SCSTR_ALL, SCSTR_STDFILTER, SCSTR_TOP10FILTER, SCSTR_EMPTY, SCSTR_NOTEMPTY }; + const USHORT nDefCount = sizeof(nDefIDs) / sizeof(USHORT); + for (i=0; i<nDefCount; i++) + { +@@ -1087,6 +1089,21 @@ + rNewEntry.eOp = SC_TOPVAL; + *rNewEntry.pStr = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("10")); + } ++ else if (nSel == SC_AUTOFILTER_EMPTY) ++ { ++ rNewEntry.pStr->Erase(); ++ rNewEntry.bQueryByString = FALSE; ++ rNewEntry.eOp = SC_EQUAL; ++ rNewEntry.nVal = SC_EMPTYFIELDS; ++ ++ } ++ else if (nSel == SC_AUTOFILTER_NOTEMPTY) ++ { ++ rNewEntry.pStr->Erase(); ++ rNewEntry.bQueryByString = FALSE; ++ rNewEntry.eOp = SC_EQUAL; ++ rNewEntry.nVal = SC_NONEMPTYFIELDS; ++ } + else + { + rNewEntry.eOp = SC_EQUAL; diff --git a/patches/OOO_1_1/sc-datapilot-database-crash.diff b/patches/OOO_1_1/sc-datapilot-database-crash.diff new file mode 100644 index 000000000..2c328c891 --- /dev/null +++ b/patches/OOO_1_1/sc-datapilot-database-crash.diff @@ -0,0 +1,28 @@ +diff -u -r sc.prev/source/ui/dbgui/pvlaydlg.cxx sc/source/ui/dbgui/pvlaydlg.cxx +--- sc.prev/source/ui/dbgui/pvlaydlg.cxx 2005-02-09 17:02:34.078477544 +0530 ++++ sc/source/ui/dbgui/pvlaydlg.cxx 2005-02-09 17:00:40.489745656 +0530 +@@ -288,9 +288,21 @@ + + ScRange inRange; + String inString; +- inRange = pDlgDPObject->GetSheetDesc()->aSourceRange; +- inRange.Format( inString, STD_FORMAT, pDoc); +- aEdInPos.SetText(inString); ++ if (pDlgDPObject->GetSheetDesc()) ++ { ++ aEdInPos.Enable(); ++ aRbInPos.Enable(); ++ inRange = pDlgDPObject->GetSheetDesc()->aSourceRange; ++ inRange.Format( inString, STD_FORMAT, pDoc); ++ aEdInPos.SetText(inString); ++ } ++ else ++ { ++ /* Data is not reachable, so could be a remote database */ ++ aEdInPos.Disable(); ++ aRbInPos.Disable(); ++ ++ } + + aSlider.SetPageSize( PAGE_SIZE ); + aSlider.SetVisibleSize( PAGE_SIZE ); diff --git a/patches/OOO_1_1/sc-paste-insert-rows.diff b/patches/OOO_1_1/sc-paste-insert-rows.diff new file mode 100644 index 000000000..ef783c7d6 --- /dev/null +++ b/patches/OOO_1_1/sc-paste-insert-rows.diff @@ -0,0 +1,13 @@ +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/view/viewfun3.cxx 2003-10-31 21:40:15.000000000 +0530 ++++ sc/source/ui/view/viewfun3.cxx 2004-10-14 13:29:36.754960480 +0530 +@@ -442,8 +442,8 @@ + + if (pOwnClip) + PasteFromClip( IDF_ALL, pOwnClip->GetDocument(), +- PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE, +- TRUE ); // allow warning dialog ++ PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_CELLSDOWN, IDF_NONE, ++ FALSE ); + else if (pDrawClip) + PasteDraw(); + else diff --git a/patches/OOO_1_1/sc-standard-filter-options.diff b/patches/OOO_1_1/sc-standard-filter-options.diff new file mode 100644 index 000000000..676d97b2d --- /dev/null +++ b/patches/OOO_1_1/sc-standard-filter-options.diff @@ -0,0 +1,362 @@ +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/inc/global.hxx 2003-04-28 21:00:46.000000000 +0530 ++++ sc/inc/global.hxx 2004-10-08 16:23:48.000000000 +0530 +@@ -1329,6 +1329,8 @@ + + enum ScQueryOp + { ++ SC_BEGINS_WITH, ++ SC_ENDS_WITH, + SC_EQUAL, + SC_LESS, + SC_GREATER, +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/dbgui/filtdlg.cxx 2004-01-09 20:11:10.000000000 +0530 ++++ sc/source/ui/dbgui/filtdlg.cxx 2004-10-08 16:24:56.000000000 +0530 +@@ -83,6 +83,7 @@ + #include "viewdata.hxx" + #include "document.hxx" + #include "scresid.hxx" ++#include "docoptio.hxx" + + #include "foptmgr.hxx" + +@@ -219,6 +220,7 @@ + aBtnMore, + aBtnCase, + aBtnRegExp, ++ aBtnWholeWord, + aBtnHeader, + aBtnUnique, + aBtnCopyResult, +@@ -573,6 +575,17 @@ + bCopyPosOk = ( SCA_VALID == (nResult & SCA_VALID) ); + } + ++ /* ++ * The reg exp checkbutton read is moved up, since, ++ * for begins and ends with query we are makeing them as re query transparently ++ * Checking this later spoils the entire transparent work. ++ */ ++ theParam.bRegExp = aBtnRegExp.IsChecked(); ++ ++ ScDocOptions pDocOpts = pDoc->GetDocOptions(); ++ pDocOpts.SetMatchWholeCell(aBtnWholeWord.IsChecked()); ++ pDoc->SetDocOptions(pDocOpts); ++ + for ( USHORT i=0; i<3; i++ ) + { + USHORT nField = aFieldLbArr[i]->GetSelectEntryPos(); +@@ -606,6 +619,19 @@ + } + else + { ++ if (eOp == SC_BEGINS_WITH ) { ++ String tmp ('^'); ++ tmp .Append(aStrVal); ++ ::rtl::OUString str (tmp); ++ aStrVal.Assign(tmp); ++ eOp = SC_EQUAL; ++ theParam.bRegExp = TRUE; ++ } ++ else if (eOp == SC_ENDS_WITH ) { ++ aStrVal.Append (String('$')); ++ eOp = SC_EQUAL; ++ theParam.bRegExp = TRUE; ++ } + *rEntry.pStr = aStrVal; + rEntry.nVal = 0; + rEntry.bQueryByString = TRUE; +@@ -642,7 +668,7 @@ + theParam.bByRow = TRUE; + theParam.bDuplicate = !aBtnUnique.IsChecked(); + theParam.bCaseSens = aBtnCase.IsChecked(); +- theParam.bRegExp = aBtnRegExp.IsChecked(); ++ + theParam.bDestPers = aBtnDestPers.IsChecked(); + + // nur die drei eingestellten - alles andere zuruecksetzen +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/inc/filtdlg.hxx 2001-09-24 22:59:58.000000000 +0530 ++++ sc/source/ui/inc/filtdlg.hxx 2004-10-08 12:23:49.000000000 +0530 +@@ -101,6 +101,7 @@ + CheckBox aBtnCase; \ + CheckBox aBtnRegExp; \ + CheckBox aBtnHeader; \ ++ CheckBox aBtnWholeWord; \ + CheckBox aBtnUnique; \ + CheckBox aBtnCopyResult; \ + ListBox aLbCopyArea; \ +@@ -122,6 +123,7 @@ + aFlOptions ( this, ScResId( FL_OPTIONS ) ), \ + aBtnCase ( this, ScResId( BTN_CASE ) ), \ + aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), \ ++ aBtnWholeWord ( this, ScResId( BTN_MATCH) ), \ + aBtnHeader ( this, ScResId( BTN_HEADER ) ), \ + aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), \ + aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), \ +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/inc/filter.hrc 2001-05-21 14:52:56.000000000 +0530 ++++ sc/source/ui/inc/filter.hrc 2004-10-08 12:27:21.000000000 +0530 +@@ -81,7 +81,7 @@ + #define FT_DBAREA_LABEL 10 + #define FT_DBAREA 11 + #define BTN_DEST_PERS 12 +- ++#define BTN_MATCH 13 + // Filter: + #define FT_OP 20 + #define FT_FIELD 21 +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/src/filter.src 2004-04-27 22:31:47.000000000 +0530 ++++ sc/source/ui/src/filter.src 2004-10-08 14:55:38.000000000 +0530 +@@ -66,7 +66,7 @@ + HelpId = SID_FILTER ; + Hide = TRUE ; + SVLook = TRUE ; +- Size = MAP_APPFONT ( 298 , 83 ) ; ++ Size = MAP_APPFONT ( 298 , 98 ) ; + Text = "Standardfilter" ; + Text [ ENGLISH ] = "Standard Filter" ; + Text [ norwegian ] = "Standardfilter" ; +@@ -708,12 +708,14 @@ + }; + stringlist [ english_us ] = + { +- < "=" ; Default ; > ; ++ < "Begins with" ; Default ; > ; ++ < "Ends with" ; Default ; > ; ++ < "Equals" ; Default ; > ; + < "<" ; Default ; > ; + < ">" ; Default ; > ; + < "<=" ; Default ; > ; + < ">=" ; Default ; > ; +- < "<>" ; Default ; > ; ++ < "Not equals" ; Default ; > ; + < "Largest" ; Default ; > ; + < "Smallest" ; Default ; > ; + < "Largest %" ; Default ; > ; +@@ -2278,6 +2280,14 @@ + Text[ zulu ] = "Isisho esi~jwayelekile"; + Text[ norwegian_nynorsk ] = "~Regulrt uttrykk"; + }; ++ ++ CheckBox BTN_MATCH ++ { ++ Pos = MAP_APPFONT ( 12 , 126 ) ; ++ Size = MAP_APPFONT ( 239 , 10 ) ; ++ Text [ english_us ] = "Search criteria must apply to ~whole cells" ; ++ }; ++ + CheckBox BTN_HEADER + { + Hide = TRUE ; +@@ -2458,7 +2468,7 @@ + { + Border = TRUE ; + Hide = TRUE ; +- Pos = MAP_APPFONT ( 21 , 126 ) ; ++ Pos = MAP_APPFONT ( 21 , 138 ) ; + Size = MAP_APPFONT ( 90 , 90 ) ; + TabStop = TRUE ; + DropDown = TRUE ; +@@ -2467,7 +2477,7 @@ + { + Border = TRUE ; + Hide = TRUE ; +- Pos = MAP_APPFONT ( 115 , 126 ) ; ++ Pos = MAP_APPFONT ( 115 , 138 ) ; + Size = MAP_APPFONT ( 104 , 12 ) ; + TabStop = TRUE ; + }; +@@ -2475,7 +2485,7 @@ + { + QuickHelpText = "Verkleinern" ; + QuickHelpText [ ENGLISH ] = "Shrink" ; +- Pos = MAP_APPFONT ( 221 , 126 ) ; ++ Pos = MAP_APPFONT ( 221 , 138 ) ; + Size = MAP_APPFONT ( 12 , 12 ) ; + TabStop = FALSE ; + QuickHelpText [ english_us ] = "Shrink" ; +@@ -2605,7 +2615,7 @@ + FixedText FT_DBAREA_LABEL + { + Hide = TRUE ; +- Pos = MAP_APPFONT ( 6 , 144 ) ; ++ Pos = MAP_APPFONT ( 6 , 156 ) ; + Size = MAP_APPFONT ( 58 , 8 ) ; + Text = "Datenbereich:" ; + Text [ ENGLISH ] = "Data area:" ; +@@ -3204,10 +3214,10 @@ + Text [ danish ] = "dummy" ; + Text [ french ] = "factice" ; + Text [ swedish ] = "dummy" ; ++ Left = TRUE ; + Text [ dutch ] = "dummy" ; + Text [ spanish ] = "Texto ejemplo" ; + Text [ english_us ] = "dummy" ; +- Left = TRUE ; + Text[ chinese_simplified ] = "样本"; + Text[ russian ] = ""; + Text[ polish ] = "Zalepka"; +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/dbgui/foptmgr.cxx 2001-10-23 14:35:11.000000000 +0530 ++++ sc/source/ui/dbgui/foptmgr.cxx 2004-10-08 16:04:15.000000000 +0530 +@@ -76,6 +76,7 @@ + #include "dbcolect.hxx" + #include "viewdata.hxx" + #include "document.hxx" ++#include "docoptio.hxx" + + #define _FOPTMGR_CXX + #include "foptmgr.hxx" +@@ -111,6 +111,7 @@ + rBtnMore ( refBtnMore ), + rBtnCase ( refBtnCase ), + rBtnRegExp ( refBtnRegExp ), ++ rBtnWholeWord ( refBtnRegExp ), + rBtnHeader ( refBtnHeader ), + rBtnUnique ( refBtnUnique ), + rBtnCopyResult ( refBtnCopyResult ), +@@ -123,9 +124,53 @@ + rStrNoName ( refStrNoName ), + rStrUndefined ( refStrUndefined ) + { +- Init(); ++ Init(FALSE); + } + ++ScFilterOptionsMgr::ScFilterOptionsMgr( ++ Dialog* ptrDlg, ++ ScViewData* ptrViewData, ++ const ScQueryParam& refQueryData, ++ MoreButton& refBtnMore, ++ CheckBox& refBtnCase, ++ CheckBox& refBtnRegExp, ++ CheckBox& refBtnWholeWord, ++ CheckBox& refBtnHeader, ++ CheckBox& refBtnUnique, ++ CheckBox& refBtnCopyResult, ++ CheckBox& refBtnDestPers, ++ ListBox& refLbCopyArea, ++ Edit& refEdCopyArea, ++ ScRefButton& refRbCopyArea, ++ FixedText& refFtDbAreaLabel, ++ FixedInfo& refFtDbArea, ++ FixedLine& refFlOptions, ++ const String& refStrNoName, ++ const String& refStrUndefined ) ++ ++ : pDlg ( ptrDlg ), ++ pViewData ( ptrViewData ), ++ pDoc ( ptrViewData ? ptrViewData->GetDocument() : NULL ), ++ rQueryData ( refQueryData ), ++ rBtnMore ( refBtnMore ), ++ rBtnCase ( refBtnCase ), ++ rBtnRegExp ( refBtnRegExp ), ++ rBtnWholeWord ( refBtnWholeWord), ++ rBtnHeader ( refBtnHeader ), ++ rBtnUnique ( refBtnUnique ), ++ rBtnCopyResult ( refBtnCopyResult ), ++ rBtnDestPers ( refBtnDestPers ), ++ rLbCopyPos ( refLbCopyArea ), ++ rEdCopyPos ( refEdCopyArea ), ++ rRbCopyPos ( refRbCopyArea ), ++ rFtDbAreaLabel ( refFtDbAreaLabel ), ++ rFtDbArea ( refFtDbArea ), ++ rFlOptions ( refFlOptions ), ++ rStrNoName ( refStrNoName ), ++ rStrUndefined ( refStrUndefined ) ++{ ++ Init(TRUE); ++} + + //---------------------------------------------------------------------------- + +@@ -141,7 +186,7 @@ + + //---------------------------------------------------------------------------- + +-void ScFilterOptionsMgr::Init() ++void ScFilterOptionsMgr::Init(BOOL param) + { + DBG_ASSERT( pViewData && pDoc, "Init failed :-/" ); + +@@ -151,6 +196,8 @@ + + rBtnMore.AddWindow( &rBtnCase ); + rBtnMore.AddWindow( &rBtnRegExp ); ++ if (param) ++ rBtnMore.AddWindow(&rBtnWholeWord); + rBtnMore.AddWindow( &rBtnHeader ); + rBtnMore.AddWindow( &rBtnUnique ); + rBtnMore.AddWindow( &rBtnCopyResult ); +@@ -160,13 +207,18 @@ + rBtnMore.AddWindow( &rRbCopyPos ); + rBtnMore.AddWindow( &rFtDbAreaLabel ); + rBtnMore.AddWindow( &rFtDbArea ); +- rBtnMore.AddWindow( &rFlOptions ); ++ rBtnMore.AddWindow( &rFlOptions ); ++ + + rBtnCase .Check( rQueryData.bCaseSens ); + rBtnHeader .Check( rQueryData.bHasHeader ); + rBtnRegExp .Check( rQueryData.bRegExp ); + rBtnUnique .Check( !rQueryData.bDuplicate ); +- ++ if (param) { ++ BOOL bMatchWholeCell = pDoc->GetDocOptions().IsMatchWholeCell(); ++ rBtnWholeWord.Check(bMatchWholeCell); ++ } ++ + if ( pViewData && pDoc ) + { + String theAreaStr; +@@ -266,6 +318,7 @@ + } + else + rEdCopyPos.SetText( EMPTY_STRING ); ++ rFtDbArea.SetPosPixel(Point(158,331)); + } + + +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/inc/foptmgr.hxx 2001-05-21 14:52:56.000000000 +0530 ++++ sc/source/ui/inc/foptmgr.hxx 2004-10-08 16:02:56.000000000 +0530 +@@ -108,6 +108,26 @@ + FixedLine& refFlOptions, + const String& refStrNoName, + const String& refStrUndefined ); ++ ScFilterOptionsMgr( Dialog* ptrDlg, ++ ScViewData* ptrViewData, ++ const ScQueryParam& refQueryData, ++ MoreButton& refBtnMore, ++ CheckBox& refBtnCase, ++ CheckBox& refBtnRegExp, ++ CheckBox& refBtnWholeWord, ++ CheckBox& refBtnHeader, ++ CheckBox& refBtnUnique, ++ CheckBox& refBtnCopyResult, ++ CheckBox& refBtnDestPers, ++ ListBox& refLbCopyArea, ++ Edit& refEdCopyArea, ++ ScRefButton& refRbCopyArea, ++ FixedText& refFtDbAreaLabel, ++ FixedInfo& refFtDbArea, ++ FixedLine& refFlOptions, ++ const String& refStrNoName, ++ const String& refStrUndefined ); ++ + ~ScFilterOptionsMgr(); + + BOOL VerifyPosStr ( const String& rPosStr ) const; +@@ -119,6 +139,7 @@ + + MoreButton& rBtnMore; + CheckBox& rBtnCase; ++ CheckBox& rBtnWholeWord; + CheckBox& rBtnRegExp; + CheckBox& rBtnHeader; + CheckBox& rBtnUnique; +@@ -138,7 +159,7 @@ + + #ifdef _FOPTMGR_CXX + private: +- void Init(); ++ void Init(BOOL param); + + // Handler: + DECL_LINK( EdPosModifyHdl, Edit* ); diff --git a/patches/OOO_1_1/static-libs-use-_pic.diff b/patches/OOO_1_1/static-libs-use-_pic.diff new file mode 100644 index 000000000..b8e072b81 --- /dev/null +++ b/patches/OOO_1_1/static-libs-use-_pic.diff @@ -0,0 +1,11 @@ +--- lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk.old 2005-08-19 12:27:54.116013352 +0200 ++++ lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 2005-08-19 12:28:08.293857992 +0200 +@@ -69,7 +69,7 @@ + + .IF "$(GUI)"=="UNX" + .IF "$(SYSTEM_HYPH)" == "YES" +-HNJLIB=-lhyph ++HNJLIB=-lhnj_pic + .ELSE + HNJLIB=-lhnj + .ENDIF diff --git a/patches/OOO_1_1/sw-online-layout-crash-fix.diff b/patches/OOO_1_1/sw-online-layout-crash-fix.diff new file mode 100644 index 000000000..5e80568bd --- /dev/null +++ b/patches/OOO_1_1/sw-online-layout-crash-fix.diff @@ -0,0 +1,19 @@ +Index: source/core/layout/fly.cxx +=================================================================== +RCS file: /cvs/sw/sw/source/core/layout/fly.cxx,v +retrieving revision 1.46.52.3 +diff -u -p -r1.46.52.3 fly.cxx +--- sw/source/core/layout/fly.cxx 28 Apr 2004 10:29:47 -0000 1.46.52.3 ++++ sw/source/core/layout/fly.cxx 5 Nov 2004 11:15:08 -0000 +@@ -1695,8 +1695,9 @@ void SwFlyFrm::MakeFlyPos() + const long nBottom = GetAnchor()->Frm().Top() + aRelPos.Y() + Frm().Height(); + if ( nAnchorBottom < nBottom ) + { +- ((SwPageFrm*)GetAnchor())->FindBodyCont()-> +- Grow( nBottom - nAnchorBottom PHEIGHT ); ++ if (SwPageFrm *pOne = ((SwPageFrm*)GetAnchor())) ++ if (SwLayoutFrm *pTwo = pOne->FindBodyCont()) ++ pTwo->Grow( nBottom - nAnchorBottom PHEIGHT ); + } + } + diff --git a/patches/OOO_1_1/system-xrender.diff b/patches/OOO_1_1/system-xrender.diff index ee53f0b52..ab145fc13 100644 --- a/patches/OOO_1_1/system-xrender.diff +++ b/patches/OOO_1_1/system-xrender.diff @@ -220,15 +220,16 @@ diff -u -u -r1.47.10.2 makefile.mk .IF "$(USE_BUILTIN_RASTERIZER)" != "" SLOFILES+= $(SLO)$/gcach_xpeer.obj .ENDIF -Index: prj/build.lst +Index: vcl/prj/build.lst =================================================================== -RCS file: /cvs/external/x11_extensions/prj/build.lst,v -retrieving revision 1.2 -diff -u -r1.2 build.lst ---- x11_extensions/prj/build.lst 12 Jun 2003 10:47:04 -0000 1.2 -+++ x11_extensions/prj/build.lst 10 Apr 2004 15:35:49 -0000 -@@ -1,3 +1,3 @@ --x1 x11_extensions : NULL -+x1 x11_extensions : NULL (!SYSTEM_X11EXT_H) - x1 x11_extensions usr1 - u x11_mkout NULL - +RCS file: /cvs/gsl/vcl/prj/build.lst,v +retrieving revision 1.20.60.3 +diff -u -p -u -r1.20.60.3 build.lst +--- vcl/prj/build.lst 24 Jun 2005 15:12:55 -0000 1.20.60.3 ++++ vcl/prj/build.lst 30 Aug 2005 15:13:24 -0000 +@@ -1,4 +1,4 @@ +-vc vcl : boost nas freetype psprint rsc sot ucbhelper unotools rvpapi icu i18npool unoil ridljar x11_extensions sndfile portaudio gtk offuh basegfx NULL ++vc vcl : boost nas freetype psprint rsc sot ucbhelper unotools rvpapi icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions sndfile portaudio gtk offuh basegfx NULL + vc vcl usr1 - all vc_mkout NULL + vc vcl\source\unotypes nmake - all vc_unot NULL + vc vcl\source\glyphs nmake - all vc_glyphs vc_unot NULL diff --git a/patches/OOO_1_1/vba-sc-import.diff b/patches/OOO_1_1/vba-sc-import.diff index 7c82c5c5d..0220906af 100644 --- a/patches/OOO_1_1/vba-sc-import.diff +++ b/patches/OOO_1_1/vba-sc-import.diff @@ -1,122 +1,3 @@ -Index: sc/source/filter/excel/excform8.cxx -=================================================================== -RCS file: /cvs/sc/sc/source/filter/excel/excform8.cxx,v -retrieving revision 1.23.120.1 -diff -u -r1.23.120.1 excform8.cxx ---- sc/source/filter/excel/excform8.cxx 19 Jan 2004 16:41:36 -0000 1.23.120.1 -+++ sc/source/filter/excel/excform8.cxx 8 Sep 2004 10:00:13 -0000 -@@ -477,11 +477,17 @@ - case 0x43: - case 0x63: - case 0x23: // Name [318 269] -+ { - aIn >> nUINT16; - aIn.Ignore( 2 ); - -- aStack << aPool.Store( ( *pExcRoot->pRNameBuff )[ nUINT16 ] ); -+ const String *pStr = pExcRoot->pRNameBuff->GetMacro ( nUINT16 ); -+ if (pStr) { -+ aStack << aPool.Store( ocMacro, *pStr ); -+ } else -+ aStack << aPool.Store( ( *pExcRoot->pRNameBuff )[ nUINT16 ] ); - break; -+ } - case 0x44: - case 0x64: - case 0x24: // Cell Reference [319 270] -Index: sc/source/filter/excel/excimp8.cxx -=================================================================== -RCS file: /cvs/sc/sc/source/filter/excel/excimp8.cxx,v -retrieving revision 1.84.18.2 -diff -u -r1.84.18.2 excimp8.cxx ---- sc/source/filter/excel/excimp8.cxx 19 Jan 2004 16:41:53 -0000 1.84.18.2 -+++ sc/source/filter/excel/excimp8.cxx 8 Sep 2004 10:00:14 -0000 -@@ -1019,6 +1019,32 @@ - ImportExcel::EndSheet(); - } - -+void ImportExcel8::ReadBasic( void ) -+{ -+ if( bHasBasic ) return; bHasBasic = TRUE; -+ -+ SfxObjectShell* pShell = GetDocShell(); -+ -+ if( pShell ) -+ { -+ OfaFilterOptions* pFiltOpt = OFF_APP()->GetFilterOptions(); -+ -+ if( pFiltOpt ) -+ { -+ if( pFiltOpt->IsLoadExcelBasicCode() || pFiltOpt->IsLoadExcelBasicStorage() ) -+ { -+ DBG_ASSERT( pExcRoot->pRootStorage, "-ImportExcel8::PostDocLoad(): no storage, no cookies!" ); -+ -+ SvxImportMSVBasic aBasicImport( *pShell, *pExcRoot->pRootStorage, -+ pFiltOpt->IsLoadExcelBasicCode(), -+ pFiltOpt->IsLoadExcelBasicStorage() ); -+ -+ aBasicImport.Import( String::CreateFromAscii( pVBAStorageName ), -+ String::CreateFromAscii( pVBASubStorageName ) ); -+ } -+ } -+ } -+} - - void ImportExcel8::PostDocLoad( void ) - { -Index: sc/source/filter/excel/read.cxx -=================================================================== -RCS file: /cvs/sc/sc/source/filter/excel/read.cxx,v -retrieving revision 1.39.80.1 -diff -u -r1.39.80.1 read.cxx ---- sc/source/filter/excel/read.cxx 19 Jan 2004 16:43:05 -0000 1.39.80.1 -+++ sc/source/filter/excel/read.cxx 8 Sep 2004 10:00:14 -0000 -@@ -1143,7 +1143,7 @@ - case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] - case 0x8D: Hideobj(); break; // HIDEOBJ [ 345 ] - case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45 ] -- case 0xD3: bHasBasic = TRUE; break; -+ case 0xD3: ReadBasic(); break; - case 0xD5: SXIdStm(); break; // SXIDSTM ##++## - case 0xDE: Olesize(); break; - case 0xE0: GetXFBuffer().ReadXF( maStrm ); break; -Index: sc/source/filter/excel/tokstack.cxx -=================================================================== -RCS file: /cvs/sc/sc/source/filter/excel/tokstack.cxx,v -retrieving revision 1.3 -diff -u -r1.3 tokstack.cxx ---- sc/source/filter/excel/tokstack.cxx 23 Oct 2001 09:37:15 -0000 1.3 -+++ sc/source/filter/excel/tokstack.cxx 8 Sep 2004 10:00:15 -0000 -@@ -350,10 +350,12 @@ - UINT16 n = pElement[ nId ]; - EXTCONT* p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL; - -- if( p ) -- /*ScToken* pTok = */pScToken->AddExternal( p->aText.GetBuffer() ); -+ if( p ) { -+ ScToken *pTok = pScToken->AddExternal( p->aText ); -+ pTok->NewOpCode (p->eId); - } - break; -+ } - case T_Nlf: - { - UINT16 n = pElement[ nId ]; -@@ -417,9 +419,11 @@ - { - UINT16 n = pElement[ ( TokenId ) *pAkt ]; - EXTCONT* p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL; -- -- if( p ) -- /*ScToken* pTok = */pScToken->AddExternal( p->aText.GetBuffer() ); -+ -+ if( p ) { -+ ScToken *pTok = pScToken->AddExternal( p->aText ); -+ pTok->NewOpCode (p->eId); -+ } - } - break; - case T_Nlf: Index: sc/source/filter/excel/xilink.cxx =================================================================== RCS file: /cvs/sc/sc/source/filter/excel/xilink.cxx,v @@ -143,86 +24,3 @@ diff -u -r1.4 xilink.cxx + DBG_ASSERT( nXclIndex > 0, "XclImpExtNameList::GetName - index must be >0" ); return GetObject( nXclIndex - 1 ); } - -Index: sc/source/filter/excel/namebuff.cxx -=================================================================== -RCS file: /cvs/sc/sc/source/filter/excel/namebuff.cxx,v -retrieving revision 1.15 -diff -u -r1.15 namebuff.cxx ---- sc/source/filter/excel/namebuff.cxx 23 Apr 2003 17:29:11 -0000 1.15 -+++ sc/source/filter/excel/namebuff.cxx 8 Sep 2004 10:00:15 -0000 -@@ -167,7 +167,11 @@ - } - - -- -+RangeNameBuffer::~RangeNameBuffer() -+{ -+ for( ULONG i = 0; i < Count(); i++ ) -+ delete (String *) GetObject( i ); -+} - - void RangeNameBuffer::Store( ByteString& r, const ScTokenArray* p, UINT16 n, const RangeType t) - { -@@ -191,6 +195,11 @@ - rName += String::CreateFromInt32( nAltSheet ); - } - -+ if (pDef->GetLen() == 0) { /* Dummy method / function call */ -+ Insert( new String (rName), LIST_APPEND ); -+ return; -+ } -+ - ScRangeData* pData = new ScRangeData( pExcRoot->pDoc, rName, *pDef ); - - pData->GuessPosition(); -@@ -205,10 +214,10 @@ - - pExcRoot->pScRangeName->Insert( pData ); - -- Insert( ( void* ) TRUE, LIST_APPEND ); -+ Insert( NULL, LIST_APPEND ); - } - else -- Insert( ( void* ) FALSE, LIST_APPEND ); -+ Insert( NULL, LIST_APPEND ); - } - - -Index: sc/source/filter/inc/excimp8.hxx -=================================================================== -RCS file: /cvs/sc/sc/source/filter/inc/excimp8.hxx,v -retrieving revision 1.48.80.1 -diff -u -r1.48.80.1 excimp8.hxx ---- sc/source/filter/inc/excimp8.hxx 19 Jan 2004 16:45:37 -0000 1.48.80.1 -+++ sc/source/filter/inc/excimp8.hxx 8 Sep 2004 10:00:15 -0000 -@@ -193,6 +193,7 @@ - void SXLi( void ); // 0xB5 - void SXPi( void ); // 0xB6 - void SXDi( void ); // 0xC5 -+ void ReadBasic( void ); // 0xD3 - void SXIdStm( void ); // 0xD5 - void SXVs( void ); // 0xE3 - void Cellmerging( void ); // 0xE5 geraten... -Index: sc/source/filter/inc/namebuff.hxx -=================================================================== -RCS file: /cvs/sc/sc/source/filter/inc/namebuff.hxx,v -retrieving revision 1.6 -diff -u -r1.6 namebuff.hxx ---- sc/source/filter/inc/namebuff.hxx 26 Mar 2003 18:05:05 -0000 1.6 -+++ sc/source/filter/inc/namebuff.hxx 8 Sep 2004 10:00:15 -0000 -@@ -219,12 +219,14 @@ - public: - inline RangeNameBuffer( RootData* p ); - // Name, Definition -+ virtual ~RangeNameBuffer(); - void Store( ByteString&, const ScTokenArray*, - UINT16 nAltSheet = 0, const RangeType eNameType = RT_ABSAREA ); - void Store( String&, const ScTokenArray*, - UINT16 nAltSheet = 0, const RangeType eNameType = RT_ABSAREA ); - inline UINT16 operator[]( UINT16 nExcInd ) const; - inline UINT16 GetPos( void ) const; -+ const String *GetMacro( UINT16 nIdx ) const { return (const String *) GetObject( nIdx ); } - }; - - diff --git a/patches/OOO_1_1/vba-scanner-fix.diff b/patches/OOO_1_1/vba-scanner-fix.diff index 79053b734..210a75302 100644 --- a/patches/OOO_1_1/vba-scanner-fix.diff +++ b/patches/OOO_1_1/vba-scanner-fix.diff @@ -14,32 +14,14 @@ diff -u -p -u -r1.8 scanner.cxx USHORT nOldCol1 = nCol1; USHORT nOldCol2 = nCol2; sal_Unicode buf[ BUF_SIZE ], *p = buf; -@@ -198,8 +198,8 @@ BOOL SbiScanner::NextSym() - // Zeile einlesen? - if( !pLine ) - { -- USHORT n = nBufPos; -- USHORT nLen = aBuf.getLength(); -+ UINT32 n = nBufPos; -+ UINT32 nLen = aBuf.getLength(); - if( nBufPos >= nLen ) - return FALSE; - const sal_Unicode* p = aBuf.getStr(); -Index: basic/source/inc/scanner.hxx -=================================================================== -RCS file: /cvs/script/basic/source/inc/scanner.hxx,v -retrieving revision 1.3 -diff -u -p -u -r1.3 scanner.hxx ---- basic/source/inc/scanner.hxx 23 Apr 2003 16:57:54 -0000 1.3 -+++ basic/source/inc/scanner.hxx 11 Mar 2004 15:10:40 -0000 -@@ -94,8 +94,8 @@ protected: - short nCol; // aktuelle Spaltennummer +--- basic/source/inc/scanner.hxx 2005-01-17 14:08:28.867361749 -0800 ++++ basic/source/inc/scanner.hxx 2005-01-17 14:08:52.439391875 -0800 +@@ -95,7 +95,7 @@ short nErrors; // Anzahl Fehler short nColLock; // Lock-Zaehler fuer Col1 -- USHORT nBufPos; // aktuelle Buffer-Pos + INT32 nBufPos; // aktuelle Buffer-Pos - USHORT nLine; // aktuelle Zeile -+ UINT32 nBufPos; // buffer position -+ UINT32 nLine; // line no. ++ UINT32 nLine; // aktuelle Zeile USHORT nCol1, nCol2; // aktuelle 1. und 2. Spalte BOOL bSymbol; // TRUE: Symbol gescannt BOOL bNumber; // TRUE: Zahl gescannt diff --git a/patches/OOO_1_1/win32-gw-send-mail.diff b/patches/OOO_1_1/win32-gw-send-mail.diff index d3e8c71ee..ae9322ac9 100755 --- a/patches/OOO_1_1/win32-gw-send-mail.diff +++ b/patches/OOO_1_1/win32-gw-send-mail.diff @@ -10,7 +10,7 @@ - aSysPath.getLength( ), - osl_getThreadTextEncoding( ) ) ); - -+ OString aFullPath = OUStringToOString( aSysPath, ++ OString aFullPath = ::rtl::OUStringToOString( aSysPath, + osl_getThreadTextEncoding() ); + sal_Int32 nLastSlash = aFullPath.lastIndexOf('\\'); + OString aFileName = aFullPath.copy( nLastSlash + 1 ); diff --git a/patches/OOO_1_1/xmlhelp-optimize-linkage.patch b/patches/OOO_1_1/xmlhelp-optimize-linkage.patch index 260608ad5..fc3943505 100644 --- a/patches/OOO_1_1/xmlhelp-optimize-linkage.patch +++ b/patches/OOO_1_1/xmlhelp-optimize-linkage.patch @@ -1,14 +1,15 @@ # libdb_cxx-X.Y.so already includes all functions/variables from # libdb-X.Y.so. Having the same functionality twice in address space # means ~ .5MB bigger RAM usage and about 650 prelink conflicts. - ---- xmlhelp/util/makefile.mk.jj 2003-04-28 18:18:57.000000000 +0200 -+++ xmlhelp/util/makefile.mk 2003-10-21 15:10:35.000000000 +0200 -@@ -105,7 +105,6 @@ SHL1STDLIBS= \ +--- xmlhelp/util/makefile.mk.bak 2005-01-17 13:30:21.191734699 -0800 ++++ xmlhelp/util/makefile.mk 2005-01-17 13:30:41.992229706 -0800 +@@ -105,8 +105,7 @@ + $(VOSLIB) \ $(SABLOT3RDLIB) \ $(EXPATASCII3RDLIB) \ - $(UCBHELPERLIB) \ -- $(BERKELEYLIB) \ - $(BERKELEYCPPLIB) +- $(UCBHELPERLIB) \ +- $(BERKELEYLIB) ++ $(UCBHELPERLIB) SHL1LIBS = \ + $(SLB)$/jaqe.lib \ diff --git a/patches/evo2/connectivity-source-drivers-evoab1-5-EApi-cxx.diff b/patches/evo2/connectivity-source-drivers-evoab1-5-EApi-cxx.diff new file mode 100644 index 000000000..2904ec4b0 --- /dev/null +++ b/patches/evo2/connectivity-source-drivers-evoab1-5-EApi-cxx.diff @@ -0,0 +1,167 @@ +--- /dev/null 2004-08-25 23:04:59.000000000 +0530 ++++ connectivity/source/drivers/evoab1.5/EApi.cxx 2005-02-22 17:41:54.999516706 +0530 +@@ -0,0 +1,164 @@ ++ /************************************************************************* ++ * ++ * $RCSfile$ ++ * ++ * $Revision$ ++ * ++ * last change: $Author$ $Date$ ++ * ++ * The Contents of this file are made available subject to the terms of ++ * either of the following licenses ++ * ++ * - GNU Lesser General Public License Version 2.1 ++ * - Sun Industry Standards Source License Version 1.1 ++ * ++ * Sun Microsystems Inc., October, 2000 ++ * ++ * GNU Lesser General Public License Version 2.1 ++ * ============================================= ++ * Copyright 2000 by Sun Microsystems, Inc. ++ * 901 San Antonio Road, Palo Alto, CA 94303, USA ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License version 2.1, as published by the Free Software Foundation. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ * ++ * ++ * Sun Industry Standards Source License Version 1.1 ++ * ================================================= ++ * The contents of this file are subject to the Sun Industry Standards ++ * Source License Version 1.1 (the License); You may not use this file ++ * except in compliance with the License. You may obtain a copy of the ++ * License at http://www.openoffice.org/license.html. ++ * ++ * Software provided under this License is provided on an AS IS basis, ++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, ++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, ++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. ++ * See the License for the specific provisions governing your rights and ++ * obligations concerning the Software. ++ * ++ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. ++ * ++ * Copyright: 2000 by Sun Microsystems, Inc. ++ * ++ * All Rights Reserved. ++ * ++ * Contributor(s): Michael Meeks, Jayant Madavi ++ * ++ * ++ ************************************************************************/ ++ ++#include <rtl/ustring.hxx> ++#include <osl/module.h> ++#include <stdio.h> ++#define _EVOLUTION_ALREADY_DEFINED_ 1 ++#ifndef _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_ ++#include "EApi.h" ++#endif ++static char *eBookLibNames[] = { ++ "libebook.so.8", // evolution-2.0 ++ "libebook-1.2.so.3" // evolution-2.2 ++ // FIXME: ask JPR about ABI compatibility going forwards ++ // "libebook-1.3.so.0", ++ // "libebook-1.4.so.0", ++ // "libebook-1.5.so.0" ++}; ++ ++typedef void (*SymbolFunc) (void); ++ ++#define SYM_MAP(a) { #a, (SymbolFunc *)&a } ++ static struct { ++ const char *sym_name; ++ SymbolFunc *ref_value; ++ } aApiMap[] = { ++ SYM_MAP( e_contact_get_type ), ++ SYM_MAP( e_contact_field_id ), ++ SYM_MAP( e_source_peek_name ), ++ SYM_MAP( e_source_get_property ), ++ SYM_MAP( e_source_list_peek_groups ), ++ SYM_MAP( e_source_group_peek_sources ), ++ SYM_MAP( e_book_new ), ++ SYM_MAP( e_book_open ), ++ SYM_MAP( e_book_get_uri ), ++ SYM_MAP( e_book_get_source ), ++ SYM_MAP( e_book_get_addressbooks ), ++ SYM_MAP( e_book_get_contacts ), ++ SYM_MAP( e_book_authenticate_user ), ++ SYM_MAP( e_book_query_field_test ), ++ SYM_MAP( e_book_query_and ), ++ SYM_MAP( e_book_query_or ), ++ SYM_MAP( e_book_query_not ), ++ SYM_MAP( e_book_query_unref ), ++ SYM_MAP( e_book_query_to_string ), ++ SYM_MAP( e_book_query_field_exists ), ++ SYM_MAP( e_source_group_peek_base_uri) ++ }; ++#undef SYM_MAP ++ ++static bool ++tryLink( oslModule &aModule, const char *pName ) ++{ ++ for( guint i = 0; i < G_N_ELEMENTS( aApiMap ); i++ ) ++ { ++ SymbolFunc aMethod; ++ aMethod = (SymbolFunc) osl_getSymbol ++ ( aModule, rtl::OUString::createFromAscii ( aApiMap[ i ].sym_name ).pData ); ++ if( !aMethod ) ++ { ++ fprintf( stderr, "Warning: missing symbol '%s' in '%s'", ++ aApiMap[ i ].sym_name, pName ); ++ return false; ++ } ++ * aApiMap[ i ].ref_value = aMethod; ++ } ++ return true; ++} ++ ++bool EApiInit() ++{ ++ oslModule aModule; ++ ++ for( guint j = 0; j < G_N_ELEMENTS( eBookLibNames ); j++ ) ++ { ++ aModule = osl_loadModule( rtl::OUString::createFromAscii ++ ( eBookLibNames[ j ] ).pData, ++ SAL_LOADMODULE_DEFAULT ); ++ if( aModule) ++ { ++ if ( tryLink( aModule, eBookLibNames[ j ] ) ) ++ return true; ++ osl_unloadModule( aModule ); ++ } ++ } ++ fprintf( stderr, "Can find no compliant libebook client libraries\n" ); ++ return false; ++} ++ ++#if 0 ++ ++ Test code - enable & ++ * ++ * Compile with ( after source LinuxIntelEnv.Set.sh ) ++ gcc $SOLARDEF -I $SOLARSRC/sal/inc -I $SOLARSRC/sal/unxlngi4.pro/inc \ ++ -I. `pkg-config --cflags --libs gobject-2.0` \ ++ -L $SOLARSRC/sal/unxlngi4.pro/lib -luno_sal -lstdc++ EApi.cxx ++ ++ ++int main( int argc, char **argv) ++{ ++ return EApiInit(); ++} ++ ++#endif ++ diff --git a/patches/order b/patches/order index 28a3555e4..840e6f171 100644 --- a/patches/order +++ b/patches/order @@ -1,2 +1,2 @@ -OOO_1_1_1 1.1 -OOO_1_1_2 1.1 buildable +OOO_1_1_5 1.1 buildable +OOO_1_1_4 1.1 buildable diff --git a/src/openintro_ark.bmp b/src/openintro_ark.bmp Binary files differnew file mode 100644 index 000000000..14c256e61 --- /dev/null +++ b/src/openintro_ark.bmp |
