use the xmlTextWriterPtr typedef consistently

this is the single biggest chunk of stuff my upcoming paramtypedef
loplugin will warn about, so do it separately

Change-Id: I412e69e76406d6d947101885d4cd92c65e021508
Reviewed-on: https://gerrit.libreoffice.org/68486
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

44 files changed, 56 insertions, 53 deletions

diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index 2275ed31d68a..10cbc541bf39 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -123,7 +123,7 @@ public:
 
     static sal_Int8             TransparencyToPercent(sal_Int32 nTrans);
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif // INCLUDED_EDITENG_BRUSHITEM_HXX
diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx
index 1c0b82ffc8b8..794ef447c2e9 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -57,7 +57,7 @@ public:
     bool IsBottomToTop() const { return  900 == GetValue(); }
     bool IsVertical() const     { return IsTopToBottom() || IsBottomToTop(); }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 
@@ -99,7 +99,7 @@ public:
     bool IsFitToLine() const                { return bFitToLine; }
     void SetFitToLine( bool b )             { bFitToLine = b; }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif
diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index 2fb55666e639..9821015d9a49 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -69,7 +69,7 @@ public:
     }
     void SetValue(const Color& rNewColor);
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 // XXX: to be moved in a separate header.
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index d8144cb41928..96ee1da89532 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -544,7 +544,7 @@ public:
 
     EditDoc& GetEditDoc();
     const EditDoc& GetEditDoc() const;
-    void dumpAsXmlEditDoc(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXmlEditDoc(xmlTextWriterPtr pWriter) const;
 
     ParaPortionList& GetParaPortions();
     const ParaPortionList& GetParaPortions() const;
diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index 48d6bcb32415..e9e30bb195f8 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -141,7 +141,7 @@ public:
 #if DEBUG_EDIT_ENGINE
     void Dump() const;
 #endif
-    void dumpAsXml(struct _xmlTextWriter * pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 #endif // INCLUDED_EDITENG_EDITOBJ_HXX
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index c61bd2eaccef..c9e5ae92756f 100644
--- a/include/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
@@ -95,7 +95,7 @@ public:
 
     MapUnit GetPropUnit() const { return ePropUnit;  }   // Percent, Twip, ...
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index 3a226dfd3e3f..0b3dcd570f41 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -107,7 +107,7 @@ public:
     SvxFontItem& operator=(const SvxFontItem& rFont);
     SvxFontItem(SvxFontItem const &) = default; // SfxPoolItem copy function dichotomy
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 EDITENG_DLLPUBLIC void GetDefaultFonts(SvxFontItem& rLatin,
diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx
index 1ec32483077d..25467ee628b8 100644
--- a/include/editeng/frmdiritem.hxx
+++ b/include/editeng/frmdiritem.hxx
@@ -58,7 +58,7 @@ public:
     }
     SvxFrameDirectionItem(SvxFrameDirectionItem const &) = default;
         // SfxPoolItem copy function dichotomy
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif // INCLUDED_EDITENG_FRMDIRITEM_HXX
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index a1b768dda66d..6cc7ad48a3b7 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -118,7 +118,7 @@ public:
                     { return nPropFirstLineOfst; }
     void SetTextFirstLineOfstValue( const short nValue )
                     { nFirstLineOfst = nValue; }
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline SvxLRSpaceItem &SvxLRSpaceItem::operator=( const SvxLRSpaceItem &rCpy )
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index d086d3aa7596..ec5671f69d7d 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -269,7 +269,7 @@ public:
     SvxNumRule&             operator=( const SvxNumRule&  );
 
     void                    Store(SvStream &rStream);
-    void                    dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void                    dumpAsXml(xmlTextWriterPtr pWriter) const;
     const SvxNumberFormat*  Get(sal_uInt16 nLevel)const;
     const SvxNumberFormat&  GetLevel(sal_uInt16 nLevel)const;
     void                    SetLevel(sal_uInt16 nLevel, const SvxNumberFormat& rFmt, bool bIsValid = true);
@@ -310,7 +310,7 @@ public:
 
     virtual bool            QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
-    virtual void            dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void            dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 class SvxNodeNum
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 718424ae463a..6c8dd7044916 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -167,7 +167,7 @@ private:
     bool                HasFlag( ParaFlag nFlag ) const { return bool(nFlags & nFlag); }
 public:
                         ~Paragraph();
-    void                dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void                dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 struct ParaRange
@@ -663,7 +663,7 @@ public:
                     Outliner( SfxItemPool* pPool, OutlinerMode nOutlinerMode );
     virtual         ~Outliner() override;
 
-    void            dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void            dumpAsXml(xmlTextWriterPtr pWriter) const;
 
     void            Init( OutlinerMode nOutlinerMode );
     OutlinerMode    GetMode() const { return nOutlinerMode; }
diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index 8b21c25eb044..38c142c905e3 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -105,7 +105,7 @@ public:
     void SetStyleSheets(sal_uInt16 nLevel, const OUString& rNewName,
         const SfxStyleFamily& rNewFamily);
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 #endif
diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx
index 82dac5275e2d..4df4ef628d0e 100644
--- a/include/editeng/postitem.hxx
+++ b/include/editeng/postitem.hxx
@@ -69,7 +69,7 @@ public:
     FontItalic              GetPosture() const
                                 { return GetValue(); }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif // INCLUDED_EDITENG_POSTITEM_HXX
diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx
index 1de4c9fd5dfc..bb989e51d86b 100644
--- a/include/editeng/protitem.hxx
+++ b/include/editeng/protitem.hxx
@@ -65,7 +65,7 @@ public:
 
     virtual bool            QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId )
diff --git a/include/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx
index 4ace56e17e24..eefa63837edc 100644
--- a/include/editeng/rsiditem.hxx
+++ b/include/editeng/rsiditem.hxx
@@ -31,7 +31,7 @@ public:
     virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif // INCLUDED_EDITENG_RSIDITEM_HXX
diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx
index ee09121c2200..6a7298ae1274 100644
--- a/include/editeng/shaditem.hxx
+++ b/include/editeng/shaditem.hxx
@@ -79,7 +79,7 @@ public:
     virtual sal_uInt16      GetValueCount() const override;
     virtual sal_uInt16      GetEnumValue() const override;
     virtual void            SetEnumValue( sal_uInt16 nNewVal ) override;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline SvxShadowItem &SvxShadowItem::operator=( const SvxShadowItem& rFmtShadow )
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index 85fcc2286762..e434e9d5a961 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -77,7 +77,7 @@ public:
     bool            operator <( const SvxTabStop& rTS ) const
                         { return nTabPos < rTS.nTabPos; }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 // class SvxTabStopItem --------------------------------------------------
@@ -143,7 +143,7 @@ public:
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = nullptr ) const override;
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif
diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx
index d93aa47d5094..cfcfbb6f330f 100644
--- a/include/editeng/ulspitem.hxx
+++ b/include/editeng/ulspitem.hxx
@@ -77,7 +77,7 @@ public:
     bool GetContext() const { return bContext; }
     sal_uInt16 GetPropUpper() const { return nPropUpper; }
     sal_uInt16 GetPropLower() const { return nPropLower; }
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline SvxULSpaceItem &SvxULSpaceItem::operator=( const SvxULSpaceItem &rCpy )
diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index 3e453362119a..1ad67dfa7166 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -69,7 +69,7 @@ public:
     // enum cast
     FontWeight              GetWeight() const { return GetValue(); }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif // INCLUDED_EDITENG_WGHTITEM_HXX
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index be6af0fe68ba..297640a63441 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -329,7 +329,7 @@ public:
     void setTiledSearching(bool bTiledSearching);
     /// See lok::Document::getPart().
     virtual int getPart() const;
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
     /// See OutlinerViewShell::GetViewShellId().
     ViewShellId GetViewShellId() const override;
     /// See OutlinerViewShell::NotifyOtherViews().
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index eb488f65b251..268df41d6f4a 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -107,7 +107,7 @@ public:
                                  const IntlWrapper&)
         const override;
 
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 
     virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 = 0) const override;
 
diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx
index 165fabae8da9..a4c14ebd863f 100644
--- a/include/svl/intitem.hxx
+++ b/include/svl/intitem.hxx
@@ -100,7 +100,7 @@ public:
     virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override
     { return new SfxUInt16Item(*this); }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 
@@ -121,7 +121,7 @@ public:
     virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override
     { return new SfxInt32Item(*this); }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 
@@ -142,7 +142,7 @@ public:
     virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override
     { return new SfxUInt32Item(*this); }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif // INCLUDED_SVL_INTITEM_HXX
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 155b85500b64..e865c9396f37 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -188,7 +188,7 @@ public:
     static bool                     IsSlot(sal_uInt16 nId) {
                                         return nId && nId > SFX_WHICH_MAX; }
 
-    void                            dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void                            dumpAsXml(xmlTextWriterPtr pWriter) const;
 
 private:
     const SfxItemPool&              operator=(const SfxItemPool &) = delete;
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index ba21e61ff1f8..0c3acdf549dd 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -227,7 +227,7 @@ public:
      */
     bool                        Equals(const SfxItemSet &, bool bComparePool) const;
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 inline void SfxItemSet::SetParent( const SfxItemSet* pNew )
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index d812f865411e..c1c017c13f44 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -111,6 +111,7 @@ enum class SfxItemState {
 
 class SfxItemPool;
 class SfxItemSet;
+typedef struct _xmlTextWriter* xmlTextWriterPtr;
 
 class SVL_DLLPUBLIC SfxPoolItem
 {
@@ -177,7 +178,7 @@ public:
 
     sal_uInt32               GetRefCount() const { return m_nRefCount; }
     SfxItemKind       GetKind() const { return m_nKind; }
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
     /** Only SfxVoidItem shall and must return true for this.
 
@@ -261,7 +262,7 @@ public:
                                     MapUnit ePresMetric,
                                     OUString &rText,
                                     const IntlWrapper& ) const override;
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 
     // create a copy of itself
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx
index 3d5a2c1a0eda..2103e917ee13 100644
--- a/include/svl/stritem.hxx
+++ b/include/svl/stritem.hxx
@@ -42,7 +42,7 @@ public:
 
     virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override;
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 
 };
 
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index c2862b886c6f..22e180570268 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -28,6 +28,7 @@
 #include <vector>
 
 typedef o3tl::strong_int<sal_Int32, struct ViewShellIdTag> ViewShellId;
+typedef struct _xmlTextWriter* xmlTextWriterPtr;
 
 class SVL_DLLPUBLIC SfxRepeatTarget
 {
@@ -64,7 +65,7 @@ public:
     virtual ViewShellId GetViewShellId() const;
     /// Timestamp when this undo item was created.
     const DateTime& GetDateTime() const;
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
 private:
     SfxUndoAction( const SfxUndoAction& ) = delete;
@@ -146,7 +147,7 @@ public:
     sal_uInt16              GetId() const;
 
     void SetComment(const OUString& rComment);
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 
@@ -291,7 +292,7 @@ public:
     */
     void            RemoveOldestUndoAction();
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
 protected:
     bool    UndoWithContext( SfxUndoContext& i_context );
diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index e18e50a2795c..714d9c5fe3ef 100644
--- a/include/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
@@ -45,7 +45,7 @@ public:
 
     virtual sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const override;
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif
diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx
index a7a7d666a953..82de52f4e6b3 100644
--- a/include/svx/sdr/properties/defaultproperties.hxx
+++ b/include/svx/sdr/properties/defaultproperties.hxx
@@ -28,6 +28,7 @@
 #include <svx/svxdllapi.h>
 
 struct _xmlTextWriter;
+typedef struct _xmlTextWriter* xmlTextWriterPtr;
 
 namespace sdr
 {
@@ -67,7 +68,7 @@ namespace sdr
             // destructor
             virtual ~DefaultProperties() override;
 
-            void dumpAsXml(struct _xmlTextWriter * pWriter) const;
+            void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
             // Clone() operator, normally just calls the local copy constructor
             virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx
index 823812b50194..25b16799b984 100644
--- a/include/svx/sdtaitm.hxx
+++ b/include/svx/sdtaitm.hxx
@@ -45,7 +45,7 @@ public:
 
     static OUString GetValueTextByPos(sal_uInt16 nPos);
     virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index e3e9edf86fd4..9dad1baa8cc1 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -606,7 +606,7 @@ public:
         also during the runtime of the Undo() and Redo() methods. */
     bool IsUndoEnabled() const;
 
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index c84965d4e984..9de436daa7e8 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -865,7 +865,7 @@ public:
 
     bool Equals(const SdrObject&) const;
 
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
     /// Is this a textbox of a drawinglayer shape?
     virtual bool IsTextBox() const;
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index bd1287c19449..1f2fcce6ec3f 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -106,7 +106,7 @@ public:
 
     virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const override;
 
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif // INCLUDED_SVX_SVDOGRP_HXX
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index bf0ea2ae87dc..a9d98366cb3d 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -259,7 +259,7 @@ public:
     static void ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj );
     static void ImportAsRTF( SvStream& rStrm, SdrTableObj& rObj );
 
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 
 private:
     void init( sal_Int32 nColumns, sal_Int32 nRows );
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index b7e5ed43b1d7..d78652d1f262 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -224,7 +224,7 @@ public:
     void SetNavigationOrder (const css::uno::Reference<
                              css::container::XIndexAccess>& rxOrder);
 
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
 private:
     class WeakSdrObjectContainerType;
diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx
index c1343dad867a..1f96268c7e88 100644
--- a/include/svx/svdtext.hxx
+++ b/include/svx/svdtext.hxx
@@ -66,7 +66,7 @@ public:
     /** returns the current OutlinerParaObject and removes it from this instance */
     std::unique_ptr<OutlinerParaObject> RemoveOutlinerParaObject();
 
-    void dumpAsXml(struct _xmlTextWriter * pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
 protected:
     virtual const SfxItemSet& GetObjectItemSet();
diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx
index ae5047bd8ae7..463fc6e78d63 100644
--- a/include/svx/xbtmpit.hxx
+++ b/include/svx/xbtmpit.hxx
@@ -61,7 +61,7 @@ public:
     static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
     std::unique_ptr<XFillBitmapItem> checkForUniqueItem( SdrModel* pModel ) const;
 
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif
diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx
index 3c7d3f69a439..92f1a356501c 100644
--- a/include/svx/xfillit0.hxx
+++ b/include/svx/xfillit0.hxx
@@ -49,7 +49,7 @@ public:
                                   OUString &rText, const IntlWrapper& ) const override;
     virtual sal_uInt16          GetValueCount() const override;
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif
diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx
index 30d77a277050..57e5a03af2d9 100644
--- a/include/svx/xflbmpit.hxx
+++ b/include/svx/xflbmpit.hxx
@@ -37,7 +37,7 @@ public:
                                                  OUString &rText, const IntlWrapper& ) const override;
 
     SVX_DLLPRIVATE virtual sal_uInt16      GetValueCount() const override;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 
diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx
index 8900a25f4b28..4aeb3095ddc6 100644
--- a/include/svx/xflbmtit.hxx
+++ b/include/svx/xflbmtit.hxx
@@ -34,7 +34,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText, const IntlWrapper& ) const override;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif
diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx
index 3c0fda473b9a..f847664f2bec 100644
--- a/include/svx/xflbstit.hxx
+++ b/include/svx/xflbstit.hxx
@@ -34,7 +34,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText, const IntlWrapper& ) const override;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif
diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx
index 820e574bbaf4..60c229a90c0f 100644
--- a/include/svx/xflclit.hxx
+++ b/include/svx/xflclit.hxx
@@ -48,7 +48,7 @@ public:
                                   MapUnit ePresMetric,
                                   OUString &rText, const IntlWrapper& ) const override;
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif
diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx
index 57dcff4a2e93..795d921387a6 100644
--- a/include/svx/xfltrit.hxx
+++ b/include/svx/xfltrit.hxx
@@ -38,7 +38,7 @@ public:
                                   MapUnit eCoreMetric,
                                   MapUnit ePresMetric,
                                   OUString &rText, const IntlWrapper& ) const override;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif
diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx
index 4630fa7f221a..871a13468b7e 100644
--- a/include/svx/xit.hxx
+++ b/include/svx/xit.hxx
@@ -62,7 +62,7 @@ public:
     */
     static OUString CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, SvxCompareValueFunc pCompareValueFunc, const char* pPrefixResId, const XPropertyListRef &pDefaults );
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif