summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2022-09-13 20:42:22 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2022-09-14 10:38:31 +0200
commit58cb4fc7d17ae5b339c5ed6ae139e6ef2433c927 (patch)
treeb4acd1d8a81c9409eee63bb2d15dfa1eced1a01d /xmloff
parent6b2433f3b66c1f118dabcd40924122deb2d4f204 (diff)
tdf#150927: properly handle nesting in tables
This re-implements the relevant part of commit 35021cd56b3b4e38035804087f215c80085564be, to follow the same recursion logic that is used in SwXMLExport::ExportTable. Additionally, it found a place where XML was still emitted when collecting autostyles (breaks were exported); fixed. Change-Id: I3b7eed06e0eca9ad20304b45db4c3e9d72478c9b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139901 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/text/txtparae.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 78390194ba69..ec0457feb755 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2531,11 +2531,13 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
}
else if (sType == gsSoftPageBreak)
{
- exportSoftPageBreak();
+ if (!bAutoStyles)
+ exportSoftPageBreak();
}
else if (sType == "LineBreak")
{
- exportTextLineBreak(xPropSet);
+ if (!bAutoStyles)
+ exportTextLineBreak(xPropSet);
}
else {
OSL_FAIL("unknown text portion type");