[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[Cédric Bosdonnat]

 patches/dev300/apply           |    1 +
 patches/dev300/sw-num-fix.diff |   22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

New commits:
commit fb8a8cd68a16aefd4c52f3b170d11582c67ab1f7
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Jan 26 15:23:01 2010 +0100

    Fixed n#569266: RTF export bugs WRT bullets
    
    * patches/dev300/apply:
    * patches/dev300/sw-num-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 432e351..33963c4 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -624,6 +624,7 @@ unxsplash-bmp-alias.diff, i#60696, jholesov
 # Some WW8 fields weren't imported at all
 sw-ww8-field-fix.diff, i#61075, i#89667, cbosdo
 sw-uno-fix.diff, i#108426, cbosdo
+sw-num-fix.diff, n#569266, cbosdo
 
 # Refresh the cell formatting after pasting in it
 sw-paste-table.diff, n#564789, cbosdo
diff --git a/patches/dev300/sw-num-fix.diff b/patches/dev300/sw-num-fix.diff
new file mode 100644
index 0000000..3d2d2bb
--- /dev/null
+++ b/patches/dev300/sw-num-fix.diff
@@ -0,0 +1,22 @@
+diff --git sw/source/filter/rtf/rtfatr.cxx sw/source/filter/rtf/rtfatr.cxx
+index bbe9030..7f191ad 100644
+--- sw/source/filter/rtf/rtfatr.cxx
++++ sw/source/filter/rtf/rtfatr.cxx
+@@ -1223,7 +1223,7 @@ static Writer& OutRTF_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
+     }
+ 
+     // gibt es harte Attributierung ?
+-    if( bNewFmts && pNd->HasSwAttrSet())
++    if( pNd->HasSwAttrSet() )
+     {
+         rRTFWrt.pFlyFmt = 0;
+ 
+@@ -1246,7 +1246,7 @@ static Writer& OutRTF_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
+             SfxItemSet aSet( rNdSet );
+             SvxLRSpaceItem aLR( (SvxLRSpaceItem&)rNdSet.Get( RES_LR_SPACE ) );
+ 
+-            aLR.SetTxtLeft( aLR.GetTxtLeft() + pFmt->GetAbsLSpace() );
++            aLR.SetTxtLeft( aLR.GetTxtLeft() + pFmt->GetIndentAt() );
+             if( MAXLEVEL > pNd->GetActualListLevel() )
+                 aLR.SetTxtFirstLineOfst( pFmt->GetFirstLineOffset() );
+             else