diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2023-05-30 08:21:33 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2023-05-30 12:49:52 +0200 |
| commit | d785d26a5599d3d546b96958b0f1c6d5ed777a0d (patch) | |
| tree | 781599f1be544d032738fa1ba3e4628cacae1d40 /sw/source | |
| parent | 5655cc201e5a80997fe21bc2a0c7abcbe4fb488f (diff) | |
sw floattable: handle \nobrkwrptbl in the RTF filter
This is the RTF import/export for the functionality added in
commit 08fa2903df1a7cf9a1647fcf967e4c8b57dad793 (sw floattable: add a
DoNotBreakWrappedTables compat flag, 2023-05-24).
Change-Id: I3c458cbe1f4b0947a94651cc205f2a7660d2ec2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152377
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/rtfexport.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 1bfc2ebc5740..96f0f628f6a9 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -829,7 +829,8 @@ ErrCode RtfExport::ExportDocument_Impl() Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_MARGMIRROR); // Gutter at top? - if (m_rDoc.getIDocumentSettingAccess().get(DocumentSettingId::GUTTER_AT_TOP)) + IDocumentSettingAccess& rIDSA = m_rDoc.getIDocumentSettingAccess(); + if (rIDSA.get(DocumentSettingId::GUTTER_AT_TOP)) { Strm().WriteOString(LO_STRING_SVTOOLS_RTF_GUTTERPRL); } @@ -858,7 +859,10 @@ ErrCode RtfExport::ExportDocument_Impl() // Enable breaking wrapped tables across pages: the "no" in the control word's name is // confusing. - Strm().WriteOString(LO_STRING_SVTOOLS_RTF_NOBRKWRPTBL); + if (!rIDSA.get(DocumentSettingId::DO_NOT_BREAK_WRAPPED_TABLES)) + { + Strm().WriteOString(LO_STRING_SVTOOLS_RTF_NOBRKWRPTBL); + } // size and empty margins of the page if (m_rDoc.GetPageDescCnt()) |