writerperfect: astyle -> clang-format

< vmiklos> dtardon: are you strongly attached to astyle usage in
core.git writerperfect/? my problem is that 1) when less regular
contributors touch it, they don't run astyle  2) core.git has git hooks
in place to enforce consistent style for selected files, but that uses
clang-format. i wonder if switching to the standard core.git
clang-format would be an option to stop this reformat game

<@dtardon> vmiklos, clang-format is okay. we started to use astyle years
ago, before there were even any serious talk about automatic formatting
for the whole libreoffice

Change-Id: I844fc9c2e8560e54a49f26064cc0b3c55a5f034c
Reviewed-on: https://gerrit.libreoffice.org/53184
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

1 files changed, 126 insertions, 81 deletions

diff --git a/writerperfect/source/writer/exp/txtparai.cxx b/writerperfect/source/writer/exp/txtparai.cxx
index e02e83d5fdbf..f219cf711880 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -17,24 +17,23 @@ using namespace com::sun::star;
 
 namespace
 {
-
 /// Looks for rName in rStyles and fills rPropertyList based on that
 /// (rAutomaticStyles and rNamedStyles are a list of possible parents).
-void FillStyle(const OUString &rName,
-               std::map<OUString, librevenge::RVNGPropertyList> &rStyles,
-               std::map<OUString, librevenge::RVNGPropertyList> &rAutomaticStyles,
-               std::map<OUString, librevenge::RVNGPropertyList> &rNamedStyles,
-               librevenge::RVNGPropertyList &rPropertyList)
+void FillStyle(const OUString& rName, std::map<OUString, librevenge::RVNGPropertyList>& rStyles,
+               std::map<OUString, librevenge::RVNGPropertyList>& rAutomaticStyles,
+               std::map<OUString, librevenge::RVNGPropertyList>& rNamedStyles,
+               librevenge::RVNGPropertyList& rPropertyList)
 {
     auto itStyle = rStyles.find(rName);
     if (itStyle == rStyles.end())
         return;
 
-    const librevenge::RVNGPropertyList &rStyle = itStyle->second;
+    const librevenge::RVNGPropertyList& rStyle = itStyle->second;
     if (rStyle["style:parent-style-name"])
     {
         // Style has a parent.
-        OUString aParent = OStringToOUString(rStyle["style:parent-style-name"]->getStr().cstr(), RTL_TEXTENCODING_UTF8);
+        OUString aParent = OStringToOUString(rStyle["style:parent-style-name"]->getStr().cstr(),
+                                             RTL_TEXTENCODING_UTF8);
         if (!aParent.isEmpty())
             writerperfect::exp::FillStyles(aParent, rAutomaticStyles, rNamedStyles, rPropertyList);
     }
@@ -47,27 +46,26 @@ void FillStyle(const OUString &rName,
             rPropertyList.insert(itProp.key(), itProp()->clone());
     }
 }
-
 }
 
 namespace writerperfect
 {
 namespace exp
 {
-
 /// Handler for <text:sequence>.
 class XMLTextSequenceContext : public XMLImportContext
 {
 public:
-    XMLTextSequenceContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList);
+    XMLTextSequenceContext(XMLImport& rImport, const librevenge::RVNGPropertyList& rPropertyList);
 
-    void SAL_CALL characters(const OUString &rChars) override;
+    void SAL_CALL characters(const OUString& rChars) override;
 
 private:
     librevenge::RVNGPropertyList m_aPropertyList;
 };
 
-XMLTextSequenceContext::XMLTextSequenceContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList)
+XMLTextSequenceContext::XMLTextSequenceContext(XMLImport& rImport,
+                                               const librevenge::RVNGPropertyList& rPropertyList)
     : XMLImportContext(rImport)
 {
     // Inherit properties from parent.
@@ -76,7 +74,7 @@ XMLTextSequenceContext::XMLTextSequenceContext(XMLImport &rImport, const libreve
         m_aPropertyList.insert(itProp.key(), itProp()->clone());
 }
 
-void XMLTextSequenceContext::characters(const OUString &rChars)
+void XMLTextSequenceContext::characters(const OUString& rChars)
 {
     mrImport.GetGenerator().openSpan(m_aPropertyList);
 
@@ -90,18 +88,23 @@ void XMLTextSequenceContext::characters(const OUString &rChars)
 class XMLSpanContext : public XMLImportContext
 {
 public:
-    XMLSpanContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList);
+    XMLSpanContext(XMLImport& rImport, const librevenge::RVNGPropertyList& rPropertyList);
 
-    rtl::Reference<XMLImportContext> CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
+    rtl::Reference<XMLImportContext>
+    CreateChildContext(const OUString& rName,
+                       const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
 
-    void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
-    void SAL_CALL characters(const OUString &rChars) override;
+    void SAL_CALL
+    startElement(const OUString& rName,
+                 const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
+    void SAL_CALL characters(const OUString& rChars) override;
 
 private:
     librevenge::RVNGPropertyList m_aPropertyList;
 };
 
-XMLSpanContext::XMLSpanContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList)
+XMLSpanContext::XMLSpanContext(XMLImport& rImport,
+                               const librevenge::RVNGPropertyList& rPropertyList)
     : XMLImportContext(rImport)
 {
     // Inherit properties from parent.
@@ -110,19 +113,22 @@ XMLSpanContext::XMLSpanContext(XMLImport &rImport, const librevenge::RVNGPropert
         m_aPropertyList.insert(itProp.key(), itProp()->clone());
 }
 
-rtl::Reference<XMLImportContext> XMLSpanContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLSpanContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     return CreateParagraphOrSpanChildContext(mrImport, rName, m_aPropertyList);
 }
 
-void XMLSpanContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLSpanContext::startElement(
+    const OUString& /*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs)
 {
     for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i)
     {
-        const OUString &rAttributeName = xAttribs->getNameByIndex(i);
-        const OUString &rAttributeValue = xAttribs->getValueByIndex(i);
+        const OUString& rAttributeName = xAttribs->getNameByIndex(i);
+        const OUString& rAttributeValue = xAttribs->getValueByIndex(i);
         if (rAttributeName == "text:style-name")
-            FillStyles(rAttributeValue, mrImport.GetAutomaticTextStyles(), mrImport.GetTextStyles(), m_aPropertyList);
+            FillStyles(rAttributeValue, mrImport.GetAutomaticTextStyles(), mrImport.GetTextStyles(),
+                       m_aPropertyList);
         else
         {
             OString sName = OUStringToOString(rAttributeName, RTL_TEXTENCODING_UTF8);
@@ -132,7 +138,7 @@ void XMLSpanContext::startElement(const OUString &/*rName*/, const css::uno::Ref
     }
 }
 
-void XMLSpanContext::characters(const OUString &rChars)
+void XMLSpanContext::characters(const OUString& rChars)
 {
     mrImport.GetGenerator().openSpan(m_aPropertyList);
 
@@ -146,13 +152,14 @@ void XMLSpanContext::characters(const OUString &rChars)
 class XMLCharContext : public XMLImportContext
 {
 public:
-    XMLCharContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList);
+    XMLCharContext(XMLImport& rImport, const librevenge::RVNGPropertyList& rPropertyList);
 
 protected:
     librevenge::RVNGPropertyList m_aPropertyList;
 };
 
-XMLCharContext::XMLCharContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList)
+XMLCharContext::XMLCharContext(XMLImport& rImport,
+                               const librevenge::RVNGPropertyList& rPropertyList)
     : XMLImportContext(rImport)
 {
     // Inherit properties from parent.
@@ -165,17 +172,22 @@ XMLCharContext::XMLCharContext(XMLImport &rImport, const librevenge::RVNGPropert
 class XMLLineBreakContext : public XMLCharContext
 {
 public:
-    XMLLineBreakContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList);
+    XMLLineBreakContext(XMLImport& rImport, const librevenge::RVNGPropertyList& rPropertyList);
 
-    void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
+    void SAL_CALL
+    startElement(const OUString& rName,
+                 const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
 };
 
-XMLLineBreakContext::XMLLineBreakContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList)
+XMLLineBreakContext::XMLLineBreakContext(XMLImport& rImport,
+                                         const librevenge::RVNGPropertyList& rPropertyList)
     : XMLCharContext(rImport, rPropertyList)
 {
 }
 
-void XMLLineBreakContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+void XMLLineBreakContext::startElement(
+    const OUString& /*rName*/,
+    const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     mrImport.GetGenerator().openSpan(m_aPropertyList);
     mrImport.GetGenerator().insertLineBreak();
@@ -186,17 +198,22 @@ void XMLLineBreakContext::startElement(const OUString &/*rName*/, const css::uno
 class XMLSpaceContext : public XMLCharContext
 {
 public:
-    XMLSpaceContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList);
+    XMLSpaceContext(XMLImport& rImport, const librevenge::RVNGPropertyList& rPropertyList);
 
-    void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
+    void SAL_CALL
+    startElement(const OUString& rName,
+                 const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
 };
 
-XMLSpaceContext::XMLSpaceContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList)
+XMLSpaceContext::XMLSpaceContext(XMLImport& rImport,
+                                 const librevenge::RVNGPropertyList& rPropertyList)
     : XMLCharContext(rImport, rPropertyList)
 {
 }
 
-void XMLSpaceContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+void XMLSpaceContext::startElement(
+    const OUString& /*rName*/,
+    const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     mrImport.GetGenerator().openSpan(m_aPropertyList);
     mrImport.GetGenerator().insertSpace();
@@ -207,17 +224,21 @@ void XMLSpaceContext::startElement(const OUString &/*rName*/, const css::uno::Re
 class XMLTabContext : public XMLCharContext
 {
 public:
-    XMLTabContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList);
+    XMLTabContext(XMLImport& rImport, const librevenge::RVNGPropertyList& rPropertyList);
 
-    void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
+    void SAL_CALL
+    startElement(const OUString& rName,
+                 const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
 };
 
-XMLTabContext::XMLTabContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList)
+XMLTabContext::XMLTabContext(XMLImport& rImport, const librevenge::RVNGPropertyList& rPropertyList)
     : XMLCharContext(rImport, rPropertyList)
 {
 }
 
-void XMLTabContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+void XMLTabContext::startElement(
+    const OUString& /*rName*/,
+    const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     mrImport.GetGenerator().openSpan(m_aPropertyList);
     mrImport.GetGenerator().insertTab();
@@ -228,19 +249,25 @@ void XMLTabContext::startElement(const OUString &/*rName*/, const css::uno::Refe
 class XMLTextFrameHyperlinkContext : public XMLImportContext
 {
 public:
-    XMLTextFrameHyperlinkContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList);
-    rtl::Reference<XMLImportContext> CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
-
-    void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
-    void SAL_CALL endElement(const OUString &rName) override;
-    void SAL_CALL characters(const OUString &rChars) override;
+    XMLTextFrameHyperlinkContext(XMLImport& rImport,
+                                 const librevenge::RVNGPropertyList& rPropertyList);
+    rtl::Reference<XMLImportContext>
+    CreateChildContext(const OUString& rName,
+                       const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
+
+    void SAL_CALL
+    startElement(const OUString& rName,
+                 const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
+    void SAL_CALL endElement(const OUString& rName) override;
+    void SAL_CALL characters(const OUString& rChars) override;
 
 private:
     librevenge::RVNGPropertyList m_aPropertyList;
     PopupState m_ePopupState = PopupState::NONE;
 };
 
-XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList)
+XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext(
+    XMLImport& rImport, const librevenge::RVNGPropertyList& rPropertyList)
     : XMLImportContext(rImport)
 {
     // Inherit properties from parent.
@@ -249,21 +276,24 @@ XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext(XMLImport &rImport, c
         m_aPropertyList.insert(itProp.key(), itProp()->clone());
 }
 
-rtl::Reference<XMLImportContext> XMLTextFrameHyperlinkContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLTextFrameHyperlinkContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     return CreateParagraphOrSpanChildContext(mrImport, rName, m_aPropertyList);
 }
 
-void XMLTextFrameHyperlinkContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLTextFrameHyperlinkContext::startElement(
+    const OUString& /*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs)
 {
     librevenge::RVNGPropertyList aPropertyList;
     for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i)
     {
-        const OUString &rAttributeName = xAttribs->getNameByIndex(i);
-        const OUString &rAttributeValue = xAttribs->getValueByIndex(i);
+        const OUString& rAttributeName = xAttribs->getNameByIndex(i);
+        const OUString& rAttributeValue = xAttribs->getValueByIndex(i);
         if (rAttributeName == "text:style-name")
             // This affects the nested span's properties.
-            FillStyles(rAttributeValue, mrImport.GetAutomaticTextStyles(), mrImport.GetTextStyles(), m_aPropertyList);
+            FillStyles(rAttributeValue, mrImport.GetAutomaticTextStyles(), mrImport.GetTextStyles(),
+                       m_aPropertyList);
         else
         {
             if (rAttributeName == "xlink:href")
@@ -284,13 +314,13 @@ void XMLTextFrameHyperlinkContext::startElement(const OUString &/*rName*/, const
         mrImport.GetGenerator().openLink(aPropertyList);
 }
 
-void XMLTextFrameHyperlinkContext::endElement(const OUString &/*rName*/)
+void XMLTextFrameHyperlinkContext::endElement(const OUString& /*rName*/)
 {
     if (m_ePopupState != PopupState::Ignore)
         mrImport.GetGenerator().closeLink();
 }
 
-void XMLTextFrameHyperlinkContext::characters(const OUString &rChars)
+void XMLTextFrameHyperlinkContext::characters(const OUString& rChars)
 {
     mrImport.GetGenerator().openSpan(m_aPropertyList);
 
@@ -304,19 +334,24 @@ void XMLTextFrameHyperlinkContext::characters(const OUString &rChars)
 class XMLHyperlinkContext : public XMLImportContext
 {
 public:
-    XMLHyperlinkContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList);
-    rtl::Reference<XMLImportContext> CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
+    XMLHyperlinkContext(XMLImport& rImport, const librevenge::RVNGPropertyList& rPropertyList);
+    rtl::Reference<XMLImportContext>
+    CreateChildContext(const OUString& rName,
+                       const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
 
-    void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
-    void SAL_CALL endElement(const OUString &rName) override;
-    void SAL_CALL characters(const OUString &rChars) override;
+    void SAL_CALL
+    startElement(const OUString& rName,
+                 const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
+    void SAL_CALL endElement(const OUString& rName) override;
+    void SAL_CALL characters(const OUString& rChars) override;
 
 private:
     librevenge::RVNGPropertyList m_aPropertyList;
     PopupState m_ePopupState = PopupState::NONE;
 };
 
-XMLHyperlinkContext::XMLHyperlinkContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList)
+XMLHyperlinkContext::XMLHyperlinkContext(XMLImport& rImport,
+                                         const librevenge::RVNGPropertyList& rPropertyList)
     : XMLImportContext(rImport)
 {
     // Inherit properties from parent.
@@ -325,21 +360,24 @@ XMLHyperlinkContext::XMLHyperlinkContext(XMLImport &rImport, const librevenge::R
         m_aPropertyList.insert(itProp.key(), itProp()->clone());
 }
 
-rtl::Reference<XMLImportContext> XMLHyperlinkContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLHyperlinkContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     return CreateParagraphOrSpanChildContext(mrImport, rName, m_aPropertyList);
 }
 
-void XMLHyperlinkContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLHyperlinkContext::startElement(
+    const OUString& /*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs)
 {
     librevenge::RVNGPropertyList aPropertyList;
     for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i)
     {
-        const OUString &rAttributeName = xAttribs->getNameByIndex(i);
-        const OUString &rAttributeValue = xAttribs->getValueByIndex(i);
+        const OUString& rAttributeName = xAttribs->getNameByIndex(i);
+        const OUString& rAttributeValue = xAttribs->getValueByIndex(i);
         if (rAttributeName == "text:style-name")
             // This affects the nested span's properties.
-            FillStyles(rAttributeValue, mrImport.GetAutomaticTextStyles(), mrImport.GetTextStyles(), m_aPropertyList);
+            FillStyles(rAttributeValue, mrImport.GetAutomaticTextStyles(), mrImport.GetTextStyles(),
+                       m_aPropertyList);
         else
         {
             if (rAttributeName == "xlink:href")
@@ -360,13 +398,13 @@ void XMLHyperlinkContext::startElement(const OUString &/*rName*/, const css::uno
         mrImport.GetGenerator().openLink(aPropertyList);
 }
 
-void XMLHyperlinkContext::endElement(const OUString &/*rName*/)
+void XMLHyperlinkContext::endElement(const OUString& /*rName*/)
 {
     if (m_ePopupState != PopupState::Ignore)
         mrImport.GetGenerator().closeLink();
 }
 
-void XMLHyperlinkContext::characters(const OUString &rChars)
+void XMLHyperlinkContext::characters(const OUString& rChars)
 {
     mrImport.GetGenerator().openSpan(m_aPropertyList);
 
@@ -376,12 +414,13 @@ void XMLHyperlinkContext::characters(const OUString &rChars)
     mrImport.GetGenerator().closeSpan();
 }
 
-XMLParaContext::XMLParaContext(XMLImport &rImport)
+XMLParaContext::XMLParaContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLParaContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLParaContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "text:a")
         return new XMLHyperlinkContext(mrImport, m_aTextPropertyList);
@@ -390,18 +429,21 @@ rtl::Reference<XMLImportContext> XMLParaContext::CreateChildContext(const OUStri
     return CreateParagraphOrSpanChildContext(mrImport, rName, m_aTextPropertyList);
 }
 
-void XMLParaContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLParaContext::startElement(
+    const OUString& /*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs)
 {
     librevenge::RVNGPropertyList aPropertyList;
     for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i)
     {
-        const OUString &rAttributeName = xAttribs->getNameByIndex(i);
-        const OUString &rAttributeValue = xAttribs->getValueByIndex(i);
+        const OUString& rAttributeName = xAttribs->getNameByIndex(i);
+        const OUString& rAttributeValue = xAttribs->getValueByIndex(i);
         if (rAttributeName == "text:style-name")
         {
             m_aStyleName = rAttributeValue;
-            FillStyles(m_aStyleName, mrImport.GetAutomaticParagraphStyles(), mrImport.GetParagraphStyles(), aPropertyList);
-            FillStyles(m_aStyleName, mrImport.GetAutomaticTextStyles(), mrImport.GetTextStyles(), m_aTextPropertyList);
+            FillStyles(m_aStyleName, mrImport.GetAutomaticParagraphStyles(),
+                       mrImport.GetParagraphStyles(), aPropertyList);
+            FillStyles(m_aStyleName, mrImport.GetAutomaticTextStyles(), mrImport.GetTextStyles(),
+                       m_aTextPropertyList);
             mrImport.HandlePageSpan(aPropertyList);
         }
         else
@@ -415,16 +457,17 @@ void XMLParaContext::startElement(const OUString &/*rName*/, const css::uno::Ref
     mrImport.GetGenerator().openParagraph(aPropertyList);
 }
 
-void XMLParaContext::endElement(const OUString &/*rName*/)
+void XMLParaContext::endElement(const OUString& /*rName*/)
 {
     mrImport.GetGenerator().closeParagraph();
 }
 
-void XMLParaContext::characters(const OUString &rChars)
+void XMLParaContext::characters(const OUString& rChars)
 {
     librevenge::RVNGPropertyList aPropertyList;
     if (!m_aStyleName.isEmpty())
-        FillStyles(m_aStyleName, mrImport.GetAutomaticTextStyles(), mrImport.GetTextStyles(), aPropertyList);
+        FillStyles(m_aStyleName, mrImport.GetAutomaticTextStyles(), mrImport.GetTextStyles(),
+                   aPropertyList);
     mrImport.GetGenerator().openSpan(aPropertyList);
 
     OString sCharU8 = OUStringToOString(rChars, RTL_TEXTENCODING_UTF8);
@@ -433,7 +476,9 @@ void XMLParaContext::characters(const OUString &rChars)
     mrImport.GetGenerator().closeSpan();
 }
 
-rtl::Reference<XMLImportContext> CreateParagraphOrSpanChildContext(XMLImport &rImport, const OUString &rName, const librevenge::RVNGPropertyList &rTextPropertyList)
+rtl::Reference<XMLImportContext>
+CreateParagraphOrSpanChildContext(XMLImport& rImport, const OUString& rName,
+                                  const librevenge::RVNGPropertyList& rTextPropertyList)
 {
     if (rName == "text:span")
         return new XMLSpanContext(rImport, rTextPropertyList);
@@ -453,10 +498,10 @@ rtl::Reference<XMLImportContext> CreateParagraphOrSpanChildContext(XMLImport &rI
     return nullptr;
 }
 
-void FillStyles(const OUString &rName,
-                std::map<OUString, librevenge::RVNGPropertyList> &rAutomaticStyles,
-                std::map<OUString, librevenge::RVNGPropertyList> &rNamedStyles,
-                librevenge::RVNGPropertyList &rPropertyList)
+void FillStyles(const OUString& rName,
+                std::map<OUString, librevenge::RVNGPropertyList>& rAutomaticStyles,
+                std::map<OUString, librevenge::RVNGPropertyList>& rNamedStyles,
+                librevenge::RVNGPropertyList& rPropertyList)
 {
     FillStyle(rName, rAutomaticStyles, rAutomaticStyles, rNamedStyles, rPropertyList);
     FillStyle(rName, rNamedStyles, rAutomaticStyles, rNamedStyles, rPropertyList);