[ooo-build-commit] 3 commits - extensions/tweakconfig patches/dev300

Cédric Bosdonnat cbosdo at kemper.freedesktop.org
Fri Aug 14 04:33:47 PDT 2009


 extensions/tweakconfig/Common.xcu    |   92 ++++++++++++++++++-----------------
 patches/dev300/apply                 |    2 
 patches/dev300/sw-ww8-field-fix.diff |   18 ++++++
 3 files changed, 68 insertions(+), 44 deletions(-)

New commits:
commit 8f75f2fa26a56efe684683201163e35d4de62774
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Fri Aug 14 13:34:45 2009 +0200

    Enabling WW8 field fix.
    
    * patches/dev300/apply: Added sw-ww8-field-fix.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 02d4e77..571c2be 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -579,6 +579,8 @@ unxsplash-bmp-alias.diff, i#60696, jholesov
 sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
 # Allows to edit a csv data source after a mail merge
 sw-remove-csv-lock.diff, i#85133, mloiseleur
+# Some WW8 fields weren't imported at all
+sw-ww8-field-fix.diff, i#61075, i#89667, cbosdo
 
 [ CalcFixes ]
 # To make CSV Text Import settings persistent, and also allow importing of
commit 3362a20814e8815e26d84dab7cc6782d651595ed
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Fri Aug 14 13:23:52 2009 +0200

    WW8: Some unknown fields weren't imported at all
    
    Some cases were forgotten by some upstream fix.
    
    * patches/dev300/sw-ww8-field-fix.diff: fixes i#61075, i#89667

diff --git a/patches/dev300/sw-ww8-field-fix.diff b/patches/dev300/sw-ww8-field-fix.diff
new file mode 100644
index 0000000..f983cdb
--- /dev/null
+++ b/patches/dev300/sw-ww8-field-fix.diff
@@ -0,0 +1,18 @@
+--- /home/cbosdonnat/go-oo/ooo-build/build/ooo310-m16/sw/source/filter/ww8/ww8par5.cxx	2009-08-04 15:54:05.000000000 +0200
++++ ww8par5.cxx	2009-08-14 10:56:23.000000000 +0200
+@@ -994,9 +994,12 @@
+         pStrm->Seek( nOldPos );
+ 
+         //#124725# field codes which contain '/' or '.' are not displayed in WinWord
+-        if (!aStr.EqualsAscii(" ADDIN", 0, 6) &&
+-            (aStr.Search('.') != STRING_NOTFOUND ||
+-             aStr.Search('/') != STRING_NOTFOUND))
++        xub_StrLen nSpacePos = aStr.Search( ' ', 1 );
++        if ( STRING_NOTFOUND == nSpacePos )
++            nSpacePos = aStr.Len( );
++        xub_StrLen nSearchPos = STRING_NOTFOUND;
++        if ( ( ( nSearchPos = aStr.Search('.') ) != STRING_NOTFOUND && nSearchPos < nSpacePos ) ||
++             ( ( nSearchPos = aStr.Search('/') ) != STRING_NOTFOUND && nSearchPos < nSpacePos ) )
+             return aF.nLen;
+         else
+             return aF.nLen - aF.nLRes - 1;  // so viele ueberlesen, das Resultfeld
commit 8d7254d6ce4c38f73f109f2ecb8f3ad4ca7f422f
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Fri Aug 14 13:23:19 2009 +0200

    Set dev-install icons to small ones
    
    * extensions/tweakconfig/Common.xcu:

diff --git a/extensions/tweakconfig/Common.xcu b/extensions/tweakconfig/Common.xcu
index 39f6543..316c16e 100644
--- a/extensions/tweakconfig/Common.xcu
+++ b/extensions/tweakconfig/Common.xcu
@@ -1,48 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"
-             xmlns:xs="http://www.w3.org/2001/XMLSchema"
-             oor:name="Common" oor:package="org.openoffice.Office">
- <node oor:name="I18N">
-  <node oor:name="CJK">
-   <prop oor:name="AsianTypography" oor:type="xs:boolean">
-    <value>true</value>
-   </prop>
-   <prop oor:name="CJKFont" oor:type="xs:boolean">
-    <value>true</value>
-   </prop>
-   <prop oor:name="ChangeCaseMap" oor:type="xs:boolean">
-    <value>true</value>
-   </prop>
-   <prop oor:name="DoubleLines" oor:type="xs:boolean">
-    <value>true</value>
-   </prop>
-   <prop oor:name="EmphasisMarks" oor:type="xs:boolean">
-    <value>true</value>
-   </prop>
-   <prop oor:name="JapaneseFind" oor:type="xs:boolean">
-    <value>true</value>
-   </prop>
-   <prop oor:name="Ruby" oor:type="xs:boolean">
-    <value>true</value>
-   </prop>
-   <prop oor:name="VerticalCallOut" oor:type="xs:boolean">
-    <value>true</value>
-   </prop>
-   <prop oor:name="VerticalText" oor:type="xs:boolean">
-    <value>true</value>
-   </prop>
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Common" oor:package="org.openoffice.Office">
+  <node oor:name="I18N">
+    <node oor:name="CJK">
+      <prop oor:name="AsianTypography" oor:type="xs:boolean">
+        <value>true</value>
+      </prop>
+      <prop oor:name="CJKFont" oor:type="xs:boolean">
+        <value>true</value>
+      </prop>
+      <prop oor:name="ChangeCaseMap" oor:type="xs:boolean">
+        <value>true</value>
+      </prop>
+      <prop oor:name="DoubleLines" oor:type="xs:boolean">
+        <value>true</value>
+      </prop>
+      <prop oor:name="EmphasisMarks" oor:type="xs:boolean">
+        <value>true</value>
+      </prop>
+      <prop oor:name="JapaneseFind" oor:type="xs:boolean">
+        <value>true</value>
+      </prop>
+      <prop oor:name="Ruby" oor:type="xs:boolean">
+        <value>true</value>
+      </prop>
+      <prop oor:name="VerticalCallOut" oor:type="xs:boolean">
+        <value>true</value>
+      </prop>
+      <prop oor:name="VerticalText" oor:type="xs:boolean">
+        <value>true</value>
+      </prop>
+    </node>
+    <node oor:name="CTL">
+      <prop oor:name="CTLFont" oor:type="xs:boolean">
+        <value>true</value>
+      </prop>
+    </node>
   </node>
-  <node oor:name="CTL">
-   <prop oor:name="CTLFont" oor:type="xs:boolean">
-    <value>true</value>
-   </prop>
+  <node oor:name="Save">
+    <node oor:name="Document">
+      <prop oor:name="PrettyPrinting" oor:type="xs:boolean">
+        <value>true</value>
+      </prop>
+    </node>
   </node>
- </node>
- <node oor:name="Save">
-  <node oor:name="Document">
-   <prop oor:name="PrettyPrinting" oor:type="xs:boolean">
-    <value>true</value>
-   </prop>
+  <!-- Small icon set -->
+  <node oor:name="Misc">
+    <prop oor:name="SymbolSet" oor:type="xs:short">
+      <value>0</value>
+    </prop>
   </node>
- </node>
-</oor:component-data>
\ No newline at end of file
+</oor:component-data>


More information about the ooo-build-commit mailing list