[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source

[Muthu Subramanian]

 filter/source/msfilter/svdfppt.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit fbfb164bb4447f5a78aff9829df828b9cbde120c
Author: Muthu Subramanian <sumuthu at collabora.com>
Date:   Fri Nov 22 19:46:58 2013 +0530

    fdo#68594: Revert bnc#758621 commit.
    
    Reverting: 55c63ccfd460895af22e91979967cec15d80b72d
    Seems some other fix, fixes the bug as well.

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index ade3f1f..750316a 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2291,14 +2291,6 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj*
                     }
                     pPortion->ApplyTo( aPortionAttribs, (SdrPowerPointImport&)*this, nDestinationInstance, pTextObj );
                     rOutliner.QuickSetAttribs( aPortionAttribs, aSelection );
-
-                    // set the attribs for the entire paragraph, if it is a placeholder
-                    if ( pTextObj->GetOEPlaceHolderAtom() && aSelection.nStartPos == aSelection.nEndPos )
-                    {
-                        SfxItemSet& rItemSet = rOutliner.GetStyleSheet( nParaIndex )->GetItemSet();
-                        pPortion->ApplyTo( rItemSet, (SdrPowerPointImport&)*this, nDestinationInstance, pTextObj );
-                    }
-
                     aSelection.nStartPos = aSelection.nEndPos;
                 }
                 boost::optional< sal_Int16 > oStartNumbering;