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>

103 files changed, 148 insertions, 139 deletions

diff --git a/editeng/inc/editattr.hxx b/editeng/inc/editattr.hxx
index e00feb41d75b..2b74427f6619 100644
--- a/editeng/inc/editattr.hxx
+++ b/editeng/inc/editattr.hxx
@@ -81,7 +81,7 @@ public:
     EditCharAttrib(const EditCharAttrib&) = delete;
     EditCharAttrib& operator=(const EditCharAttrib&) = delete;
 
-    void                dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void                dumpAsXml(xmlTextWriterPtr pWriter) const;
 
     sal_uInt16          Which() const   { return pItem->Which(); }
     const SfxPoolItem*  GetItem() const { return pItem; }
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 31c15e201a5e..089addc59c07 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -163,7 +163,7 @@ private:
 public:
                     ContentAttribs( SfxItemPool& rItemPool );
 
-    void            dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void            dumpAsXml(xmlTextWriterPtr pWriter) const;
 
     SvxTabStop      FindTabStop( sal_Int32 nCurPos, sal_uInt16 nDefTab );
     SfxItemSet&     GetItems()                          { return aAttribSet; }
@@ -198,7 +198,7 @@ public:
                     CharAttribList();
                     ~CharAttribList();
 
-    void            dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void            dumpAsXml(xmlTextWriterPtr pWriter) const;
 
     void            DeleteEmptyAttribs(  SfxItemPool& rItemPool );
 
@@ -254,7 +254,7 @@ public:
                     ContentNode(const ContentNode&) = delete;
     ContentNode&    operator=(const ContentNode&) = delete;
 
-    void            dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void            dumpAsXml(xmlTextWriterPtr pWriter) const;
 
     ContentAttribs& GetContentAttribs()     { return aContentAttribs; }
     const ContentAttribs& GetContentAttribs() const { return aContentAttribs; }
@@ -755,7 +755,7 @@ public:
                     EditDoc( SfxItemPool* pItemPool );
                     ~EditDoc();
 
-    void            dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void            dumpAsXml(xmlTextWriterPtr pWriter) const;
     void            ClearSpellErrors();
 
     bool            IsModified() const      { return bModified; }
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index d86d39fbf18a..8c27e0dbf09a 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1788,7 +1788,7 @@ void ContentNode::DestroyWrongList()
     mpWrongList.reset();
 }
 
-void ContentNode::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void ContentNode::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("ContentNode"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("maString"), BAD_CAST(maString.toUtf8().getStr()));
@@ -1863,7 +1863,7 @@ bool ContentAttribs::HasItem( sal_uInt16 nWhich ) const
     return bHasItem;
 }
 
-void ContentAttribs::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void ContentAttribs::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("ContentAttribs"));
     xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("style"), "%s", pStyle->GetName().toUtf8().getStr());
@@ -2659,7 +2659,7 @@ void EditDoc::FindAttribs( ContentNode* pNode, sal_Int32 nStartPos, sal_Int32 nE
     }
 }
 
-void EditDoc::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void EditDoc::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     bool bOwns = false;
     if (!pWriter)
@@ -2980,7 +2980,7 @@ void CharAttribList::DbgCheckAttribs(CharAttribList const& rAttribs)
 }
 #endif
 
-void CharAttribList::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void CharAttribList::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("CharAttribList"));
     for (auto const & i : aAttribs) {
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 9925a39ecf74..a301145d9473 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -887,7 +887,7 @@ const EditDoc& EditEngine::GetEditDoc() const
     return pImpEditEngine->GetEditDoc();
 }
 
-void EditEngine::dumpAsXmlEditDoc(struct _xmlTextWriter* pWriter) const
+void EditEngine::dumpAsXmlEditDoc(xmlTextWriterPtr pWriter) const
 {
     pImpEditEngine->GetEditDoc().dumpAsXml(pWriter);
 }
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 349ce205104b..24c399db53a1 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -147,7 +147,7 @@ public:
     OUString GetText() const;
     void SetText( const OUString& rStr );
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
     const XEditAttributesType& GetCharAttribs() const { return maCharAttribs; }
     XEditAttributesType& GetCharAttribs() { return maCharAttribs; }
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 5ed48a2b6f11..4d727743cf12 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -691,7 +691,7 @@ void SvxNumRule::Store( SvStream &rStream )
     rStream.WriteUInt16( static_cast<sal_uInt16>(nFeatureFlags) );
 }
 
-void SvxNumRule::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void SvxNumRule::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("SvxNumRule"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("levelCount"), BAD_CAST(OUString::number(nLevelCount).getStr()));
@@ -973,7 +973,7 @@ bool SvxNumBulletItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberI
     return false;
 }
 
-void SvxNumBulletItem::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void SvxNumBulletItem::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("SvxNumBulletItem"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 72fece8bfaff..458de0c6df05 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2148,7 +2148,7 @@ void Outliner::ClearOverflowingParaNum()
     pEditEngine->ClearOverflowingParaNum();
 }
 
-void Outliner::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void Outliner::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     bool bOwns = false;
     if (!pWriter)
diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index 2dd6a56f8798..db3ec1817ea4 100644
--- a/editeng/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -83,7 +83,7 @@ void Paragraph::SetParaIsNumberingRestart( bool bParaIsNumberingRestart )
         mnNumberingStartValue = -1;
 }
 
-void Paragraph::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void Paragraph::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("Paragraph"));
     xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("nDepth"), "%" SAL_PRIdINT32, static_cast<sal_Int32>(nDepth));
@@ -247,7 +247,7 @@ sal_Int32 ParagraphList::GetAbsPos( Paragraph const * pParent ) const
     return EE_PARA_NOT_FOUND;
 }
 
-void ParagraphList::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void ParagraphList::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("ParagraphList"));
     for (auto const & pParagraph : maEntries)
diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx
index a3a1b5158c28..e2f67249cf66 100644
--- a/editeng/source/outliner/paralist.hxx
+++ b/editeng/source/outliner/paralist.hxx
@@ -29,6 +29,7 @@
 #include <tools/link.hxx>
 
 class Paragraph;
+typedef struct _xmlTextWriter* xmlTextWriterPtr;
 
 class ParagraphList
 {
@@ -69,7 +70,7 @@ public:
 
     void            SetVisibleStateChangedHdl( const Link<Paragraph&,void>& rLink ) { aVisibleStateChangedHdl = rLink; }
 
-    void            dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void            dumpAsXml(xmlTextWriterPtr pWriter) const;
 
 private:
 
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
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 5c0ce12a45c0..9e4a556080e4 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -77,7 +77,7 @@ public:
                 return *this;
             }
 
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 class SC_DLLPUBLIC ScMergeFlagAttr: public SfxInt16Item
@@ -107,7 +107,7 @@ public:
     bool    HasPivotButton() const;
     bool    HasPivotPopupButton() const;
 
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 class SC_DLLPUBLIC ScProtectionAttr: public SfxPoolItem
@@ -275,7 +275,7 @@ public:
     void AddCondFormatData( sal_uInt32 nIndex );
     void SetCondFormatData( const std::vector<sal_uInt32>& aIndex );
 
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 
 private:
     std::vector<sal_uInt32> maIndex;
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 4678dfefcfe5..f824c3cc74a3 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -633,7 +633,7 @@ public:
     SAL_DLLPRIVATE void SetEmbedFontScriptAsian(bool bUse) { mbEmbedFontScriptAsian = bUse; }
     SAL_DLLPRIVATE void SetEmbedFontScriptComplex(bool bUse) { mbEmbedFontScriptComplex = bUse; }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 
 private:
     /** This member stores the printer independent layout mode.  Please
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index ec1efd71a2d0..b974b50244d2 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -374,7 +374,7 @@ public:
     void removeAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation );
     const sd::AnnotationVector& getAnnotations() const { return maAnnotations; }
     bool Equals(const SdPage&) const;
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
     sal_uInt16 getPageId() { return mnPageId; }
 
     static sal_uInt16 mnLastPageId;
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 5eee4494a988..d69e072afb93 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -114,7 +114,7 @@ bool SfxBoolItem::GetPresentation(SfxItemPresentation,
     return true;
 }
 
-void SfxBoolItem::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void SfxBoolItem::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("SfxBoolItem"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx
index f5687c6889c9..c17d878b5812 100644
--- a/svx/source/inc/cell.hxx
+++ b/svx/source/inc/cell.hxx
@@ -182,7 +182,7 @@ public:
 
     SVX_DLLPRIVATE void notifyModified();
 
-    void dumpAsXml(struct _xmlTextWriter * pWriter, sal_Int32 nRow, sal_Int32 nCol) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter, sal_Int32 nRow, sal_Int32 nCol) const;
 
 protected:
     SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet() override;
diff --git a/svx/source/inc/tablemodel.hxx b/svx/source/inc/tablemodel.hxx
index 5db52a4afbca..78aabc51f692 100644
--- a/svx/source/inc/tablemodel.hxx
+++ b/svx/source/inc/tablemodel.hxx
@@ -30,6 +30,7 @@
 #include "celltypes.hxx"
 
 struct _xmlTextWriter;
+typedef struct _xmlTextWriter* xmlTextWriterPtr;
 
 namespace sdr { namespace table {
 
@@ -84,7 +85,7 @@ public:
     /// Get the width of all columns in this table.
     std::vector<sal_Int32> getColumnWidths();
 
-    void dumpAsXml(struct _xmlTextWriter * pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
     // ICellRange
     virtual sal_Int32 getLeft() override;
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 28c25ca68212..60c1d5a00b0c 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -230,7 +230,7 @@ namespace sdr
         {
         }
 
-        void DefaultProperties::dumpAsXml(struct _xmlTextWriter * pWriter) const
+        void DefaultProperties::dumpAsXml(xmlTextWriterPtr pWriter) const
         {
             xmlTextWriterStartElement(pWriter, BAD_CAST("DefaultProperties"));
             mpItemSet->dumpAsXml(pWriter);
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 4a38f806f902..b85fc3b41c49 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -1069,7 +1069,7 @@ bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberI
     return true;
 }
 
-void SdrTextVertAdjustItem::dumpAsXml(struct _xmlTextWriter* pWriter) const
+void SdrTextVertAdjustItem::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("SdrTextVertAdjustItem"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index 44c84f490dbd..a3bc07431670 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -143,7 +143,7 @@ SfxStyleSheet* SdrText::GetStyleSheet() const
     return mrObject.GetStyleSheet();
 }
 
-void SdrText::dumpAsXml(struct _xmlTextWriter * pWriter) const
+void SdrText::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("SdrText"));
     mpOutlinerParaObject->dumpAsXml(pWriter);
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 391cd13a4009..da489f728846 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -1692,7 +1692,7 @@ void SAL_CALL Cell::disposing( const EventObject& /*Source*/ )
     dispose();
 }
 
-void Cell::dumpAsXml(struct _xmlTextWriter * pWriter, sal_Int32 nRow, sal_Int32 nCol) const
+void Cell::dumpAsXml(xmlTextWriterPtr pWriter, sal_Int32 nRow, sal_Int32 nCol) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("Cell"));
     xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("row"), "%" SAL_PRIdINT32, nRow);
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 91e694b5e591..8d6e030d8bf0 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -232,7 +232,7 @@ public:
     void connectTableStyle();
     void disconnectTableStyle();
     virtual bool isInUse() override;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 private:
     static SdrTableObjImpl* lastLayoutTable;
     static tools::Rectangle lastLayoutInputRectangle;
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index b3e4f11a36eb..f6fa7af167f0 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -105,7 +105,7 @@ public:
                          sal_Int32 nLastRow,
                          const bool bOptimize,
                          const bool bMinimize );
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
 private:
     CellRef getCell( const CellPos& rPos ) const;
@@ -135,7 +135,7 @@ private:
 
         Layout() : mnPos( 0 ), mnSize( 0 ), mnMinSize( 0 ) {}
         void clear() { mnPos = 0; mnSize = 0; mnMinSize = 0; }
-        void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+        void dumpAsXml(xmlTextWriterPtr pWriter) const;
     };
     typedef std::vector< Layout > LayoutVector;
 
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 8c54d538b374..6887ccec3e34 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -1101,7 +1101,7 @@ void TableModel::updateColumns()
     }
 }
 
-void TableModel::dumpAsXml(struct _xmlTextWriter * pWriter) const
+void TableModel::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("TableModel"));
     for (sal_Int32 nRow = 0; nRow < getRowCountImpl(); ++nRow)
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 262f9abc4437..a58ecff0e8c2 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -72,7 +72,7 @@ namespace sw { namespace mark
                 { return GetMarkEnd() < rPos; }
 
             virtual OUString ToString( ) const =0;
-            virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const = 0;
+            virtual void dumpAsXml(xmlTextWriterPtr pWriter) const = 0;
         private:
             IMark(IMark const &) = delete;
             IMark &operator =(IMark const&) = delete;
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index b372de271437..796268eccb71 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -38,7 +38,7 @@ class SW_DLLPUBLIC SwCharFormat : public SwFormat
 
 public:
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 namespace CharFormat
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index e8144d4a52ba..98895e664963 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -846,7 +846,7 @@ public:
      */
     OUString GetCursorDescr() const;
 
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
     /// Implementation of lok::Document::getPartPageRectangles() for Writer.
     OUString getPageRectangles();
 
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 9dda17de8e8b..e9b3023ce5be 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1616,7 +1616,7 @@ public:
     /**
      * Dumps the entire nodes structure to the given destination (file nodes.xml in the current directory by default)
      */
-    void dumpAsXml(struct _xmlTextWriter* = nullptr) const;
+    void dumpAsXml(xmlTextWriterPtr = nullptr) const;
 
     std::set<Color> GetDocColors();
     std::vector< std::weak_ptr<SwUnoCursor> > mvUnoCursorTable;
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 346b3293afb4..53b32d38fad4 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -143,7 +143,7 @@ public:
     bool IsAlive(typename std::remove_pointer<Value>::type const*const p) const
         { return std::find(begin(), end(), p) != end(); }
 
-    static void dumpAsXml(struct _xmlTextWriter* /*pWriter*/) {};
+    static void dumpAsXml(xmlTextWriterPtr /*pWriter*/) {};
 };
 
 template<typename Value>
@@ -256,7 +256,7 @@ public:
     const_iterator begin() const { return m_PosIndex.begin(); }
     const_iterator end() const { return m_PosIndex.end(); }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter, const char* pName) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter, const char* pName) const;
 
     virtual size_t GetFormatCount() const override { return m_Array.size(); }
     virtual SwFormat* GetFormat(size_t idx) const override { return operator[]( idx ); }
@@ -284,33 +284,33 @@ public:
 class SwCharFormats : public SwFormatsModifyBase<SwCharFormat*>
 {
 public:
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 class SwTextFormatColls : public SwFormatsModifyBase<SwTextFormatColl*>
 {
 public:
     SwTextFormatColls() : SwFormatsModifyBase( DestructorPolicy::KeepElements ) {}
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 /// Array of Undo-history.
 class SW_DLLPUBLIC SwSectionFormats : public SwFormatsModifyBase<SwSectionFormat*>
 {
 public:
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 class SwFieldTypes : public SwVectorModifyBase<SwFieldType*> {
 public:
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 class SwTOXTypes : public SwVectorModifyBase<SwTOXType*> {};
 
 class SW_DLLPUBLIC SwNumRuleTable : public SwVectorModifyBase<SwNumRule*> {
 public:
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 struct CompareSwRedlineTable
@@ -347,7 +347,7 @@ public:
     void DeleteAndDestroy(size_type nPos);
     void DeleteAndDestroyAll();
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
     size_type FindNextOfSeqNo( size_type nSttPos ) const;
     size_type FindPrevOfSeqNo( size_type nSttPos ) const;
@@ -391,7 +391,7 @@ public:
     void DeleteAndDestroy( sal_uInt16 nPos);
     void DeleteAndDestroyAll();
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
     sal_uInt16 GetSize() const                              {     return m_aExtraRedlines.size();                }
     SwExtraRedline* GetRedline( sal_uInt16 uIndex ) const   {     return m_aExtraRedlines.operator[]( uIndex );  }
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 70f39e522628..d7316a224224 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -493,7 +493,7 @@ public:
     virtual bool        QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override;
     virtual bool        PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override;
     virtual OUString    GetDescription() const override;
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 class SwDocInfoFieldType : public SwValueFieldType
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 52ca812c1c0b..745c640e73ab 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -33,6 +33,8 @@ class SvNumberFormatter;
 namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
 namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
 
+typedef struct _xmlTextWriter* xmlTextWriterPtr;
+
 enum class SwFieldIds : sal_uInt16 {
 /// For old documents the Field-Which IDs must be preserved !!!
     Database,
@@ -263,7 +265,7 @@ public:
     SwFieldIds              Which() const { return m_nWhich; }
 
     inline  void            UpdateFields() const;
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 inline void SwFieldType::UpdateFields() const
@@ -374,7 +376,7 @@ public:
     virtual OUString    GetDescription() const;
     /// Is this field clickable?
     bool IsClickable() const;
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 inline SwFieldType* SwField::GetTyp() const
@@ -450,7 +452,7 @@ public:
     }
 
     static sal_uInt32       GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFormat);
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 class SW_DLLPUBLIC SwFormulaField : public SwValueField
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index 236df3a9f01c..6bba4ce42267 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -72,7 +72,7 @@ public:
     void SetPageNum( sal_uInt16 nNew ) { m_nPageNumber = nNew; }
     void SetAnchor( const SwPosition *pPos );
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline const SwFormatAnchor &SwAttrSet::GetAnchor(bool bInP) const
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 326ba0983da6..76527f90ddfe 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -47,7 +47,7 @@ public:
     void SetStyleHandle( const std::shared_ptr<SfxItemSet>& pHandle ) { mpHandle = pHandle; }
     const std::shared_ptr<SfxItemSet>& GetStyleHandle() const { return mpHandle; }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index dcfdba05f7f1..8b6914771fc2 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -33,7 +33,7 @@ public:
 
     /// "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline const SwFormatNoBalancedColumns &SwAttrSet::GetBalancedColumns(bool bInP) const
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index e5432b543a10..c300c60d1e54 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -51,7 +51,7 @@ public:
     sal_uInt16 GetLeft () const { return m_nLeft; }
     sal_uInt16 GetRight() const { return m_nRight; }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 typedef std::vector<SwColumn> SwColumns;
@@ -159,7 +159,7 @@ public:
      that corresponds to what constitutes the column for the user. */
     sal_uInt16 CalcPrtColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const;
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline const SwFormatCol &SwAttrSet::GetCol(bool bInP) const
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index 42e513b5a932..db634b448f10 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -46,7 +46,7 @@ public:
     const SwNodeIndex *GetContentIdx() const { return m_pStartNode.get(); }
     void SetNewContentIdx( const SwNodeIndex *pIdx );
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline const SwFormatContent &SwAttrSet::GetContent(bool bInP) const
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index d389e87544a3..76fe1a997b72 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -132,7 +132,7 @@ public:
 
     bool AreListLevelIndentsApplicable() const;
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 class SwGrfFormatColl final : public SwFormatColl
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index ab53d6d2bf93..3f73105a04a0 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -39,7 +39,7 @@ public:
                                   MapUnit ePresMetric,
                                   OUString &rText,
                                   const IntlWrapper& rIntl ) const override;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline const SwFormatEditInReadonly &SwAttrSet::GetEditInReadonly(bool bInP) const
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 6c1b805e952c..b144243ec4c9 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -105,7 +105,7 @@ public:
             { return m_wXTextField; }
     SAL_DLLPRIVATE void SetXTextField(css::uno::Reference<css::text::XTextField> const& xTextField)
             { m_wXTextField = xTextField; }
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 enum class SwFormatFieldHintWhich
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index 9e54f07060e6..c13b678f1c6c 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -58,7 +58,7 @@ public:
 
     bool QueryValue(css::uno::Any& rVal, sal_uInt8 aInt = 0) const override;
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 
     bool operator==(const SfxPoolItem& rItem) const override;
 };
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index a7059a932a68..e393d3a44ca3 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -95,7 +95,7 @@ public:
     void    SetWidthPercent ( sal_uInt8 n ) { m_nWidthPercent  = n; }
     void    SetWidthPercentRelation ( sal_Int16 n ) { m_eWidthPercentRelation  = n; }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline const SwFormatFrameSize &SwAttrSet::GetFrameSize(bool bInP) const
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 817bdf871db7..055db32bade3 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -63,7 +63,7 @@ public:
     SwTwips GetPos() const { return m_nYPos; }
     void    SetPos( SwTwips nNew ) { m_nYPos = nNew; }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 class SW_DLLPUBLIC SwFormatHoriOrient: public SfxPoolItem
@@ -100,7 +100,7 @@ public:
     bool IsPosToggle() const { return m_bPosToggle; }
     void SetPosToggle( bool bNew ) { m_bPosToggle = bNew; }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline SwFormatVertOrient &SwFormatVertOrient::operator=( const SwFormatVertOrient &rCpy )
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index c44ee75d71a7..4b99ccb3ad72 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -70,7 +70,7 @@ public:
     void ChgDefinedIn( const SwModify* pNew ) { m_pDefinedIn = const_cast<SwModify*>(pNew); }
     void RegisterToPageDesc( SwPageDesc& );
     bool KnowsPageDesc() const;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline const SwFormatPageDesc &SwAttrSet::GetPageDesc(bool bInP) const
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index 03e943ff07ba..264e0517da12 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -57,7 +57,7 @@ public:
     void    SetContour( bool bNew )         { bContour = bNew; }
     void    SetOutside( bool bNew )         { bOutside = bNew; }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline const SwFormatSurround &SwAttrSet::GetSurround(bool bInP) const
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index c4fb82eb9c10..8d2b4a73032c 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -55,7 +55,7 @@ public:
     sal_Int16 GetWrapInfluenceOnObjPos(
                         const bool _bIterativeAsOnceConcurrent = false ) const;
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 inline const SwFormatWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(bool bInP) const
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index bb8a9622d2be..5c3c9dc55213 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -175,7 +175,7 @@ public:
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const override;
     virtual bool supportsFullDrawingLayerFillAttributeSet() const override;
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
     virtual void SetName( const OUString& rNewName, bool bBroadcast=false ) override;
 };
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index e10fd669eddc..1ae373fd934e 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -789,7 +789,7 @@ public:
 
     bool IsCollapse() const;
 
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 
     sal_uInt32 GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const;
     sal_uInt32 GetParRsid() const;
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 7f585b8617bd..1b53254083de 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -292,7 +292,7 @@ public:
     /**
      * Dumps the node structure to the given destination (file nodes.xml in the current directory by default)
      */
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
 private:
     SwNode( const SwNode & rNodes ) = delete;
@@ -322,7 +322,7 @@ public:
     /// Call ChkCondcoll to all ContentNodes of section.
     void CheckSectionCondColl() const;
 
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 
 private:
     SwStartNode( const SwStartNode & rNode ) = delete;
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index c7bc752ff347..202d28f79400 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -55,7 +55,7 @@ struct SAL_WARN_UNUSED SW_DLLPUBLIC SwPosition
     bool operator >=(const SwPosition &) const;
     bool operator ==(const SwPosition &) const;
     bool operator !=(const SwPosition &) const;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 SW_DLLPUBLIC std::ostream &operator <<(std::ostream& s, const SwPosition& position);
@@ -272,7 +272,7 @@ public:
     bool IsMultiSelection() const
         { return !unique(); }
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 SW_DLLPUBLIC std::ostream &operator <<(std::ostream& s, const SwPaM& pam);
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index cc173cb9173b..78c03ff0e2df 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -154,7 +154,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;
 };
 
 class SwParaConnectBorderItem : public SfxBoolItem
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 7e3b94ed1d0a..030e160c6dfe 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -276,7 +276,7 @@ public:
     OUString GetDescr();
 
     bool operator<( const SwRangeRedline& ) const;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
     void MaybeNotifyRedlinePositionModification(long nTop);
 };
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index d0fcff0078bd..bdaff9c102be 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -330,7 +330,7 @@ public:
     virtual bool IsInUndo() const override;
     virtual bool IsInContent() const override;
     virtual css::uno::Reference< css::rdf::XMetadatable > MakeUnoObject() override;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
 };
 
diff --git a/sw/inc/swdbdata.hxx b/sw/inc/swdbdata.hxx
index 362c8f733138..d691336f6ab0 100644
--- a/sw/inc/swdbdata.hxx
+++ b/sw/inc/swdbdata.hxx
@@ -22,6 +22,8 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
+typedef struct _xmlTextWriter* xmlTextWriterPtr;
+
 // contains the description of a data source
 struct SwDBData
 {
@@ -30,7 +32,7 @@ struct SwDBData
     sal_Int32    nCommandType; //css::sdb::CommandType
     SwDBData() :
         nCommandType(0){}
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
     bool operator !=(const SwDBData& rCmp) const
         {return rCmp.sDataSource != sDataSource || rCmp.sCommand != sCommand || rCmp.nCommandType != nCommandType;}
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index a3b0fd0353df..4be53ba7a408 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -116,7 +116,7 @@ public:
     inline const SwFormatINetFormat           &GetINetFormat() const;
     inline const SwFormatRuby              &GetRuby() const;
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 class SAL_DLLPUBLIC_RTTI SwTextAttrEnd : public virtual SwTextAttr
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index 2ba7e2fd4bc6..80ab6c257c90 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.hxx
@@ -68,7 +68,7 @@ public:
 
     virtual void        QueryValue( css::uno::Any& rVal, sal_uInt16 nMId ) const override;
     virtual void        PutValue( const css::uno::Any& rVal, sal_uInt16 nMId ) override;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 
 protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override;
@@ -124,7 +124,7 @@ public:
     virtual void            SetPar2(const OUString& rStr) override;
     virtual bool            QueryValue( css::uno::Any& rVal, sal_uInt16 nWhichId ) const override;
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt16 nWhichId ) override;
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif // INCLUDED_SW_INC_USRFLD_HXX
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index fe33f94e6dd9..66c61eef6dc5 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -637,7 +637,7 @@ public:
     /// See SfxViewShell::getPart().
     int getPart() const override;
     /// See SfxViewShell::dumpAsXml().
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+    void dumpAsXml(xmlTextWriterPtr pWriter) const override;
     void SetRedlineAuthor(const OUString& rAuthor);
     const OUString& GetRedlineAuthor();
     /// See SfxViewShell::NotifyCursor().
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 71c5adc76d72..7536cda1e9fb 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -79,6 +79,8 @@ namespace vcl
 #define VSHELLFLAG_SHARELAYOUT          (long(0x2))
 typedef std::shared_ptr<SwRootFrame> SwRootFramePtr;
 
+typedef struct _xmlTextWriter* xmlTextWriterPtr;
+
 class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell>
 {
     friend void SetOutDev( SwViewShell *pSh, OutputDevice *pOut );
@@ -571,7 +573,7 @@ public:
     void setOutputToWindow(bool bOutputToWindow);
     bool isOutputToWindow() const;
 
-    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 // manages global ShellPointer
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index 5bb34130394b..d47e4a615d92 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -85,7 +85,7 @@ namespace sw {
             virtual ::sw::mark::IFieldmark* getDropDownFor(const SwPosition &rPos) const override;
             virtual std::vector< ::sw::mark::IFieldmark* > getDropDownsFor(const SwPaM &rPaM) const override;
 
-            void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+            void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
             // Annotation Marks
             virtual const_iterator_t getAnnotationMarksBegin() const override;
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index d5f0495ef09e..9bf1c9d7679c 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -88,7 +88,7 @@ namespace sw {
                 { m_pPos2.reset(); }
 
             virtual OUString ToString( ) const override;
-            virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+            virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 
             void Swap()
             {
@@ -228,7 +228,7 @@ namespace sw {
 
             virtual void Invalidate() override;
             virtual OUString ToString() const override;
-            virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+            virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 
         private:
             OUString m_aFieldname;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 5f9a2cfcf886..55688215275e 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -62,7 +62,6 @@ class SwFormat;
 class SwPrintData;
 class SwSortedObjs;
 class SwAnchoredObject;
-typedef struct _xmlTextWriter *xmlTextWriterPtr;
 enum class SvxFrameDirection;
 
 // Each FrameType is represented here as a bit.
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 2e1369450c89..e91793116ac6 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -37,7 +37,6 @@ class SwDrawTextInfo;   // DrawText_
 class SwScriptInfo;     // GetTextSize_
 class SwViewShell;
 class IDocumentSettingAccess;
-typedef struct _xmlTextWriter *xmlTextWriterPtr;
 enum class SvxShadowItemSide;
 
 const sal_Unicode CH_BLANK = ' ';   // ' ' blank spaces