diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-02-05 10:03:04 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-02-10 12:11:09 +0100 |
| commit | 6fa5ce6cb9d121329bf1056c471bf522fc50d3fc (patch) | |
| tree | 200ba4aa80b8685243a992f7ddc7e53a7f120bd4 /writerfilter/source | |
| parent | bd4b1697496daa39d8ecfe034d707a89902dc07e (diff) | |
tdf#91920 sw page gutter margin, from top: add DOCX filter
ODF filter was already working as-is.
(cherry picked from commit 506bacb79ab96656de9168d0db3e3159c6bde3b0)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/SettingsTable.cxx
writerfilter/source/dmapper/SettingsTable.hxx
Change-Id: I71089a5d0171eba0cd4c2d14bdee6ca9b64193b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110668
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/SettingsTable.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/SettingsTable.hxx | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index f3bcc7a066c8..c180a1250945 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -6815,6 +6815,10 @@ void DomainMapper_Impl::ApplySettingsTable() xSettings->setPropertyValue("AddParaTableSpacing", uno::makeAny(m_pSettingsTable->GetDoNotUseHTMLParagraphAutoSpacing())); if( m_pSettingsTable->GetProtectForm() ) xSettings->setPropertyValue("ProtectForm", uno::makeAny( true )); + if (m_pSettingsTable->GetGutterAtTop()) + { + xSettings->setPropertyValue("GutterAtTop", uno::makeAny(true)); + } } catch(const uno::Exception&) { diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index ba619d4d4a65..16a4d48bdefc 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -266,6 +266,7 @@ struct SettingsTable_Impl OUString m_sCurrentDatabaseDataSource; DocumentProtection_Impl m_DocumentProtection; + bool m_bGutterAtTop = false; SettingsTable_Impl() : m_nDefaultTabStop( 720 ) //default is 1/2 in @@ -577,6 +578,9 @@ void SettingsTable::lcl_sprm(Sprm& rSprm) case NS_ooxml::LN_CT_Settings_displayBackgroundShape: m_pImpl->m_bDisplayBackgroundShape = nIntValue; break; + case NS_ooxml::LN_CT_Settings_gutterAtTop: + m_pImpl->m_bGutterAtTop = nIntValue != 0; + break; default: { #ifdef DBG_UTIL @@ -812,6 +816,8 @@ bool SettingsTable::GetLongerSpaceSequence() const return m_pImpl->m_bLongerSpaceSequence; } +bool SettingsTable::GetGutterAtTop() const { return m_pImpl->m_bGutterAtTop; } + }//namespace dmapper } //namespace writerfilter diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx index 2de8a1e4a8bf..3e7d655804fc 100644 --- a/writerfilter/source/dmapper/SettingsTable.hxx +++ b/writerfilter/source/dmapper/SettingsTable.hxx @@ -95,6 +95,7 @@ class SettingsTable : public LoggedProperties, public LoggedTable sal_Int32 GetWordCompatibilityMode() const; const OUString & GetCurrentDatabaseDataSource() const; + bool GetGutterAtTop() const; private: // Properties |