summaryrefslogtreecommitdiff
path: root/include/xmloff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2023-05-10 20:39:12 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2023-05-11 18:06:02 +0200
commit1a88efa8e02a6d765dab13c7110443bb9e6acecf (patch)
treefcefc280189d41ff6b6277017232085bfe334743 /include/xmloff
parentabd630e81bc150d05e4129cc22752ecf461777c7 (diff)
tdf#155238: Reimplement how ListAutoFormat is stored to ODF
This reimplements commits 6249858a8972aef077e0249bd93cfe8f01bce4d6 (sw: ODT import/export of DOCX's paragraph marker formatting, 2022-12-19) and 209dce614c43f63f63f5b42a746665c0ec1cbfe3 (sw: fix ODT import of paragraph marker formatting, 2022-12-20). Instead of using an empty trailing span for the ListAutoFormat data, introduce a new loext:marker-style-name attribute for text:p element, referencing a text autostyle. The problems with the previous implementation were that (1) it was impossible (or very difficult) to disambiguate several empty trailing spans, in case it was needed; and (2) this was incompatible change, with other ODF implementations treating the trailing span normally. I couldn't manage to incorporate the attribute to paragraph autostyle, because of problems referencing different autostyles one from another, so put it directly to the paragraph attributes. Change-Id: I33473147f1f774c24cbbc57bf0c4f3a1d83ce5bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151645 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/xmloff')
-rw-r--r--include/xmloff/txtimp.hxx2
-rw-r--r--include/xmloff/xmltoken.hxx1
2 files changed, 3 insertions, 0 deletions
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index cc617393e1b4..218db6fa7acd 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -223,6 +223,8 @@ public:
const OUString& rName ) const;
XMLPropStyleContext* FindPageMaster(
const OUString& rName ) const;
+ XMLPropStyleContext* FindAutoCharStyle(const OUString& rName) const;
+
XMLPropStyleContext* FindDrawingPage(OUString const& rName) const;
const css::uno::Reference< css::container::XNameContainer> & GetParaStyles() const;
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 09bb105d17e9..7f4f21c15dfc 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1209,6 +1209,7 @@ namespace xmloff::token {
XML_LINKED_CELL,
XML_LINK_TO_SOURCE_DATA,
XML_LIST,
+ XML_MARKER_STYLE_NAME,
XML_LIST_BLOCK,
XML_LIST_HEADER,
XML_LIST_INFO,