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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Oct 4 06:31:16 UTC 2018


 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |    1 +
 writerfilter/source/ooxml/model.xml        |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b4c0a0ea0102d4157572b4f4302324533c0667fb
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Tue Aug 21 17:10:00 2018 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Thu Oct 4 08:30:50 2018 +0200

    related tdf#76683 writerfilter: hanging implemented as Signed
    
    despite the documentation that states it must be a positive value,
    the actual implmentation honors a negative number (as opposed to
    treating it as a zero, or an absolute).
    
    Change-Id: Ie38369ecdf5353b73572dd3533c2efe41adda290
    Reviewed-on: https://gerrit.libreoffice.org/59401
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index adb0dc6f4264..812ff0c09f45 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -674,6 +674,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf118521_marginsLR, "tdf118521_marginsLR.docx")
     nMargin = getProperty<sal_Int32>(xMyStyle, "ParaRightMargin");
     CPPUNIT_ASSERT_EQUAL(sal_Int32(1900), nMargin);
     CPPUNIT_ASSERT_EQUAL(nMargin, getProperty<sal_Int32>(getParagraph(2), "ParaRightMargin"));
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(882), getProperty<sal_Int32>(getParagraph(2), "ParaFirstLineIndent"));
 }
 
 DECLARE_OOXMLIMPORT_TEST(testTdf104797, "tdf104797.docx")
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 953010eb020b..a838c8bfde2c 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -11784,7 +11784,7 @@
           <ref name="ST_DecimalNumber"/>
         </attribute>
         <attribute name="hanging">
-          <ref name="ST_TwipsMeasure"/>
+          <ref name="ST_TwipsMeasure_asSigned"/>
         </attribute>
         <attribute name="hangingChars">
           <ref name="ST_DecimalNumber"/>


More information about the Libreoffice-commits mailing list