summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper/SettingsTable.cxx
diff options
context:
space:
mode:
authornikki <nikkic@epoq.co.uk>2017-04-12 16:52:49 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-07-04 11:29:34 +0200
commit9ad9c5183f348384b62ec88459a3a5922e423d83 (patch)
treee5cf9c500dea78d20f6bdd461f12c03c4d1d0015 /writerfilter/source/dmapper/SettingsTable.cxx
parent469076317d27e545449ea5a5688a468d02558451 (diff)
Fix tdf#106029 - Add setting XML_doNotExpandShiftReturn when exporting to docx
Change-Id: Ie8ffb0f2d5444c6ead13bdc894715c5a2e6d0baa Reviewed-on: https://gerrit.libreoffice.org/36485 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter/source/dmapper/SettingsTable.cxx')
-rw-r--r--writerfilter/source/dmapper/SettingsTable.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 196a2a237af9..a5f96231474b 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -62,6 +62,7 @@ struct SettingsTable_Impl
bool m_bWidowControl;
bool m_bSplitPgBreakAndParaMark;
bool m_bMirrorMargin;
+ bool m_bDoNotExpandShiftReturn;
bool m_bProtectForm;
bool m_bDisplayBackgroundShape;
@@ -86,6 +87,7 @@ struct SettingsTable_Impl
, m_bWidowControl(false)
, m_bSplitPgBreakAndParaMark(false)
, m_bMirrorMargin(false)
+ , m_bDoNotExpandShiftReturn(false)
, m_bProtectForm(false)
, m_bDisplayBackgroundShape(false)
, m_pThemeFontLangProps(3)
@@ -269,6 +271,9 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
case NS_ooxml::LN_CT_Settings_widowControl:
m_pImpl->m_bWidowControl = nIntValue;
break;
+ case NS_ooxml::LN_CT_Compat_doNotExpandShiftReturn:
+ m_pImpl->m_bDoNotExpandShiftReturn = true;
+ break;
case NS_ooxml::LN_CT_Settings_displayBackgroundShape:
m_pImpl->m_bDisplayBackgroundShape = nIntValue;
break;
@@ -352,6 +357,11 @@ bool SettingsTable::GetDisplayBackgroundShape() const
return m_pImpl->m_bDisplayBackgroundShape;
}
+bool SettingsTable::GetDoNotExpandShiftReturn() const
+{
+ return m_pImpl->m_bDoNotExpandShiftReturn;
+}
+
bool SettingsTable::GetProtectForm() const
{
return m_pImpl->m_bProtectForm;