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>

28 files changed, 816 insertions, 679 deletions

diff --git a/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx b/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx
index 137bf01aff01..e7161e5295cf 100644
--- a/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx
+++ b/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx
@@ -17,22 +17,24 @@ namespace writerperfect
 {
 namespace exp
 {
-
-XMLBase64ImportContext::XMLBase64ImportContext(XMLImport &rImport)
+XMLBase64ImportContext::XMLBase64ImportContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-void XMLBase64ImportContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+void XMLBase64ImportContext::startElement(
+    const OUString& /*rName*/,
+    const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
 }
 
-void XMLBase64ImportContext::endElement(const OUString &/*rName*/)
+void XMLBase64ImportContext::endElement(const OUString& /*rName*/)
 {
-    m_aBinaryData.append(static_cast<const unsigned char *>(m_aStream.GetBuffer()), m_aStream.GetSize());
+    m_aBinaryData.append(static_cast<const unsigned char*>(m_aStream.GetBuffer()),
+                         m_aStream.GetSize());
 }
 
-void XMLBase64ImportContext::characters(const OUString &rChars)
+void XMLBase64ImportContext::characters(const OUString& rChars)
 {
     OUString aTrimmedChars(rChars.trim());
 
@@ -56,7 +58,7 @@ void XMLBase64ImportContext::characters(const OUString &rChars)
     }
 }
 
-const librevenge::RVNGBinaryData &XMLBase64ImportContext::getBinaryData() const
+const librevenge::RVNGBinaryData& XMLBase64ImportContext::getBinaryData() const
 {
     return m_aBinaryData;
 }
diff --git a/writerperfect/source/writer/exp/XMLBase64ImportContext.hxx b/writerperfect/source/writer/exp/XMLBase64ImportContext.hxx
index 6ad850a825c1..1fc1325fd2ce 100644
--- a/writerperfect/source/writer/exp/XMLBase64ImportContext.hxx
+++ b/writerperfect/source/writer/exp/XMLBase64ImportContext.hxx
@@ -20,18 +20,19 @@ namespace writerperfect
 {
 namespace exp
 {
-
 /// Handler for <office:binary-data>.
 class XMLBase64ImportContext : public XMLImportContext
 {
 public:
-    XMLBase64ImportContext(XMLImport &rImport);
+    XMLBase64ImportContext(XMLImport& rImport);
 
-    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;
 
-    const librevenge::RVNGBinaryData &getBinaryData() const;
+    const librevenge::RVNGBinaryData& getBinaryData() const;
 
 private:
     librevenge::RVNGBinaryData m_aBinaryData;
diff --git a/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx b/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
index f8ac4d1bb082..e23f60932773 100644
--- a/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
+++ b/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
@@ -22,29 +22,29 @@ namespace exp
 class XMLTextNoteCitationContext : public XMLImportContext
 {
 public:
-    XMLTextNoteCitationContext(XMLImport &rImport, librevenge::RVNGPropertyList &rProperties);
+    XMLTextNoteCitationContext(XMLImport& rImport, librevenge::RVNGPropertyList& rProperties);
 
-    void SAL_CALL characters(const OUString &rCharacters) override;
-    void SAL_CALL endElement(const OUString &rName) override;
+    void SAL_CALL characters(const OUString& rCharacters) override;
+    void SAL_CALL endElement(const OUString& rName) override;
 
 private:
-    librevenge::RVNGPropertyList &m_rProperties;
+    librevenge::RVNGPropertyList& m_rProperties;
     OUString m_aCharacters;
 };
 
-XMLTextNoteCitationContext::XMLTextNoteCitationContext(XMLImport &rImport,
-                                                       librevenge::RVNGPropertyList &rProperties)
+XMLTextNoteCitationContext::XMLTextNoteCitationContext(XMLImport& rImport,
+                                                       librevenge::RVNGPropertyList& rProperties)
     : XMLImportContext(rImport)
     , m_rProperties(rProperties)
 {
 }
 
-void XMLTextNoteCitationContext::endElement(const OUString & /*rName*/)
+void XMLTextNoteCitationContext::endElement(const OUString& /*rName*/)
 {
     m_rProperties.insert("librevenge:number", m_aCharacters.toUtf8().getStr());
 }
 
-void XMLTextNoteCitationContext::characters(const OUString &rCharacters)
+void XMLTextNoteCitationContext::characters(const OUString& rCharacters)
 {
     m_aCharacters += rCharacters;
 }
@@ -53,54 +53,54 @@ void XMLTextNoteCitationContext::characters(const OUString &rCharacters)
 class XMLFootnoteBodyImportContext : public XMLImportContext
 {
 public:
-    XMLFootnoteBodyImportContext(XMLImport &rImport,
-                                 const librevenge::RVNGPropertyList &rProperties);
+    XMLFootnoteBodyImportContext(XMLImport& rImport,
+                                 const librevenge::RVNGPropertyList& rProperties);
 
     rtl::Reference<XMLImportContext>
-    CreateChildContext(const OUString &rName,
-                       const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
+    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;
+    startElement(const OUString& rName,
+                 const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
+    void SAL_CALL endElement(const OUString& rName) override;
 
 private:
-    const librevenge::RVNGPropertyList &m_rProperties;
+    const librevenge::RVNGPropertyList& m_rProperties;
 };
 
 XMLFootnoteBodyImportContext::XMLFootnoteBodyImportContext(
-    XMLImport &rImport, const librevenge::RVNGPropertyList &rProperties)
+    XMLImport& rImport, const librevenge::RVNGPropertyList& rProperties)
     : XMLImportContext(rImport)
     , m_rProperties(rProperties)
 {
 }
 
 rtl::Reference<XMLImportContext> XMLFootnoteBodyImportContext::CreateChildContext(
-    const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> & /*xAttribs*/)
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     return CreateTextChildContext(mrImport, rName);
 }
 
 void XMLFootnoteBodyImportContext::startElement(
-    const OUString & /*rName*/,
-    const css::uno::Reference<css::xml::sax::XAttributeList> & /*xAttribs*/)
+    const OUString& /*rName*/,
+    const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     mrImport.GetGenerator().openFootnote(m_rProperties);
 }
 
-void XMLFootnoteBodyImportContext::endElement(const OUString & /*rName*/)
+void XMLFootnoteBodyImportContext::endElement(const OUString& /*rName*/)
 {
     mrImport.GetGenerator().closeFootnote();
 }
 
-XMLFootnoteImportContext::XMLFootnoteImportContext(XMLImport &rImport)
+XMLFootnoteImportContext::XMLFootnoteImportContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
 rtl::Reference<XMLImportContext> XMLFootnoteImportContext::CreateChildContext(
-    const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> & /*xAttribs*/)
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "text:note-citation")
         return new XMLTextNoteCitationContext(mrImport, m_aProperties);
@@ -111,8 +111,8 @@ rtl::Reference<XMLImportContext> XMLFootnoteImportContext::CreateChildContext(
 }
 
 void XMLFootnoteImportContext::startElement(
-    const OUString & /*rName*/,
-    const css::uno::Reference<css::xml::sax::XAttributeList> & /*xAttribs*/)
+    const OUString& /*rName*/,
+    const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
 }
 } // namespace exp
diff --git a/writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx b/writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx
index 489288a6387f..22594f2ddd76 100644
--- a/writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx
+++ b/writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx
@@ -24,15 +24,15 @@ namespace exp
 class XMLFootnoteImportContext : public XMLImportContext
 {
 public:
-    XMLFootnoteImportContext(XMLImport &rImport);
+    XMLFootnoteImportContext(XMLImport& rImport);
 
     rtl::Reference<XMLImportContext>
-    CreateChildContext(const OUString &rName,
-                       const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
+    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;
+    startElement(const OUString& rName,
+                 const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
 
 private:
     librevenge::RVNGPropertyList m_aProperties;
diff --git a/writerperfect/source/writer/exp/XMLSectionContext.cxx b/writerperfect/source/writer/exp/XMLSectionContext.cxx
index 9d3621c4f346..bf88d0e174fb 100644
--- a/writerperfect/source/writer/exp/XMLSectionContext.cxx
+++ b/writerperfect/source/writer/exp/XMLSectionContext.cxx
@@ -18,23 +18,25 @@ namespace writerperfect
 {
 namespace exp
 {
-
-XMLSectionContext::XMLSectionContext(XMLImport &rImport)
+XMLSectionContext::XMLSectionContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLSectionContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLSectionContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     return CreateTextChildContext(mrImport, rName);
 }
 
-void XMLSectionContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+void XMLSectionContext::startElement(
+    const OUString& /*rName*/,
+    const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     mrImport.GetGenerator().openSection(librevenge::RVNGPropertyList());
 }
 
-void XMLSectionContext::endElement(const OUString &/*rName*/)
+void XMLSectionContext::endElement(const OUString& /*rName*/)
 {
     mrImport.GetGenerator().closeSection();
 }
diff --git a/writerperfect/source/writer/exp/XMLSectionContext.hxx b/writerperfect/source/writer/exp/XMLSectionContext.hxx
index 9eeb69a311b4..20c4047c0c2e 100644
--- a/writerperfect/source/writer/exp/XMLSectionContext.hxx
+++ b/writerperfect/source/writer/exp/XMLSectionContext.hxx
@@ -16,16 +16,19 @@ namespace writerperfect
 {
 namespace exp
 {
-
 /// Handler for <text:section>.
 class XMLSectionContext : public XMLImportContext
 {
 public:
-    XMLSectionContext(XMLImport &rImport);
-
-    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;
+    XMLSectionContext(XMLImport& rImport);
+
+    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;
 };
 
 } // namespace exp
diff --git a/writerperfect/source/writer/exp/XMLTextFrameContext.cxx b/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
index 78ea1b4d1e4b..37848e668593 100644
--- a/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
@@ -20,35 +20,41 @@ namespace writerperfect
 {
 namespace exp
 {
-
 /// Handler for <draw:text-box>.
 class XMLTextBoxContext : public XMLImportContext
 {
 public:
-    XMLTextBoxContext(XMLImport &rImport);
+    XMLTextBoxContext(XMLImport& rImport);
 
-    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 endElement(const OUString &rName) 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;
 };
 
-XMLTextBoxContext::XMLTextBoxContext(XMLImport &rImport)
+XMLTextBoxContext::XMLTextBoxContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLTextBoxContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLTextBoxContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     return CreateTextChildContext(mrImport, rName);
 }
 
-void XMLTextBoxContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+void XMLTextBoxContext::startElement(
+    const OUString& /*rName*/,
+    const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     mrImport.GetGenerator().openTextBox(librevenge::RVNGPropertyList());
 }
 
-void XMLTextBoxContext::endElement(const OUString &/*rName*/)
+void XMLTextBoxContext::endElement(const OUString& /*rName*/)
 {
     mrImport.GetGenerator().closeTextBox();
 }
@@ -57,24 +63,29 @@ void XMLTextBoxContext::endElement(const OUString &/*rName*/)
 class XMLTextImageContext : public XMLImportContext
 {
 public:
-    XMLTextImageContext(XMLImport &rImport);
+    XMLTextImageContext(XMLImport& rImport);
 
-    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 endElement(const OUString &rName) 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;
 
 private:
     OString m_aMimeType;
     rtl::Reference<XMLBase64ImportContext> m_xBinaryData;
 };
 
-XMLTextImageContext::XMLTextImageContext(XMLImport &rImport)
+XMLTextImageContext::XMLTextImageContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLTextImageContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLTextImageContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "office:binary-data")
     {
@@ -84,17 +95,18 @@ rtl::Reference<XMLImportContext> XMLTextImageContext::CreateChildContext(const O
     return nullptr;
 }
 
-void XMLTextImageContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLTextImageContext::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& rAttributeName = xAttribs->getNameByIndex(i);
         if (rAttributeName == "loext:mime-type")
             m_aMimeType = OUStringToOString(xAttribs->getValueByIndex(i), RTL_TEXTENCODING_UTF8);
     }
 }
 
-void XMLTextImageContext::endElement(const OUString &/*rName*/)
+void XMLTextImageContext::endElement(const OUString& /*rName*/)
 {
     librevenge::RVNGPropertyList aPropertyList;
 
@@ -105,12 +117,13 @@ void XMLTextImageContext::endElement(const OUString &/*rName*/)
     mrImport.GetGenerator().insertBinaryObject(aPropertyList);
 }
 
-XMLTextFrameContext::XMLTextFrameContext(XMLImport &rImport)
+XMLTextFrameContext::XMLTextFrameContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLTextFrameContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLTextFrameContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "draw:image")
         return new XMLTextImageContext(mrImport);
@@ -120,16 +133,18 @@ rtl::Reference<XMLImportContext> XMLTextFrameContext::CreateChildContext(const O
     return nullptr;
 }
 
-void XMLTextFrameContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLTextFrameContext::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 == "draw:style-name")
-            FillStyles(rAttributeValue, mrImport.GetAutomaticGraphicStyles(), mrImport.GetGraphicStyles(), aPropertyList);
+            FillStyles(rAttributeValue, mrImport.GetAutomaticGraphicStyles(),
+                       mrImport.GetGraphicStyles(), aPropertyList);
         else
         {
             OString sName = OUStringToOString(rAttributeName, RTL_TEXTENCODING_UTF8);
@@ -140,7 +155,7 @@ void XMLTextFrameContext::startElement(const OUString &/*rName*/, const css::uno
     mrImport.GetGenerator().openFrame(aPropertyList);
 }
 
-void XMLTextFrameContext::endElement(const OUString &/*rName*/)
+void XMLTextFrameContext::endElement(const OUString& /*rName*/)
 {
     mrImport.GetGenerator().closeFrame();
 }
diff --git a/writerperfect/source/writer/exp/XMLTextFrameContext.hxx b/writerperfect/source/writer/exp/XMLTextFrameContext.hxx
index 076426e69ed9..fa8c52123afb 100644
--- a/writerperfect/source/writer/exp/XMLTextFrameContext.hxx
+++ b/writerperfect/source/writer/exp/XMLTextFrameContext.hxx
@@ -18,19 +18,22 @@ namespace writerperfect
 {
 namespace exp
 {
-
 class XMLBase64ImportContext;
 
 /// Handler for <draw:frame>.
 class XMLTextFrameContext : public XMLImportContext
 {
 public:
-    XMLTextFrameContext(XMLImport &rImport);
+    XMLTextFrameContext(XMLImport& rImport);
 
-    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 endElement(const OUString &rName) 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;
 };
 
 } // namespace exp
diff --git a/writerperfect/source/writer/exp/XMLTextListContext.cxx b/writerperfect/source/writer/exp/XMLTextListContext.cxx
index 3a7698890759..5aae47876ec2 100644
--- a/writerperfect/source/writer/exp/XMLTextListContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextListContext.cxx
@@ -17,13 +17,13 @@ namespace writerperfect
 {
 namespace exp
 {
-
-XMLTextListContext::XMLTextListContext(XMLImport &rImport)
+XMLTextListContext::XMLTextListContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLTextListContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLTextListContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "text:list-item")
         return new XMLTextListItemContext(mrImport);
diff --git a/writerperfect/source/writer/exp/XMLTextListContext.hxx b/writerperfect/source/writer/exp/XMLTextListContext.hxx
index 8e9152f06058..d5145465da77 100644
--- a/writerperfect/source/writer/exp/XMLTextListContext.hxx
+++ b/writerperfect/source/writer/exp/XMLTextListContext.hxx
@@ -16,14 +16,15 @@ namespace writerperfect
 {
 namespace exp
 {
-
 /// Handler for <text:list>.
 class XMLTextListContext : public XMLImportContext
 {
 public:
-    XMLTextListContext(XMLImport &rImport);
+    XMLTextListContext(XMLImport& rImport);
 
-    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;
 };
 
 } // namespace exp
diff --git a/writerperfect/source/writer/exp/XMLTextListItemContext.cxx b/writerperfect/source/writer/exp/XMLTextListItemContext.cxx
index f75bb782ba6b..8651e9d8666c 100644
--- a/writerperfect/source/writer/exp/XMLTextListItemContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextListItemContext.cxx
@@ -18,13 +18,13 @@ namespace writerperfect
 {
 namespace exp
 {
-
-XMLTextListItemContext::XMLTextListItemContext(XMLImport &rImport)
+XMLTextListItemContext::XMLTextListItemContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLTextListItemContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLTextListItemContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "text:p" || rName == "text:h")
         return new XMLParaContext(mrImport);
diff --git a/writerperfect/source/writer/exp/XMLTextListItemContext.hxx b/writerperfect/source/writer/exp/XMLTextListItemContext.hxx
index cbca5bf7feac..c66fac6a2104 100644
--- a/writerperfect/source/writer/exp/XMLTextListItemContext.hxx
+++ b/writerperfect/source/writer/exp/XMLTextListItemContext.hxx
@@ -16,14 +16,15 @@ namespace writerperfect
 {
 namespace exp
 {
-
 /// Handler for <text:list-item>.
 class XMLTextListItemContext : public XMLImportContext
 {
 public:
-    XMLTextListItemContext(XMLImport &rImport);
+    XMLTextListItemContext(XMLImport& rImport);
 
-    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;
 };
 
 } // namespace exp
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);
diff --git a/writerperfect/source/writer/exp/txtparai.hxx b/writerperfect/source/writer/exp/txtparai.hxx
index ace8d740397a..b87a5762b7a3 100644
--- a/writerperfect/source/writer/exp/txtparai.hxx
+++ b/writerperfect/source/writer/exp/txtparai.hxx
@@ -20,18 +20,21 @@ namespace writerperfect
 {
 namespace exp
 {
-
 /// Handler for <text:p>/<text:h>.
 class XMLParaContext : public XMLImportContext
 {
 public:
-    XMLParaContext(XMLImport &rImport);
+    XMLParaContext(XMLImport& rImport);
 
-    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 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:
     OUString m_aStyleName;
@@ -40,14 +43,16 @@ private:
 };
 
 /// Shared child context factory for paragraph and span contexts.
-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);
 
 /// Looks for rName in rAutomaticStyles (and failing that, in rNamedStyles) and
 /// fills rPropertyList based on that.
-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);
 
 } // namespace exp
 } // namespace writerperfect
diff --git a/writerperfect/source/writer/exp/txtstyli.cxx b/writerperfect/source/writer/exp/txtstyli.cxx
index 90cc66b9c80b..b8b7813e08ad 100644
--- a/writerperfect/source/writer/exp/txtstyli.cxx
+++ b/writerperfect/source/writer/exp/txtstyli.cxx
@@ -17,26 +17,29 @@ namespace writerperfect
 {
 namespace exp
 {
-
 /// Handler for <style:paragraph-properties>.
 class XMLParagraphPropertiesContext : public XMLImportContext
 {
 public:
-    XMLParagraphPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle);
+    XMLParagraphPropertiesContext(XMLImport& rImport, XMLStyleContext& rStyle);
 
-    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;
 
 private:
-    XMLStyleContext &mrStyle;
+    XMLStyleContext& mrStyle;
 };
 
-XMLParagraphPropertiesContext::XMLParagraphPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle)
+XMLParagraphPropertiesContext::XMLParagraphPropertiesContext(XMLImport& rImport,
+                                                             XMLStyleContext& rStyle)
     : XMLImportContext(rImport)
     , mrStyle(rStyle)
 {
 }
 
-void XMLParagraphPropertiesContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLParagraphPropertiesContext::startElement(
+    const OUString& /*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs)
 {
     for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i)
     {
@@ -50,21 +53,24 @@ void XMLParagraphPropertiesContext::startElement(const OUString &/*rName*/, cons
 class XMLTextPropertiesContext : public XMLImportContext
 {
 public:
-    XMLTextPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle);
+    XMLTextPropertiesContext(XMLImport& rImport, XMLStyleContext& rStyle);
 
-    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;
 
 private:
-    XMLStyleContext &mrStyle;
+    XMLStyleContext& mrStyle;
 };
 
-XMLTextPropertiesContext::XMLTextPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle)
+XMLTextPropertiesContext::XMLTextPropertiesContext(XMLImport& rImport, XMLStyleContext& rStyle)
     : XMLImportContext(rImport)
     , mrStyle(rStyle)
 {
 }
 
-void XMLTextPropertiesContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLTextPropertiesContext::startElement(
+    const OUString& /*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs)
 {
     for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i)
     {
@@ -78,21 +84,25 @@ void XMLTextPropertiesContext::startElement(const OUString &/*rName*/, const css
 class XMLGraphicPropertiesContext : public XMLImportContext
 {
 public:
-    XMLGraphicPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle);
+    XMLGraphicPropertiesContext(XMLImport& rImport, XMLStyleContext& rStyle);
 
-    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;
 
 private:
-    XMLStyleContext &mrStyle;
+    XMLStyleContext& mrStyle;
 };
 
-XMLGraphicPropertiesContext::XMLGraphicPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle)
+XMLGraphicPropertiesContext::XMLGraphicPropertiesContext(XMLImport& rImport,
+                                                         XMLStyleContext& rStyle)
     : XMLImportContext(rImport)
     , mrStyle(rStyle)
 {
 }
 
-void XMLGraphicPropertiesContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLGraphicPropertiesContext::startElement(
+    const OUString& /*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs)
 {
     for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i)
     {
@@ -106,21 +116,25 @@ void XMLGraphicPropertiesContext::startElement(const OUString &/*rName*/, const
 class XMLPageLayoutPropertiesContext : public XMLImportContext
 {
 public:
-    XMLPageLayoutPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle);
+    XMLPageLayoutPropertiesContext(XMLImport& rImport, XMLStyleContext& rStyle);
 
-    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;
 
 private:
-    XMLStyleContext &mrStyle;
+    XMLStyleContext& mrStyle;
 };
 
-XMLPageLayoutPropertiesContext::XMLPageLayoutPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle)
+XMLPageLayoutPropertiesContext::XMLPageLayoutPropertiesContext(XMLImport& rImport,
+                                                               XMLStyleContext& rStyle)
     : XMLImportContext(rImport)
     , mrStyle(rStyle)
 {
 }
 
-void XMLPageLayoutPropertiesContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLPageLayoutPropertiesContext::startElement(
+    const OUString& /*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs)
 {
     for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i)
     {
@@ -138,21 +152,24 @@ void XMLPageLayoutPropertiesContext::startElement(const OUString &/*rName*/, con
 class XMLTablePropertiesContext : public XMLImportContext
 {
 public:
-    XMLTablePropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle);
+    XMLTablePropertiesContext(XMLImport& rImport, XMLStyleContext& rStyle);
 
-    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;
 
 private:
-    XMLStyleContext &mrStyle;
+    XMLStyleContext& mrStyle;
 };
 
-XMLTablePropertiesContext::XMLTablePropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle)
+XMLTablePropertiesContext::XMLTablePropertiesContext(XMLImport& rImport, XMLStyleContext& rStyle)
     : XMLImportContext(rImport)
     , mrStyle(rStyle)
 {
 }
 
-void XMLTablePropertiesContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLTablePropertiesContext::startElement(
+    const OUString& /*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs)
 {
     for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i)
     {
@@ -160,7 +177,8 @@ void XMLTablePropertiesContext::startElement(const OUString &/*rName*/, const cs
         OString sValue = OUStringToOString(xAttribs->getValueByIndex(i), RTL_TEXTENCODING_UTF8);
         if (sName == "style:rel-width")
             // Make sure this is passed through as a string, and not parsed as a double.
-            mrStyle.GetTablePropertyList().insert(sName.getStr(), librevenge::RVNGPropertyFactory::newStringProp(sValue.getStr()));
+            mrStyle.GetTablePropertyList().insert(
+                sName.getStr(), librevenge::RVNGPropertyFactory::newStringProp(sValue.getStr()));
         else
             mrStyle.GetTablePropertyList().insert(sName.getStr(), sValue.getStr());
     }
@@ -170,21 +188,25 @@ void XMLTablePropertiesContext::startElement(const OUString &/*rName*/, const cs
 class XMLTableRowPropertiesContext : public XMLImportContext
 {
 public:
-    XMLTableRowPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle);
+    XMLTableRowPropertiesContext(XMLImport& rImport, XMLStyleContext& rStyle);
 
-    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;
 
 private:
-    XMLStyleContext &mrStyle;
+    XMLStyleContext& mrStyle;
 };
 
-XMLTableRowPropertiesContext::XMLTableRowPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle)
+XMLTableRowPropertiesContext::XMLTableRowPropertiesContext(XMLImport& rImport,
+                                                           XMLStyleContext& rStyle)
     : XMLImportContext(rImport)
     , mrStyle(rStyle)
 {
 }
 
-void XMLTableRowPropertiesContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLTableRowPropertiesContext::startElement(
+    const OUString& /*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs)
 {
     for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i)
     {
@@ -198,21 +220,25 @@ void XMLTableRowPropertiesContext::startElement(const OUString &/*rName*/, const
 class XMLTableColumnPropertiesContext : public XMLImportContext
 {
 public:
-    XMLTableColumnPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle);
+    XMLTableColumnPropertiesContext(XMLImport& rImport, XMLStyleContext& rStyle);
 
-    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;
 
 private:
-    XMLStyleContext &mrStyle;
+    XMLStyleContext& mrStyle;
 };
 
-XMLTableColumnPropertiesContext::XMLTableColumnPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle)
+XMLTableColumnPropertiesContext::XMLTableColumnPropertiesContext(XMLImport& rImport,
+                                                                 XMLStyleContext& rStyle)
     : XMLImportContext(rImport)
     , mrStyle(rStyle)
 {
 }
 
-void XMLTableColumnPropertiesContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLTableColumnPropertiesContext::startElement(
+    const OUString& /*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs)
 {
     for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i)
     {
@@ -226,21 +252,25 @@ void XMLTableColumnPropertiesContext::startElement(const OUString &/*rName*/, co
 class XMLTableCellPropertiesContext : public XMLImportContext
 {
 public:
-    XMLTableCellPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle);
+    XMLTableCellPropertiesContext(XMLImport& rImport, XMLStyleContext& rStyle);
 
-    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;
 
 private:
-    XMLStyleContext &mrStyle;
+    XMLStyleContext& mrStyle;
 };
 
-XMLTableCellPropertiesContext::XMLTableCellPropertiesContext(XMLImport &rImport, XMLStyleContext &rStyle)
+XMLTableCellPropertiesContext::XMLTableCellPropertiesContext(XMLImport& rImport,
+                                                             XMLStyleContext& rStyle)
     : XMLImportContext(rImport)
     , mrStyle(rStyle)
 {
 }
 
-void XMLTableCellPropertiesContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLTableCellPropertiesContext::startElement(
+    const OUString& /*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs)
 {
     for (sal_Int16 i = 0; i < xAttribs->getLength(); ++i)
     {
@@ -250,13 +280,14 @@ void XMLTableCellPropertiesContext::startElement(const OUString &/*rName*/, cons
     }
 }
 
-XMLStyleContext::XMLStyleContext(XMLImport &rImport, XMLStylesContext &rStyles)
-    : XMLImportContext(rImport),
-      m_rStyles(rStyles)
+XMLStyleContext::XMLStyleContext(XMLImport& rImport, XMLStylesContext& rStyles)
+    : XMLImportContext(rImport)
+    , m_rStyles(rStyles)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLStyleContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLStyleContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "style:paragraph-properties")
         return new XMLParagraphPropertiesContext(mrImport, *this);
@@ -277,12 +308,13 @@ rtl::Reference<XMLImportContext> XMLStyleContext::CreateChildContext(const OUStr
     return nullptr;
 }
 
-void XMLStyleContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLStyleContext::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 == "style:name")
             m_aName = rAttributeValue;
         else if (rAttributeName == "style:family")
@@ -300,7 +332,7 @@ void XMLStyleContext::startElement(const OUString &/*rName*/, const css::uno::Re
     }
 }
 
-void XMLStyleContext::endElement(const OUString &rName)
+void XMLStyleContext::endElement(const OUString& rName)
 {
     if (m_aName.isEmpty())
         return;
@@ -325,47 +357,38 @@ void XMLStyleContext::endElement(const OUString &rName)
         m_rStyles.GetCurrentMasterStyles()[m_aName] = m_aMasterPagePropertyList;
 }
 
-librevenge::RVNGPropertyList &XMLStyleContext::GetTextPropertyList()
-{
-    return m_aTextPropertyList;
-}
+librevenge::RVNGPropertyList& XMLStyleContext::GetTextPropertyList() { return m_aTextPropertyList; }
 
-librevenge::RVNGPropertyList &XMLStyleContext::GetParagraphPropertyList()
+librevenge::RVNGPropertyList& XMLStyleContext::GetParagraphPropertyList()
 {
     return m_aParagraphPropertyList;
 }
 
-librevenge::RVNGPropertyList &XMLStyleContext::GetCellPropertyList()
-{
-    return m_aCellPropertyList;
-}
+librevenge::RVNGPropertyList& XMLStyleContext::GetCellPropertyList() { return m_aCellPropertyList; }
 
-librevenge::RVNGPropertyList &XMLStyleContext::GetColumnPropertyList()
+librevenge::RVNGPropertyList& XMLStyleContext::GetColumnPropertyList()
 {
     return m_aColumnPropertyList;
 }
 
-librevenge::RVNGPropertyList &XMLStyleContext::GetRowPropertyList()
-{
-    return m_aRowPropertyList;
-}
+librevenge::RVNGPropertyList& XMLStyleContext::GetRowPropertyList() { return m_aRowPropertyList; }
 
-librevenge::RVNGPropertyList &XMLStyleContext::GetTablePropertyList()
+librevenge::RVNGPropertyList& XMLStyleContext::GetTablePropertyList()
 {
     return m_aTablePropertyList;
 }
 
-librevenge::RVNGPropertyList &XMLStyleContext::GetGraphicPropertyList()
+librevenge::RVNGPropertyList& XMLStyleContext::GetGraphicPropertyList()
 {
     return m_aGraphicPropertyList;
 }
 
-librevenge::RVNGPropertyList &XMLStyleContext::GetPageLayoutPropertyList()
+librevenge::RVNGPropertyList& XMLStyleContext::GetPageLayoutPropertyList()
 {
     return m_aPageLayoutPropertyList;
 }
 
-librevenge::RVNGPropertyList &XMLStyleContext::GetMasterPagePropertyList()
+librevenge::RVNGPropertyList& XMLStyleContext::GetMasterPagePropertyList()
 {
     return m_aMasterPagePropertyList;
 }
diff --git a/writerperfect/source/writer/exp/txtstyli.hxx b/writerperfect/source/writer/exp/txtstyli.hxx
index 05d549ab2a79..f72f9e60d769 100644
--- a/writerperfect/source/writer/exp/txtstyli.hxx
+++ b/writerperfect/source/writer/exp/txtstyli.hxx
@@ -18,28 +18,31 @@ namespace writerperfect
 {
 namespace exp
 {
-
 class XMLStylesContext;
 
 /// Handler for <style:style>.
 class XMLStyleContext : public XMLImportContext
 {
 public:
-    XMLStyleContext(XMLImport &rImport, XMLStylesContext &rStyles);
+    XMLStyleContext(XMLImport& rImport, XMLStylesContext& rStyles);
 
-    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;
+    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;
 
-    librevenge::RVNGPropertyList &GetTextPropertyList();
-    librevenge::RVNGPropertyList &GetParagraphPropertyList();
-    librevenge::RVNGPropertyList &GetCellPropertyList();
-    librevenge::RVNGPropertyList &GetColumnPropertyList();
-    librevenge::RVNGPropertyList &GetRowPropertyList();
-    librevenge::RVNGPropertyList &GetTablePropertyList();
-    librevenge::RVNGPropertyList &GetGraphicPropertyList();
-    librevenge::RVNGPropertyList &GetPageLayoutPropertyList();
-    librevenge::RVNGPropertyList &GetMasterPagePropertyList();
+    librevenge::RVNGPropertyList& GetTextPropertyList();
+    librevenge::RVNGPropertyList& GetParagraphPropertyList();
+    librevenge::RVNGPropertyList& GetCellPropertyList();
+    librevenge::RVNGPropertyList& GetColumnPropertyList();
+    librevenge::RVNGPropertyList& GetRowPropertyList();
+    librevenge::RVNGPropertyList& GetTablePropertyList();
+    librevenge::RVNGPropertyList& GetGraphicPropertyList();
+    librevenge::RVNGPropertyList& GetPageLayoutPropertyList();
+    librevenge::RVNGPropertyList& GetMasterPagePropertyList();
 
 private:
     OUString m_aName;
@@ -53,7 +56,7 @@ private:
     librevenge::RVNGPropertyList m_aGraphicPropertyList;
     librevenge::RVNGPropertyList m_aPageLayoutPropertyList;
     librevenge::RVNGPropertyList m_aMasterPagePropertyList;
-    XMLStylesContext &m_rStyles;
+    XMLStylesContext& m_rStyles;
 };
 
 } // namespace exp
diff --git a/writerperfect/source/writer/exp/xmlfmt.cxx b/writerperfect/source/writer/exp/xmlfmt.cxx
index e8b735c44890..fca68bf7900d 100644
--- a/writerperfect/source/writer/exp/xmlfmt.cxx
+++ b/writerperfect/source/writer/exp/xmlfmt.cxx
@@ -19,69 +19,76 @@ namespace writerperfect
 {
 namespace exp
 {
-
-XMLStylesContext::XMLStylesContext(XMLImport &rImport, StyleType eType)
-    : XMLImportContext(rImport),
-      m_rParagraphStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticParagraphStyles() : mrImport.GetParagraphStyles()),
-      m_rTextStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticTextStyles() : mrImport.GetTextStyles()),
-      m_rCellStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticCellStyles() : mrImport.GetCellStyles()),
-      m_rColumnStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticColumnStyles() : mrImport.GetColumnStyles()),
-      m_rRowStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticRowStyles() : mrImport.GetRowStyles()),
-      m_rTableStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticTableStyles() : mrImport.GetTableStyles()),
-      m_rGraphicStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticGraphicStyles() : mrImport.GetGraphicStyles()),
-      m_rPageLayouts(mrImport.GetPageLayouts()),
-      m_rMasterStyles(mrImport.GetMasterStyles())
+XMLStylesContext::XMLStylesContext(XMLImport& rImport, StyleType eType)
+    : XMLImportContext(rImport)
+    , m_rParagraphStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticParagraphStyles()
+                                                      : mrImport.GetParagraphStyles())
+    , m_rTextStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticTextStyles()
+                                                 : mrImport.GetTextStyles())
+    , m_rCellStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticCellStyles()
+                                                 : mrImport.GetCellStyles())
+    , m_rColumnStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticColumnStyles()
+                                                   : mrImport.GetColumnStyles())
+    , m_rRowStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticRowStyles()
+                                                : mrImport.GetRowStyles())
+    , m_rTableStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticTableStyles()
+                                                  : mrImport.GetTableStyles())
+    , m_rGraphicStyles(eType == StyleType_AUTOMATIC ? mrImport.GetAutomaticGraphicStyles()
+                                                    : mrImport.GetGraphicStyles())
+    , m_rPageLayouts(mrImport.GetPageLayouts())
+    , m_rMasterStyles(mrImport.GetMasterStyles())
 {
 }
 
-rtl::Reference<XMLImportContext> XMLStylesContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLStylesContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "style:style" || rName == "style:page-layout" || rName == "style:master-page")
         return new XMLStyleContext(mrImport, *this);
     return nullptr;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLStylesContext::GetCurrentParagraphStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLStylesContext::GetCurrentParagraphStyles()
 {
     return m_rParagraphStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLStylesContext::GetCurrentTextStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLStylesContext::GetCurrentTextStyles()
 {
     return m_rTextStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLStylesContext::GetCurrentCellStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLStylesContext::GetCurrentCellStyles()
 {
     return m_rCellStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLStylesContext::GetCurrentColumnStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLStylesContext::GetCurrentColumnStyles()
 {
     return m_rColumnStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLStylesContext::GetCurrentRowStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLStylesContext::GetCurrentRowStyles()
 {
     return m_rRowStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLStylesContext::GetCurrentTableStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLStylesContext::GetCurrentTableStyles()
 {
     return m_rTableStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLStylesContext::GetCurrentGraphicStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLStylesContext::GetCurrentGraphicStyles()
 {
     return m_rGraphicStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLStylesContext::GetCurrentPageLayouts()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLStylesContext::GetCurrentPageLayouts()
 {
     return m_rPageLayouts;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLStylesContext::GetCurrentMasterStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLStylesContext::GetCurrentMasterStyles()
 {
     return m_rMasterStyles;
 }
@@ -90,10 +97,14 @@ std::map<OUString, librevenge::RVNGPropertyList> &XMLStylesContext::GetCurrentMa
 class XMLFontFaceContext : public XMLImportContext
 {
 public:
-    XMLFontFaceContext(XMLImport &rImport);
-    void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
+    XMLFontFaceContext(XMLImport& rImport);
+    void SAL_CALL
+    startElement(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;
+    rtl::Reference<XMLImportContext>
+    CreateChildContext(const OUString& rName,
+                       const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
 
     OUString maName;
 };
@@ -102,23 +113,29 @@ public:
 class XMLFontFaceSrcContext : public XMLImportContext
 {
 public:
-    XMLFontFaceSrcContext(XMLImport &rImport, XMLFontFaceContext &rFontFace);
+    XMLFontFaceSrcContext(XMLImport& rImport, XMLFontFaceContext& rFontFace);
 
-    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;
 
 private:
-    XMLFontFaceContext &mrFontFace;
+    XMLFontFaceContext& mrFontFace;
 };
 
 /// Handler for <svg:font-face-uri>.
 class XMLFontFaceUriContext : public XMLImportContext
 {
 public:
-    XMLFontFaceUriContext(XMLImport &rImport, XMLFontFaceContext const &rFontFace);
-    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;
+    XMLFontFaceUriContext(XMLImport& rImport, XMLFontFaceContext const& rFontFace);
+    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;
 
-    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;
 
     librevenge::RVNGPropertyList maPropertyList;
 
@@ -130,25 +147,29 @@ private:
 class XMLFontFaceFormatContext : public XMLImportContext
 {
 public:
-    XMLFontFaceFormatContext(XMLImport &rImport, XMLFontFaceUriContext &rFontFaceUri);
-    void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
+    XMLFontFaceFormatContext(XMLImport& rImport, XMLFontFaceUriContext& rFontFaceUri);
+    void SAL_CALL
+    startElement(const OUString& rName,
+                 const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
 
 private:
-    XMLFontFaceUriContext &mrFontFaceUri;
+    XMLFontFaceUriContext& mrFontFaceUri;
 };
 
-XMLFontFaceFormatContext::XMLFontFaceFormatContext(XMLImport &rImport, XMLFontFaceUriContext &rFontFaceUri)
+XMLFontFaceFormatContext::XMLFontFaceFormatContext(XMLImport& rImport,
+                                                   XMLFontFaceUriContext& rFontFaceUri)
     : XMLImportContext(rImport)
     , mrFontFaceUri(rFontFaceUri)
 {
 }
 
-void XMLFontFaceFormatContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLFontFaceFormatContext::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 == "svg:string")
         {
             OString aAttributeValueU8 = OUStringToOString(rAttributeValue, RTL_TEXTENCODING_UTF8);
@@ -157,19 +178,21 @@ void XMLFontFaceFormatContext::startElement(const OUString &/*rName*/, const css
     }
 }
 
-XMLFontFaceUriContext::XMLFontFaceUriContext(XMLImport &rImport, XMLFontFaceContext const &rFontFace)
+XMLFontFaceUriContext::XMLFontFaceUriContext(XMLImport& rImport,
+                                             XMLFontFaceContext const& rFontFace)
     : XMLImportContext(rImport)
 {
     OString aNameU8 = OUStringToOString(rFontFace.maName, RTL_TEXTENCODING_UTF8);
     maPropertyList.insert("librevenge:name", aNameU8.getStr());
 }
 
-void XMLFontFaceUriContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLFontFaceUriContext::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 == "loext:font-style")
         {
             OString aAttributeValueU8 = OUStringToOString(rAttributeValue, RTL_TEXTENCODING_UTF8);
@@ -183,14 +206,15 @@ void XMLFontFaceUriContext::startElement(const OUString &/*rName*/, const css::u
     }
 }
 
-void XMLFontFaceUriContext::endElement(const OUString &/*rName*/)
+void XMLFontFaceUriContext::endElement(const OUString& /*rName*/)
 {
     if (mxBinaryData.is())
         maPropertyList.insert("office:binary-data", mxBinaryData->getBinaryData());
     mrImport.GetGenerator().defineEmbeddedFont(maPropertyList);
 }
 
-rtl::Reference<XMLImportContext> XMLFontFaceUriContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLFontFaceUriContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "office:binary-data")
     {
@@ -204,13 +228,14 @@ rtl::Reference<XMLImportContext> XMLFontFaceUriContext::CreateChildContext(const
     return nullptr;
 }
 
-XMLFontFaceSrcContext::XMLFontFaceSrcContext(XMLImport &rImport, XMLFontFaceContext &rFontFace)
+XMLFontFaceSrcContext::XMLFontFaceSrcContext(XMLImport& rImport, XMLFontFaceContext& rFontFace)
     : XMLImportContext(rImport)
     , mrFontFace(rFontFace)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLFontFaceSrcContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLFontFaceSrcContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "svg:font-face-uri")
         return new XMLFontFaceUriContext(mrImport, mrFontFace);
@@ -218,23 +243,25 @@ rtl::Reference<XMLImportContext> XMLFontFaceSrcContext::CreateChildContext(const
     return nullptr;
 }
 
-XMLFontFaceContext::XMLFontFaceContext(XMLImport &rImport)
+XMLFontFaceContext::XMLFontFaceContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-void XMLFontFaceContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLFontFaceContext::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 == "style:name")
             maName = rAttributeValue;
     }
 }
 
-rtl::Reference<XMLImportContext> XMLFontFaceContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLFontFaceContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "svg:font-face-src")
         return new XMLFontFaceSrcContext(mrImport, *this);
@@ -242,12 +269,13 @@ rtl::Reference<XMLImportContext> XMLFontFaceContext::CreateChildContext(const OU
     return nullptr;
 }
 
-XMLFontFaceDeclsContext::XMLFontFaceDeclsContext(XMLImport &rImport)
+XMLFontFaceDeclsContext::XMLFontFaceDeclsContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLFontFaceDeclsContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLFontFaceDeclsContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "style:font-face")
         return new XMLFontFaceContext(mrImport);
diff --git a/writerperfect/source/writer/exp/xmlfmt.hxx b/writerperfect/source/writer/exp/xmlfmt.hxx
index 71c3c8e80ace..6f3211de258f 100644
--- a/writerperfect/source/writer/exp/xmlfmt.hxx
+++ b/writerperfect/source/writer/exp/xmlfmt.hxx
@@ -23,7 +23,6 @@ namespace writerperfect
 {
 namespace exp
 {
-
 /// Handler for <office:automatic-styles>/<office:styles>.
 class XMLStylesContext : public XMLImportContext
 {
@@ -33,38 +32,43 @@ public:
         StyleType_NONE,
         StyleType_AUTOMATIC
     };
-    XMLStylesContext(XMLImport &rImport, StyleType eType);
+    XMLStylesContext(XMLImport& rImport, StyleType eType);
+
+    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;
+    std::map<OUString, librevenge::RVNGPropertyList>& GetCurrentParagraphStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetCurrentTextStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetCurrentCellStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetCurrentColumnStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetCurrentRowStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetCurrentTableStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetCurrentGraphicStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetCurrentPageLayouts();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetCurrentMasterStyles();
 
-    std::map<OUString, librevenge::RVNGPropertyList> &GetCurrentParagraphStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetCurrentTextStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetCurrentCellStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetCurrentColumnStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetCurrentRowStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetCurrentTableStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetCurrentGraphicStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetCurrentPageLayouts();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetCurrentMasterStyles();
 private:
-    std::map<OUString, librevenge::RVNGPropertyList> &m_rParagraphStyles;
-    std::map<OUString, librevenge::RVNGPropertyList> &m_rTextStyles;
-    std::map<OUString, librevenge::RVNGPropertyList> &m_rCellStyles;
-    std::map<OUString, librevenge::RVNGPropertyList> &m_rColumnStyles;
-    std::map<OUString, librevenge::RVNGPropertyList> &m_rRowStyles;
-    std::map<OUString, librevenge::RVNGPropertyList> &m_rTableStyles;
-    std::map<OUString, librevenge::RVNGPropertyList> &m_rGraphicStyles;
-    std::map<OUString, librevenge::RVNGPropertyList> &m_rPageLayouts;
-    std::map<OUString, librevenge::RVNGPropertyList> &m_rMasterStyles;
+    std::map<OUString, librevenge::RVNGPropertyList>& m_rParagraphStyles;
+    std::map<OUString, librevenge::RVNGPropertyList>& m_rTextStyles;
+    std::map<OUString, librevenge::RVNGPropertyList>& m_rCellStyles;
+    std::map<OUString, librevenge::RVNGPropertyList>& m_rColumnStyles;
+    std::map<OUString, librevenge::RVNGPropertyList>& m_rRowStyles;
+    std::map<OUString, librevenge::RVNGPropertyList>& m_rTableStyles;
+    std::map<OUString, librevenge::RVNGPropertyList>& m_rGraphicStyles;
+    std::map<OUString, librevenge::RVNGPropertyList>& m_rPageLayouts;
+    std::map<OUString, librevenge::RVNGPropertyList>& m_rMasterStyles;
 };
 
 /// Handler for <office:font-face-decls>.
 class XMLFontFaceDeclsContext : public XMLImportContext
 {
 public:
-    XMLFontFaceDeclsContext(XMLImport &rImport);
+    XMLFontFaceDeclsContext(XMLImport& rImport);
 
-    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;
 };
 
 } // namespace exp
diff --git a/writerperfect/source/writer/exp/xmlictxt.cxx b/writerperfect/source/writer/exp/xmlictxt.cxx
index ba5c06804dc4..02ac21ab73e3 100644
--- a/writerperfect/source/writer/exp/xmlictxt.cxx
+++ b/writerperfect/source/writer/exp/xmlictxt.cxx
@@ -17,46 +17,39 @@ namespace writerperfect
 {
 namespace exp
 {
-
-XMLImportContext::XMLImportContext(XMLImport &rImport)
+XMLImportContext::XMLImportContext(XMLImport& rImport)
     : mrImport(rImport)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLImportContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+rtl::Reference<XMLImportContext> XMLImportContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs)
 {
     return mrImport.CreateContext(rName, xAttribs);
 }
 
-void XMLImportContext::startDocument()
-{
-}
+void XMLImportContext::startDocument() {}
 
-void XMLImportContext::endDocument()
-{
-}
+void XMLImportContext::endDocument() {}
 
-void XMLImportContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+void XMLImportContext::startElement(
+    const OUString& /*rName*/,
+    const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
 }
 
-void XMLImportContext::endElement(const OUString &/*rName*/)
-{
-}
+void XMLImportContext::endElement(const OUString& /*rName*/) {}
 
-void XMLImportContext::characters(const OUString &/*rChars*/)
-{
-}
+void XMLImportContext::characters(const OUString& /*rChars*/) {}
 
-void XMLImportContext::ignorableWhitespace(const OUString &/*rWhitespaces*/)
-{
-}
+void XMLImportContext::ignorableWhitespace(const OUString& /*rWhitespaces*/) {}
 
-void XMLImportContext::processingInstruction(const OUString &/*rTarget*/, const OUString &/*rData*/)
+void XMLImportContext::processingInstruction(const OUString& /*rTarget*/, const OUString& /*rData*/)
 {
 }
 
-void XMLImportContext::setDocumentLocator(const css::uno::Reference<css::xml::sax::XLocator> &/*xLocator*/)
+void XMLImportContext::setDocumentLocator(
+    const css::uno::Reference<css::xml::sax::XLocator>& /*xLocator*/)
 {
 }
 
diff --git a/writerperfect/source/writer/exp/xmlictxt.hxx b/writerperfect/source/writer/exp/xmlictxt.hxx
index 622daccb368e..03801d104bcb 100644
--- a/writerperfect/source/writer/exp/xmlictxt.hxx
+++ b/writerperfect/source/writer/exp/xmlictxt.hxx
@@ -19,32 +19,33 @@ namespace writerperfect
 {
 namespace exp
 {
-
 class XMLImport;
 
 /// Base class for a handler of a single XML element during ODF -> librevenge conversion.
-class XMLImportContext : public cppu::WeakImplHelper
-    <
-    css::xml::sax::XDocumentHandler
-    >
+class XMLImportContext : public cppu::WeakImplHelper<css::xml::sax::XDocumentHandler>
 {
 public:
-    XMLImportContext(XMLImport &rImport);
+    XMLImportContext(XMLImport& rImport);
 
-    virtual rtl::Reference<XMLImportContext> CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs);
+    virtual rtl::Reference<XMLImportContext>
+    CreateChildContext(const OUString& rName,
+                       const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs);
 
     // XDocumentHandler
     void SAL_CALL startDocument() override;
     void SAL_CALL endDocument() 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 ignorableWhitespace(const OUString &rWhitespaces) override;
-    void SAL_CALL processingInstruction(const OUString &rTarget, const OUString &rData) override;
-    void SAL_CALL setDocumentLocator(const css::uno::Reference<css::xml::sax::XLocator> &xLocator) 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 ignorableWhitespace(const OUString& rWhitespaces) override;
+    void SAL_CALL processingInstruction(const OUString& rTarget, const OUString& rData) override;
+    void SAL_CALL
+    setDocumentLocator(const css::uno::Reference<css::xml::sax::XLocator>& xLocator) override;
 
 protected:
-    XMLImport &mrImport;
+    XMLImport& mrImport;
 };
 
 } // namespace exp
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx b/writerperfect/source/writer/exp/xmlimp.cxx
index 5c22a5f911d7..6e647ccdadf8 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -36,18 +36,16 @@ namespace writerperfect
 {
 namespace exp
 {
-
 namespace
 {
 /// Looks up mime type for a given image extension.
-OUString GetMimeType(const OUString &rExtension)
+OUString GetMimeType(const OUString& rExtension)
 {
-    static const std::unordered_map<OUString, OUString> vMimeTypes =
-    {
-        {"gif", "image/gif"},
-        {"jpg", "image/jpeg"},
-        {"png", "image/png"},
-        {"svg", "image/svg+xml"},
+    static const std::unordered_map<OUString, OUString> vMimeTypes = {
+        { "gif", "image/gif" },
+        { "jpg", "image/jpeg" },
+        { "png", "image/png" },
+        { "svg", "image/svg+xml" },
     };
 
     auto it = vMimeTypes.find(rExtension);
@@ -55,7 +53,8 @@ OUString GetMimeType(const OUString &rExtension)
 }
 
 /// Determines the base directory for cover images, XMP metadata, popup images.
-OUString FindMediaDir(const OUString &rDocumentBaseURL, const uno::Sequence<beans::PropertyValue> &rFilterData)
+OUString FindMediaDir(const OUString& rDocumentBaseURL,
+                      const uno::Sequence<beans::PropertyValue>& rFilterData)
 {
     OUString aMediaDir;
 
@@ -78,7 +77,7 @@ OUString FindMediaDir(const OUString &rDocumentBaseURL, const uno::Sequence<bean
     {
         aMediaDir = rtl::Uri::convertRelToAbs(rDocumentBaseURL, aURL.GetBase()) + "/";
     }
-    catch (const rtl::MalformedUriException &)
+    catch (const rtl::MalformedUriException&)
     {
         DBG_UNHANDLED_EXCEPTION("writerperfect");
     }
@@ -86,7 +85,8 @@ OUString FindMediaDir(const OUString &rDocumentBaseURL, const uno::Sequence<bean
 }
 
 /// Picks up a cover image from the base directory.
-OUString FindCoverImage(const OUString &rDocumentBaseURL, OUString &rMimeType, const uno::Sequence<beans::PropertyValue> &rFilterData)
+OUString FindCoverImage(const OUString& rDocumentBaseURL, OUString& rMimeType,
+                        const uno::Sequence<beans::PropertyValue>& rFilterData)
 {
     OUString aRet;
 
@@ -111,16 +111,11 @@ OUString FindCoverImage(const OUString &rDocumentBaseURL, OUString &rMimeType, c
     if (rDocumentBaseURL.isEmpty())
         return aRet;
 
-    static const std::initializer_list<OUStringLiteral> vExtensions =
-    {
-        "gif",
-        "jpg",
-        "png",
-        "svg"
-    };
+    static const std::initializer_list<OUStringLiteral> vExtensions
+        = { "gif", "jpg", "png", "svg" };
 
     OUString aMediaDir = FindMediaDir(rDocumentBaseURL, rFilterData);
-    for (const auto &rExtension : vExtensions)
+    for (const auto& rExtension : vExtensions)
     {
         aRet = aMediaDir + "cover." + rExtension;
         if (!aRet.isEmpty())
@@ -141,7 +136,10 @@ OUString FindCoverImage(const OUString &rDocumentBaseURL, OUString &rMimeType, c
 }
 
 /// Picks up XMP metadata from the base directory.
-void FindXMPMetadata(const uno::Reference<uno::XComponentContext> &xContext, const OUString &rDocumentBaseURL, const uno::Sequence<beans::PropertyValue> &rFilterData, librevenge::RVNGPropertyList &rMetaData)
+void FindXMPMetadata(const uno::Reference<uno::XComponentContext>& xContext,
+                     const OUString& rDocumentBaseURL,
+                     const uno::Sequence<beans::PropertyValue>& rFilterData,
+                     librevenge::RVNGPropertyList& rMetaData)
 {
     // See if filter data contains metadata explicitly.
     OUString aValue;
@@ -200,7 +198,7 @@ void FindXMPMetadata(const uno::Reference<uno::XComponentContext> &xContext, con
     {
         xParser->parseStream(aInputSource);
     }
-    catch (const uno::Exception &)
+    catch (const uno::Exception&)
     {
         DBG_UNHANDLED_EXCEPTION("writerperfect", "parseStream() failed");
         return;
@@ -212,17 +210,21 @@ void FindXMPMetadata(const uno::Reference<uno::XComponentContext> &xContext, con
 class XMLBodyContext : public XMLImportContext
 {
 public:
-    XMLBodyContext(XMLImport &rImport);
+    XMLBodyContext(XMLImport& rImport);
 
-    rtl::Reference<XMLImportContext> CreateChildContext(const OUString &rName, const uno::Reference<xml::sax::XAttributeList> &/*xAttribs*/) override;
+    rtl::Reference<XMLImportContext>
+    CreateChildContext(const OUString& rName,
+                       const uno::Reference<xml::sax::XAttributeList>& /*xAttribs*/) override;
 };
 
-XMLBodyContext::XMLBodyContext(XMLImport &rImport)
+XMLBodyContext::XMLBodyContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLBodyContext::CreateChildContext(const OUString &rName, const uno::Reference<xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext>
+XMLBodyContext::CreateChildContext(const OUString& rName,
+                                   const uno::Reference<xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "office:text")
         return new XMLBodyContentContext(mrImport);
@@ -233,20 +235,23 @@ rtl::Reference<XMLImportContext> XMLBodyContext::CreateChildContext(const OUStri
 class XMLOfficeDocContext : public XMLImportContext
 {
 public:
-    XMLOfficeDocContext(XMLImport &rImport);
+    XMLOfficeDocContext(XMLImport& rImport);
 
-    rtl::Reference<XMLImportContext> CreateChildContext(const OUString &rName, const uno::Reference<xml::sax::XAttributeList> &/*xAttribs*/) override;
+    rtl::Reference<XMLImportContext>
+    CreateChildContext(const OUString& rName,
+                       const uno::Reference<xml::sax::XAttributeList>& /*xAttribs*/) override;
 
     // Handles metafile for a single page.
-    void HandleFixedLayoutPage(const FixedLayoutPage &rPage, bool bFirst);
+    void HandleFixedLayoutPage(const FixedLayoutPage& rPage, bool bFirst);
 };
 
-XMLOfficeDocContext::XMLOfficeDocContext(XMLImport &rImport)
+XMLOfficeDocContext::XMLOfficeDocContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLOfficeDocContext::CreateChildContext(const OUString &rName, const uno::Reference<xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLOfficeDocContext::CreateChildContext(
+    const OUString& rName, const uno::Reference<xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "office:meta")
         return new XMLMetaDocumentContext(mrImport);
@@ -266,7 +271,7 @@ rtl::Reference<XMLImportContext> XMLOfficeDocContext::CreateChildContext(const O
         // Ignore text from doc model in the fixed layout case, instead
         // insert the page metafiles.
         bool bFirst = true;
-        for (const auto &rPage : mrImport.GetPageMetafiles())
+        for (const auto& rPage : mrImport.GetPageMetafiles())
         {
             HandleFixedLayoutPage(rPage, bFirst);
             if (bFirst)
@@ -276,18 +281,19 @@ rtl::Reference<XMLImportContext> XMLOfficeDocContext::CreateChildContext(const O
     return nullptr;
 }
 
-void XMLOfficeDocContext::HandleFixedLayoutPage(const FixedLayoutPage &rPage, bool bFirst)
+void XMLOfficeDocContext::HandleFixedLayoutPage(const FixedLayoutPage& rPage, bool bFirst)
 {
     uno::Reference<uno::XComponentContext> xCtx = mrImport.GetComponentContext();
     uno::Reference<xml::sax::XWriter> xSaxWriter = xml::sax::Writer::create(xCtx);
     if (!xSaxWriter.is())
         return;
 
-    uno::Sequence<uno::Any> aArguments =
-    {
-        uno::makeAny<uno::Sequence<beans::PropertyValue>>({comphelper::makePropertyValue("DTDString", false)})
-    };
-    uno::Reference<svg::XSVGWriter> xSVGWriter(xCtx->getServiceManager()->createInstanceWithArgumentsAndContext("com.sun.star.svg.SVGWriter", aArguments, xCtx), uno::UNO_QUERY);
+    uno::Sequence<uno::Any> aArguments = { uno::makeAny<uno::Sequence<beans::PropertyValue>>(
+        { comphelper::makePropertyValue("DTDString", false) }) };
+    uno::Reference<svg::XSVGWriter> xSVGWriter(
+        xCtx->getServiceManager()->createInstanceWithArgumentsAndContext(
+            "com.sun.star.svg.SVGWriter", aArguments, xCtx),
+        uno::UNO_QUERY);
     if (!xSVGWriter.is())
         return;
 
@@ -310,7 +316,7 @@ void XMLOfficeDocContext::HandleFixedLayoutPage(const FixedLayoutPage &rPage, bo
     {
         // Name of chapters starting on this page.
         librevenge::RVNGPropertyListVector aChapterNames;
-        for (const auto &rName : rPage.aChapterNames)
+        for (const auto& rName : rPage.aChapterNames)
         {
             librevenge::RVNGPropertyList aChapter;
             aChapter.insert("librevenge:name", rName.toUtf8().getStr());
@@ -329,18 +335,22 @@ void XMLOfficeDocContext::HandleFixedLayoutPage(const FixedLayoutPage &rPage, bo
     librevenge::RVNGPropertyList aImageProperties;
     aImageProperties.insert("librevenge:mime-type", "image/svg+xml");
     librevenge::RVNGBinaryData aBinaryData;
-    aBinaryData.append(static_cast<const unsigned char *>(aMemoryStream.GetBuffer()), aMemoryStream.GetSize());
+    aBinaryData.append(static_cast<const unsigned char*>(aMemoryStream.GetBuffer()),
+                       aMemoryStream.GetSize());
     aImageProperties.insert("office:binary-data", aBinaryData);
     mrImport.GetGenerator().insertBinaryObject(aImageProperties);
     mrImport.GetGenerator().closeParagraph();
     mrImport.GetGenerator().closePageSpan();
 }
 
-XMLImport::XMLImport(const uno::Reference<uno::XComponentContext> &xContext, librevenge::RVNGTextInterface &rGenerator, const OUString &rURL, const uno::Sequence<beans::PropertyValue> &rDescriptor, const std::vector<FixedLayoutPage> &rPageMetafiles)
-    : mrGenerator(rGenerator),
-      mxContext(xContext),
-      mbIsInPageSpan(false),
-      mrPageMetafiles(rPageMetafiles)
+XMLImport::XMLImport(const uno::Reference<uno::XComponentContext>& xContext,
+                     librevenge::RVNGTextInterface& rGenerator, const OUString& rURL,
+                     const uno::Sequence<beans::PropertyValue>& rDescriptor,
+                     const std::vector<FixedLayoutPage>& rPageMetafiles)
+    : mrGenerator(rGenerator)
+    , mxContext(xContext)
+    , mbIsInPageSpan(false)
+    , mrPageMetafiles(rPageMetafiles)
 {
     uno::Sequence<beans::PropertyValue> aFilterData;
     for (sal_Int32 i = 0; i < rDescriptor.getLength(); ++i)
@@ -362,7 +372,8 @@ XMLImport::XMLImport(const uno::Reference<uno::XComponentContext> &xContext, lib
         SvFileStream aStream(aCoverImage, StreamMode::READ);
         SvMemoryStream aMemoryStream;
         aMemoryStream.WriteStream(aStream);
-        aBinaryData.append(static_cast<const unsigned char *>(aMemoryStream.GetBuffer()), aMemoryStream.GetSize());
+        aBinaryData.append(static_cast<const unsigned char*>(aMemoryStream.GetBuffer()),
+                           aMemoryStream.GetSize());
         librevenge::RVNGPropertyList aCoverImageProperties;
         aCoverImageProperties.insert("office:binary-data", aBinaryData);
         aCoverImageProperties.insert("librevenge:mime-type", aMimeType.toUtf8().getStr());
@@ -374,34 +385,28 @@ XMLImport::XMLImport(const uno::Reference<uno::XComponentContext> &xContext, lib
     mxUriReferenceFactory = uri::UriReferenceFactory::create(mxContext);
 }
 
-const librevenge::RVNGPropertyListVector &XMLImport::GetCoverImages()
-{
-    return maCoverImages;
-}
+const librevenge::RVNGPropertyListVector& XMLImport::GetCoverImages() { return maCoverImages; }
 
-const librevenge::RVNGPropertyList &XMLImport::GetMetaData()
-{
-    return maMetaData;
-}
+const librevenge::RVNGPropertyList& XMLImport::GetMetaData() { return maMetaData; }
 
 namespace
 {
 /// Finds out if a file URL exists.
-bool FileURLExists(const OUString &rURL)
+bool FileURLExists(const OUString& rURL)
 {
     SvFileStream aStream(rURL, StreamMode::READ);
     return aStream.IsOpen();
 }
 }
 
-PopupState XMLImport::FillPopupData(const OUString &rURL, librevenge::RVNGPropertyList &rPropList)
+PopupState XMLImport::FillPopupData(const OUString& rURL, librevenge::RVNGPropertyList& rPropList)
 {
     uno::Reference<uri::XUriReference> xUriRef;
     try
     {
         xUriRef = mxUriReferenceFactory->parse(rURL);
     }
-    catch (const uno::Exception &)
+    catch (const uno::Exception&)
     {
         DBG_UNHANDLED_EXCEPTION("writerperfect", "XUriReference::parse() failed");
     }
@@ -428,7 +433,8 @@ PopupState XMLImport::FillPopupData(const OUString &rURL, librevenge::RVNGProper
     librevenge::RVNGBinaryData aBinaryData;
     SvMemoryStream aMemoryStream;
     aMemoryStream.WriteStream(aStream);
-    aBinaryData.append(static_cast<const unsigned char *>(aMemoryStream.GetBuffer()), aMemoryStream.GetSize());
+    aBinaryData.append(static_cast<const unsigned char*>(aMemoryStream.GetBuffer()),
+                       aMemoryStream.GetSize());
     rPropList.insert("office:binary-data", aBinaryData);
 
     INetURLObject aAbsURL(aAbs);
@@ -438,119 +444,107 @@ PopupState XMLImport::FillPopupData(const OUString &rURL, librevenge::RVNGProper
     return PopupState::Consumed;
 }
 
-const std::vector<FixedLayoutPage> &XMLImport::GetPageMetafiles() const
-{
-    return mrPageMetafiles;
-}
+const std::vector<FixedLayoutPage>& XMLImport::GetPageMetafiles() const { return mrPageMetafiles; }
 
-const uno::Reference<uno::XComponentContext> &XMLImport::GetComponentContext() const
+const uno::Reference<uno::XComponentContext>& XMLImport::GetComponentContext() const
 {
     return mxContext;
 }
 
-rtl::Reference<XMLImportContext> XMLImport::CreateContext(const OUString &rName, const uno::Reference<xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext>
+XMLImport::CreateContext(const OUString& rName,
+                         const uno::Reference<xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "office:document")
         return new XMLOfficeDocContext(*this);
     return nullptr;
 }
 
-librevenge::RVNGTextInterface &XMLImport::GetGenerator() const
-{
-    return mrGenerator;
-}
+librevenge::RVNGTextInterface& XMLImport::GetGenerator() const { return mrGenerator; }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetAutomaticTextStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetAutomaticTextStyles()
 {
     return maAutomaticTextStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetAutomaticParagraphStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetAutomaticParagraphStyles()
 {
     return maAutomaticParagraphStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetAutomaticCellStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetAutomaticCellStyles()
 {
     return maAutomaticCellStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetAutomaticColumnStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetAutomaticColumnStyles()
 {
     return maAutomaticColumnStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetAutomaticRowStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetAutomaticRowStyles()
 {
     return maAutomaticRowStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetAutomaticTableStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetAutomaticTableStyles()
 {
     return maAutomaticTableStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetAutomaticGraphicStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetAutomaticGraphicStyles()
 {
     return maAutomaticGraphicStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetTextStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetTextStyles()
 {
     return maTextStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetParagraphStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetParagraphStyles()
 {
     return maParagraphStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetCellStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetCellStyles()
 {
     return maCellStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetColumnStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetColumnStyles()
 {
     return maColumnStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetRowStyles()
-{
-    return maRowStyles;
-}
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetRowStyles() { return maRowStyles; }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetTableStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetTableStyles()
 {
     return maTableStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetGraphicStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetGraphicStyles()
 {
     return maGraphicStyles;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetPageLayouts()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetPageLayouts()
 {
     return maPageLayouts;
 }
 
-std::map<OUString, librevenge::RVNGPropertyList> &XMLImport::GetMasterStyles()
+std::map<OUString, librevenge::RVNGPropertyList>& XMLImport::GetMasterStyles()
 {
     return maMasterStyles;
 }
 
-void XMLImport::startDocument()
-{
-    mrGenerator.startDocument(librevenge::RVNGPropertyList());
-}
+void XMLImport::startDocument() { mrGenerator.startDocument(librevenge::RVNGPropertyList()); }
 
-void XMLImport::endDocument()
-{
-    mrGenerator.endDocument();
-}
+void XMLImport::endDocument() { mrGenerator.endDocument(); }
 
-void XMLImport::startElement(const OUString &rName, const uno::Reference<xml::sax::XAttributeList> &xAttribs)
+void XMLImport::startElement(const OUString& rName,
+                             const uno::Reference<xml::sax::XAttributeList>& xAttribs)
 {
     rtl::Reference<XMLImportContext> xContext;
     if (!maContexts.empty())
@@ -567,7 +561,7 @@ void XMLImport::startElement(const OUString &rName, const uno::Reference<xml::sa
     maContexts.push(xContext);
 }
 
-void XMLImport::endElement(const OUString &rName)
+void XMLImport::endElement(const OUString& rName)
 {
     if (maContexts.empty())
         return;
@@ -578,46 +572,42 @@ void XMLImport::endElement(const OUString &rName)
     maContexts.pop();
 }
 
-void XMLImport::characters(const OUString &rChars)
+void XMLImport::characters(const OUString& rChars)
 {
     if (maContexts.top().is())
         maContexts.top()->characters(rChars);
 }
 
-void XMLImport::ignorableWhitespace(const OUString &/*rWhitespaces*/)
-{
-}
+void XMLImport::ignorableWhitespace(const OUString& /*rWhitespaces*/) {}
 
-void XMLImport::processingInstruction(const OUString &/*rTarget*/, const OUString &/*rData*/)
-{
-}
+void XMLImport::processingInstruction(const OUString& /*rTarget*/, const OUString& /*rData*/) {}
 
-void XMLImport::setDocumentLocator(const uno::Reference<xml::sax::XLocator> &/*xLocator*/)
-{
-}
+void XMLImport::setDocumentLocator(const uno::Reference<xml::sax::XLocator>& /*xLocator*/) {}
 
-void XMLImport::HandlePageSpan(const librevenge::RVNGPropertyList &rPropertyList)
+void XMLImport::HandlePageSpan(const librevenge::RVNGPropertyList& rPropertyList)
 {
     OUString sMasterPageName;
     OUString sLayoutName;
 
     if (rPropertyList["style:master-page-name"])
-        sMasterPageName = OStringToOUString(rPropertyList["style:master-page-name"]->getStr().cstr(), RTL_TEXTENCODING_UTF8);
+        sMasterPageName = OStringToOUString(
+            rPropertyList["style:master-page-name"]->getStr().cstr(), RTL_TEXTENCODING_UTF8);
     else if (!GetIsInPageSpan())
         sMasterPageName = "Standard";
 
     if (sMasterPageName.getLength())
     {
-        librevenge::RVNGPropertyList &rMasterPage = GetMasterStyles()[sMasterPageName];
+        librevenge::RVNGPropertyList& rMasterPage = GetMasterStyles()[sMasterPageName];
         if (rMasterPage["style:page-layout-name"])
         {
-            sLayoutName = OStringToOUString(rMasterPage["style:page-layout-name"]->getStr().cstr(), RTL_TEXTENCODING_UTF8);
+            sLayoutName = OStringToOUString(rMasterPage["style:page-layout-name"]->getStr().cstr(),
+                                            RTL_TEXTENCODING_UTF8);
         }
     }
 
     if (sLayoutName.getLength())
     {
-        librevenge::RVNGPropertyList &rPageLayout = GetPageLayouts()[sLayoutName];
+        librevenge::RVNGPropertyList& rPageLayout = GetPageLayouts()[sLayoutName];
 
         if (GetIsInPageSpan())
             GetGenerator().closePageSpan();
diff --git a/writerperfect/source/writer/exp/xmlimp.hxx b/writerperfect/source/writer/exp/xmlimp.hxx
index 4ef4bf3f5c43..9d0dfd430d12 100644
--- a/writerperfect/source/writer/exp/xmlimp.hxx
+++ b/writerperfect/source/writer/exp/xmlimp.hxx
@@ -29,7 +29,6 @@ namespace writerperfect
 {
 namespace exp
 {
-
 class XMLImportContext;
 
 /// Contains info about a fixed-layout page.
@@ -54,13 +53,10 @@ enum class PopupState
 };
 
 /// ODT export feeds this class to make librevenge calls.
-class XMLImport : public cppu::WeakImplHelper
-    <
-    css::xml::sax::XDocumentHandler
-    >
+class XMLImport : public cppu::WeakImplHelper<css::xml::sax::XDocumentHandler>
 {
-    librevenge::RVNGTextInterface &mrGenerator;
-    std::stack< rtl::Reference<XMLImportContext> > maContexts;
+    librevenge::RVNGTextInterface& mrGenerator;
+    std::stack<rtl::Reference<XMLImportContext>> maContexts;
     std::map<OUString, librevenge::RVNGPropertyList> maAutomaticTextStyles;
     std::map<OUString, librevenge::RVNGPropertyList> maTextStyles;
     std::map<OUString, librevenge::RVNGPropertyList> maAutomaticParagraphStyles;
@@ -80,59 +76,61 @@ class XMLImport : public cppu::WeakImplHelper
     librevenge::RVNGPropertyListVector maCoverImages;
     /// Author, date, etc -- overwrites what would be from the document out of the box.
     librevenge::RVNGPropertyList maMetaData;
-    const css::uno::Reference<css::uno::XComponentContext> &mxContext;
+    const css::uno::Reference<css::uno::XComponentContext>& mxContext;
     css::uno::Reference<css::uri::XUriReferenceFactory> mxUriReferenceFactory;
     OUString maMediaDir;
     bool mbIsInPageSpan;
-    const std::vector<FixedLayoutPage> &mrPageMetafiles;
+    const std::vector<FixedLayoutPage>& mrPageMetafiles;
 
 public:
-    XMLImport(const css::uno::Reference<css::uno::XComponentContext> &xContext, librevenge::RVNGTextInterface &rGenerator, const OUString &rURL, const css::uno::Sequence<css::beans::PropertyValue> &rDescriptor, const std::vector<FixedLayoutPage> &rPageMetafiles);
-
-    rtl::Reference<XMLImportContext> CreateContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs);
-
-    librevenge::RVNGTextInterface &GetGenerator() const;
-    std::map<OUString, librevenge::RVNGPropertyList> &GetAutomaticTextStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetAutomaticParagraphStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetAutomaticCellStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetAutomaticColumnStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetAutomaticRowStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetAutomaticTableStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetAutomaticGraphicStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetTextStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetParagraphStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetCellStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetColumnStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetRowStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetTableStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetGraphicStyles();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetPageLayouts();
-    std::map<OUString, librevenge::RVNGPropertyList> &GetMasterStyles();
-    const librevenge::RVNGPropertyListVector &GetCoverImages();
-    const librevenge::RVNGPropertyList &GetMetaData();
-    PopupState FillPopupData(const OUString &rURL, librevenge::RVNGPropertyList &rPropList);
-    const std::vector<FixedLayoutPage> &GetPageMetafiles() const;
-    const css::uno::Reference<css::uno::XComponentContext> &GetComponentContext() const;
-
-    bool GetIsInPageSpan() const
-    {
-        return mbIsInPageSpan;
-    }
-    void SetIsInPageSpan(bool bSet)
-    {
-        mbIsInPageSpan = bSet;
-    }
-    void HandlePageSpan(const librevenge::RVNGPropertyList &rPropertyList);
+    XMLImport(const css::uno::Reference<css::uno::XComponentContext>& xContext,
+              librevenge::RVNGTextInterface& rGenerator, const OUString& rURL,
+              const css::uno::Sequence<css::beans::PropertyValue>& rDescriptor,
+              const std::vector<FixedLayoutPage>& rPageMetafiles);
+
+    rtl::Reference<XMLImportContext>
+    CreateContext(const OUString& rName,
+                  const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs);
+
+    librevenge::RVNGTextInterface& GetGenerator() const;
+    std::map<OUString, librevenge::RVNGPropertyList>& GetAutomaticTextStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetAutomaticParagraphStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetAutomaticCellStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetAutomaticColumnStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetAutomaticRowStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetAutomaticTableStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetAutomaticGraphicStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetTextStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetParagraphStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetCellStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetColumnStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetRowStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetTableStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetGraphicStyles();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetPageLayouts();
+    std::map<OUString, librevenge::RVNGPropertyList>& GetMasterStyles();
+    const librevenge::RVNGPropertyListVector& GetCoverImages();
+    const librevenge::RVNGPropertyList& GetMetaData();
+    PopupState FillPopupData(const OUString& rURL, librevenge::RVNGPropertyList& rPropList);
+    const std::vector<FixedLayoutPage>& GetPageMetafiles() const;
+    const css::uno::Reference<css::uno::XComponentContext>& GetComponentContext() const;
+
+    bool GetIsInPageSpan() const { return mbIsInPageSpan; }
+    void SetIsInPageSpan(bool bSet) { mbIsInPageSpan = bSet; }
+    void HandlePageSpan(const librevenge::RVNGPropertyList& rPropertyList);
 
     // XDocumentHandler
     void SAL_CALL startDocument() override;
     void SAL_CALL endDocument() 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 ignorableWhitespace(const OUString &rWhitespaces) override;
-    void SAL_CALL processingInstruction(const OUString &rTarget, const OUString &rData) override;
-    void SAL_CALL setDocumentLocator(const css::uno::Reference<css::xml::sax::XLocator> &xLocator) 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 ignorableWhitespace(const OUString& rWhitespaces) override;
+    void SAL_CALL processingInstruction(const OUString& rTarget, const OUString& rData) override;
+    void SAL_CALL
+    setDocumentLocator(const css::uno::Reference<css::xml::sax::XLocator>& xLocator) override;
 };
 
 } // namespace exp
diff --git a/writerperfect/source/writer/exp/xmlmetai.cxx b/writerperfect/source/writer/exp/xmlmetai.cxx
index 7ee2024968ae..229dd82ff2d5 100644
--- a/writerperfect/source/writer/exp/xmlmetai.cxx
+++ b/writerperfect/source/writer/exp/xmlmetai.cxx
@@ -17,24 +17,24 @@ namespace writerperfect
 {
 namespace exp
 {
-
 /// Handler for <dc:title>.
 class XMLDcTitleContext : public XMLImportContext
 {
 public:
-    XMLDcTitleContext(XMLImport &rImport, XMLMetaDocumentContext &rMeta);
+    XMLDcTitleContext(XMLImport& rImport, XMLMetaDocumentContext& rMeta);
 
-    void SAL_CALL characters(const OUString &rChars) override;
+    void SAL_CALL characters(const OUString& rChars) override;
 
-    XMLMetaDocumentContext &mrMeta;
+    XMLMetaDocumentContext& mrMeta;
 };
 
-XMLDcTitleContext::XMLDcTitleContext(XMLImport &rImport, XMLMetaDocumentContext &rMeta)
-    : XMLImportContext(rImport), mrMeta(rMeta)
+XMLDcTitleContext::XMLDcTitleContext(XMLImport& rImport, XMLMetaDocumentContext& rMeta)
+    : XMLImportContext(rImport)
+    , mrMeta(rMeta)
 {
 }
 
-void XMLDcTitleContext::characters(const OUString &rChars)
+void XMLDcTitleContext::characters(const OUString& rChars)
 {
     OString sCharU8 = OUStringToOString(rChars, RTL_TEXTENCODING_UTF8);
     if (!mrMeta.m_aPropertyList["dc:title"])
@@ -45,19 +45,20 @@ void XMLDcTitleContext::characters(const OUString &rChars)
 class XMLDcLanguageContext : public XMLImportContext
 {
 public:
-    XMLDcLanguageContext(XMLImport &rImport, XMLMetaDocumentContext &rMeta);
+    XMLDcLanguageContext(XMLImport& rImport, XMLMetaDocumentContext& rMeta);
 
-    void SAL_CALL characters(const OUString &rChars) override;
+    void SAL_CALL characters(const OUString& rChars) override;
 
-    XMLMetaDocumentContext &mrMeta;
+    XMLMetaDocumentContext& mrMeta;
 };
 
-XMLDcLanguageContext::XMLDcLanguageContext(XMLImport &rImport, XMLMetaDocumentContext &rMeta)
-    : XMLImportContext(rImport), mrMeta(rMeta)
+XMLDcLanguageContext::XMLDcLanguageContext(XMLImport& rImport, XMLMetaDocumentContext& rMeta)
+    : XMLImportContext(rImport)
+    , mrMeta(rMeta)
 {
 }
 
-void XMLDcLanguageContext::characters(const OUString &rChars)
+void XMLDcLanguageContext::characters(const OUString& rChars)
 {
     OString sCharU8 = OUStringToOString(rChars, RTL_TEXTENCODING_UTF8);
     if (!mrMeta.m_aPropertyList["dc:language"])
@@ -68,19 +69,20 @@ void XMLDcLanguageContext::characters(const OUString &rChars)
 class XMLDcDateContext : public XMLImportContext
 {
 public:
-    XMLDcDateContext(XMLImport &rImport, XMLMetaDocumentContext &rMeta);
+    XMLDcDateContext(XMLImport& rImport, XMLMetaDocumentContext& rMeta);
 
-    void SAL_CALL characters(const OUString &rChars) override;
+    void SAL_CALL characters(const OUString& rChars) override;
 
-    XMLMetaDocumentContext &mrMeta;
+    XMLMetaDocumentContext& mrMeta;
 };
 
-XMLDcDateContext::XMLDcDateContext(XMLImport &rImport, XMLMetaDocumentContext &rMeta)
-    : XMLImportContext(rImport), mrMeta(rMeta)
+XMLDcDateContext::XMLDcDateContext(XMLImport& rImport, XMLMetaDocumentContext& rMeta)
+    : XMLImportContext(rImport)
+    , mrMeta(rMeta)
 {
 }
 
-void XMLDcDateContext::characters(const OUString &rChars)
+void XMLDcDateContext::characters(const OUString& rChars)
 {
     OString sCharU8 = OUStringToOString(rChars, RTL_TEXTENCODING_UTF8);
     if (!mrMeta.m_aPropertyList["dc:date"])
@@ -91,19 +93,20 @@ void XMLDcDateContext::characters(const OUString &rChars)
 class XMLMetaGeneratorContext : public XMLImportContext
 {
 public:
-    XMLMetaGeneratorContext(XMLImport &rImport, XMLMetaDocumentContext &rMeta);
+    XMLMetaGeneratorContext(XMLImport& rImport, XMLMetaDocumentContext& rMeta);
 
-    void SAL_CALL characters(const OUString &rChars) override;
+    void SAL_CALL characters(const OUString& rChars) override;
 
-    XMLMetaDocumentContext &mrMeta;
+    XMLMetaDocumentContext& mrMeta;
 };
 
-XMLMetaGeneratorContext::XMLMetaGeneratorContext(XMLImport &rImport, XMLMetaDocumentContext &rMeta)
-    : XMLImportContext(rImport), mrMeta(rMeta)
+XMLMetaGeneratorContext::XMLMetaGeneratorContext(XMLImport& rImport, XMLMetaDocumentContext& rMeta)
+    : XMLImportContext(rImport)
+    , mrMeta(rMeta)
 {
 }
 
-void XMLMetaGeneratorContext::characters(const OUString &rChars)
+void XMLMetaGeneratorContext::characters(const OUString& rChars)
 {
     OString sCharU8 = OUStringToOString(rChars, RTL_TEXTENCODING_UTF8);
     mrMeta.m_aPropertyList.insert("meta:generator", librevenge::RVNGString(sCharU8.getStr()));
@@ -113,26 +116,29 @@ void XMLMetaGeneratorContext::characters(const OUString &rChars)
 class XMLMetaInitialCreatorContext : public XMLImportContext
 {
 public:
-    XMLMetaInitialCreatorContext(XMLImport &rImport, XMLMetaDocumentContext &rMeta);
+    XMLMetaInitialCreatorContext(XMLImport& rImport, XMLMetaDocumentContext& rMeta);
 
-    void SAL_CALL characters(const OUString &rChars) override;
+    void SAL_CALL characters(const OUString& rChars) override;
 
-    XMLMetaDocumentContext &mrMeta;
+    XMLMetaDocumentContext& mrMeta;
 };
 
-XMLMetaInitialCreatorContext::XMLMetaInitialCreatorContext(XMLImport &rImport, XMLMetaDocumentContext &rMeta)
-    : XMLImportContext(rImport), mrMeta(rMeta)
+XMLMetaInitialCreatorContext::XMLMetaInitialCreatorContext(XMLImport& rImport,
+                                                           XMLMetaDocumentContext& rMeta)
+    : XMLImportContext(rImport)
+    , mrMeta(rMeta)
 {
 }
 
-void XMLMetaInitialCreatorContext::characters(const OUString &rChars)
+void XMLMetaInitialCreatorContext::characters(const OUString& rChars)
 {
     OString sCharU8 = OUStringToOString(rChars, RTL_TEXTENCODING_UTF8);
     if (!mrMeta.m_aPropertyList["meta:initial-creator"])
-        mrMeta.m_aPropertyList.insert("meta:initial-creator", librevenge::RVNGString(sCharU8.getStr()));
+        mrMeta.m_aPropertyList.insert("meta:initial-creator",
+                                      librevenge::RVNGString(sCharU8.getStr()));
 }
 
-XMLMetaDocumentContext::XMLMetaDocumentContext(XMLImport &rImport)
+XMLMetaDocumentContext::XMLMetaDocumentContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
     librevenge::RVNGPropertyList::Iter it(mrImport.GetMetaData());
@@ -141,7 +147,8 @@ XMLMetaDocumentContext::XMLMetaDocumentContext(XMLImport &rImport)
     m_aPropertyList.insert("librevenge:cover-images", mrImport.GetCoverImages());
 }
 
-rtl::Reference<XMLImportContext> XMLMetaDocumentContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLMetaDocumentContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "dc:title")
         return new XMLDcTitleContext(mrImport, *this);
@@ -156,25 +163,22 @@ rtl::Reference<XMLImportContext> XMLMetaDocumentContext::CreateChildContext(cons
     return nullptr;
 }
 
-void XMLMetaDocumentContext::endElement(const OUString &/*rName*/)
+void XMLMetaDocumentContext::endElement(const OUString& /*rName*/)
 {
     mrImport.GetGenerator().setDocumentMetaData(m_aPropertyList);
 }
 
-XMPParser::XMPParser(librevenge::RVNGPropertyList &rMetaData)
+XMPParser::XMPParser(librevenge::RVNGPropertyList& rMetaData)
     : mrMetaData(rMetaData)
 {
 }
 
 XMPParser::~XMPParser() = default;
 
-void XMPParser::startDocument()
-{
-}
+void XMPParser::startDocument() {}
 
 void XMPParser::endDocument()
 {
-
     if (!mrMetaData["dc:identifier"] && !m_aIdentifier.isEmpty())
         mrMetaData.insert("dc:identifier", m_aIdentifier.toUtf8().getStr());
     if (!mrMetaData["dc:title"] && !m_aTitle.isEmpty())
@@ -187,7 +191,8 @@ void XMPParser::endDocument()
         mrMetaData.insert("dc:date", m_aDate.toUtf8().getStr());
 }
 
-void XMPParser::startElement(const OUString &rName, const uno::Reference<xml::sax::XAttributeList> &/*xAttribs*/)
+void XMPParser::startElement(const OUString& rName,
+                             const uno::Reference<xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "dc:identifier")
         m_bInIdentifier = true;
@@ -212,7 +217,7 @@ void XMPParser::startElement(const OUString &rName, const uno::Reference<xml::sa
     }
 }
 
-void XMPParser::endElement(const OUString &rName)
+void XMPParser::endElement(const OUString& rName)
 {
     if (rName == "dc:identifier")
         m_bInIdentifier = false;
@@ -237,7 +242,7 @@ void XMPParser::endElement(const OUString &rName)
     }
 }
 
-void XMPParser::characters(const OUString &rChars)
+void XMPParser::characters(const OUString& rChars)
 {
     if (m_bInIdentifier)
         m_aIdentifier += rChars;
@@ -251,17 +256,11 @@ void XMPParser::characters(const OUString &rChars)
         m_aDate += rChars;
 }
 
-void XMPParser::ignorableWhitespace(const OUString &/*rWhitespace*/)
-{
-}
+void XMPParser::ignorableWhitespace(const OUString& /*rWhitespace*/) {}
 
-void XMPParser::processingInstruction(const OUString &/*rTarget*/, const OUString &/*rData*/)
-{
-}
+void XMPParser::processingInstruction(const OUString& /*rTarget*/, const OUString& /*rData*/) {}
 
-void XMPParser::setDocumentLocator(const uno::Reference<xml::sax::XLocator> &/*xLocator*/)
-{
-}
+void XMPParser::setDocumentLocator(const uno::Reference<xml::sax::XLocator>& /*xLocator*/) {}
 
 } // namespace exp
 } // namespace writerperfect
diff --git a/writerperfect/source/writer/exp/xmlmetai.hxx b/writerperfect/source/writer/exp/xmlmetai.hxx
index d69818a8648b..296adec7f836 100644
--- a/writerperfect/source/writer/exp/xmlmetai.hxx
+++ b/writerperfect/source/writer/exp/xmlmetai.hxx
@@ -18,28 +18,26 @@ namespace writerperfect
 {
 namespace exp
 {
-
 /// Handler for <office:meta>.
 class XMLMetaDocumentContext : public XMLImportContext
 {
 public:
-    XMLMetaDocumentContext(XMLImport &rImport);
+    XMLMetaDocumentContext(XMLImport& rImport);
 
-    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 endElement(const OUString &rName) override;
+    void SAL_CALL endElement(const OUString& rName) override;
 
     librevenge::RVNGPropertyList m_aPropertyList;
 };
 
 /// Parses an XMP file.
-class XMPParser: public cppu::WeakImplHelper
-    <
-    css::xml::sax::XDocumentHandler
-    >
+class XMPParser : public cppu::WeakImplHelper<css::xml::sax::XDocumentHandler>
 {
 public:
-    explicit XMPParser(librevenge::RVNGPropertyList &rMetaData);
+    explicit XMPParser(librevenge::RVNGPropertyList& rMetaData);
     ~XMPParser() override;
 
     // XDocumentHandler
@@ -47,20 +45,23 @@ public:
 
     void SAL_CALL endDocument() override;
 
-    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;
 
-    void SAL_CALL endElement(const OUString &rName) override;
+    void SAL_CALL endElement(const OUString& rName) override;
 
-    void SAL_CALL characters(const OUString &rChars) override;
+    void SAL_CALL characters(const OUString& rChars) override;
 
-    void SAL_CALL ignorableWhitespace(const OUString &aWhitespaces) override;
+    void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) override;
 
-    void SAL_CALL processingInstruction(const OUString &aTarget, const OUString &aData) override;
+    void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) override;
 
-    void SAL_CALL setDocumentLocator(const css::uno::Reference<css::xml::sax::XLocator> &xLocator) override;
+    void SAL_CALL
+    setDocumentLocator(const css::uno::Reference<css::xml::sax::XLocator>& xLocator) override;
 
 private:
-    librevenge::RVNGPropertyList &mrMetaData;
+    librevenge::RVNGPropertyList& mrMetaData;
     bool m_bInIdentifier = false;
     OUString m_aIdentifier;
     bool m_bInTitle = false;
diff --git a/writerperfect/source/writer/exp/xmltbli.cxx b/writerperfect/source/writer/exp/xmltbli.cxx
index 82468e12a91a..b5c16388b750 100644
--- a/writerperfect/source/writer/exp/xmltbli.cxx
+++ b/writerperfect/source/writer/exp/xmltbli.cxx
@@ -19,19 +19,22 @@ namespace writerperfect
 {
 namespace exp
 {
-
 /// Handler for <table:table-row>.
 class XMLTableRowContext : public XMLImportContext
 {
 public:
-    XMLTableRowContext(XMLImport &rImport);
+    XMLTableRowContext(XMLImport& rImport);
 
-    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;
     int GetColumn() const;
     void SetColumn(int nColumn);
 
-    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
+    startElement(const OUString& rName,
+                 const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
+    void SAL_CALL endElement(const OUString& rName) override;
 
 private:
     int m_nColumn = 0;
@@ -41,38 +44,45 @@ private:
 class XMLTableCellContext : public XMLImportContext
 {
 public:
-    XMLTableCellContext(XMLImport &rImport, XMLTableRowContext &rRow);
+    XMLTableCellContext(XMLImport& rImport, XMLTableRowContext& rRow);
 
-    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 endElement(const OUString &rName) 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;
 
 private:
-    XMLTableRowContext &m_rRow;
+    XMLTableRowContext& m_rRow;
 };
 
-XMLTableCellContext::XMLTableCellContext(XMLImport &rImport, XMLTableRowContext &rRow)
-    : XMLImportContext(rImport),
-      m_rRow(rRow)
+XMLTableCellContext::XMLTableCellContext(XMLImport& rImport, XMLTableRowContext& rRow)
+    : XMLImportContext(rImport)
+    , m_rRow(rRow)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLTableCellContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLTableCellContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     return CreateTextChildContext(mrImport, rName);
 }
 
-void XMLTableCellContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLTableCellContext::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 == "table:style-name")
-            FillStyles(rAttributeValue, mrImport.GetAutomaticCellStyles(), mrImport.GetCellStyles(), aPropertyList);
+            FillStyles(rAttributeValue, mrImport.GetAutomaticCellStyles(), mrImport.GetCellStyles(),
+                       aPropertyList);
         else
         {
             OString sName = OUStringToOString(rAttributeName, RTL_TEXTENCODING_UTF8);
@@ -85,7 +95,7 @@ void XMLTableCellContext::startElement(const OUString &/*rName*/, const css::uno
     m_rRow.SetColumn(m_rRow.GetColumn() + 1);
 }
 
-void XMLTableCellContext::endElement(const OUString &/*rName*/)
+void XMLTableCellContext::endElement(const OUString& /*rName*/)
 {
     mrImport.GetGenerator().closeTableCell();
 }
@@ -94,40 +104,46 @@ void XMLTableCellContext::endElement(const OUString &/*rName*/)
 class XMLTableColumnContext : public XMLImportContext
 {
 public:
-    XMLTableColumnContext(XMLImport &rImport, librevenge::RVNGPropertyListVector &rColumns);
+    XMLTableColumnContext(XMLImport& rImport, librevenge::RVNGPropertyListVector& rColumns);
 
-    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;
 
 private:
-    librevenge::RVNGPropertyListVector &m_rColumns;
+    librevenge::RVNGPropertyListVector& m_rColumns;
 };
 
-XMLTableColumnContext::XMLTableColumnContext(XMLImport &rImport, librevenge::RVNGPropertyListVector &rColumns)
-    : XMLImportContext(rImport),
-      m_rColumns(rColumns)
+XMLTableColumnContext::XMLTableColumnContext(XMLImport& rImport,
+                                             librevenge::RVNGPropertyListVector& rColumns)
+    : XMLImportContext(rImport)
+    , m_rColumns(rColumns)
 {
 }
 
-void XMLTableColumnContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLTableColumnContext::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 == "table:style-name")
-            FillStyles(rAttributeValue, mrImport.GetAutomaticColumnStyles(), mrImport.GetColumnStyles(), aPropertyList);
+            FillStyles(rAttributeValue, mrImport.GetAutomaticColumnStyles(),
+                       mrImport.GetColumnStyles(), aPropertyList);
     }
     m_rColumns.append(aPropertyList);
 }
 
-XMLTableRowContext::XMLTableRowContext(XMLImport &rImport)
+XMLTableRowContext::XMLTableRowContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLTableRowContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLTableRowContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "table:table-cell")
         return new XMLTableCellContext(mrImport, *this);
@@ -141,41 +157,38 @@ rtl::Reference<XMLImportContext> XMLTableRowContext::CreateChildContext(const OU
     return nullptr;
 }
 
-void XMLTableRowContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLTableRowContext::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 == "table:style-name")
-            FillStyles(rAttributeValue, mrImport.GetAutomaticRowStyles(), mrImport.GetRowStyles(), aPropertyList);
+            FillStyles(rAttributeValue, mrImport.GetAutomaticRowStyles(), mrImport.GetRowStyles(),
+                       aPropertyList);
     }
     mrImport.GetGenerator().openTableRow(aPropertyList);
 }
 
-void XMLTableRowContext::endElement(const OUString &/*rName*/)
+void XMLTableRowContext::endElement(const OUString& /*rName*/)
 {
     mrImport.GetGenerator().closeTableRow();
 }
 
-int XMLTableRowContext::GetColumn() const
-{
-    return m_nColumn;
-}
+int XMLTableRowContext::GetColumn() const { return m_nColumn; }
 
-void XMLTableRowContext::SetColumn(int nColumn)
-{
-    m_nColumn = nColumn;
-}
+void XMLTableRowContext::SetColumn(int nColumn) { m_nColumn = nColumn; }
 
-XMLTableContext::XMLTableContext(XMLImport &rImport)
+XMLTableContext::XMLTableContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-rtl::Reference<XMLImportContext> XMLTableContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLTableContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     if (rName == "table:table-column")
         // Make sure columns are parsed before we open the table.
@@ -197,16 +210,18 @@ rtl::Reference<XMLImportContext> XMLTableContext::CreateChildContext(const OUStr
     return nullptr;
 }
 
-void XMLTableContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs)
+void XMLTableContext::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 == "table:style-name")
         {
-            FillStyles(rAttributeValue, mrImport.GetAutomaticTableStyles(), mrImport.GetTableStyles(), m_aPropertyList);
+            FillStyles(rAttributeValue, mrImport.GetAutomaticTableStyles(),
+                       mrImport.GetTableStyles(), m_aPropertyList);
             mrImport.HandlePageSpan(m_aPropertyList);
         }
         else
@@ -218,7 +233,7 @@ void XMLTableContext::startElement(const OUString &/*rName*/, const css::uno::Re
     }
 }
 
-void XMLTableContext::endElement(const OUString &/*rName*/)
+void XMLTableContext::endElement(const OUString& /*rName*/)
 {
     mrImport.GetGenerator().closeTable();
 }
diff --git a/writerperfect/source/writer/exp/xmltbli.hxx b/writerperfect/source/writer/exp/xmltbli.hxx
index ed755731e9fc..6b7d7b267cbe 100644
--- a/writerperfect/source/writer/exp/xmltbli.hxx
+++ b/writerperfect/source/writer/exp/xmltbli.hxx
@@ -18,17 +18,20 @@ namespace writerperfect
 {
 namespace exp
 {
-
 /// Handler for <table:table>.
 class XMLTableContext : public XMLImportContext
 {
 public:
-    XMLTableContext(XMLImport &rImport);
+    XMLTableContext(XMLImport& rImport);
 
-    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 endElement(const OUString &rName) 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;
 
 private:
     bool m_bTableOpened = false;
diff --git a/writerperfect/source/writer/exp/xmltext.cxx b/writerperfect/source/writer/exp/xmltext.cxx
index a6624b1f2115..1472a23c3763 100644
--- a/writerperfect/source/writer/exp/xmltext.cxx
+++ b/writerperfect/source/writer/exp/xmltext.cxx
@@ -21,24 +21,24 @@ namespace writerperfect
 {
 namespace exp
 {
-
-XMLBodyContentContext::XMLBodyContentContext(XMLImport &rImport)
+XMLBodyContentContext::XMLBodyContentContext(XMLImport& rImport)
     : XMLImportContext(rImport)
 {
 }
 
-void XMLBodyContentContext::endElement(const OUString &/*rName*/)
+void XMLBodyContentContext::endElement(const OUString& /*rName*/)
 {
     if (mrImport.GetIsInPageSpan())
         mrImport.GetGenerator().closePageSpan();
 }
 
-rtl::Reference<XMLImportContext> XMLBodyContentContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLBodyContentContext::CreateChildContext(
+    const OUString& rName, const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
 {
     return CreateTextChildContext(mrImport, rName);
 }
 
-rtl::Reference<XMLImportContext> CreateTextChildContext(XMLImport &rImport, const OUString &rName)
+rtl::Reference<XMLImportContext> CreateTextChildContext(XMLImport& rImport, const OUString& rName)
 {
     if (rName == "text:p" || rName == "text:h")
         return new XMLParaContext(rImport);
diff --git a/writerperfect/source/writer/exp/xmltext.hxx b/writerperfect/source/writer/exp/xmltext.hxx
index 1c9a1e131542..b635176ce4ce 100644
--- a/writerperfect/source/writer/exp/xmltext.hxx
+++ b/writerperfect/source/writer/exp/xmltext.hxx
@@ -16,19 +16,20 @@ namespace writerperfect
 {
 namespace exp
 {
-
 /// Handler for <office:text>.
 class XMLBodyContentContext : public XMLImportContext
 {
 public:
-    XMLBodyContentContext(XMLImport &rImport);
+    XMLBodyContentContext(XMLImport& rImport);
 
-    rtl::Reference<XMLImportContext> CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/) override;
-    void SAL_CALL endElement(const OUString &rName) override;
+    rtl::Reference<XMLImportContext> CreateChildContext(
+        const OUString& rName,
+        const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/) override;
+    void SAL_CALL endElement(const OUString& rName) override;
 };
 
 /// Context factory for body text, section, table cell, etc.
-rtl::Reference<XMLImportContext> CreateTextChildContext(XMLImport &rImport, const OUString &rName);
+rtl::Reference<XMLImportContext> CreateTextChildContext(XMLImport& rImport, const OUString& rName);
 
 } // namespace exp
 } // namespace writerperfect