diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-28 10:17:00 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-28 21:01:20 +0100 |
commit | f23738139429358c11fa62708fbdf5bb0c43d199 (patch) | |
tree | 2189f9c923cf2f1299f2e6aa3c55a5207951578e /sw/inc | |
parent | f4fbb127897ea6afe27055d3b6cfcb0441080902 (diff) |
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>
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/IMark.hxx | 2 | ||||
-rw-r--r-- | sw/inc/charfmt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/crsrsh.hxx | 2 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 2 | ||||
-rw-r--r-- | sw/inc/docary.hxx | 18 | ||||
-rw-r--r-- | sw/inc/docufld.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fldbas.hxx | 8 | ||||
-rw-r--r-- | sw/inc/fmtanchr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtautofmt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtclbl.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtclds.hxx | 4 | ||||
-rw-r--r-- | sw/inc/fmtcntnt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtcol.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmteiro.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtfld.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtfollowtextflow.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtfsize.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtornt.hxx | 4 | ||||
-rw-r--r-- | sw/inc/fmtpdsc.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtsrnd.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtwrapinfluenceonobjpos.hxx | 2 | ||||
-rw-r--r-- | sw/inc/frmfmt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/ndtxt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/node.hxx | 4 | ||||
-rw-r--r-- | sw/inc/pam.hxx | 4 | ||||
-rw-r--r-- | sw/inc/paratr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/redline.hxx | 2 | ||||
-rw-r--r-- | sw/inc/section.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swdbdata.hxx | 4 | ||||
-rw-r--r-- | sw/inc/txatbase.hxx | 2 | ||||
-rw-r--r-- | sw/inc/usrfld.hxx | 4 | ||||
-rw-r--r-- | sw/inc/view.hxx | 2 | ||||
-rw-r--r-- | sw/inc/viewsh.hxx | 4 |
33 files changed, 54 insertions, 48 deletions
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 |