[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/fix-ppt-linespacing-import-export.diff |   32 ++----------------
 1 file changed, 5 insertions(+), 27 deletions(-)

New commits:
commit 09d9b7857c3c492df2296b04d905e3ede109cd28
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 12:25:22 2011 +0300

    Make fix-ppt-linespacing-import-export.diff apply again

diff --git a/patches/dev300/fix-ppt-linespacing-import-export.diff b/patches/dev300/fix-ppt-linespacing-import-export.diff
index f3a9c18..1d3d6ee 100644
--- a/patches/dev300/fix-ppt-linespacing-import-export.diff
+++ b/patches/dev300/fix-ppt-linespacing-import-export.diff
@@ -1,14 +1,3 @@
----
- editeng/source/editeng/impedit3.cxx |   15 +++++++++++++++
- filter/source/msfilter/svdfppt.cxx  |    6 ++++--
- sd/source/filter/eppt/eppt.hxx      |    1 +
- sd/source/filter/eppt/epptso.cxx    |   10 +++++++---
- sd/source/ui/dlg/paragr.cxx         |   14 ++++++++++++++
- sd/source/ui/inc/paragr.hxx         |    2 ++
- 6 files changed, 43 insertions(+), 5 deletions(-)
-
-diff --git editeng/source/editeng/impedit3.cxx editeng/source/editeng/impedit3.cxx
-index 01d36c2..0511385 100644
 --- editeng/source/editeng/impedit3.cxx
 +++ editeng/source/editeng/impedit3.cxx
 @@ -1326,6 +1326,13 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
@@ -24,7 +13,7 @@ index 01d36c2..0511385 100644
 +            }
              else if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
              {
-                 if ( nPara || IsFixedCellHeight() || pLine->GetStartPortion() ) // Nicht die aller erste Zeile
+                 if ( nPara || IsFixedCellHeight() || pLine->GetStartPortion() ) // Not the very first line
 @@ -1670,6 +1677,14 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
                  pTmpLine->SetHeight( nMinHeight, nTxtHeight );
              }
@@ -39,27 +28,23 @@ index 01d36c2..0511385 100644
 +        }
          else if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
          {
-             USHORT nPara = GetParaPortions().GetPos( pParaPortion );
-diff --git filter/source/msfilter/svdfppt.cxx filter/source/msfilter/svdfppt.cxx
-index 355970f..993ca9a 100644
+             sal_uInt16 nPara = GetParaPortions().GetPos( pParaPortion );
 --- filter/source/msfilter/svdfppt.cxx
 +++ filter/source/msfilter/svdfppt.cxx
 @@ -6382,9 +6382,11 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet,  boost::optional< sal_Int16 >&
          }
-         rSet.Put( SdrTextFixedCellHeightItem( TRUE ), SDRATTR_TEXT_USEFIXEDCELLHEIGHT );
+         rSet.Put( SdrTextFixedCellHeightItem( sal_True ), SDRATTR_TEXT_USEFIXEDCELLHEIGHT );
          SvxLineSpacingItem aItem( 200, EE_PARA_SBL );
 -        if ( nVal2 <= 0 )
 +        if ( nVal2 <= 0 ) {
-             aItem.SetLineHeight( (UINT16)( rManager.ScalePoint( -nVal2 ) / 8 ) );
+             aItem.SetLineHeight( (sal_uInt16)( rManager.ScalePoint( -nVal2 ) / 8 ) );
 -        else
 +            aItem.GetLineSpaceRule() = SVX_LINE_SPACE_FIX;
 +            aItem.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF;
 +        } else
          {
-             sal_uInt8 nPropLineSpace = (BYTE)nVal2;
+             sal_uInt8 nPropLineSpace = (sal_uInt8)nVal2;
              aItem.SetPropLineSpace( nPropLineSpace );
-diff --git sd/source/filter/eppt/epptso.cxx sd/source/filter/eppt/epptso.cxx
-index d8121b2..d226781 100755
 --- sd/source/filter/eppt/epptso.cxx
 +++ sd/source/filter/eppt/epptso.cxx
 @@ -1365,7 +1365,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
@@ -91,8 +76,6 @@ index d8121b2..d226781 100755
  
              case ::com::sun::star::style::LineSpacingMode::PROP :
              default:
-diff --git sd/source/ui/dlg/paragr.cxx sd/source/ui/dlg/paragr.cxx
-index a3f81f2..a896cc4 100644
 --- sd/source/ui/dlg/paragr.cxx
 +++ sd/source/ui/dlg/paragr.cxx
 @@ -190,5 +190,19 @@ SdParagraphDlg::SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr )
@@ -115,8 +98,6 @@ index a3f81f2..a896cc4 100644
 +}
  
  /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-diff --git sd/source/ui/inc/paragr.hxx sd/source/ui/inc/paragr.hxx
-index 89333d8..1bf81b6 100644
 --- sd/source/ui/inc/paragr.hxx
 +++ sd/source/ui/inc/paragr.hxx
 @@ -43,6 +43,8 @@ class SdParagraphDlg : public SfxTabDialog
@@ -128,6 +109,3 @@ index 89333d8..1bf81b6 100644
  public:
                      SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr );
                      ~SdParagraphDlg() {};
--- 
-1.7.0.1
-