This commit was manufactured by cvs2svn to create tagOOO_BUILD_1_9_121

'OOO_BUILD_1_9_121'.
author: nobody <nobody@gnome.org> 2005-08-04 16:00:21 +0000
committer: nobody <nobody@gnome.org> 2005-08-04 16:00:21 +0000
commit: b853027bff7b2322efe3f1e5663e5de94483300f (patch)
tree: 5e676a7498098d7e0cbb2dd5f72403d2252c77ca
parent: b5b5b3c2ef0c7ff4799d8d4da735c79b57ba67a1 (diff)
14 files changed, 725 insertions, 458 deletions
diff --git a/NEWS b/NEWS
index c5970eb03..2b1a30b43 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+ooo-build-1.9.121
+
+    + bug fixes
+	+ misc IDL comments fixes (Christian)
+	+ make csv/text import settings persistent (Muthu)
+	+ bash completion of filenames with spaces and directories (Rene)
+    + build bits
+	+ fix for system db 4.3 (Rene)
+	+ bin all conditionals & support for milestones up to m118 (Michael)
+	+ conditional use of xsltproc at buildtime even with java (Rene)
+	+ updated Debian bits (Rene)
+	+ some more gcc4 related fixes (Petr)
+    + features
+	+ target m120, m121
+	+ AA slide show cairo canvas (Radek)
+	+ vba compatibility (Michael, Noel, Jayant, Shilpa, Nicel)
+	+ GNOME desktop integration (Raul)
+	+ mdbtools based Access base backend (Nicel)
+	+ shrink myspell memory usage (Naren)
+
 ooo-build-1.9.118
 
     + bug fixes
diff --git a/configure.in b/configure.in
index 17daf5085..e6a1044ae 100644
--- a/configure.in
+++ b/configure.in
@@ -2,11 +2,11 @@ AC_INIT(bin/build-ooo)
 AC_PREREQ(2.51)
 AC_PREFIX_DEFAULT(/usr)
 
-DEFAULT_TAG=src680-m118
+DEFAULT_TAG=src680-m121
 
 OOO_BUILDMAJOR_VERSION=1
 OOO_BUILDMINOR_VERSION=9
-OOO_BUILDMICRO_VERSION=118
+OOO_BUILDMICRO_VERSION=121
 dnl this includes pre-pended period.
 OOO_BUILDSTRIKE_VERSION=
 OOO_BUILDVERSION="$OOO_BUILDMAJOR_VERSION.$OOO_BUILDMINOR_VERSION.$OOO_BUILDMICRO_VERSION$OOO_BUILDSTRIKE_VERSION"
diff --git a/patches/evo2/dbaccess-evo-changes.diff b/patches/evo2/dbaccess-evo-changes.diff
index d70df7deb..b3033c3d2 100644
--- a/patches/evo2/dbaccess-evo-changes.diff
+++ b/patches/evo2/dbaccess-evo-changes.diff
@@ -1,20 +1,3 @@
-# FIXME: This hunk from dbwizsetup.cxx seems to be obsolete, but this
-# needs verification
-#@@ -595,6 +604,14 @@
-#                 activatePath( THUNDERBIRD_PATH, sal_True);
-# 			    break;
-# 
-#+            case DST_EVOLUTION_LOCAL:
-#+                activatePath( EVOLUTION_PATH_LOCAL, sal_True);
-#+                break;
-#+
-#+            case DST_EVOLUTION_LDAP:
-#+                activatePath( EVOLUTION_PATH, sal_True);
-#+                break;
-#+
-#             case DST_EVOLUTION:
-#                 activatePath( EVOLUTION_PATH, sal_True);
-#                 break;
 --- dbaccess/source/ui/dlg/dbwizsetup.cxx.bakj	2005-04-06 18:15:46.000000000 +0530
 +++ dbaccess/source/ui/dlg/dbwizsetup.cxx	2005-04-06 18:21:11.000000000 +0530
 @@ -268,6 +268,7 @@
@@ -40,6 +23,15 @@
      if ( m_pCollection->hasAuthentication(DST_EVOLUTION))
          declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
      else
+@@ -560,6 +569,8 @@ void ODbTypeWizDialogSetup::activateData
+             { DST_MOZILLA,      MOZILLA_PATH        },
+             { DST_THUNDERBIRD,  THUNDERBIRD_PATH    },
+             { DST_EVOLUTION,    EVOLUTION_PATH      },
++            { DST_EVOLUTION_LOCAL,    EVOLUTION_PATH_LOCAL      },
++            { DST_EVOLUTION_LDAP,    EVOLUTION_PATH      },
+             { DST_USERDEFINE1,  USERDEFINED_PATH    },
+                    { DST_USERDEFINE2,  USERDEFINED_PATH    },
+                    { DST_USERDEFINE3,  USERDEFINED_PATH    },
 @@ -643,6 +660,8 @@
  	switch ( m_eType )
      {
diff --git a/patches/src680/apply b/patches/src680/apply
index b92e718b2..993ff87b6 100644
--- a/patches/src680/apply
+++ b/patches/src680/apply
@@ -73,20 +73,10 @@ ww8scan.diff
 # See issue #50842
 myspell_hashify.diff
 
-[ TemporaryHacks <= src680-m111 ]
-# Fix totally broken UNO with gcc < 4.0 (3.3.[35] certainly) i#47459
-cws-sb32.diff
-
-[ TemporaryHacks >= src680-m111 < src680-m115 ]
-# Fix --without-java build #51194, CWS sb33
-buildfix-ridljar-withoutjava.diff
-
-[ TemporaryHacks >= src680-m111 ]
 # Fix --without-java build #51194, CWS sb33
 # Fix javaloader, #51724
 buildfix-testtools.diff
 
-[ TemporaryHacks >= src680-m114 ]
 # Fix --without-java build #51679
 buildfix-scp2-without-java.diff
 
@@ -105,20 +95,7 @@ filter-no-sun-misc.diff
 wizards-filter-gcj-access-problems.diff
 gjdoc-no-class-use.diff
 
-[ GCJ < src680-m112 ]
-gcj-new-map-symbols-m111.diff
-
-[ GCJ >= src680-m112 < src680-m115 ]
-gcj-new-map-symbols.diff
-
-[ GCJ >= src680-m115 < src680-m116 ]
-# Mapping for new UnoVirtualMachine constructor
-gcj-more-new-map-symbols.diff
-
-[ GCJ >= src680-m113 <= src680-m117 ]
-hsqldb-gcj-access-problems-m117.diff
-
-[ GCJ > src680-m117 <= src680-m118 ]
+[ GCJ <= src680-m118 ]
 hsqldb-gcj-access-problems-m118.diff
 
 [ GCJ = src680-m119 ]
@@ -127,16 +104,10 @@ hsqldb-gcj-access-problems-m119.diff
 [ GCJ >= src680-m120 ]
 hsqldb-gcj-access-problems.diff
 
-[ GCJ < src680-m113 ]
-hsqldb-problems.diff
-
 [ GCJ ]
 # make gcj-dbtool optional
 gcj-dbtool-optional.diff
 
-[ GCJ < src680-m111 ]
-# libgcjawt.so exists only for traget gcc 4.1.0, 4.0.x has libjawt.so
-cws-cmcfixes9.diff
 
 # Fixes that were not accepted up-stream, but are still useful
 [ FixesNotForUpstream ]
@@ -257,88 +228,12 @@ pyuno-rpath.diff
 # fixes missing return values, i#47962, CWS localedata5
 warning-return-values-l10n.diff
 
-[ Fixes < src680-m118 ]
-# fixes some potentialy dangerous warnings in the module np_sdk, i#48819
-warnings-npunix.diff
-# fixes missing return values, i#47964, CWS dvoqbfix4, included into m118
-warning-return-values-sw.diff
-
-[ Fixes < src680-m116 ]
-warning-return-values-api.diff
-# don't init the vfs to lookup vnd.sun.star.wfs:// i#51181
-speed-no-vfs-on-startup.diff
-
-# don't load/relocate a big chunk of database code on startup i#51304
-# committed to cws-mmeeks09, i#51304
-[ Fixes >= src680-m113 < src680-m115 ]
-speed-forms.diff
-
-[ Fixes < src680-m113 ]
-speed-forms-m112.diff
-
-[ Fixes < src680-m112 ]
-# Applied upstream in m112...
-warning-return-values-script.diff
-warning-return-values-util.diff
-warning-missing-sentinel-util.diff
-# fixes latest parameter of XtVaAppInitialize to be NULL, i#47957, i#47958, i#47959
-warning-missing-sentinel-nas.diff
-
 [ BFFixes ]
 # fixes missing return values, i#51959
 warning-return-values-binfilter.diff
 # fixes warnings about uninitialized variables, i#51954
 warning-uninitialized-variables-binfilter.diff
 
-[ BFFixes < src680-m118 ]
-# add missing forward declarations that are required by gcc4 #50551, CWS mh19104, integrated in m118
-forward-declaration-binfilter.diff
-
-[ Fixes < src680-m110 ]
-# added missing forward declarations required by gcc4
-# i#50057, CWS gcc4fwdecl
-forward-declaration-automation.diff
-# i#50058, CWS gcc4fwdecl
-forward-declaration-basctl.diff
-# i#50059, CWS gcc4fwdecl
-forward-declaration-comphelper.diff
-# i#50060, CWS gcc4fwdecl
-forward-declaration-configmgr.diff
-# i#50061, CWS gcc4fwdecl
-forward-declaration-connectivity.diff
-# i#50062, CWS gcc4fwdecl
-forward-declaration-dbaccess.diff
-# i#50063, CWS gcc4fwdecl
-forward-declaration-extensions.diff
-# i#50064, CWS gcc4fwdecl
-forward-declaration-forms.diff
-# i#50068, CWS gcc4fwdecl
-forward-declaration-sc.diff
-# i#50069, CWS gcc4fwdecl
-forward-declaration-sd.diff
-# i#50070, CWS gcc4fwdecl
-forward-declaration-sfx2.diff
-# i#50071, CWS gcc4fwdecl
-forward-declaration-so3.diff
-# i#50072, CWS gcc4fwdecl
-forward-declaration-starmath.diff
-# i#50073, CWS gcc4fwdecl
-forward-declaration-stoc.diff
-# i#50074, CWS gcc4fwdecl
-forward-declaration-svtools.diff
-# i#50075, CWS gcc4fwdecl
-forward-declaration-svx.diff
-# i#50076, CWS gcc4fwdecl
-forward-declaration-sw.diff
-# i#50077, CWS gcc4fwdecl
-forward-declaration-tools.diff
-# i#50078, CWS gcc4fwdecl
-forward-declaration-ucb.diff
-# i#50080, CWS gcc4fwdecl
-forward-declaration-xmloff.diff
-# i#50081, CWS gcc4fwdecl
-forward-declaration-xmlsecurity.diff
-
 [ Fixes ]
 # fix generic fpicker problem i#35830
 fpicker-generic-extn.diff
@@ -349,21 +244,8 @@ sc-datapilot-cut-paste-disable.diff
 sd-dynamic-cast.diff
 # Tell the desktop we support the VFS #43504
 uses-vfs.diff
-
-[ Fixes >= src680-m113 ]
 svx-dynamic-const-cast.diff
 
-[ Fixes < src680-m113 ]
-svx-dynamic-const-cast-m112.diff
-
-[ Fixes < src680-m109 ]
-# fix system python build, i#48816
-# [different patch to the same effect is in m109]
-instsetoo-native-cp1251-py.diff
-# fix crash if help isn't available, from cws helpfixes1
-# [applied in m109]
-check-if-help-available.diff
-
 [ Leaks ]
 # silly leaks around the place i#50726
 leak-sal-file.diff
@@ -372,21 +254,9 @@ leak-sal-module.diff
 leak-sch-3d.diff
 # 3D properties leak i#50808
 leak-svx-3d.diff
-
-[ Leaks >= src680-m114 ]
 # daft mis-use of rtl_uString i#50776
 leak-registry.diff
 
-[ Leaks < src680-m114 ]
-# daft mis-use of rtl_uString i#50776
-leak-registry-m113.diff
-# A variant of this patch has been applied upstream in m114
-leak-sal-nlsupport.diff
-
-[ Leaks < src680-m113 ]
-# silly transformer leak i#50756
-leak-xmloff-transform.diff
-
 [ CalcFixes ]
 # <ctrl> +/‑ to insert/delete a complete line in calc (X#62530) #38108
 calc-new-acceleration.diff
@@ -412,6 +282,8 @@ sc-xls-shared-expr.diff
 sc-column-row-array.diff
 # Support for formula input to start with '+' or '-' - i#20496, i#52179
 sc-startformulawplus.diff
+# To make CSV Text Import settings persistent - i#3687
+sc-preserve-imp-opts.diff
 
 # Send e-mail in MS format as attachment x#62200, i#46895
 ms-interoperability-email-attachment-as-doc-xls-ppt-m99.diff 
@@ -445,40 +317,16 @@ db4-jni-casting.diff
 # Fix some IDL comments, i#28045, i#29235, i#36476, i#51098
 idl-doc-fixes.diff
 
-[ Misc >= src680-m114 ]
+[ Misc ]
 # Try to get the font mapping right
 gui-metric-fonts.diff
 # Review comments implemented for #34909
-# FIXME make sure the removed hunk is really obsolete, see top of diff file
 dbaccess-evo-changes.diff
-# FIXME check if a variant of dbaccess-esc-crash.diff is still needed after
-# the restructuring of the related code
-
-[ Misc < src680-m114 ]
-# Try to get the font mapping right
-gui-metric-fonts-m113.diff
-# Review comments implemented for #34909
-dbaccess-evo-changes-m113.diff
-# Crash when a user uses esc while configuring db:patch from "CWS dba201a" (n#74431 & i#45899)
-dbaccess-esc-crash.diff
-
-[ Misc < src680-m113 ]
-# configure some Indian fonts in VCL.xcu, #67170
-gui-indian-fonts.diff
-
-[ Misc < src680-m111 ]
-# more system stuff (lingucomponent) and optionally link with crypt, pam, xrender
-cws-moresystemstuff2.diff
 
 [ NovellOnly ]
 novell-team.diff
-
-[ NovellOnly > src680-m110 ]
 # The odk has a horribly slow & buggy build & we don't package it
 odk-disable.diff
-[ NovellOnly <= src680-m110 ]
-# The odk has a horribly slow & buggy build & we don't package it
-odk-disable-m110.diff
 
 [ NotDebian ]
 # Fix the system default fpicker
@@ -501,11 +349,7 @@ mandriva-splash.diff
 default-system-fpicker.diff
 mozilla-firefox.diff
 gcc401-stlport45-include.diff
-
-[ MandrivaOnly > src680-m110 ]
 odk-disable.diff
-[ MandrivaOnly <= src680-m110]
-odk-disable-m110.diff
 
 [ NovellOnlyUnix ]
 # Help Support page
@@ -515,15 +359,9 @@ build-wizard-bitmap-scp.diff
 # configure some Japanese fonts used on Novell products
 # (patch by Mike Fabian mfabian@suse.de)
 novell-cjk-fonts.diff
-
-[ NovellOnlyUnix > src680-m110 ]
 # change user config dir name from ~/.openoffice.org1.9.milestone to ~/.ooo-2.0-pre
 version-2-0-pre.diff
 
-[ NovellOnlyUnix <= src680-m110 ]
-# change user config dir name from ~/.openoffice.org1.9.milestone to ~/.ooo-2.0-pre
-version-2-0-pre-m110.diff
-
 [ NovellOnlyWin32 ]
 filebug-support.diff
 
@@ -570,18 +408,12 @@ vfs-kde-too.diff
 # Trade speed for reliability with valgrind
 valgrind-alloc.diff
 
-[ Defaults < src680-m115 ]
-# make tri-state toolbars less confusing #35563
-gui-toolbox-tristate.diff
-
-[ SDFPatches >= src680-m113 ]
+[ SDFPatches ]
 sd-save-image-context-menu-localize.diff
 
+[ Defaults ]
 # Save as menuitem for image context menus in impress #13816
-[ Defaults >= src680-m113 ]
 sd-save-image-context-menu.diff
-[ Defaults < src680-m113 ]
-sd-save-image-context-menu-m112.diff
 
 [ Features ]
 # Make cut and paste nicer i#15509
@@ -594,7 +426,7 @@ gengal-tool.diff
 pyuno-registering.diff
 pymailmerge.diff
 
-[ BuildBits < src680-m119 > src680-m117 ]
+[ BuildBits < src680-m119 ]
 # fix animations build, #i52061
 buildfix-animations.diff
 
@@ -625,42 +457,22 @@ config_office-system-db-4.3.diff
 # fix system-portaudio; actually set SYSTEM_PORTAUDIO=YES, cws configure11
 system-portaudio-set-variable.diff
 
+# allow use of xsltproc even when building with Java
+use-xsltproc.diff
+
 [ ArkOnly ]
 system-db-4.3-use-lpthread.diff
 # FIXME this is generally useful -- currently applied here only because
 # it breaks building with db < 4.3
 xmlhelp-port-to-db-4.3.diff
 
-[ BuildBits <= src680-m117 ]
-# remove binfilter formats from type & SaveAs configuration i#47824
-starformat-disable.diff
-# add possibility to set ARCH_FLAGS when building berkeleydb, i#47954, n#77967
-berkeleydb-use-arch-flags.diff
-# memmove is implemented correctly in glibc, i#50592
-system-memmove.diff
-
 [ BuildBits ]
 # use -Os on powerpc to work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392
 powerpc-use-Os.diff
-
-[ BuildBits >= src680-m112 ]
 # fix to build with system libnspr (installed apart from mozilla), i#49720
 buildfix-system-nspr-m112.diff
 # fix to build with system libnss (installed apart from mozilla)
 buildfix-system-nss.diff
-
-[ BuildBits < src680-m112 ]
-# fix to build with system libnspr (installed apart from mozilla), i#49720
-buildfix-system-nspr.diff
-
-[ BuildBits == src680-m115 ]
-wizards-formwizard.diff
-
-[ BuildBits < src680-m117 ]
-# add possibility to set ARCH_FLAGS when building with gcc4, i#47954, CWS ause030, integrated into m117
-buildfix-arch-flags-for-gcc4.diff
-
-[ BuildBits >= src680-m117 ]
 # workarounds a build error with gcc-3.2 and gcc-3.3, new in m117, i#51940
 buildfix-gcc3-package.diff
 
@@ -668,6 +480,10 @@ buildfix-gcc3-package.diff
 # Make the ldap stuff compile even if system openldap is >= 2.3.x
 extensions-ldap-system-openldap-2.3.x.diff
 
+[ BuildBits >= src680-m121 ]
+# make some symbols from sc visible when compiling with gcc4, necessary since m121
+gcc4-visibility-sc.diff
+
 [ ParallelMake ]
 # Fixes for distributed building (with icecream) #35627
 parallel-solenv-target-mk.diff
@@ -703,21 +519,10 @@ internal-nss-xmlsecurity-libnss.diff
 sfx2-toolbox-size.diff
 # Make insensitive toolbar icons look far nicer #35555
 gui-insensitive.diff
-
-[ Icons < src680-m117 ]
-
-# Installation & appearance of multiple icon sets (Industrial and Crystal) #36518
-# Cleanup after cut'n'paste in CWS oooicons
-icons-cleanup-m116.diff
-
-[ Icons >= src680-m117 ]
-
 # Installation & appearance of multiple icon sets (Industrial and Crystal)
 # #36518, CWS iconswitching1
 # Cleanup after cut'n'paste in CWS oooicons
 icons-cleanup.diff
-
-[ Icons ]
 # Implement the icon switching, CWS iconswitching1
 icons-switching-framework.diff
 icons-switching-svtools.diff
@@ -767,55 +572,12 @@ fpicker-show-checkbox.diff
 # pre-expand the filter choice for 'Export' i#51002
 fpicker-export-expand.diff
 
-[ Fpickers < src680-m117 ]
-# extract several fixes merged into 1 cws.
-cws-fpicker4.diff
-
-[ Fpickers < src680-m116 ]
-# make some symbols from svtools visible for the kde fpicker when compiling with gcc4
-fpicker-kde-gcc4-visibility-m115.diff
-
-[ Fpickers >= src680-m116 ]
 # make some symbols from svtools visible for the kde fpicker when compiling with gcc4
 fpicker-kde-gcc4-visibility.diff
 
-[ Evo2 > src680-m108 ]
+[ Evo2 ]
 # misc. other fixes / bits for the driver. i#50913
 evo2-fixes-m109.diff
-
-[ Evo2 <= src680-m108 ]
-# evolution addressbook driver version 2 i#34909
-connectivity-source-drivers-evoab1-5-dataaccess-xcu.diff
-connectivity-source-drivers-evoab1-5-evoab1-5-map.diff
-connectivity-source-drivers-evoab1-5-evoab-xml.diff
-connectivity-source-drivers-evoab1-5-makefile-mk.diff
-connectivity-source-drivers-evoab1-5-nconnection-cxx.diff
-connectivity-source-drivers-evoab1-5-nconnection-hxx.diff
-connectivity-source-drivers-evoab1-5-ndatabasemetadata-cxx.diff
-connectivity-source-drivers-evoab1-5-ndatabasemetadata-hxx.diff
-connectivity-source-drivers-evoab1-5-ndebug-cxx.diff
-connectivity-source-drivers-evoab1-5-ndebug-hxx.diff
-connectivity-source-drivers-evoab1-5-ndriver-cxx.diff
-connectivity-source-drivers-evoab1-5-ndriver-hxx.diff
-connectivity-source-drivers-evoab1-5-npreparedstatement-cxx.diff
-connectivity-source-drivers-evoab1-5-npreparedstatement-hxx.diff
-connectivity-source-drivers-evoab1-5-nresultset-cxx.diff
-connectivity-source-drivers-evoab1-5-nresultset-hxx.diff
-connectivity-source-drivers-evoab1-5-nresultsetmetadata-cxx.diff
-connectivity-source-drivers-evoab1-5-nresultsetmetadata-hxx.diff
-connectivity-source-drivers-evoab1-5-nservices-cxx.diff
-connectivity-source-drivers-evoab1-5-nstatement-cxx.diff
-connectivity-source-drivers-evoab1-5-nstatement-hxx.diff
-connectivity-source-drivers-evoab1-5-ncatalog-cxx.diff
-connectivity-source-drivers-evoab1-5-ncatalog-hxx.diff
-connectivity-source-drivers-evoab1-5-ntables-cxx.diff
-connectivity-source-drivers-evoab1-5-ntables-hxx.diff
-evoab2_scp.diff
-evoab2_prj.diff
-connectivity-source-drivers-evoab1-5-EApi-cxx.diff
-connectivity-source-drivers-evoab1-5-EApi-h.diff
-
-[ Evo2 ]
 # Evolution in wizards -> addressbook X#66214
 wizard-evo-local.diff
 # Evolution should also be default database(n#66217).
@@ -888,9 +650,6 @@ suse-splash.diff
 ark-handle-split-qt.diff
 # some branding action cf. doc/splash.txt
 ark-splash.diff
-# Use xsltproc even if java is there, shamelessly stolen from
-# DebianOnly
-# use-xsltproc.diff
 # change user config dir name from ~/.openoffice.org1.9.milestone to ~/.ooo-2.0-pre
 # shamelessly stolen from NovellUnixOnly
 # version-2-0-pre.diff
@@ -918,19 +677,10 @@ fix-64bit-vcl-wmadaptor.diff
 # fix NULL pointer check silly #50485 CWS canvas02
 fix-64bit-basegfx.diff
 
-[ 64bit < src680-m114 ]
-# Snapshot of CWS ooo64bit02
-cws-ooo64bit02.2005-04-19.m113.diff
-
-[ 64bit >= src680-m114 < src680-m116 ]
-# Snapshot of CWS ooo64bit02
-cws-ooo64bit02.2005-04-19.m114.diff
-
-[ 64bit >= src680-m116 ]
+[ 64bit ]
 # Snapshot of CWS ooo64bit02
 cws-ooo64bit02.2005-04-19.diff
 
-[ 64bit ]
 cws-ooo64bit02.2005-04-19-math-h.diff
 
 # Temporary hacks
@@ -1002,21 +752,8 @@ fix-64bit-focus.diff
 # TODO: Probably use -Os (like x86) for opt. case? (-O breaks with gcc 4 and some svx code)
 fix-64bit-solenv-noopt.diff
 
-[ 64bit <= src680-m109 ]
-buildfix-64bit-jvmaccess.diff
-
-[ 64bit <= src680-m110 ]
-buildfix-64bit-stoc-m110.diff
-
-[ 64bit > src680-m110 ]
 buildfix-64bit-stoc.diff
-
-[ 64bit < src680-m114 ]
-# in fact this patches the tools module ...
-buildfix-64bit-automation-m113.diff
-
-[ 64bit >= src680-m114 ]
-# but this is the same patch and it patches automation
+# in fact this patches automation
 buildfix-64bit-automation.diff
 
 
@@ -1044,7 +781,6 @@ buildfix-jdk150-XmlSearch.diff
 [ DebianOnly ]
 ant-only-main-classes-hack.diff
 disable-helpcontent2.diff
-use-xsltproc.diff
 version-1-9-x.diff
 use-free-xt-xp-jaxp-from-system.diff
 disable-xmlsearch-and-xmlhelp-jar.diff
@@ -1127,6 +863,10 @@ vba-basic-globals.diff
 vba-build.diff
 vba_configure_set_soenv_in.diff
 vba-sc-docuno-hook.diff
+sc-vba-build-lst.diff
+sc-source-ui-vba-vbahelper-cxx.diff
+sc-source-ui-inc-viewfunc-hxx.diff
+sc-source-ui-inc-tabview-hxx.diff
 
 [ Lockdown ]
 # GNOME desktop integration, pick up configuration values from gconf
@@ -1135,14 +875,16 @@ gnome-desktop-integration.diff
 ui-desktop-integration.diff
 # Disable printing where restricted throughout desktop
 printing-desktop-integration.diff
+# add in an entry for a corporate common dictionary
+corporate-dictionary.diff
 
 [ cairocanvas ]
 cairo-canvas-pixmap.diff
 cairo-canvas-component-install.diff
 
 # OOo configure patches
-config-office-configure-in.diff
-config-office-set-soenv-in.diff
+cairo-config-office-configure-in.diff
+cairo-config-office-set-soenv-in.diff
 
 # canvas build patches
 canvas-source-factory-cf-service-cxx.diff
@@ -1207,8 +949,14 @@ libpixman-prj-d-lst.diff
 # scp2 bits
 cairo-scp2.diff
 
+# options dialog
+cairo-svx-source-dialog-makefile-mk.diff
+cairo-svx-source-dialog-optgdlg-cxx.diff
+cairo-svx-source-dialog-optgdlg-hrc.diff
+
 [ msaccess ]
 
+disable-access.diff
 cws-mdbdriver01.diff
 mdbtools.diff
 mdbtools-makefile-mk.diff
diff --git a/patches/src680/connectivity-source-drivers-mdb-mdb-wrapper-cxx.diff b/patches/src680/connectivity-source-drivers-mdb-mdb-wrapper-cxx.diff
index 52bc33c00..dd2c8903e 100644
--- a/patches/src680/connectivity-source-drivers-mdb-mdb-wrapper-cxx.diff
+++ b/patches/src680/connectivity-source-drivers-mdb-mdb-wrapper-cxx.diff
@@ -329,6 +329,6 @@
 +			aRows.push_back(row);
 +		}
 +	mdb_sql_reset(sql);
-+	
++	return sal_True;
 +}
 +
diff --git a/patches/src680/corporate-dictionary.diff b/patches/src680/corporate-dictionary.diff
new file mode 100644
index 000000000..101febefe
--- /dev/null
+++ b/patches/src680/corporate-dictionary.diff
@@ -0,0 +1,11 @@
+--- officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs	2005-04-04 18:09:25.000000000 +0530
++++ officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs	2005-08-04 14:17:21.066786557 +0530
+@@ -144,7 +144,7 @@
+ 						<desc>Specifies the custom dictionaries to be used. The Ignore list (IgnoreAllList (All)) is administered in the RAM only for the current spellcheck.</desc>
+ 						<label>Custom dictionaries</label>
+ 					</info>
+-					<value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;sun.dic</value>
++					<value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;sun.dic;corporate.dic</value>
+ 				</prop>
+ 				<prop oor:name="IsUseDictionaryList" oor:type="xs:boolean">
+ 					<!-- OldLocation: NEW -->
diff --git a/patches/src680/disable-access.diff b/patches/src680/disable-access.diff
new file mode 100644
index 000000000..7b884e595
--- /dev/null
+++ b/patches/src680/disable-access.diff
@@ -0,0 +1,41 @@
+--- config_office/configure.in	2005-07-29 14:22:24.000000000 +0530
++++ config_office/configure.in	2005-08-04 16:36:39.908621384 +0530
+@@ -88,6 +91,9 @@ AC_ARG_ENABLE(directx,
+ AC_ARG_ENABLE(atlmfc,
+ [  --disable-atlmfc        Disable the use of ATL/MFC for windows build.
+ ],,)
++AC_ARG_ENABLE(access,
++[  --disable-access        Disable the Access import pieces.
++],,)
+ 
+ AC_ARG_ENABLE(symbols,
+ [  --enable-symbols        Include debugging symbols in output.
+@@ -866,6 +872,18 @@ if test "$_os" = "WINNT"; then
+ fi
+ 
+ dnl ===================================================================
++dnl Disable the Access import pieces?
++dnl ===================================================================
++AC_MSG_CHECKING([whether to enable the Access import pieces])
++if test "$enable_access" = "no"; then
++   ENABLE_ACCESS="NO"
++else
++   ENABLE_ACCESS="YES"
++fi
++AC_MSG_RESULT([$ENABLE_ACCESS])
++AC_SUBST(ENABLE_ACCESS)
++
++dnl ===================================================================
+ dnl Disable rpath in shared libraries?
+ dnl ===================================================================
+ AC_MSG_CHECKING([whether to use RPATH in shared libraries])
+--- config_office/set_soenv.in	2005-07-29 14:22:24.000000000 +0530
++++ config_office/set_soenv.in	2005-08-04 16:39:57.758227869 +0530
+@@ -1682,6 +1682,7 @@ ToFile( "ENABLE_CRASHDUMP",  "@ENABLE_CR
+ ToFile( "ENABLE_CUPS",       "@ENABLE_CUPS@",       "e" );
+ ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
+ ToFile( "ENABLE_DIRECTX",    "@ENABLE_DIRECTX@",    "e" );
++ToFile( "ENABLE_ACCESS",     "@ENABLE_ACCESS@",    "e" );
+ ToFile( "VC_STANDARD",       "@VC_STANDARD@",      "e" );
+ ToFile( "WITH_GPC",          "@WITH_GPC@",         "e" );
+ ToFile( "WITH_LIBART",       "@WITH_LIBART@",      "e" );
diff --git a/patches/src680/gnome-desktop-integration.diff b/patches/src680/gnome-desktop-integration.diff
index b259400d9..ae755792b 100644
--- a/patches/src680/gnome-desktop-integration.diff
+++ b/patches/src680/gnome-desktop-integration.diff
@@ -40,8 +40,8 @@
  ToFile( "WITH_LIBSN",        "@WITH_LIBSN@",       "e" );
  ToFile( "LIBSN_CFLAGS",      "@LIBSN_CFLAGS@",     "e" );
  ToFile( "LIBSN_LIBS",        "@LIBSN_LIBS@",       "e" );
---- shell/source/backends/gconfbe/gconfbackend.cxx	2005-07-29 14:22:24.215756993 +0530
-+++ shell/source/backends/gconfbe/gconfbackend.cxx	2005-07-29 14:23:09.834230692 +0530
+--- shell/source/backends/gconfbe/gconfbackend.cxx	2005-07-29 14:22:24.000000000 +0530
++++ shell/source/backends/gconfbe/gconfbackend.cxx	2005-08-02 19:11:40.506543209 +0530
 @@ -61,17 +61,9 @@
  
  #include "gconfbackend.hxx"
@@ -63,11 +63,47 @@
  
  #ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_COMPONENTCHANGEEVENT_HPP_
  #include <com/sun/star/configuration/backend/ComponentChangeEvent.hpp>
-@@ -99,6 +91,434 @@
+@@ -99,6 +91,481 @@
  
  #include <stdio.h>
  
 +// each entry should have an identifying ConfigurationSetting
++static const ConfigurationValue SetupConfigurationValuesList[] =
++{
++#ifdef ENABLE_LOCKDOWN
++    {
++        SETTING_WRITER_DEFAULT_DOC_FORMAT,
++        "/apps/openoffice/writer_default_document_format",
++        "org.openoffice.Setup/Office/Factories/com.sun.star.text.TextDocument/ooSetupFactoryDefaultFilter",
++        "string",
++        sal_False,
++        sal_False,
++        SETTINGS_LAST
++    },
++
++    {
++        SETTING_IMPRESS_DEFAULT_DOC_FORMAT,
++        "/apps/openoffice/impress_default_document_format",
++        "org.openoffice.Setup/Office/Factories/com.sun.star.presentation.PresentationDocument/ooSetupFactoryDefaultFilter",
++        "string",
++        sal_False,
++        sal_False,
++        SETTINGS_LAST
++    },
++
++    {
++        SETTING_CALC_DEFAULT_DOC_FORMAT,
++        "/apps/openoffice/calc_default_document_format",
++        "org.openoffice.Setup/Office/Factories/com.sun.star.sheet.SpreadsheetDocument/ooSetupFactoryDefaultFilter",
++        "string",
++        sal_False,
++        sal_False,
++        SETTINGS_LAST
++    },
++#endif // ENABLE_LOCKDOWN
++};
++
++// each entry should have an identifying ConfigurationSetting
 +static const ConfigurationValue RecoveryConfigurationValuesList[] =
 +{
 +#ifdef ENABLE_LOCKDOWN
@@ -459,8 +495,19 @@
 +
 +};
 +
++static const char * SetupPreloadValuesList[] =
++{
++#ifdef ENABLE_LOCKDOWN
++    "/apps/openoffice",
++#endif // ENABLE_LOCKDOWN
++    NULL
++};
++
 +static const char * RecoveryPreloadValuesList[] =
 +{
++#ifdef ENABLE_LOCKDOWN
++    "/apps/openoffice",
++#endif // ENABLE_LOCKDOWN
 +    NULL
 +};
 +
@@ -498,7 +545,7 @@
  //==============================================================================
  
  /*
-@@ -193,15 +613,38 @@ uno::Reference<backend::XLayer> SAL_CALL
+@@ -193,16 +660,47 @@ uno::Reference<backend::XLayer> SAL_CALL
      
      if( aComponent.equalsAscii("org.openoffice.Office.Common" ) )
      {
@@ -530,22 +577,31 @@
 +                                 UserProfileConfigurationValuesList,
 +                                 G_N_ELEMENTS( UserProfileConfigurationValuesList ),
 +                                 UserProfilePreloadValuesList );
-+    }
+     }
 +    else if( aComponent.equalsAscii("org.openoffice.Office.Recovery" ) )
 +    {
 +        xLayer = new GconfLayer( m_xContext,
 +                                 RecoveryConfigurationValuesList,
 +                                 G_N_ELEMENTS( RecoveryConfigurationValuesList ),
 +                                 RecoveryPreloadValuesList );
-     }
++    }
++    else if( aComponent.equalsAscii("org.openoffice.Setup" ) )
++    {
++        xLayer = new GconfLayer( m_xContext,
++                                 SetupConfigurationValuesList,
++                                 G_N_ELEMENTS( SetupConfigurationValuesList ),
++                                 SetupPreloadValuesList );
++    }
++    
      
      return xLayer;
-@@ -460,13 +903,18 @@ uno::Sequence<rtl::OUString> SAL_CALL Gc
+ }
+@@ -460,13 +958,20 @@ uno::Sequence<rtl::OUString> SAL_CALL Gc
  
  uno::Sequence<rtl::OUString> SAL_CALL GconfBackend::getSupportedComponents(void)
  {
 -    uno::Sequence<rtl::OUString> aSupportedComponentsList(3) ;
-+    uno::Sequence<rtl::OUString> aSupportedComponentsList(5) ;
++    uno::Sequence<rtl::OUString> aSupportedComponentsList(6) ;
 +
      aSupportedComponentsList[0] = rtl::OUString( 
          RTL_CONSTASCII_USTRINGPARAM("org.openoffice.VCL")) ;
@@ -557,21 +613,44 @@
 +        RTL_CONSTASCII_USTRINGPARAM("org.openoffice.UserProfile")) ;
 +    aSupportedComponentsList[4] = rtl::OUString( 
 +        RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Recovery")) ;
++    aSupportedComponentsList[4] = rtl::OUString( 
++        RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup")) ;
              
      return aSupportedComponentsList ;
  }
---- shell/source/backends/gconfbe/gconfbe1-ucd.txt	2005-07-29 14:22:24.216756828 +0530
-+++ shell/source/backends/gconfbe/gconfbe1-ucd.txt	2005-07-27 18:06:06.000000000 +0530
+--- shell/source/backends/gconfbe/gconfbe1-ucd.txt	2005-07-29 14:22:24.000000000 +0530
++++ shell/source/backends/gconfbe/gconfbe1-ucd.txt	2005-08-02 17:46:33.958823361 +0530
 @@ -3,7 +3,7 @@ ImplementationName=com.sun.star.comp.con
  ComponentName=gconfbe1.uno.so
  LoaderName=com.sun.star.loader.SharedLibrary
  [Data]
 -SupportedComponents=org.openoffice.VCL;org.openoffice.Inet;org.openoffice.Office.Common
-+SupportedComponents=org.openoffice.VCL;org.openoffice.Inet;org.openoffice.Office.Common;org.openoffice.UserProfile;org.openoffice.Office.Recovery
++SupportedComponents=org.openoffice.VCL;org.openoffice.Inet;org.openoffice.Office.Common;org.openoffice.UserProfile;org.openoffice.Office.Recovery;org.openoffice.Setup
  [SupportedServices]
  com.sun.star.configuration.backend.GconfBackend
  com.sun.star.configuration.backend.PlatformBackend
---- shell/source/backends/gconfbe/makefile.mk	2005-07-29 14:22:24.217756663 +0530
+--- shell/source/backends/gconfbe/gconfbecdef.cxx	2005-01-31 18:43:19.000000000 +0530
++++ shell/source/backends/gconfbe/gconfbecdef.cxx	2005-08-02 17:45:06.314270259 +0530
+@@ -97,18 +97,11 @@ static uno::Reference<uno::XInterface> S
+         
+         if (xCurrentContext.is())
+         {
+-            uno::Any aValue = xCurrentContext->getValueByName(
+-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "system.desktop-environment" ) ) );
+-        
+-            rtl::OUString aDesktopEnvironment;
+-            if ( (aValue >>= aDesktopEnvironment) && (aDesktopEnvironment.equalsAscii("GNOME")) )
+-            {
+                 // ORBit-2 versions < 2.8 cause a deadlock with the gtk+ VCL plugin
+                 if ( (orbit_major_version >= 2) && (orbit_minor_version >= 8) )
+                 {
+                     return * GconfBackend::createInstance(xContext);
+                 }
+-            }
+         }
+         
+         return uno::Reference<uno::XInterface>(); 
+--- shell/source/backends/gconfbe/makefile.mk	2005-07-29 14:22:24.000000000 +0530
 +++ shell/source/backends/gconfbe/makefile.mk	2005-07-21 15:03:32.000000000 +0530
 @@ -81,6 +81,10 @@ UNIXTEXT=$(MISC)/$(TARGET)1-ucd.txt
  # no "lib" prefix
@@ -596,8 +675,8 @@
  SHL1NOCHECK=TRUE
  SHL1TARGET=$(TARGET)1.uno   
 --- /dev/null	2004-08-25 23:04:59.000000000 +0530
-+++ shell/source/backends/gconfbe/gconflayer.hxx	2005-07-29 13:56:19.158948162 +0530
-@@ -0,0 +1,137 @@
++++ shell/source/backends/gconfbe/gconflayer.hxx	2005-08-02 19:16:03.105492568 +0530
+@@ -0,0 +1,140 @@
 +#ifndef GCONFLAYER_HXX_
 +#define GCONFLAYER_HXX_
 +
@@ -669,6 +748,9 @@
 +    SETTING_WARN_ALIEN_FORMAT,
 +    SETTING_AUTO_SAVE,
 +    SETTING_AUTO_SAVE_INTERVAL,
++    SETTING_WRITER_DEFAULT_DOC_FORMAT,
++    SETTING_IMPRESS_DEFAULT_DOC_FORMAT,
++    SETTING_CALC_DEFAULT_DOC_FORMAT,
 +
 +#endif // ENABLE_LOCKDOWN
 +
@@ -736,7 +818,7 @@
 +
 +#endif // GCONFLAYER
 --- /dev/null	2004-08-25 23:04:59.000000000 +0530
-+++ shell/source/backends/gconfbe/gconflayer.cxx	2005-07-29 13:47:45.426612398 +0530
++++ shell/source/backends/gconfbe/gconflayer.cxx	2005-08-02 19:12:24.656303889 +0530
 @@ -0,0 +1,353 @@
 +#ifndef GCONFLAYER_HXX_
 +#include "gconflayer.hxx"
diff --git a/patches/src680/mdbtools.diff b/patches/src680/mdbtools.diff
index 522816c72..9b1b6ff13 100644
--- a/patches/src680/mdbtools.diff
+++ b/patches/src680/mdbtools.diff
@@ -1,6 +1,90 @@
 --- /dev/null	2005-03-20 01:06:14.000000000 +0530
 +++ mdbtools/mdbtools-0.6pre1.patch	2005-07-29 11:03:56.000000000 +0530
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,106 @@
++--- Makefile.am	2002-12-27 16:09:02.000000000 +0100
+++++ misc/build/mdbtools-0.6pre1/src/Makefile.am	2005-08-01 17:52:49.000000000 +0200
++@@ -1,3 +1,3 @@
++-SUBDIRS	=	libmdb extras $(OPTDIRS) util
++-DIST_SUBDIRS = libmdb extras sql odbc gmdb2 util
+++SUBDIRS	=	libmdb $(OPTDIRS)
+++DIST_SUBDIRS = libmdb sql odbc gmdb2
++ DEFDIR	=	$(prefix)
++--- Makefile.in	2004-06-18 11:34:19.000000000 +0200
+++++ misc/build/mdbtools-0.6pre1/src/Makefile.in	2005-08-01 17:53:01.000000000 +0200
++@@ -153,8 +153,8 @@
++ sharedstatedir = @sharedstatedir@
++ sysconfdir = @sysconfdir@
++ target_alias = @target_alias@
++-SUBDIRS = libmdb extras $(OPTDIRS) util
++-DIST_SUBDIRS = libmdb extras sql odbc gmdb2 util
+++SUBDIRS = libmdb $(OPTDIRS)
+++DIST_SUBDIRS = libmdb sql odbc gmdb2
++ DEFDIR = $(prefix)
++ subdir = src
++ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++--- gmdb.h	2004-02-11 23:04:26.000000000 +0100
+++++ misc/build/mdbtools-0.6pre1/src/gmdb2/gmdb.h	2005-08-01 18:27:10.000000000 +0200
++@@ -24,6 +24,7 @@
++ GtkWidget *gmdb_table_def_new(MdbCatalogEntry *entry);
++ GtkWidget *gmdb_table_export_new(MdbCatalogEntry *entry);
++ void gmdb_table_export(MdbCatalogEntry *entry) ;
+++gchar *gmdb_export_get_filepath(GladeXML *xml);
++ 
++ void gmdb_file_select_cb(GtkWidget *w, gpointer data);
++ void gmdb_file_open_cb(GtkWidget *w, gpointer data);
++--- info.c	2003-01-12 23:59:42.000000000 +0100
+++++ misc/build/mdbtools-0.6pre1/src/gmdb2/info.c	2005-08-01 19:04:14.000000000 +0200
++@@ -71,4 +71,7 @@
++ 	gtk_label_set_text(GTK_LABEL(label), tmpstr);	
++ 
++ 	g_free(filepath);
+++	// a hack to avoid warning: control reaches end of non-void function
+++	// the return value is nowhere used anyway
+++	return NULL;
++ }
++--- table_export.c	2003-01-14 18:37:44.000000000 +0100
+++++ misc/build/mdbtools-0.6pre1/src/gmdb2/table_export.c	2005-08-01 19:05:50.000000000 +0200
++@@ -49,6 +49,7 @@
++ 	}
++ }
++ 
+++void
++ gmdb_export_get_delimiter(GladeXML *xml, gchar *delimiter, int max_buf)
++ {
++ 	GtkWidget *combo;
++--- backend.c	2004-06-11 15:56:41.000000000 +0200
+++++ misc/build/mdbtools-0.6pre1/src/libmdb/backend.c	2005-08-01 17:36:27.000000000 +0200
++@@ -28,7 +28,7 @@
++ #endif
++ 
++ static int is_init;
++-static GHashTable *mdb_backends;
+++GHashTable *mdb_backends;
++ 
++    /*    Access data types */
++ static MdbBackendType mdb_access_types[] = {
++--- data.c	2004-06-11 15:56:41.000000000 +0200
+++++ misc/build/mdbtools-0.6pre1/src/libmdb/data.c	2005-08-01 19:11:29.000000000 +0200
++@@ -136,7 +136,7 @@
++ }
++ static int mdb_xfer_bound_ole(MdbHandle *mdb, int start, MdbColumn *col, int len)
++ {
++-int ret;
+++int ret=0;
++ 	if (len) {
++ 		col->cur_value_start = start;
++ 		col->cur_value_len = len;
++--- kkd.c	2003-04-29 19:55:17.000000000 +0200
+++++ misc/build/mdbtools-0.6pre1/src/libmdb/kkd.c	2005-08-01 19:15:43.000000000 +0200
++@@ -55,7 +55,7 @@
++ 
++ GHashTable *mdb_get_column_def(MdbCatalogEntry *entry, int start)
++ {
++-GHashTable *hash;
+++GHashTable *hash=NULL;
++ MdbHandle *mdb = entry->mdb;
++ MdbColumnProp prop;
++ int tmp, pos, col_num, val_len, i;
 +--- mdbsql.c    2004-05-30 11:20:40.000000000 +0530
 ++++ misc/build/mdbtools-0.6pre1/src/sql/mdbsql.c  2005-07-26 17:06:18.000000000 +0530
 +@@ -84,7 +84,7 @@
@@ -23,4 +107,3 @@
 ++#include "mdbtools.h"
 + 
 + #ifndef _mdbsql_h_
-+ #define _mdbsql_h_
diff --git a/patches/src680/sc-preserve-imp-opts.diff b/patches/src680/sc-preserve-imp-opts.diff
new file mode 100644
index 000000000..874c60bb0
--- /dev/null
+++ b/patches/src680/sc-preserve-imp-opts.diff
@@ -0,0 +1,183 @@
+--- officecfg/registry/schema/org/openoffice/Office/Calc.xcs	2005-07-24 17:09:34.000000000 +0530
++++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs	2005-07-31 22:13:51.000000000 +0530
+@@ -1041,6 +1041,35 @@
+ 				<value>NULL</value>
+ 			</prop>
+ 		</group>
++		<group oor:name="CSVImport">
++			<info>
++				<desc>Contains setting for Text CSV Import</desc>
++			</info>
++			<prop oor:name="MergeDelimiters" oor:type="xs:boolean">
++				<info>
++					<author>muthusuba</author>
++					<desc>Merge Delimiter check box status</desc>
++					<label>MergeDelimiters</label>
++				</info>
++				<value>false</value>
++			</prop>
++			<prop oor:name="Separators" oor:type="xs:string">
++				<info>
++					<author>muthusuba</author>
++					<desc>List of Separators - as a String</desc>
++					<label>Separators</label>
++				</info>
++				<value>;	</value>
++			</prop>
++			<prop oor:name="TextSeparators" oor:type="xs:string">
++				<info>
++					<author>muthusuba</author>
++					<desc>Text Separators</desc>
++					<label>TextSeparators</label>
++				</info>
++				<value>"</value>
++			</prop>
++		</group>
+ 		<group oor:name="Calculate">
+ 			<info>
+ 				<desc>Contains settings that affect cell calculation.</desc>
+--- sc/source/ui/dbgui/scuiasciiopt.cxx	2005-07-24 17:46:45.000000000 +0530
++++ sc/source/ui/dbgui/scuiasciiopt.cxx	2005-07-31 22:37:08.000000000 +0530
+@@ -79,6 +79,12 @@
+ // ause
+ #include "editutil.hxx"
+ 
++#include <optutil.hxx>
++#include <com/sun/star/uno/Any.hxx>
++#include <com/sun/star/uno/Sequence.hxx>
++#include "miscuno.hxx"
++
++
+ //! TODO make dynamic
+ #ifdef WIN
+ const SCSIZE ASCIIDLG_MAXROWS                = 10000;
+@@ -86,6 +92,17 @@ const SCSIZE ASCIIDLG_MAXROWS           
+ const SCSIZE ASCIIDLG_MAXROWS                = MAXROWCOUNT;
+ #endif
+ 
++
++using namespace rtl;
++using namespace com::sun::star::uno;
++
++// Defines - CSV Import Preserve Options
++#define SEPARATORS			"Separators"
++#define TEXT_SEPARATORS		"TextSeparators"
++#define MERGE_DELIMITERS	"MergeDelimiters"
++#define SEP_PATH			"Office.Calc/CSVImport"
++
++
+ // ============================================================================
+ 
+ void lcl_FillCombo( ComboBox& rCombo, const String& rList, sal_Unicode cSelect )
+@@ -133,6 +150,51 @@ sal_Unicode lcl_CharFromCombo( ComboBox&
+ 	return c;
+ }
+ 
++static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparators, 
++							 bool &bMergeDelimiters )
++{
++	Sequence<Any>aValues;
++	const Any *pProperties;
++	Sequence<OUString> aNames(3);
++	OUString* pNames = aNames.getArray();
++	ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
++
++	pNames[0] = OUString::createFromAscii( MERGE_DELIMITERS );
++	pNames[1] = OUString::createFromAscii( SEPARATORS );
++	pNames[2] = OUString::createFromAscii( TEXT_SEPARATORS );
++	aValues = aItem.GetProperties( aNames );
++	pProperties = aValues.getConstArray();
++	if( pProperties[1].hasValue() )
++		pProperties[1] >>= sFieldSeparators;
++
++	if( pProperties[2].hasValue() )
++		pProperties[2] >>= sTextSeparators;
++
++	if( pProperties[0].hasValue() )
++		bMergeDelimiters = ScUnoHelpFunctions::GetBoolFromAny( pProperties[0] );
++}
++
++static void save_Separators( String maSeparators, String maTxtSep, bool bMergeDelimiters )
++{
++	OUString sFieldSeparators = OUString( maSeparators );
++	OUString sTextSeparators = OUString( maTxtSep );
++	Sequence<Any> aValues;
++	Any *pProperties;
++	Sequence<OUString> aNames(3);
++	OUString* pNames = aNames.getArray();
++	ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
++
++	pNames[0] = OUString::createFromAscii( MERGE_DELIMITERS );
++	pNames[1] = OUString::createFromAscii( SEPARATORS );
++	pNames[2] = OUString::createFromAscii( TEXT_SEPARATORS );
++	aValues = aItem.GetProperties( aNames );
++	pProperties = aValues.getArray();
++	pProperties[1] <<= sFieldSeparators;
++	pProperties[2] <<= sTextSeparators;
++	ScUnoHelpFunctions::SetBoolInAny( pProperties[0], bMergeDelimiters );
++	
++	aItem.PutProperties(aNames, aValues);
++}
+ 
+ // ----------------------------------------------------------------------------
+ 
+@@ -190,16 +252,35 @@ ScImportAsciiDlg::ScImportAsciiDlg( Wind
+ 	aName += ']';
+ 	SetText( aName );
+ 
+-	switch(cSep)
++
++	OUString sFieldSeparators;
++	OUString sTextSeparators;
++	bool bMergeDelimiters = false;
++	load_Separators (sFieldSeparators, sTextSeparators, bMergeDelimiters);
++	maFieldSeparators = String(sFieldSeparators);
++
++	if( bMergeDelimiters )
++		aCkbAsOnce.Check();
++
++	ByteString bString(maFieldSeparators,RTL_TEXTENCODING_MS_1252);
++	const sal_Char *aSep = bString.GetBuffer();
++	int i = 0;
++	int len = maFieldSeparators.Len();
++	for(i=0;i<len;i++)
+ 	{
+-        case '\t':  aCkbTab.Check();        break;
+-        case ';':   aCkbSemicolon.Check();  break;
+-        case ',':   aCkbComma.Check();      break;
+-        case ' ':   aCkbSpace.Check();      break;
+-        default:
+-            aCkbOther.Check();
+-            aEdOther.SetText( cSep );
++		switch( aSep[i] )
++		{
++			case '\t':  aCkbTab.Check();        break;
++	        case ';':   aCkbSemicolon.Check();  break;
++    	    case ',':   aCkbComma.Check();      break;
++        	case ' ':   aCkbSpace.Check();      break;
++	        default:
++    	        aCkbOther.Check();
++        	    aEdOther.SetText( aEdOther.GetText() + OUString( aSep[i] ) );
++		}
+ 	}
++	
++	// Get Separators from the dialog
+     maFieldSeparators = GetSeparators();
+ 
+ 	BOOL bPreselectUnicode = FALSE;
+@@ -238,6 +319,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Wind
+ 
+     // *** Separator characters ***
+     lcl_FillCombo( aCbTextSep, aTextSepList, mcTextSep );
++	aCbTextSep.SetText( sTextSeparators );
+ 
+     Link aSeparatorHdl =LINK( this, ScImportAsciiDlg, SeparatorHdl );
+     aCbTextSep.SetSelectHdl( aSeparatorHdl );
+@@ -289,6 +371,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Wind
+ 
+ ScImportAsciiDlg::~ScImportAsciiDlg()
+ {
++	save_Separators( maFieldSeparators, aCbTextSep.GetText(), aCkbAsOnce.IsChecked() );
+ 	delete[] mpRowPosArray;
+ }
+ 
diff --git a/patches/src680/use-xsltproc.diff b/patches/src680/use-xsltproc.diff
index a3668e46f..faa316117 100644
--- a/patches/src680/use-xsltproc.diff
+++ b/patches/src680/use-xsltproc.diff
@@ -1,178 +1,114 @@
-Index: tg_config.mk
+Index: config_office/configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.128
+retrieving revision 1.128.4.4
+diff -u -u -r1.128 -r1.128.4.4
+--- config_office/configure.in	14 Jul 2005 13:45:35 -0000	1.128
++++ config_office/configure.in	26 Jul 2005 18:01:24 -0000	1.128.4.4
+@@ -105,6 +105,9 @@
+                           assertions, object counting, etc. Larger build.
+                           Independent from --enable-debug
+ ],,)
++AC_ARG_ENABLE(xsltproc,
++[  --enable-xsltproc:      Use xsltproc at buildtime, even when java is available
++],,)
+ AC_ARG_ENABLE(crashdump,
+ [[  --enable-crashdump[=yes|TRUE|STATIC|no]
+                           Enable (disable) the crashdump feature code. [default=STATIC]
+@@ -1985,7 +1988,7 @@
+ fi
+ AC_SUBST(JAVACACHE)
+ 
+-if test "$NEEDXSLTPROC" = "no"; then
++if test "$NEEDXSLTPROC" = "no" && test -z "$enable_xsltproc"; then
+    XSLTPROC=NO_XSLTPROC
+ else
+    dnl Check for xsltproc
+Index: solenv/inc/tg_config.mk
 ===================================================================
 RCS file: /cvs/tools/solenv/inc/tg_config.mk,v
 retrieving revision 1.2
-diff -u -u -r1.2 tg_config.mk
+retrieving revision 1.2.154.1
+diff -u -u -r1.2 -r1.2.154.1
 --- solenv/inc/tg_config.mk	15 Mar 2005 13:00:23 -0000	1.2
-+++ solenv/inc/tg_config.mk	10 May 2005 15:01:43 -0000
-@@ -84,15 +85,6 @@
++++ solenv/inc/tg_config.mk	26 Jul 2005 15:47:16 -0000	1.2.154.1
+@@ -84,7 +84,7 @@
  $(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs
      @+echo -------------+ validating and stripping schema files
  	-$(MKDIRHIER) $(@:d)
 -.IF "$(SOLAR_JAVA)"!=""
--.IF "$(NO_INSPECTION)"==""
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
--.ENDIF			# "$(NO_INSPECTION)"==""
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$*.val componentName=$(PACKAGE).$*
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san 
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
--.ELSE
- # xsltproc already validates against the dtd.  For additional validation,
- # org.openoffice.configuration.Inspector should be replaced and the
- # replacement should be invoked here.
-@@ -106,7 +98,6 @@
- # xsltproc already seems to pretty-print the xml, so
- # org.openoffice.helper.PrettyPrinter seems to be unnecessary.
- 	cp $(@:d)$*.tmp $@
--.ENDIF
- 	+$(RM) $(@:d)$*.tmp > $(NULLDEV)
- 	+$(RM) $(@:d)$*.val > $(NULLDEV)
- 	+$(RM) $(@:d)$*.san > $(NULLDEV)
-@@ -142,14 +133,6 @@
++.IF "$(XSLTPROC)"=="NO_XSLTPROC"
+ .IF "$(NO_INSPECTION)"==""
+ 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
+ .ENDIF			# "$(NO_INSPECTION)"==""
+@@ -124,7 +124,7 @@
+ $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs
+     @+echo -------------+ creating locale dependent resource bundles
+ 	-$(MKDIRHIER) $(@:d)
+-.IF "$(SOLAR_JAVA)"!=""
++.IF "$(XSLTPROC)"=="NO_XSLTPROC"
+ 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}
+ .ELSE
+ 	$(XSLTPROC) -o $@ \
+@@ -142,7 +142,7 @@
  $(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu
      @+echo -------------+ validating and creating a locale independent file
  	-$(MKDIRHIER) $(@:d) 
 -.IF "$(SOLAR_JAVA)"!=""
--.IF "$(NO_INSPECTION)"==""
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
--.ENDIF			# "$(NO_INSPECTION)"==""
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$*.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
--.ELSE
- # xsltproc already validates against the dtd.  For additional validation,
- # org.openoffice.configuration.Inspector should be replaced and the
- # replacement should be invoked here.
-@@ -164,7 +147,6 @@
- # xsltproc already seems to pretty-print the xml, so
- # org.openoffice.helper.PrettyPrinter seems to be unnecessary.
- 	cp $(@:d)$*.tmp $@
--.ENDIF
- 	+$(RM) $(@:d)$*.tmp > $(NULLDEV)
- 	+$(RM) $(@:d)$*.val > $(NULLDEV)
- 
-@@ -184,10 +166,6 @@
++.IF "$(XSLTPROC)"=="NO_XSLTPROC"
+ .IF "$(NO_INSPECTION)"==""
+ 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
+ .ENDIF			# "$(NO_INSPECTION)"==""
+@@ -184,7 +184,7 @@
  $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.xcu :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcu
      @+echo -------------+ creating locale dependent entries
  	-$(MKDIRHIER) $(@:d)
 -.IF "$(SOLAR_JAVA)"!=""
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}	
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
--.ELSE
- 	$(XSLTPROC) -o $(@:d)$*.tmp \
- 	            --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \
- 	            --stringparam schemaRoot $(XCSROOT)$/registry$/schema \
-@@ -196,7 +174,6 @@
- # xsltproc already seems to pretty-print the xml, so
- # org.openoffice.helper.PrettyPrinter seems to be unnecessary.
- 	cp $(@:d)$*.tmp $@
--.ENDIF
- 	+$(RM) $(@:d)$*.tmp > $(NULLDEV)
- 
- # --- languagepack tag modules ---
-@@ -220,10 +197,6 @@
++.IF "$(XSLTPROC)"=="NO_XSLTPROC"
+ 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}	
+ 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
+ .ELSE
+@@ -220,7 +220,7 @@
  $(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/%.xcu :| $$(@:b:s/-/./:b).xcu
      @+echo -------------+ creating a module file
  	-$(MKDIRHIER) $(@:d) 
 -.IF "$(SOLAR_JAVA)"!=""
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))}
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@
--.ELSE
- 	$(XSLTPROC) -o $(@:d)$(@:f:s/.xcu/.tmp/) \
- 	            --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs \
- 	            --stringparam schemaRoot $(XCSROOT)$/registry$/schema \
-@@ -232,7 +205,6 @@
- # xsltproc already seems to pretty-print the xml, so
- # org.openoffice.helper.PrettyPrinter seems to be unnecessary.
- 	cp $(@:d)$(@:f:s/.xcu/.tmp/) $@
--.ENDIF
- 	+$(RM) $(@:d)$(@:f:s/.xcu/.tmp/) > $(NULLDEV)
- 
- .IF "$(XCUFILES)"!=""
-Index: configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.116
-diff -u -u -r1.116 configure.in
---- config_office/configure.in	11 Apr 2005 09:31:15 -0000	1.116
-+++ config_office/configure.in	10 May 2005 15:03:37 -0000
-@@ -1693,11 +1744,9 @@
- if test "$WITH_JAVA" != "no"; then
-    AC_MSG_RESULT([yes])
-    SOLAR_JAVA="TRUE"
--   NEEDXSLTPROC="no"
- else
-    AC_MSG_RESULT([no])
-    SOLAR_JAVA=""
--   NEEDXSLTPROC="yes"
- 
-    AC_MSG_WARN([building without java will mean some features will not be available])
-    echo "building without java will mean some features will not be available" >>warn
-@@ -1905,14 +1954,10 @@
- fi
- AC_SUBST(JAVACACHE)
- 
--if test "$NEEDXSLTPROC" = "no"; then
--   XSLTPROC=NO_XSLTPROC
--else
--   dnl Check for xsltproc
--   AC_PATH_PROG(XSLTPROC, xsltproc, no)
--   if test "$XSLTPROC" = "no"; then
--      AC_MSG_ERROR([xsltproc is required])
--   fi
-+dnl Check for xsltproc
-+AC_PATH_PROG(XSLTPROC, xsltproc, no)
-+if test "$XSLTPROC" = "no"; then
-+  AC_MSG_ERROR([xsltproc is required])
- fi
- AC_SUBST(XSLTPROC)
- 
-Index: util/makefile.pmk
++.IF "$(XSLTPROC)"=="NO_XSLTPROC"
+ 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))}
+ 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@
+ .ELSE
+Index: makefile.pmk
 ===================================================================
 RCS file: /cvs/installation/readlicense/util/makefile.pmk,v
 retrieving revision 1.6
 diff -u -u -r1.6 makefile.pmk
 --- readlicense_oo/util/makefile.pmk	15 Mar 2005 09:05:23 -0000	1.6
-+++ readlicense_oo/util/makefile.pmk	10 May 2005 15:08:34 -0000
-@@ -62,10 +62,7 @@
++++ readlicense_oo/util/makefile.pmk	4 Aug 2005 09:22:40 -0000
+@@ -62,7 +62,7 @@
  
  # --- Targets ------------------------------------------------------
  
 -.IF "$(SOLAR_JAVA)"==""
--# FIXME: Java-disabled case not parallel-build safe yet
++.IF "$(XSLTPROC)"=="NO_XSLTPROC"
+ # FIXME: Java-disabled case not parallel-build safe yet
  MAXPROCESS=1
--.ENDIF
- 
- .IF "$(GUI)"=="UNX"
- SYSDOCS=$(foreach,j,$(READMEFILES) $(j:d)$(j:b:u)$(j:e:s/.txt//))
-@@ -96,9 +93,6 @@
+ .ENDIF
+@@ -96,7 +96,7 @@
     
  $(MISC)$/readme%.html :
      @+-$(MKDIR) $(@:d)
 -.IF "$(SOLAR_JAVA)"!=""
--	$(JAVAI) $(JAVACPS) $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
--.ELSE
++.IF "$(XSLTPROC)"=="NO_XSLTPROC"
+ 	$(JAVAI) $(JAVACPS) $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
+ .ELSE
  	sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl > ..$/readme2.xsl
- 	xsltproc -o $@ \
- 	         --stringparam os1 $(OS) \
-@@ -110,13 +104,9 @@
- 	         ..$/readme2.xsl \
- 	         $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm)
- 	rm ..$/readme2.xsl
--.ENDIF
+@@ -114,7 +114,7 @@
  
  $(MISC)$/readme%.txt :
      @+-$(MKDIR) $(@:d)
 -.IF "$(SOLAR_JAVA)"!=""
--	$(JAVAI) $(JAVACPS) $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
--.ELSE
++.IF "$(XSLTPROC)"=="NO_XSLTPROC"
+ 	$(JAVAI) $(JAVACPS) $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
+ .ELSE
  	sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl > ..$/readme2.xsl
- 	xsltproc -o $@ \
- 	         --stringparam os1 $(OS) \
-@@ -128,5 +118,4 @@
- 	         ..$/readme2.xsl \
- 	         $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm)
- 	rm ..$/readme2.xsl
--.ENDIF
- 
diff --git a/patches/vba/offapi-org-openoffice-vba-makefile-pmk.diff b/patches/vba/offapi-org-openoffice-vba-makefile-pmk.diff
new file mode 100644
index 000000000..d07d3fda5
--- /dev/null
+++ b/patches/vba/offapi-org-openoffice-vba-makefile-pmk.diff
@@ -0,0 +1,96 @@
+--- /dev/null	
++++ offapi/org/openoffice/vba/makefile.pmk	
+@@ -0,0 +1,93 @@
++#*************************************************************************
++#
++#   $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): _______________________________________
++#
++#
++#
++#*************************************************************************
++
++#PROJECTPCH4DLL=TRUE
++#PROJECTPCH=sjpch
++#PROJECTPCHSOURCE=$(PRJ)$/util\sjpch
++#PDBTARGET=sj
++PRJPCH=
++ENABLE_EXCEPTIONS=TRUE
++
++JAVAPREPRO=
++.IF "$(JDK_VERSION)" == "110"
++JAVAPREPRO=-jdk11
++.ENDIF
++.IF "$(PRODUCT)" != ""
++JAVAPREPRO=$(JAVAPREPRO) + " -product"
++.ENDIF
++
++# --- Settings -----------------------------------------------------
++.INCLUDE :  settings.mk
++.INCLUDE :  sv.mk
++
++NOUNODOC=
++BUILD_URD_ONLY=TRUE
++LOCALIDLFILES=TRUE
++
++URDDOC=TRUE
++
++.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
++.IF "$(CPU)"=="I"
++UNOIDL=unoidl
++.ENDIF
++.ENDIF
++
diff --git a/patches/vba/offapi-org-openoffice-vba-position.diff b/patches/vba/offapi-org-openoffice-vba-position.diff
new file mode 100644
index 000000000..c0a856fa7
--- /dev/null
+++ b/patches/vba/offapi-org-openoffice-vba-position.diff
@@ -0,0 +1,4 @@
+--- /dev/null	
++++ offapi/org/openoffice/vba/POSITION	
+@@ -0,0 +1 @@
++sc/source/ui/vba
diff --git a/patches/vba/offapi-org-openoffice-vba-target-pmk.diff b/patches/vba/offapi-org-openoffice-vba-target-pmk.diff
new file mode 100644
index 000000000..32c475b27
--- /dev/null
+++ b/patches/vba/offapi-org-openoffice-vba-target-pmk.diff
@@ -0,0 +1,71 @@
+--- /dev/null	
++++ offapi/org/openoffice/vba/target.pmk	
+@@ -0,0 +1,68 @@
++#*************************************************************************
++#
++#   $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): _______________________________________
++#
++#
++#
++#*************************************************************************
++
++$(OUT)$/misc$/$(TARGET).idls: makefile.mk
++	+-$(RM) $@
++	+$(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@
++
++ALLTAR: $(OUT)$/misc$/$(TARGET).idls
++
author	nobody <nobody@gnome.org>	2005-08-04 16:00:21 +0000
committer	nobody <nobody@gnome.org>	2005-08-04 16:00:21 +0000
commit	b853027bff7b2322efe3f1e5663e5de94483300f (patch)
tree	5e676a7498098d7e0cbb2dd5f72403d2252c77ca
parent	b5b5b3c2ef0c7ff4799d8d4da735c79b57ba67a1 (diff)