diff options
34 files changed, 42 insertions, 194 deletions
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 16dc38de410c..9a7bb0f6bedd 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -128,7 +128,7 @@ public: static WallpaperStyle GraphicPos2WallpaperStyle( SvxGraphicPosition ePos ); static sal_Int8 TransparencyToPercent(sal_Int32 nTrans); - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; #endif // INCLUDED_EDITENG_BRUSHITEM_HXX diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index c78cfc69670d..6a88c76c25f0 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -75,7 +75,7 @@ public: bool IsFitToLine() const { return bFitToLine; } void SetFitToLine( bool b ) { bFitToLine = b; } - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; #endif diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index 7034dcfdf079..ac3cde46a02f 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -92,7 +92,7 @@ public: SfxMapUnit GetPropUnit() const { return ePropUnit; } // Percent, Twip, ... - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; #endif diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index 6a2cb8a5dba1..38e7d416152b 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -87,7 +87,7 @@ public: static void EnableStoreUnicodeNames( bool bEnable ); - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; EDITENG_DLLPUBLIC void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index ef5d73798bd2..123264e9cd89 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -126,7 +126,7 @@ public: { return nPropFirstLineOfst; } inline void SetTxtFirstLineOfstValue( const short nValue ) { nFirstLineOfst = nValue; } - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline SvxLRSpaceItem &SvxLRSpaceItem::operator=( const SvxLRSpaceItem &rCpy ) diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index 2651415b7586..d8a2b42c6360 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -70,7 +70,7 @@ public: void SetPosture( FontItalic eNew ) { SetValue( (sal_uInt16)eNew ); } - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; #endif // INCLUDED_EDITENG_POSTITEM_HXX diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index a21bb6b785a8..66fa1a30d1ca 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -66,7 +66,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId ) diff --git a/include/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx index cda36484f8f5..43ba37eaede4 100644 --- a/include/editeng/rsiditem.hxx +++ b/include/editeng/rsiditem.hxx @@ -30,7 +30,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; #endif // INCLUDED_EDITENG_RSIDITEM_HXX diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index c7761fcae9cb..1e9209b87ae3 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -83,7 +83,7 @@ public: virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; virtual sal_uInt16 GetEnumValue() const SAL_OVERRIDE; virtual void SetEnumValue( sal_uInt16 nNewVal ) SAL_OVERRIDE; - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline SvxShadowItem &SvxShadowItem::operator=( const SvxShadowItem& rFmtShadow ) diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index 58aade9613c3..3fd40f0dca03 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -78,7 +78,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; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline SvxULSpaceItem &SvxULSpaceItem::operator=( const SvxULSpaceItem &rCpy ) diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index 4f0c7956b041..834052674189 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -70,7 +70,7 @@ public: void SetWeight( FontWeight eNew ) { SetValue( (sal_uInt16)eNew ); } - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; #endif // INCLUDED_EDITENG_WGHTITEM_HXX diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index fea545b07c74..152f5b5ae8bf 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -115,7 +115,7 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE { return new SfxUInt16Item(*this); } - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 45d415bc16d1..bc5180ba15d0 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -194,6 +194,7 @@ public: sal_uLong GetRefCount() const { return m_nRefCount; } inline SfxItemKind GetKind() const { return m_nKind; } + virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const; private: SfxPoolItem& operator=( const SfxPoolItem& ); // not implemented!! diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx index eb0fea36a5ae..d2df1e42a158 100644 --- a/include/svl/stritem.hxx +++ b/include/svl/stritem.hxx @@ -42,7 +42,7 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; #endif // INCLUDED_SVL_STRITEM_HXX diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 4ed3af637cfd..cd3fec1f8046 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -51,7 +51,7 @@ public: virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; css::drawing::FillStyle GetValue() const { return (css::drawing::FillStyle) SfxEnumItem::GetValue(); } - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx index 34dfd7a22755..621c34ccdfc9 100644 --- a/include/svx/xflbmpit.hxx +++ b/include/svx/xflbmpit.hxx @@ -41,7 +41,7 @@ public: SVX_DLLPRIVATE virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; SVX_DLLPRIVATE RECT_POINT GetValue() const { return (RECT_POINT) SfxEnumItem::GetValue(); } - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx index cefca741b3ab..ad41503dccee 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -37,7 +37,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index 2e8e9322ed3d..a558ed83220a 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -37,7 +37,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx index 3424a691d334..4109b7a43e41 100644 --- a/include/svx/xfltrit.hxx +++ b/include/svx/xfltrit.hxx @@ -41,7 +41,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index 6ac1236d7e91..74fd1cc2442f 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -70,7 +70,7 @@ public: */ static OUString CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, const XPropertyListRef &pDefaults ); - virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; #endif diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index bf26c1e04eae..3a0e9f8cd9be 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -21,6 +21,7 @@ #include <svl/poolitem.hxx> #include <tools/stream.hxx> #include <osl/diagnose.h> +#include <libxml/xmlwriter.h> TYPEINIT0(SfxPoolItem); TYPEINIT1(SfxVoidItem, SfxPoolItem); @@ -207,6 +208,13 @@ bool SfxPoolItem::GetPresentation return false; } +void SfxPoolItem::dumpAsXml(xmlTextWriterPtr pWriter) const +{ + xmlTextWriterStartElement(pWriter, BAD_CAST("sfxPoolItem")); + xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); + xmlTextWriterEndElement(pWriter); +} + SfxVoidItem::SfxVoidItem( sal_uInt16 which ): SfxPoolItem(which) { diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index 294e2e2c9835..e5f24ca324b2 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -72,7 +72,7 @@ public: void SetPageNum( sal_uInt16 nNew ) { nPageNum = nNew; } void SetAnchor( const SwPosition *pPos ); - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline const SwFmtAnchor &SwAttrSet::GetAnchor(bool bInP) const diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx index ffdf3091077a..a2f80eee33d8 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 = 0 ) const SAL_OVERRIDE; - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(bool bInP) const diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index a98e39f19341..94e0a74d4184 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -163,7 +163,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; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline const SwFmtCol &SwAttrSet::GetCol(bool bInP) const diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index a33b545be1a2..cb8aac06a27c 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -45,7 +45,7 @@ public: const SwNodeIndex *GetCntntIdx() const { return pStartNode; } void SetNewCntntIdx( const SwNodeIndex *pIdx ); - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline const SwFmtCntnt &SwAttrSet::GetCntnt(bool bInP) const diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index 1d6e365c5dff..fef34d6dc26c 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -39,7 +39,7 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(bool bInP) const diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index 06cd43dde4d5..24f68138b229 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -42,7 +42,7 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline const SwFmtFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) const diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index 29598be03579..4b11a279c1de 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -98,7 +98,7 @@ public: void SetWidthPercent ( sal_uInt8 n ) { m_nWidthPercent = n; } void SetWidthPercentRelation ( sal_Int16 n ) { m_eWidthPercentRelation = n; } - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(bool bInP) const diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index 53049313986d..150f61a70f45 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; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem @@ -100,7 +100,7 @@ public: bool IsPosToggle() const { return bPosToggle; } void SetPosToggle( bool bNew ) { bPosToggle = bNew; } - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline SwFmtVertOrient &SwFmtVertOrient::operator=( const SwFmtVertOrient &rCpy ) diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 202f4bea87c5..15cf821cfea3 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -81,7 +81,7 @@ public: void RegisterToEndNotInfo( SwEndNoteInfo& ); void RegisterToPageDesc( SwPageDesc& ); bool KnowsPageDesc() const; - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(bool bInP) const diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index 691e77550695..e69da8528618 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -59,7 +59,7 @@ public: void SetContour( bool bNew ) { bContour = bNew; } void SetOutside( bool bNew ) { bOutside = bNew; } - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy ) diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index 0e70e3bb6787..2b4e3e418211 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -57,7 +57,7 @@ public: sal_Int16 GetWrapInfluenceOnObjPos( const bool _bIterativeAsOnceConcurrent = false ) const; - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(bool bInP) const diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index b94acc843858..23096b33e666 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -169,7 +169,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; - void dumpAsXml(struct _xmlTextWriter* pWriter) const; + void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; class SwParaConnectBorderItem : public SfxBoolItem diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index eb7af267cd3e..ccd2e4eb0540 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -10,63 +10,20 @@ #include "doc.hxx" #include "drawdoc.hxx" #include <IDocumentDrawModelAccess.hxx> -#include <IDocumentRedlineAccess.hxx> #include <IDocumentFieldsAccess.hxx> #include <IDocumentState.hxx> #include <UndoManager.hxx> #include "ndtxt.hxx" #include "MarkManager.hxx" -#include "docary.hxx" #include "switerator.hxx" -#include "fmtfld.hxx" #include "docufld.hxx" #include "txatbase.hxx" -#include "fmtautofmt.hxx" -#include "fmtcntnt.hxx" -#include "fmtornt.hxx" -#include "fmtfsize.hxx" -#include "fmtclbl.hxx" -#include "fmteiro.hxx" -#include "charfmt.hxx" -#include "frmfmt.hxx" -#include "fmtanchr.hxx" -#include "fmtsrnd.hxx" -#include "paratr.hxx" #include "redline.hxx" -#include "section.hxx" -#include "fmtclds.hxx" -#include "fmtpdsc.hxx" -#include "pagedesc.hxx" -#include "fchrfmt.hxx" -#include "fmtfollowtextflow.hxx" -#include "fmtwrapinfluenceonobjpos.hxx" #include <swmodule.hxx> #include <svl/itemiter.hxx> -#include <svl/intitem.hxx> -#include <editeng/charrotateitem.hxx> -#include <editeng/rsiditem.hxx> -#include <editeng/fontitem.hxx> -#include <editeng/fhgtitem.hxx> -#include <editeng/editobj.hxx> -#include <editeng/outlobj.hxx> -#include <editeng/postitem.hxx> -#include <editeng/wghtitem.hxx> -#include <svx/xdef.hxx> -#include <svx/svdpage.hxx> -#include <svx/svdmodel.hxx> -#include <svx/xfillit0.hxx> -#include <svx/xflclit.hxx> -#include <svx/xbtmpit.hxx> -#include <svx/xfltrit.hxx> -#include <svx/xflbmtit.hxx> -#include <svx/xflbmpit.hxx> -#include <svx/xflbstit.hxx> #include <tools/datetimeutils.hxx> -#include <libxml/encoding.h> #include <libxml/xmlwriter.h> -#include <boost/optional.hpp> -#include <rtl/strbuf.hxx> #include <comphelper/anytostring.hxx> using namespace com::sun::star; @@ -398,125 +355,7 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const SfxItemSet* pSet) const SfxPoolItem* pItem = aIter.FirstItem(); while (pItem) { - bool bDone = true; - switch (pItem->Which()) - { - case RES_CHRATR_POSTURE: - case RES_CHRATR_CJK_POSTURE: - case RES_CHRATR_CTL_POSTURE: - static_cast<const SvxPostureItem*>(pItem)->dumpAsXml(writer); - break; - case RES_CHRATR_WEIGHT: - case RES_CHRATR_CJK_WEIGHT: - case RES_CHRATR_CTL_WEIGHT: - static_cast<const SvxWeightItem*>(pItem)->dumpAsXml(writer); - break; - case RES_CHRATR_RSID: - static_cast<const SvxRsidItem*>(pItem)->dumpAsXml(writer); - break; - case RES_CHRATR_ROTATE: - static_cast<const SvxCharRotateItem*>(pItem)->dumpAsXml(writer); - break; - case RES_PARATR_OUTLINELEVEL: - static_cast<const SfxUInt16Item*>(pItem)->dumpAsXml(writer); - break; - case RES_PARATR_NUMRULE: - static_cast<const SwNumRuleItem*>(pItem)->dumpAsXml(writer); - break; - case RES_CHRATR_FONT: - case RES_CHRATR_CTL_FONT: - static_cast<const SvxFontItem*>(pItem)->dumpAsXml(writer); - break; - case RES_CHRATR_BACKGROUND: - static_cast<const SvxBrushItem*>(pItem)->dumpAsXml(writer); - break; - case RES_CHRATR_FONTSIZE: - static_cast<const SvxFontHeightItem*>(pItem)->dumpAsXml(writer); - break; - case RES_CNTNT: - static_cast<const SwFmtCntnt*>(pItem)->dumpAsXml(writer); - break; - case RES_FRM_SIZE: - static_cast<const SwFmtFrmSize*>(pItem)->dumpAsXml(writer); - break; - case RES_VERT_ORIENT: - static_cast<const SwFmtVertOrient*>(pItem)->dumpAsXml(writer); - break; - case RES_HORI_ORIENT: - static_cast<const SwFmtHoriOrient*>(pItem)->dumpAsXml(writer); - break; - case RES_ANCHOR: - static_cast<const SwFmtAnchor*>(pItem)->dumpAsXml(writer); - break; - case RES_SURROUND: - static_cast<const SwFmtSurround*>(pItem)->dumpAsXml(writer); - break; - case RES_FOLLOW_TEXT_FLOW: - static_cast<const SwFmtFollowTextFlow*>(pItem)->dumpAsXml(writer); - break; - case RES_WRAP_INFLUENCE_ON_OBJPOS: - static_cast<const SwFmtWrapInfluenceOnObjPos*>(pItem)->dumpAsXml(writer); - break; - case RES_COL: - static_cast<const SwFmtCol*>(pItem)->dumpAsXml(writer); - break; - case XATTR_FILLSTYLE: - static_cast<const XFillStyleItem*>(pItem)->dumpAsXml(writer); - break; - case XATTR_FILLCOLOR: - static_cast<const XFillColorItem*>(pItem)->dumpAsXml(writer); - break; - case XATTR_FILLBITMAP: - static_cast<const XFillBitmapItem*>(pItem)->dumpAsXml(writer); - break; - case XATTR_FILLTRANSPARENCE: - static_cast<const XFillTransparenceItem*>(pItem)->dumpAsXml(writer); - break; - case XATTR_FILLBMP_TILE: - static_cast<const XFillBmpTileItem*>(pItem)->dumpAsXml(writer); - break; - case XATTR_FILLBMP_POS: - static_cast<const XFillBmpPosItem*>(pItem)->dumpAsXml(writer); - break; - case XATTR_FILLBMP_STRETCH: - static_cast<const XFillBmpStretchItem*>(pItem)->dumpAsXml(writer); - break; - case RES_PROTECT: - static_cast<const SvxProtectItem*>(pItem)->dumpAsXml(writer); - break; - case RES_EDIT_IN_READONLY: - static_cast<const SwFmtEditInReadonly*>(pItem)->dumpAsXml(writer); - break; - case RES_COLUMNBALANCE: - static_cast<const SwFmtNoBalancedColumns*>(pItem)->dumpAsXml(writer); - break; - case RES_LR_SPACE: - static_cast<const SvxLRSpaceItem*>(pItem)->dumpAsXml(writer); - break; - case RES_UL_SPACE: - static_cast<const SvxULSpaceItem*>(pItem)->dumpAsXml(writer); - break; - case RES_SHADOW: - static_cast<const SvxShadowItem*>(pItem)->dumpAsXml(writer); - break; - case RES_PAGEDESC: - static_cast<const SwFmtPageDesc*>(pItem)->dumpAsXml(writer); - break; - case RES_FRMATR_CONDITIONAL_STYLE_NAME: - case RES_FRMATR_STYLE_NAME: - static_cast<const SfxStringItem*>(pItem)->dumpAsXml(writer); - break; - default: bDone = false; break; - } - if (bDone) - { - pItem = aIter.NextItem(); - continue; - } - - writer.startElement("item"); - writer.writeFormatAttribute("whichId", TMP_FORMAT, pItem->Which()); - writer.endElement(); + pItem->dumpAsXml(writer); pItem = aIter.NextItem(); } } |