diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-04 12:26:11 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-05-02 18:25:41 +0200 |
| commit | c2064f99b97f9d7e3806c09d3eb0df8eae257c86 (patch) | |
| tree | ae60407eedb978fbc95468bd1fc5c7c44c4cda42 /writerfilter | |
| parent | fdb04adc44fc1f1ff85390e55730f78d6c644e41 (diff) | |
tdf#99074 DOCX import: handle <w:view w:val="web"/>
Instead of always using the Normal view, use the Web view when the DOCX
file contains Web Layout.
For this to work, expose sw's DocumentSettingId::BROWSE_MODE via
css.document.Settings.
Reviewed-on: https://gerrit.libreoffice.org/23806
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit e0f9bb795251d950b5dd960fcd030170c8eb67aa)
Change-Id: I7787ca058d8cb8a346b2001a2bd70c3df86d8673
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 2906e24f4840..856ab75f5590 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4985,6 +4985,10 @@ void DomainMapper_Impl::ApplySettingsTable() if( m_pSettingsTable->GetEmbedSystemFonts()) xSettings->setPropertyValue( PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_EMBED_SYSTEM_FONTS ), uno::makeAny(true) ); xSettings->setPropertyValue("AddParaTableSpacing", uno::makeAny(m_pSettingsTable->GetDoNotUseHTMLParagraphAutoSpacing())); + + // Web Layout. + if (m_pSettingsTable->GetView() == NS_ooxml::LN_Value_doc_ST_View_web) + xSettings->setPropertyValue("InBrowseMode", uno::makeAny(true)); } catch(const uno::Exception&) { |