diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-09-18 13:17:39 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-09-19 17:35:05 +0200 |
| commit | 2c26414aecd414ea70fe7151f5616d72cfe5ead1 (patch) | |
| tree | 466678bda933ea9c1d071dd586f046db29602263 | |
| parent | 379990b93958d6c49d716f097d94f5b8894e811e (diff) | |
Word 2013 and 2016 does not honor the <w:view> setting, let's ignore it too.
In other words, let's open documents in the non-web view even when saved with
<w:view w:val="web"/>.
The behavior I see in Word 2013 (and it's documented that his happens in 2016
too) is that the setting is not a document setting any more, but user's
setting. Ie. regardless of what is written in the file, the .docx document
opens in the Print Layout if the Word was in the Print Layout until now, and
in the Web Layout if it was that mode.
We handle the non-web layout much better than the web layout, so let's just
default to the normal layout on load.
Change-Id: Ieba7ddc280b9b79501a6b89ff21b03a86356583c
Reviewed-on: https://gerrit.libreoffice.org/42414
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/42413
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -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); |