use unique_ptr for pImpl's in xmloff/

Change-Id: Ib95118941938af83fed566a085837e17f092017a

15 files changed, 31 insertions, 16 deletions

diff --git a/include/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx
index 36f8d402a061..dae6f7f64d74 100644
--- a/include/xmloff/SchXMLExportHelper.hxx
+++ b/include/xmloff/SchXMLExportHelper.hxx
@@ -31,6 +31,7 @@
 
 #include <queue>
 #include <vector>
+#include <memory>
 
 class SvXMLAutoStylePoolP;
 class SvXMLExport;
@@ -60,7 +61,7 @@ private:
     void operator =(SchXMLExportHelper &) = delete;
 
 private:
-    SchXMLExportHelper_Impl* m_pImpl;
+    std::unique_ptr<SchXMLExportHelper_Impl> m_pImpl;
     friend class SchXMLExport;
 };
 
diff --git a/include/xmloff/animationexport.hxx b/include/xmloff/animationexport.hxx
index 4142910edfb2..d07678f7ad7f 100644
--- a/include/xmloff/animationexport.hxx
+++ b/include/xmloff/animationexport.hxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/animations/XAnimationNode.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <salhelper/simplereferenceobject.hxx>
+#include <memory>
 
 class SvXMLExport;
 
@@ -36,7 +37,7 @@ class AnimationsExporterImpl;
 
 class XMLOFF_DLLPUBLIC AnimationsExporter : public salhelper::SimpleReferenceObject
 {
-    AnimationsExporterImpl*	mpImpl;
+    std::unique_ptr<AnimationsExporterImpl>  mpImpl;
 
 public:
     AnimationsExporter( SvXMLExport& rExport, const css::uno::Reference< css::beans::XPropertySet >& xPageProps  );
diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx
index 3b44a18370fe..7276b477149d 100644
--- a/include/xmloff/animexp.hxx
+++ b/include/xmloff/animexp.hxx
@@ -22,6 +22,7 @@
 
 #include <com/sun/star/drawing/XShape.hpp>
 #include <salhelper/simplereferenceobject.hxx>
+#include <memory>
 
 class AnimExpImpl;
 class SvXMLExport;
@@ -29,7 +30,7 @@ class XMLShapeExport;
 
 class XMLAnimationsExporter : public salhelper::SimpleReferenceObject
 {
-    AnimExpImpl*    mpImpl;
+    std::unique_ptr<AnimExpImpl> mpImpl;
 
 public:
     XMLAnimationsExporter( XMLShapeExport* pShapeExp );
diff --git a/include/xmloff/attrlist.hxx b/include/xmloff/attrlist.hxx
index 6eca0ce7af17..55e3e4eb46ba 100644
--- a/include/xmloff/attrlist.hxx
+++ b/include/xmloff/attrlist.hxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
 #include <cppuhelper/implbase3.hxx>
+#include <memory>
 
 struct SvXMLAttributeList_Impl;
 
@@ -40,7 +41,7 @@ class XMLOFF_DLLPUBLIC SvXMLAttributeList : public ::cppu::WeakImplHelper3<
         css::util::XCloneable,
         css::lang::XUnoTunnel>
 {
-    SvXMLAttributeList_Impl *m_pImpl;
+    std::unique_ptr<SvXMLAttributeList_Impl> m_pImpl;
 
 public:
     SvXMLAttributeList();
diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx
index 1aeb85b70494..d3c7e14574c5 100644
--- a/include/xmloff/formlayerexport.hxx
+++ b/include/xmloff/formlayerexport.hxx
@@ -29,6 +29,7 @@
 #include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 #include <xmloff/xmlexppr.hxx>
+#include <memory>
 
 namespace com { namespace sun { namespace star { namespace awt {
     class XControlModel;
@@ -55,7 +56,7 @@ namespace xmloff
         /// our export context
         SvXMLExport&                m_rContext;
         // impl class
-        OFormLayerXMLExport_Impl*   m_pImpl;
+        std::unique_ptr<OFormLayerXMLExport_Impl> m_pImpl;
 
     protected:
         virtual ~OFormLayerXMLExport();
@@ -173,7 +174,7 @@ namespace xmloff
     class XMLOFF_DLLPUBLIC OOfficeFormsExport
     {
     private:
-        OFormsRootExport*   m_pImpl;
+        std::unique_ptr<OFormsRootExport>  m_pImpl;
 
     public:
         OOfficeFormsExport( SvXMLExport& _rExp );
diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx
index 344bd4fc39b9..8b4ea5cba459 100644
--- a/include/xmloff/formlayerimport.hxx
+++ b/include/xmloff/formlayerimport.hxx
@@ -28,6 +28,7 @@
 #include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 #include <xmloff/xmlimppr.hxx>
+#include <memory>
 
 class SvXMLImport;
 class SvXMLImportContext;
@@ -48,7 +49,7 @@ namespace xmloff
     class XMLOFF_DLLPUBLIC OFormLayerXMLImport
                 :public ::salhelper::SimpleReferenceObject
     {
-        OFormLayerXMLImport_Impl*   m_pImpl;
+        std::unique_ptr<OFormLayerXMLImport_Impl>   m_pImpl;
 
     public:
         OFormLayerXMLImport(SvXMLImport& _rImporter);
diff --git a/include/xmloff/prhdlfac.hxx b/include/xmloff/prhdlfac.hxx
index 515a69cfbfe7..84827d64a215 100644
--- a/include/xmloff/prhdlfac.hxx
+++ b/include/xmloff/prhdlfac.hxx
@@ -24,6 +24,7 @@
 #include <sal/types.h>
 
 #include <salhelper/simplereferenceobject.hxx>
+#include <memory>
 
 class XMLPropertyHandler;
 
@@ -39,7 +40,7 @@ class XMLPropertyHandler;
 class XMLOFF_DLLPUBLIC XMLPropertyHandlerFactory : public salhelper::SimpleReferenceObject
 {
     struct Impl;
-    Impl* mpImpl;
+    std::unique_ptr<Impl> mpImpl;
 
     XMLPropertyHandlerFactory( const XMLPropertyHandlerFactory& ) = delete;
     XMLPropertyHandlerFactory& operator= ( const XMLPropertyHandlerFactory& ) = delete;
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 9ced9eb2c293..b347ec4f9613 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -35,6 +35,7 @@
 #include <xmloff/table/XMLTableImport.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 #include <vector>
+#include <memory>
 
 class SvXMLImport;
 class SvXMLImportContext;
@@ -268,7 +269,7 @@ struct XMLShapeImportPageContextImpl;
 
 class XMLOFF_DLLPUBLIC XMLShapeImportHelper : public salhelper::SimpleReferenceObject
 {
-    XMLShapeImportHelperImpl*   mpImpl;
+    std::unique_ptr<XMLShapeImportHelperImpl> mpImpl;
 
     XMLShapeImportPageContextImpl*  mpPageContext;
 
diff --git a/include/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx
index d7e8f4ac99cc..ac03690bb37a 100644
--- a/include/xmloff/xmlaustp.hxx
+++ b/include/xmloff/xmlaustp.hxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <xmloff/xmlprmap.hxx>
 #include <salhelper/simplereferenceobject.hxx>
+#include <memory>
 
 class SvXMLExportPropertyMapper;
 class SvXMLNamespaceMap;
@@ -40,7 +41,7 @@ class XMLOFF_DLLPUBLIC SvXMLAutoStylePoolP : public salhelper::SimpleReferenceOb
     friend class Test;
     friend class SvXMLAutoStylePoolP_Impl;
 
-    SvXMLAutoStylePoolP_Impl    *pImpl;
+    std::unique_ptr<SvXMLAutoStylePoolP_Impl>    pImpl;
 
 protected:
 
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index fbf4a19d8fb9..4c4e9efde031 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -61,6 +61,7 @@
 #include <tools/fldunit.hxx>
 
 #include <list>
+#include <memory>
 #include <o3tl/typed_flags_set.hxx>
 
 class SvXMLNamespaceMap;
@@ -115,7 +116,7 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6<
              css::container::XNamed,
              css::lang::XUnoTunnel>
 {
-    SvXMLExport_Impl            *mpImpl;            // dummy
+    std::unique_ptr<SvXMLExport_Impl>            mpImpl;            // dummy
 
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
     OUString m_implementationName;
diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx
index 78f0678440bf..ad990e18c2ff 100644
--- a/include/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
@@ -28,6 +28,7 @@
 #include <o3tl/typed_flags_set.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <memory>
 
 enum class SvXmlExportFlags {
     NONE        = 0x0000,
@@ -52,7 +53,7 @@ class SvXMLExport;
 class XMLOFF_DLLPUBLIC SvXMLExportPropertyMapper : public salhelper::SimpleReferenceObject
 {
     struct Impl;
-    Impl* mpImpl;
+    std::unique_ptr<Impl> mpImpl;
 
 protected:
 
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 353b0ac2db67..7da065ea8867 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -57,6 +57,7 @@
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
 #include <o3tl/typed_flags_set.hxx>
+#include <memory>
 
 namespace com { namespace sun { namespace star {
     namespace frame { class XModel; }
@@ -140,7 +141,7 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper7<
     css::uno::Reference< css::container::XNameContainer > mxNumberStyles;
     css::uno::Reference< css::lang::XEventListener > mxEventListener;
 
-    SvXMLImport_Impl            *mpImpl;            // dummy
+    std::unique_ptr<SvXMLImport_Impl>  mpImpl;            // dummy
 
     SvXMLNamespaceMap           *mpNamespaceMap;
     SvXMLUnitConverter          *mpUnitConv;
diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx
index 7fc7a720a27f..a0793c8f091a 100644
--- a/include/xmloff/xmlprmap.hxx
+++ b/include/xmloff/xmlprmap.hxx
@@ -26,6 +26,7 @@
 #include <rtl/ustring.hxx>
 
 #include <salhelper/simplereferenceobject.hxx>
+#include <memory>
 
 class SvXMLUnitConverter;
 class XMLPropertyHandler;
@@ -37,7 +38,7 @@ class XMLOFF_DLLPUBLIC XMLPropertySetMapper : public salhelper::SimpleReferenceO
 {
     struct Impl;
 
-    Impl* mpImpl;
+    std::unique_ptr<Impl> mpImpl;
 
     XMLPropertySetMapper( const XMLPropertySetMapper& ) = delete;
     XMLPropertySetMapper& operator= ( const XMLPropertySetMapper& ) = delete;
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 658cce3d9607..a73a24fc0800 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -27,6 +27,7 @@
 #include <rsc/rscsfx.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmlictxt.hxx>
+#include <memory>
 
 class SvXMLStylesContext_Impl;
 class SvXMLUnitConverter;
@@ -154,7 +155,7 @@ class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext
     const OUString msParaStyleServiceName;
     const OUString msTextStyleServiceName;
 
-    SvXMLStylesContext_Impl *mpImpl;
+    std::unique_ptr<SvXMLStylesContext_Impl> mpImpl;
     SvXMLTokenMap           *mpStyleStylesElemTokenMap;
 
 
diff --git a/include/xmloff/xmltkmap.hxx b/include/xmloff/xmltkmap.hxx
index d0f2288380dd..4cf640393660 100644
--- a/include/xmloff/xmltkmap.hxx
+++ b/include/xmloff/xmltkmap.hxx
@@ -24,6 +24,7 @@
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
 #include <xmloff/xmltoken.hxx>
+#include <memory>
 
 
 class SvXMLTokenMap_Impl;
@@ -40,7 +41,7 @@ struct SvXMLTokenMapEntry
 
 class XMLOFF_DLLPUBLIC SvXMLTokenMap
 {
-    SvXMLTokenMap_Impl      *m_pImpl;
+    std::unique_ptr<SvXMLTokenMap_Impl>  m_pImpl;
 
 public: