[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Wed May 19 07:07:52 PDT 2010
patches/dev300/apply | 2 ++
patches/dev300/sw-num-fix.diff | 22 ++++++++++++++++++++++
2 files changed, 24 insertions(+)
New commits:
commit fdaf78eb13e30b8f658c33d1518ac49f3cd35428
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
cherry-picked from 3.2.0 branch
* patches/dev300/apply:
* patches/dev300/sw-num-fix.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 944b70c..b3c8ab2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -665,6 +665,8 @@ sw-ww8font-fix.diff, cbosdo
sw-show-Remove-Hyperlink-even-with-selection.diff, alvarezp2000
sw-preserve-char-style-on-reset-format.diff, i#47893, alvarezp2000
+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
More information about the ooo-build-commit
mailing list