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

[Petr Mladek]

 patches/dev300/apply                                  |    2 
 patches/dev300/fix-ppt-linespacing-import-export.diff |  111 ------------------
 2 files changed, 113 deletions(-)

New commits:
commit 19082d2d912a83d2f45e2efa2791aff8744db0cf
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 27 20:39:45 2011 +0200

    pushed fix-ppt-linespacing-import-export.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 77ddb38..0ed324b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1120,8 +1120,6 @@ ooop-updatable-sameversion.diff
 always_default_iconset.diff
 
 [ Fixes ]
-fix-ppt-linespacing-import-export.diff, n#355302, rodo
-
 # FIXME 2011-04-05: Does not apply, leaving it to cbosdonnat for now
 # fields-table-formula.diff, n#631912, cbosdo
 
diff --git a/patches/dev300/fix-ppt-linespacing-import-export.diff b/patches/dev300/fix-ppt-linespacing-import-export.diff
deleted file mode 100644
index 0601a8a..0000000
--- a/patches/dev300/fix-ppt-linespacing-import-export.diff
+++ /dev/null
@@ -1,111 +0,0 @@
---- editeng/source/editeng/impedit3.cxx
-+++ editeng/source/editeng/impedit3.cxx
-@@ -1326,6 +1326,13 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
-                     pLine->SetHeight( nMinHeight, nTxtHeight );
-                 }
-             }
-+            else if ( rLSItem.GetLineSpaceRule() == SVX_LINE_SPACE_FIX )
-+            {
-+                sal_uInt16 nFixHeight = GetYValue( rLSItem.GetLineHeight() );
-+                sal_uInt16 nTxtHeight = pLine->GetHeight();
-+                pLine->SetMaxAscent( (sal_uInt16)(pLine->GetMaxAscent() + ( nFixHeight - nTxtHeight ) ) );
-+                pLine->SetHeight( nFixHeight, nTxtHeight );
-+            }
-             else if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
-             {
-                 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 );
-             }
-         }
-+        else if ( rLSItem.GetLineSpaceRule() == SVX_LINE_SPACE_FIX )
-+        {
-+            sal_uInt16 nFixHeight = rLSItem.GetLineHeight();
-+            sal_uInt16 nTxtHeight = pTmpLine->GetHeight();
-+
-+            pTmpLine->SetMaxAscent( (sal_uInt16)(pTmpLine->GetMaxAscent() + ( nFixHeight - nTxtHeight ) ) );
-+            pTmpLine->SetHeight( nFixHeight, nTxtHeight );
-+        }
-         else if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
-         {
-             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( sal_True ), SDRATTR_TEXT_USEFIXEDCELLHEIGHT );
-         SvxLineSpacingItem aItem( 200, EE_PARA_SBL );
--        if ( nVal2 <= 0 )
-+        if ( nVal2 <= 0 ) {
-             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 = (sal_uInt8)nVal2;
-             aItem.SetPropLineSpace( nPropLineSpace );
---- sd/source/filter/eppt/epptso.cxx
-+++ sd/source/filter/eppt/epptso.cxx
-@@ -1365,7 +1365,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
-             }
-             else
-             {
--                if ( pPortion && pPortion->mnCharHeight > (sal_uInt16)( ((double)-nLineSpacing) * 0.001 * 72.0 / 2.54 ) ) // 1/100mm to point
-+                if ( !pPara->mbFixedLineSpacing && pPortion && pPortion->mnCharHeight > (sal_uInt16)( ((double)-nLineSpacing) * 0.001 * 72.0 / 2.54 ) ) // 1/100mm to point
-                     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 )
-         {
-+            case ::com::sun::star::style::LineSpacingMode::FIX :
-+                mnLineSpacing = (sal_Int16)(-( aLineSpacing.Height ) );
-+                mbFixedLineSpacing = sal_True;
-+                break;
-             case ::com::sun::star::style::LineSpacingMode::MINIMUM :
-             case ::com::sun::star::style::LineSpacingMode::LEADING :
--            case ::com::sun::star::style::LineSpacingMode::FIX :
-                 mnLineSpacing = (sal_Int16)(-( aLineSpacing.Height ) );
--            break;
-+                mbFixedLineSpacing = sal_False;
-+           break;
- 
-             case ::com::sun::star::style::LineSpacingMode::PROP :
-             default:
---- sd/source/ui/dlg/paragr.cxx
-+++ sd/source/ui/dlg/paragr.cxx
-@@ -190,5 +190,19 @@ SdParagraphDlg::SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr )
- 
-        AddTabPage( RID_SVXPAGE_TABULATOR );
- }
-+
-+void SdParagraphDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
-+{
-+    SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
-+    switch( nId )
-+    {
-+    case RID_SVXPAGE_STD_PARAGRAPH:
-+        aSet.Put(SfxUInt32Item(SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST, MM50/2));
-+        rPage.PageCreated(aSet);
-+        break;
-+    default:
-+        break;
-+    }
-+}
- 
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
---- sd/source/ui/inc/paragr.hxx
-+++ sd/source/ui/inc/paragr.hxx
-@@ -43,6 +43,8 @@ class SdParagraphDlg : public SfxTabDialog
- private:
-     const SfxItemSet&	rOutAttrs;
- 
-+    virtual void	PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
-+
- public:
-                     SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr );
-                     ~SdParagraphDlg() {};