diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2023-10-24 09:06:54 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2023-10-24 10:43:42 +0200 |
| commit | 612629f4a81acd7b851b7eccc97aba9a5915d13c (patch) | |
| tree | e3fbcf457cb630733cf3c6a15a5349125b08e63a /chart2/source/model/main | |
| parent | b7c857fab92ec26ed0a32e30243ff688f83a40be (diff) | |
tdf#155040 sw floattable, RTF: fix table is overlapped by subsequent inline one
The document had overlapping text on load since commit
05425f73bfa41d3f7591461e2ad0beb4fafc39b4 (sw floatable: teach the RTF
import about SwFormatFlySplit, 2023-04-21).
Interestingly the DOCX equivalent was fine, there the inline table is
shifted down, below the floating table, so the overlap doesn't happen.
Fix the problem by moving the AddVerticalFrameOffsets=true code from the
DOCX filter to the shared dmapper, because RTF needs the same.
See commit 50223ea6e212b60b7d33839c2753c5601fb50f95 (tdf#98987 sw: add
AddVerticalFrameOffsets compat mode, 2016-03-31) for more details about
this compat flag. It was already enabled for DOC, too.
Change-Id: I948b179c9ec5fa24377014b0e86826568c417b6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158372
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'chart2/source/model/main')
| -rw-r--r-- | chart2/source/model/main/ChartModel.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 5634f358cce1..19fccff373e9 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -37,7 +37,7 @@ #include <ModifyListenerHelper.hxx> #include <RangeHighlighter.hxx> #include <Diagram.hxx> -#include <dumpxmltostring.hxx> +#include <comphelper/dumpxmltostring.hxx> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> @@ -1287,7 +1287,7 @@ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartM OUString SAL_CALL ChartModel::dump(OUString const & kind) { if (kind.isEmpty()) { - return dumpXmlToString([this](auto writer) { return dumpAsXml(writer); }); + return comphelper::dumpXmlToString([this](auto writer) { return dumpAsXml(writer); }); } // kind == "shapes": |