summaryrefslogtreecommitdiff
path: root/writerperfect/source/writer/exp/txtparai.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-09-05 14:48:22 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-09-05 16:23:04 +0200
commite808bbe1ce51465e6f3e9dc4fec2ecd263fe0e4b (patch)
tree6405ef788a0965c3c5503c29596d256331d1262f /writerperfect/source/writer/exp/txtparai.cxx
parent0e16ea1f04fb099dceeda70565dac471bfe1ee7a (diff)
EPUB export: handle paragraph properties from paragraph styles
This adds support for inheriting paragraph properties from named paragraph styles. Change-Id: I3cb787f6704329a5e0d11d3cd0266254749ac5ae Reviewed-on: https://gerrit.libreoffice.org/41938 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'writerperfect/source/writer/exp/txtparai.cxx')
-rw-r--r--writerperfect/source/writer/exp/txtparai.cxx22
1 files changed, 16 insertions, 6 deletions
diff --git a/writerperfect/source/writer/exp/txtparai.cxx b/writerperfect/source/writer/exp/txtparai.cxx
index 293fb10eb3d3..b812549c69b3 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -156,13 +156,23 @@ void XMLParaContext::startElement(const OUString &/*rName*/, const css::uno::Ref
// Reference to an automatic style, try to look it up.
auto itStyle = mrImport.GetAutomaticParagraphStyles().find(m_aStyleName);
- if (itStyle == mrImport.GetAutomaticParagraphStyles().end())
+ if (itStyle != mrImport.GetAutomaticParagraphStyles().end())
+ {
+ // Found an automatic paragraph style.
+ librevenge::RVNGPropertyList::Iter itProp(itStyle->second);
+ for (itProp.rewind(); itProp.next();)
+ aPropertyList.insert(itProp.key(), itProp()->clone());
continue;
-
- // Found an automatic paragraph style.
- librevenge::RVNGPropertyList::Iter itProp(itStyle->second);
- for (itProp.rewind(); itProp.next();)
- aPropertyList.insert(itProp.key(), itProp()->clone());
+ }
+
+ itStyle = mrImport.GetParagraphStyles().find(m_aStyleName);
+ if (itStyle != mrImport.GetParagraphStyles().end())
+ {
+ // Found a paragraph style.
+ librevenge::RVNGPropertyList::Iter itProp(itStyle->second);
+ for (itProp.rewind(); itProp.next();)
+ aPropertyList.insert(itProp.key(), itProp()->clone());
+ }
}
else
{