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

[Michael Stahl]

 writerfilter/source/dmapper/StyleSheetTable.cxx |   18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

New commits:
commit 11ad475ec81353ddf87834e22e2db02c23d172d7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Aug 4 17:00:50 2014 +0200

    fdo#81993: Revert "Resolves: #i119464# Update default alignment ...
    
    ... value for docx [Sub]Title"
    
    This reverts commit acc671ec74c874ffd22803bb2ee54a1f2c027155.
    
    The commit is clearly unnecessary:
    
    1) commit 3f9e7e72c53ecbe8ee1ab060f811cb41eadfc7e1
       appears to be a better fix for alignment
    
    2) commit b95d203bc17c83ec0fe5139f519d53ed1d842d3a
       should have disabled the Center default in Writer already
    
    Change-Id: Ib0cc60af037f12be0a1ab94ab32c743f7fca2b1d
    (cherry picked from commit d4b96b45727314585d02394bb5a084393b647729)
    Reviewed-on: https://gerrit.libreoffice.org/10734
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 329cc63..2f48513 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1118,23 +1118,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
                             xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_PROP_HEIGHT        ));
                             xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_PROP_HEIGHT_ASIAN  ));
                             xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_PROP_HEIGHT_COMPLEX));
-                        }
-                        else if (sConvertedStyleName == "Title" || sConvertedStyleName == "Subtitle")
-                        {
-                            //set the default adjust for ParaStyle Title and Subtitle to left
-                            try
-                            {
-                                uno::Reference< beans::XPropertySet > xProp( xStyle, uno::UNO_QUERY );
-                                if( xProp.is() )
-                                {
-                                    uno::Any aMSDefaultVal = uno::makeAny( (sal_Int16)style::ParagraphAdjust_LEFT );
-                                    xProp->setPropertyValue( rPropNameSupplier.GetName( PROP_PARA_ADJUST), aMSDefaultVal );
-                                }
-                            }
-                            catch(...)
-                            {
-                                OSL_ENSURE( false, "Default ParaAdjust style property could not be set");
-                            }
+
                         }
                     }