[ooo-build-commit] .: 2 commits - patches/dev300

[Cédric Bosdonnat]

 patches/dev300/apply                         |    8 ++++++--
 patches/dev300/sw-ww8-styles-import-fix.diff |   13 +++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 0950adb5fcb0d695ab2b70b6da38514f5f80e3c4
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue May 18 17:23:06 2010 +0200

    Fixed i#21939: bug ww8 styles import
    
    * patches/dev300/apply:
    * patches/dev300/sw-ww8-styles-import-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5d7b0e7..d6605c0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -656,9 +656,13 @@ sfx2-qstartfixes.diff, i#108846, caolan
 
 [ WriterFixes ]
 # Some WW8 fields weren't imported at all
-sw-ww8-field-fix.diff, i#61075, i#89667, cbosdo
+# Upstreamed in cbosdo06
+sw-ww8-field-fix.diff, i#61075, i#89667, i#11684 cbosdo
 sw-ww8font-fix.diff, cbosdo
 
+# Upstreamed in cbosdo06
+sw-ww8-styles-import-fix.diff, i#21939, cbosdo
+
 # Added by Octavio Alvarez <alvarezp at alvarezp.ods.org>
 # The first patch is to prevent losing functionality because
 # of the second patch.
diff --git a/patches/dev300/sw-ww8-styles-import-fix.diff b/patches/dev300/sw-ww8-styles-import-fix.diff
new file mode 100644
index 0000000..b576572
--- /dev/null
+++ b/patches/dev300/sw-ww8-styles-import-fix.diff
@@ -0,0 +1,13 @@
+diff --git sw/source/filter/ww8/writerwordglue.cxx sw/source/filter/ww8/writerwordglue.cxx
+index 55e6868..3a77426 100644
+--- sw/source/filter/ww8/writerwordglue.cxx
++++ sw/source/filter/ww8/writerwordglue.cxx
+@@ -162,7 +162,7 @@ namespace myImplHelpers
+             RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_LISTS_BEGIN,
+             RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
+             RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
+-            RES_NONE, RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE,
++            RES_NONE, RES_NONE, RES_POOLCOLL_HEADLINE_BASE, RES_NONE,
+             RES_POOLCOLL_SIGNATURE, RES_NONE, RES_POOLCOLL_TEXT,
+             RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
+             RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL
commit a8c99cbc52d7a239b611926e64917c13500d6677
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue May 18 09:59:43 2010 +0200

    [GSoc]Applying ovcica's writer navigation patch
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index bf81828..5d7b0e7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -19,7 +19,7 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
 	 PopupRemoval, LinkWarningDlg, InternalCairo, Lockdown, \
 	 FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, Fuzz, \
 	 CalcRowLimit, Gcc44, Gcc45, BuildFix, WriterDocComparison, \
-	 OptionalIconThemes, Toolbars, MySQL, BorderTypes
+	 OptionalIconThemes, Toolbars, MySQL, BorderTypes, WriterNavigation
 
 LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
 	      FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \