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

[Mark Hung]

 sw/qa/extras/odfexport/odfexport.cxx            |    1 +
 xmloff/source/text/XMLTextMasterPageContext.cxx |    3 +++
 2 files changed, 4 insertions(+)

New commits:
commit 4e5123fc592cc1a97f7f64b964f858b6f71540cb
Author: Mark Hung <marklh9 at gmail.com>
Date:   Wed Oct 25 20:26:47 2017 +0800

    tdf#77961 regard layout-grid-print as off when missing.
    
    Change-Id: I8404ebed8ba84ee83528310ee63f796356674553
    Reviewed-on: https://gerrit.libreoffice.org/43830
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mark Hung <marklh9 at gmail.com>

diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 173807889849..ed4d67002ffe 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -1700,6 +1700,7 @@ DECLARE_ODFEXPORT_TEST(testTdf77961, "tdf77961.odt")
     uno::Reference<container::XNameAccess> xStyles(getStyles("PageStyles"));
     uno::Reference<beans::XPropertySet> xStyle(xStyles->getByName("Standard"), uno::UNO_QUERY);
     CPPUNIT_ASSERT_EQUAL( false , getProperty<bool>(xStyle, "GridDisplay"));
+    CPPUNIT_ASSERT_EQUAL( false , getProperty<bool>(xStyle, "GridPrint"));
 }
 
 #endif
diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx
index 6fa630c1182d..7ade7edd7a38 100644
--- a/xmloff/source/text/XMLTextMasterPageContext.cxx
+++ b/xmloff/source/text/XMLTextMasterPageContext.cxx
@@ -160,6 +160,9 @@ XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport,
         if ( xPropSetInfo->hasPropertyByName( "GridDisplay" ) )
             xPropSet->setPropertyValue( "GridDisplay", Any(false) );
 
+        if ( xPropSetInfo->hasPropertyByName( "GridPrint" ) )
+            xPropSet->setPropertyValue( "GridPrint", Any(false) );
+
         bInsertHeader = bInsertFooter = true;
         bInsertHeaderLeft = bInsertFooterLeft = true;
         bInsertHeaderFirst = bInsertFooterFirst = true;