[ooo-build-commit] .: patches/dev300 patches/lwp
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue May 25 08:24:34 PDT 2010
patches/dev300/apply | 22 ++++++++--------
patches/dev300/cjk-default-compatibility.diff | 34 +++++++-------------------
patches/lwp/lwp-filter-component.diff | 2 -
3 files changed, 22 insertions(+), 36 deletions(-)
New commits:
commit 2f41d018bc761d8fbdcf62b88de800712c6813ca
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue May 25 17:22:17 2010 +0200
DEV300-m77 update: fixed LWP and CJK patches
* patches/dev300/apply:
* patches/dev300/cjk-default-compatibility.diff:
* patches/lwp/lwp-filter-component.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 626903a..f73ea84 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -318,7 +318,7 @@ cjk-character-units-fix-376788.diff, i#376788, Amelia Wang
cjk-character-units-in-pggrid-fix.diff, Amelia Wang
# Doesn't expand spaces for lines with manual break for CJK locales
-# FIXME dev300-m77 cjk-default-compatibility.diff, i#54320, cbosdo
+cjk-default-compatibility.diff, i#54320, cbosdo
#[ CJKTemporaryHacks ]
# the following patch is disabled temporary.
@@ -1500,16 +1500,16 @@ default-evo2-ab.diff, michael
jdbc-driver-classpaths-debian.diff
[ Lwp ]
-# FIXME dev300-m77 # Lotus Word Pro Import Filter
-# FIXME dev300-m77 lwp-filter-component.diff, i#11215, noelpwer
-# FIXME dev300-m77 # Integrate cws ooo11lotusfilter for WordPro filter
-# FIXME dev300-m77 cws-ooo11lotusfilter-lwp-filter-component.diff, Fong
-# FIXME dev300-m77 cws-ooo11lotusfilter-lwp-filter.diff, Fong
-# FIXME dev300-m77 cws-ooo11lotusfilter-lwp-xfilter.diff, Fong
-# FIXME dev300-m77 # avoid warning: control reaches end of non-void function
-# FIXME dev300-m77 warning-return-values-lotuswordpro.diff, pmladek
-# FIXME dev300-m77 # found by gcc-4.5; the empty operator= definitions seems to be evidently broken
-# FIXME dev300-m77 warning-return-values-lotuswordpro-2.diff, pmladek
+# Lotus Word Pro Import Filter
+lwp-filter-component.diff, i#11215, noelpwer
+# Integrate cws ooo11lotusfilter for WordPro filter
+cws-ooo11lotusfilter-lwp-filter-component.diff, Fong
+cws-ooo11lotusfilter-lwp-filter.diff, Fong
+cws-ooo11lotusfilter-lwp-xfilter.diff, Fong
+# avoid warning: control reaches end of non-void function
+warning-return-values-lotuswordpro.diff, pmladek
+# found by gcc-4.5; the empty operator= definitions seems to be evidently broken
+warning-return-values-lotuswordpro-2.diff, pmladek
[ Win32Only ]
diff --git a/patches/dev300/cjk-default-compatibility.diff b/patches/dev300/cjk-default-compatibility.diff
index eb8c488..b6e7654 100644
--- a/patches/dev300/cjk-default-compatibility.diff
+++ b/patches/dev300/cjk-default-compatibility.diff
@@ -1,16 +1,5 @@
-From df0841da2d1d47896680118b45d54ca07ad8c2b9 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 16:53:35 +0200
-Subject: [PATCH 044/768] cjk-default-compatibility.diff
-
----
- cui/source/options/optgdlg.cxx | 6 ++++
- unotools/inc/unotools/compatibility.hxx | 2 +
- unotools/source/config/compatibility.cxx | 40 ++++++++++++++++++++++++++++++
- 3 files changed, 48 insertions(+), 0 deletions(-)
-
diff --git cui/source/options/optgdlg.cxx cui/source/options/optgdlg.cxx
-index 41a459e..19c8c02 100644
+index 02ef33d..f080d21 100644
--- cui/source/options/optgdlg.cxx
+++ cui/source/options/optgdlg.cxx
@@ -40,6 +40,7 @@
@@ -21,7 +10,7 @@ index 41a459e..19c8c02 100644
#include <unotools/useroptions.hxx>
#include <unotools/cacheoptions.hxx>
#include <unotools/fontoptions.hxx>
-@@ -1543,6 +1544,11 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
+@@ -1597,6 +1598,11 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
// the end of this method
pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang );
rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, TRUE ) );
@@ -47,17 +36,17 @@ index 11aeffc..65e92fa 100644
@short return complete specified list
@descr Call it to get all entries of compatibility options.
diff --git unotools/source/config/compatibility.cxx unotools/source/config/compatibility.cxx
-index e502860..91aa8e8 100644
+index e502860..4640cf9 100644
--- unotools/source/config/compatibility.cxx
+++ unotools/source/config/compatibility.cxx
-@@ -38,6 +38,7 @@
+@@ -35,6 +35,7 @@
+ #include <unotools/compatibility.hxx>
+ #include <unotools/configmgr.hxx>
+ #include <unotools/configitem.hxx>
++#include <unotools/syslocale.hxx>
#include <tools/debug.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-+#include <vcl/svapp.hxx>
-
- #ifndef __SGI_STL_VECTOR
- #include <vector>
@@ -247,6 +248,8 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
SvtCompatibilityOptions_Impl();
~SvtCompatibilityOptions_Impl();
@@ -71,8 +60,8 @@ index e502860..91aa8e8 100644
if ( !bDefaultFound && aItem.sName.equals( COMPATIBILITY_DEFAULT_NAME ) != sal_False )
{
-+ const AllSettings& rSettings = Application::GetSettings();
-+ com::sun::star::lang::Locale aLocale = rSettings.GetLocale();
++ SvtSysLocale aSysLocale;
++ com::sun::star::lang::Locale aLocale = aSysLocale.GetLocale();
+ if ( aLocale.Language.equalsAscii( "zh" ) || aLocale.Language.equalsAscii( "ja" ) ||
+ aLocale.Language.equalsAscii( "ko" ) )
+ aItem.bExpandWordSpace = false;
@@ -125,6 +114,3 @@ index e502860..91aa8e8 100644
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
---
-1.7.0.1
-
diff --git a/patches/lwp/lwp-filter-component.diff b/patches/lwp/lwp-filter-component.diff
index b0258a4..886ba0d 100644
--- a/patches/lwp/lwp-filter-component.diff
+++ b/patches/lwp/lwp-filter-component.diff
@@ -714,7 +714,7 @@ index 0000000..7152f7e
--- /dev/null
+++ lotuswordpro/util/lwpft.map
@@ -0,0 +1,8 @@
-+WPFT_1_0 {
++UDK_3_0_0 {
+ global:
+ component_getImplementationEnvironment;
+ component_writeInfo;
More information about the ooo-build-commit
mailing list