diff options
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 7 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index 40601461c308..b2c8a417109c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -302,8 +302,11 @@ DECLARE_OOXMLEXPORT_TEST(testTdf99074, "tdf99074.docx") xModel->getCurrentController(), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> const xViewSettings( xController->getViewSettings()); - // This was false, Web Layout was ignored on import. - CPPUNIT_ASSERT(getProperty<bool>(xViewSettings, "ShowOnlineLayout")); + + // The behavior changed - Word 2013 and 2016 ignore this setting on + // import, and instead honor the user's setting. + // Let's ignore the <w:view w:val="web"/> too. + CPPUNIT_ASSERT(!getProperty<bool>(xViewSettings, "ShowOnlineLayout")); } DECLARE_OOXMLEXPORT_TEST(testTdf107104, "tdf107104.docx") diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 4cb55513eacb..1b08a5882970 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -5110,10 +5110,6 @@ void DomainMapper_Impl::ApplySettingsTable() aViewProps.push_back(beans::PropertyValue("VisibleBottom", -1, uno::makeAny(sal_Int32(0)), beans::PropertyState_DIRECT_VALUE)); aViewProps.push_back(beans::PropertyValue("ZoomType", -1, uno::makeAny(sal_Int16(0)), beans::PropertyState_DIRECT_VALUE)); } - if (m_pSettingsTable->GetView()) - { - aViewProps.push_back(beans::PropertyValue("ShowOnlineLayout", -1, uno::makeAny(m_pSettingsTable->GetView() == NS_ooxml::LN_Value_doc_ST_View_web), beans::PropertyState_DIRECT_VALUE)); - } uno::Reference<container::XIndexContainer> xBox = document::IndexedPropertyValues::create(m_xComponentContext); xBox->insertByIndex(sal_Int32(0), uno::makeAny(comphelper::containerToSequence(aViewProps))); uno::Reference<container::XIndexAccess> xIndexAccess(xBox, uno::UNO_QUERY); |