summaryrefslogtreecommitdiff
path: root/writerperfect/source/writer
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-09-25 10:33:48 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-09-25 14:11:23 +0200
commit68af7378074397466c15509a5d813dce69a54a41 (patch)
tree0db6984a4649e0acf32ddc4516aacded7a5d168e /writerperfect/source/writer
parent7810858ee6cac233ce5868de1f2ef5de1d443af4 (diff)
EPUB export: don't leak when exceptions are thrown
Additional benefit is that this way we're again in sync with xmloff code. Change-Id: Ifa1dd976fbd2ce04cb47814060508c65e35474ca
Diffstat (limited to 'writerperfect/source/writer')
-rw-r--r--writerperfect/source/writer/exp/XMLSectionContext.cxx2
-rw-r--r--writerperfect/source/writer/exp/XMLSectionContext.hxx2
-rw-r--r--writerperfect/source/writer/exp/XMLTextFrameContext.cxx6
-rw-r--r--writerperfect/source/writer/exp/XMLTextFrameContext.hxx2
-rw-r--r--writerperfect/source/writer/exp/XMLTextListContext.cxx2
-rw-r--r--writerperfect/source/writer/exp/XMLTextListContext.hxx2
-rw-r--r--writerperfect/source/writer/exp/XMLTextListItemContext.cxx2
-rw-r--r--writerperfect/source/writer/exp/XMLTextListItemContext.hxx2
-rw-r--r--writerperfect/source/writer/exp/txtparai.cxx8
-rw-r--r--writerperfect/source/writer/exp/txtparai.hxx4
-rw-r--r--writerperfect/source/writer/exp/txtstyli.cxx2
-rw-r--r--writerperfect/source/writer/exp/txtstyli.hxx2
-rw-r--r--writerperfect/source/writer/exp/xmlfmt.cxx2
-rw-r--r--writerperfect/source/writer/exp/xmlfmt.hxx2
-rw-r--r--writerperfect/source/writer/exp/xmlictxt.cxx2
-rw-r--r--writerperfect/source/writer/exp/xmlictxt.hxx7
-rw-r--r--writerperfect/source/writer/exp/xmlimp.cxx10
-rw-r--r--writerperfect/source/writer/exp/xmlimp.hxx2
-rw-r--r--writerperfect/source/writer/exp/xmlmetai.cxx2
-rw-r--r--writerperfect/source/writer/exp/xmlmetai.hxx2
-rw-r--r--writerperfect/source/writer/exp/xmltbli.cxx10
-rw-r--r--writerperfect/source/writer/exp/xmltbli.hxx2
-rw-r--r--writerperfect/source/writer/exp/xmltext.cxx4
-rw-r--r--writerperfect/source/writer/exp/xmltext.hxx4
24 files changed, 43 insertions, 42 deletions
diff --git a/writerperfect/source/writer/exp/XMLSectionContext.cxx b/writerperfect/source/writer/exp/XMLSectionContext.cxx
index ba6e1a7944f7..9d3621c4f346 100644
--- a/writerperfect/source/writer/exp/XMLSectionContext.cxx
+++ b/writerperfect/source/writer/exp/XMLSectionContext.cxx
@@ -24,7 +24,7 @@ XMLSectionContext::XMLSectionContext(XMLImport &rImport)
{
}
-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);
}
diff --git a/writerperfect/source/writer/exp/XMLSectionContext.hxx b/writerperfect/source/writer/exp/XMLSectionContext.hxx
index 5aa49a444a9a..9eeb69a311b4 100644
--- a/writerperfect/source/writer/exp/XMLSectionContext.hxx
+++ b/writerperfect/source/writer/exp/XMLSectionContext.hxx
@@ -23,7 +23,7 @@ class XMLSectionContext : public XMLImportContext
public:
XMLSectionContext(XMLImport &rImport);
- 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;
};
diff --git a/writerperfect/source/writer/exp/XMLTextFrameContext.cxx b/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
index 60cbe2d21263..94c76b71be9a 100644
--- a/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
@@ -25,7 +25,7 @@ class XMLTextImageContext : public XMLImportContext
public:
XMLTextImageContext(XMLImport &rImport);
- 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;
@@ -40,7 +40,7 @@ XMLTextImageContext::XMLTextImageContext(XMLImport &rImport)
{
}
-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")
{
@@ -76,7 +76,7 @@ XMLTextFrameContext::XMLTextFrameContext(XMLImport &rImport)
{
}
-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);
diff --git a/writerperfect/source/writer/exp/XMLTextFrameContext.hxx b/writerperfect/source/writer/exp/XMLTextFrameContext.hxx
index 2cf14889df05..076426e69ed9 100644
--- a/writerperfect/source/writer/exp/XMLTextFrameContext.hxx
+++ b/writerperfect/source/writer/exp/XMLTextFrameContext.hxx
@@ -27,7 +27,7 @@ class XMLTextFrameContext : public XMLImportContext
public:
XMLTextFrameContext(XMLImport &rImport);
- 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;
diff --git a/writerperfect/source/writer/exp/XMLTextListContext.cxx b/writerperfect/source/writer/exp/XMLTextListContext.cxx
index edfd7371b15e..3a7698890759 100644
--- a/writerperfect/source/writer/exp/XMLTextListContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextListContext.cxx
@@ -23,7 +23,7 @@ XMLTextListContext::XMLTextListContext(XMLImport &rImport)
{
}
-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 533257228fbb..8e9152f06058 100644
--- a/writerperfect/source/writer/exp/XMLTextListContext.hxx
+++ b/writerperfect/source/writer/exp/XMLTextListContext.hxx
@@ -23,7 +23,7 @@ class XMLTextListContext : public XMLImportContext
public:
XMLTextListContext(XMLImport &rImport);
- 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 7b166d52fb42..cbf3462566f0 100644
--- a/writerperfect/source/writer/exp/XMLTextListItemContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextListItemContext.cxx
@@ -25,7 +25,7 @@ XMLTextListItemContext::XMLTextListItemContext(XMLImport &rImport)
{
}
-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 cb6a68aedf5a..cbca5bf7feac 100644
--- a/writerperfect/source/writer/exp/XMLTextListItemContext.hxx
+++ b/writerperfect/source/writer/exp/XMLTextListItemContext.hxx
@@ -23,7 +23,7 @@ class XMLTextListItemContext : public XMLImportContext
public:
XMLTextListItemContext(XMLImport &rImport);
- 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 8e19475b65fe..fa6f91f0bd7b 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -76,7 +76,7 @@ class XMLSpanContext : public XMLImportContext
public:
XMLSpanContext(XMLImport &rImport, const librevenge::RVNGPropertyList &rPropertyList);
- 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;
@@ -94,7 +94,7 @@ XMLSpanContext::XMLSpanContext(XMLImport &rImport, const librevenge::RVNGPropert
m_aPropertyList.insert(itProp.key(), itProp()->clone());
}
-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*/)
{
if (rName == "draw:frame")
return new XMLTextFrameContext(mrImport);
@@ -259,7 +259,7 @@ XMLParaContext::XMLParaContext(XMLImport &rImport)
{
}
-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);
@@ -308,7 +308,7 @@ void XMLParaContext::characters(const OUString &rChars)
mrImport.GetGenerator().closeSpan();
}
-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);
diff --git a/writerperfect/source/writer/exp/txtparai.hxx b/writerperfect/source/writer/exp/txtparai.hxx
index a427d2602516..c32ef1916b0b 100644
--- a/writerperfect/source/writer/exp/txtparai.hxx
+++ b/writerperfect/source/writer/exp/txtparai.hxx
@@ -23,7 +23,7 @@ class XMLParaContext : public XMLImportContext
public:
XMLParaContext(XMLImport &rImport);
- 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;
@@ -36,7 +36,7 @@ private:
};
/// Shared child context factory for paragraph and span contexts.
-XMLImportContext *CreateParagraphOrSpanChildContext(XMLImport &rImport, const OUString &rName, const librevenge::RVNGPropertyList &rTextPropertyList);
+rtl::Reference<XMLImportContext> CreateParagraphOrSpanChildContext(XMLImport &rImport, const OUString &rName, const librevenge::RVNGPropertyList &rTextPropertyList);
} // namespace exp
} // namespace writerperfect
diff --git a/writerperfect/source/writer/exp/txtstyli.cxx b/writerperfect/source/writer/exp/txtstyli.cxx
index 420651a1ddb0..bdb36eedea51 100644
--- a/writerperfect/source/writer/exp/txtstyli.cxx
+++ b/writerperfect/source/writer/exp/txtstyli.cxx
@@ -81,7 +81,7 @@ XMLStyleContext::XMLStyleContext(XMLImport &rImport, XMLStylesContext &rStyles)
{
}
-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);
diff --git a/writerperfect/source/writer/exp/txtstyli.hxx b/writerperfect/source/writer/exp/txtstyli.hxx
index 83ffd78f4e70..5852730049a0 100644
--- a/writerperfect/source/writer/exp/txtstyli.hxx
+++ b/writerperfect/source/writer/exp/txtstyli.hxx
@@ -27,7 +27,7 @@ class XMLStyleContext : public XMLImportContext
public:
XMLStyleContext(XMLImport &rImport, XMLStylesContext &rStyles);
- 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;
diff --git a/writerperfect/source/writer/exp/xmlfmt.cxx b/writerperfect/source/writer/exp/xmlfmt.cxx
index b3317283f470..f1e501ccc748 100644
--- a/writerperfect/source/writer/exp/xmlfmt.cxx
+++ b/writerperfect/source/writer/exp/xmlfmt.cxx
@@ -26,7 +26,7 @@ XMLStylesContext::XMLStylesContext(XMLImport &rImport, std::map<OUString, librev
{
}
-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")
return new XMLStyleContext(mrImport, *this);
diff --git a/writerperfect/source/writer/exp/xmlfmt.hxx b/writerperfect/source/writer/exp/xmlfmt.hxx
index 394be55b36c2..aea29dbdfa8f 100644
--- a/writerperfect/source/writer/exp/xmlfmt.hxx
+++ b/writerperfect/source/writer/exp/xmlfmt.hxx
@@ -27,7 +27,7 @@ class XMLStylesContext : public XMLImportContext
public:
XMLStylesContext(XMLImport &rImport, std::map<OUString, librevenge::RVNGPropertyList> &rParagraphStyles, std::map<OUString, librevenge::RVNGPropertyList> &rTextStyles);
- 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();
diff --git a/writerperfect/source/writer/exp/xmlictxt.cxx b/writerperfect/source/writer/exp/xmlictxt.cxx
index 5f5a731493c8..ba5c06804dc4 100644
--- a/writerperfect/source/writer/exp/xmlictxt.cxx
+++ b/writerperfect/source/writer/exp/xmlictxt.cxx
@@ -23,7 +23,7 @@ XMLImportContext::XMLImportContext(XMLImport &rImport)
{
}
-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);
}
diff --git a/writerperfect/source/writer/exp/xmlictxt.hxx b/writerperfect/source/writer/exp/xmlictxt.hxx
index 0076852f25d3..cbdeab0f6898 100644
--- a/writerperfect/source/writer/exp/xmlictxt.hxx
+++ b/writerperfect/source/writer/exp/xmlictxt.hxx
@@ -10,12 +10,13 @@
#ifndef INCLUDED_WRITERPERFECT_SOURCE_WRITER_EXP_XMLICTXT_HXX
#define INCLUDED_WRITERPERFECT_SOURCE_WRITER_EXP_XMLICTXT_HXX
-#include <cppuhelper/implbase.hxx>
-
#include <librevenge/librevenge.h>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#include <cppuhelper/implbase.hxx>
+#include <rtl/ref.hxx>
+
namespace writerperfect
{
namespace exp
@@ -32,7 +33,7 @@ class XMLImportContext : public cppu::WeakImplHelper
public:
XMLImportContext(XMLImport &rImport);
- virtual 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;
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx b/writerperfect/source/writer/exp/xmlimp.cxx
index 2370399edb65..5d368ed277f0 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -27,7 +27,7 @@ class XMLBodyContext : public XMLImportContext
public:
XMLBodyContext(XMLImport &rImport);
- 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;
};
XMLBodyContext::XMLBodyContext(XMLImport &rImport)
@@ -35,7 +35,7 @@ XMLBodyContext::XMLBodyContext(XMLImport &rImport)
{
}
-XMLImportContext *XMLBodyContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLBodyContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
{
if (rName == "office:text")
return new XMLBodyContentContext(mrImport);
@@ -48,7 +48,7 @@ class XMLOfficeDocContext : public XMLImportContext
public:
XMLOfficeDocContext(XMLImport &rImport);
- 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;
};
XMLOfficeDocContext::XMLOfficeDocContext(XMLImport &rImport)
@@ -56,7 +56,7 @@ XMLOfficeDocContext::XMLOfficeDocContext(XMLImport &rImport)
{
}
-XMLImportContext *XMLOfficeDocContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLOfficeDocContext::CreateChildContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
{
if (rName == "office:body")
return new XMLBodyContext(mrImport);
@@ -74,7 +74,7 @@ XMLImport::XMLImport(librevenge::RVNGTextInterface &rGenerator)
{
}
-XMLImportContext *XMLImport::CreateContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+rtl::Reference<XMLImportContext> XMLImport::CreateContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
{
if (rName == "office:document")
return new XMLOfficeDocContext(*this);
diff --git a/writerperfect/source/writer/exp/xmlimp.hxx b/writerperfect/source/writer/exp/xmlimp.hxx
index 128a88cabdd6..f971327fada8 100644
--- a/writerperfect/source/writer/exp/xmlimp.hxx
+++ b/writerperfect/source/writer/exp/xmlimp.hxx
@@ -43,7 +43,7 @@ class XMLImport : public cppu::WeakImplHelper
public:
XMLImport(librevenge::RVNGTextInterface &rGenerator);
- XMLImportContext *CreateContext(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs);
+ 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();
diff --git a/writerperfect/source/writer/exp/xmlmetai.cxx b/writerperfect/source/writer/exp/xmlmetai.cxx
index 8777f4fa0b6f..0d804833bc7a 100644
--- a/writerperfect/source/writer/exp/xmlmetai.cxx
+++ b/writerperfect/source/writer/exp/xmlmetai.cxx
@@ -133,7 +133,7 @@ XMLMetaDocumentContext::XMLMetaDocumentContext(XMLImport &rImport)
{
}
-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);
diff --git a/writerperfect/source/writer/exp/xmlmetai.hxx b/writerperfect/source/writer/exp/xmlmetai.hxx
index b02e1f21caaf..12285937a705 100644
--- a/writerperfect/source/writer/exp/xmlmetai.hxx
+++ b/writerperfect/source/writer/exp/xmlmetai.hxx
@@ -25,7 +25,7 @@ class XMLMetaDocumentContext : public XMLImportContext
public:
XMLMetaDocumentContext(XMLImport &rImport);
- 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;
diff --git a/writerperfect/source/writer/exp/xmltbli.cxx b/writerperfect/source/writer/exp/xmltbli.cxx
index 735e276de241..d5844fd18d5c 100644
--- a/writerperfect/source/writer/exp/xmltbli.cxx
+++ b/writerperfect/source/writer/exp/xmltbli.cxx
@@ -26,7 +26,7 @@ class XMLTableCellContext : public XMLImportContext
public:
XMLTableCellContext(XMLImport &rImport);
- 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;
@@ -37,7 +37,7 @@ XMLTableCellContext::XMLTableCellContext(XMLImport &rImport)
{
}
-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);
}
@@ -58,7 +58,7 @@ class XMLTableRowContext : public XMLImportContext
public:
XMLTableRowContext(XMLImport &rImport);
- 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;
@@ -69,7 +69,7 @@ XMLTableRowContext::XMLTableRowContext(XMLImport &rImport)
{
}
-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);
@@ -91,7 +91,7 @@ XMLTableContext::XMLTableContext(XMLImport &rImport)
{
}
-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-row")
return new XMLTableRowContext(mrImport);
diff --git a/writerperfect/source/writer/exp/xmltbli.hxx b/writerperfect/source/writer/exp/xmltbli.hxx
index ceeb098c1f9c..07ae0a647181 100644
--- a/writerperfect/source/writer/exp/xmltbli.hxx
+++ b/writerperfect/source/writer/exp/xmltbli.hxx
@@ -23,7 +23,7 @@ class XMLTableContext : public XMLImportContext
public:
XMLTableContext(XMLImport &rImport);
- 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;
diff --git a/writerperfect/source/writer/exp/xmltext.cxx b/writerperfect/source/writer/exp/xmltext.cxx
index 14c5b306dd99..3902e15ae839 100644
--- a/writerperfect/source/writer/exp/xmltext.cxx
+++ b/writerperfect/source/writer/exp/xmltext.cxx
@@ -26,12 +26,12 @@ XMLBodyContentContext::XMLBodyContentContext(XMLImport &rImport)
{
}
-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);
}
-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 dc8f35f33fbd..bce957c4f7e8 100644
--- a/writerperfect/source/writer/exp/xmltext.hxx
+++ b/writerperfect/source/writer/exp/xmltext.hxx
@@ -23,11 +23,11 @@ class XMLBodyContentContext : public XMLImportContext
public:
XMLBodyContentContext(XMLImport &rImport);
- 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;
};
/// Context factory for body text, section, table cell, etc.
-XMLImportContext *CreateTextChildContext(XMLImport &rImport, const OUString &rName);
+rtl::Reference<XMLImportContext> CreateTextChildContext(XMLImport &rImport, const OUString &rName);
} // namespace exp
} // namespace writerperfect