[Libreoffice-commits] .: Branch 'feature/pptx-export-ooxml11' - patches/dev300

[Tor Lillqvist]

 patches/dev300/fix-ppt-linespacing-import-export.diff |   14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

New commits:
commit 323899ebc054b8c7684f8467d06f9801706d9b26
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Nov 8 14:11:28 2010 +0200

    Make fix-ppt-linespacing-import-export.diff apply again
    
    A part of it is in git here in the feature/pptx-export-ooxml11 branch,
    another part is to code now in another file.

diff --git a/patches/dev300/fix-ppt-linespacing-import-export.diff b/patches/dev300/fix-ppt-linespacing-import-export.diff
index ed02912..f3a9c18 100644
--- a/patches/dev300/fix-ppt-linespacing-import-export.diff
+++ b/patches/dev300/fix-ppt-linespacing-import-export.diff
@@ -58,18 +58,6 @@ index 355970f..993ca9a 100644
          {
              sal_uInt8 nPropLineSpace = (BYTE)nVal2;
              aItem.SetPropLineSpace( nPropLineSpace );
-diff --git sd/source/filter/eppt/eppt.hxx sd/source/filter/eppt/eppt.hxx
-index 8fadff5..afbf97c 100755
---- sd/source/filter/eppt/eppt.hxx
-+++ sd/source/filter/eppt/eppt.hxx
-@@ -620,6 +620,7 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph
- 
-         sal_uInt16								mnTextAdjust;
-         sal_Int16								mnLineSpacing;
-+        sal_Bool								mbFixedLineSpacing;
-         sal_Int16								mnLineSpacingTop;
-         sal_Int16								mnLineSpacingBottom;
-         sal_Bool								mbForbiddenRules;
 diff --git sd/source/filter/eppt/epptso.cxx sd/source/filter/eppt/epptso.cxx
 index d8121b2..d226781 100755
 --- sd/source/filter/eppt/epptso.cxx
@@ -83,6 +71,8 @@ index d8121b2..d226781 100755
                      nLineSpacing = nNormalSpacing;
                  else
                      nLineSpacing = (sal_Int16)( (double)nLineSpacing / 4.40972 );
+--- sd/source/filter/eppt/pptx-text.cxx
++++ sd/source/filter/eppt/pptx-text.cxx
 @@ -2818,11 +2818,15 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo
              = *( (::com::sun::star::style::LineSpacing*)mAny.getValue() );
          switch ( aLineSpacing.Mode )