[Libreoffice-commits] core.git: writerfilter/source

[Justin Luth (via logerrit)]

 writerfilter/source/dmapper/StyleSheetTable.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6da0fd14aa2290c3c052ede7eb3f9c86bc0eb164
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Sat Aug 3 11:03:24 2019 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Mon Aug 5 10:57:32 2019 +0200

    writerfilter comment cleanup: keep comment with code
    
    Keep the comment with the code portion that it describes.
    Initially the if clause only dealt with this topic, but
    it has since expanded to include many other things.
    
    Although it talks about a right margin, the code doesn't do
    anything with that. I left the comment as is in case it
    indicates something that OUGHT to still be done,
    even though the original commit does nothing to the right margin.
    See original commit 1d2af74e226bf44e1a0f1e1981ca965cffeaa0b2.
    
    Change-Id: I8ac21082e7a27924a108dd16fe8131ec3de92b28
    Reviewed-on: https://gerrit.libreoffice.org/76898
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 12b525f79e6d..5b23d9aaedb0 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1035,7 +1035,6 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable )
 
                     auto aPropValues = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(pEntry->pProperties->GetPropertyValues());
 
-                    // remove Left/RightMargin values from TOX heading styles
                     if( bParaStyle )
                     {
                         // delay adding FollowStyle property: all styles need to be created first
@@ -1061,6 +1060,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable )
                             sConvertedStyleName == "User Index Heading" ||
                             sConvertedStyleName == "Index Heading" )
                         {
+                            // remove Left/RightMargin values from TOX heading styles
                             //left margin is set to NULL by default
                             uno::Reference< beans::XPropertyState >xState1( xStyle, uno::UNO_QUERY_THROW );
                             xState1->setPropertyToDefault(getPropertyName( PROP_PARA_LEFT_MARGIN ));