diff options
| author | Mark Hung <marklh9@gmail.com> | 2017-10-25 20:26:47 +0800 |
|---|---|---|
| committer | Mark Hung <marklh9@gmail.com> | 2017-10-26 17:32:53 +0200 |
| commit | 4e5123fc592cc1a97f7f64b964f858b6f71540cb (patch) | |
| tree | fb4f727567379d57f437f127b70e436e2ba0f14a | |
| parent | d4064927a2e83c974d4ee9538081e8a4fcdb1e34 (diff) | |
tdf#77961 regard layout-grid-print as off when missing.
Change-Id: I8404ebed8ba84ee83528310ee63f796356674553
Reviewed-on: https://gerrit.libreoffice.org/43830
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mark Hung <marklh9@gmail.com>
| -rw-r--r-- | sw/qa/extras/odfexport/odfexport.cxx | 1 | ||||
| -rw-r--r-- | xmloff/source/text/XMLTextMasterPageContext.cxx | 3 |
2 files changed, 4 insertions, 0 deletions
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; |