diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-12 09:53:27 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-12 12:24:28 +0200 |
commit | 5dd762ddc1829a86e7b4e23076143bc01d6073ad (patch) | |
tree | 90ac69d1bab369bc054ac84ede13ec3c87075642 /include | |
parent | 9bd372218dfea3fb70d503d7532ee2b144ada136 (diff) |
hold MetaAction by rtl::Reference
instead of yet another private implementation of manual reference
counting
Change-Id: Iefb1d2e595e45a2dfdc3be54e1c51b64afeaf9d8
Reviewed-on: https://gerrit.libreoffice.org/52753
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/salhelper/simplereferenceobject.hxx | 2 | ||||
-rw-r--r-- | include/vcl/gdimtf.hxx | 10 | ||||
-rw-r--r-- | include/vcl/metaact.hxx | 122 |
3 files changed, 67 insertions, 67 deletions
diff --git a/include/salhelper/simplereferenceobject.hxx b/include/salhelper/simplereferenceobject.hxx index 662c31a72350..d8f86f52d00a 100644 --- a/include/salhelper/simplereferenceobject.hxx +++ b/include/salhelper/simplereferenceobject.hxx @@ -91,9 +91,9 @@ public: protected: virtual ~SimpleReferenceObject() COVERITY_NOEXCEPT_FALSE; -private: oslInterlockedCount m_nCount; +private: /** not implemented */ SimpleReferenceObject(SimpleReferenceObject &) SAL_DELETED_FUNCTION; diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 07fd8444492e..ccf3380c8f5a 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -58,7 +58,7 @@ VCL_DLLPUBLIC SvStream& WriteGDIMetaFile( SvStream& rOStm, const GDIMetaFile& rG class VCL_DLLPUBLIC GDIMetaFile final { private: - ::std::vector< MetaAction* > m_aList; + ::std::vector< rtl::Reference<MetaAction> > m_aList; size_t m_nCurrentActionElement; MapMode m_aPrefMapMode; @@ -157,14 +157,14 @@ public: size_t GetActionSize() const; - void AddAction( MetaAction* pAction ); - void AddAction( MetaAction* pAction, size_t nPos ); - void push_back( MetaAction* pAction ); + void AddAction( rtl::Reference<MetaAction> pAction ); + void AddAction( rtl::Reference<MetaAction> pAction, size_t nPos ); + void push_back( rtl::Reference<MetaAction> pAction ); /** * @param pAction takes ownership * @param nAction the action to replace */ - MetaAction* ReplaceAction( MetaAction* pAction, size_t nAction ); + void ReplaceAction( rtl::Reference<MetaAction> pAction, size_t nAction ); MetaAction* FirstAction(); MetaAction* NextAction(); diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 8deb04222fc8..2578cfd26c3e 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -36,6 +36,8 @@ #include <vcl/gfxlink.hxx> #include <vcl/lineinfo.hxx> #include <vcl/metaactiontypes.hxx> +#include <salhelper/simplereferenceobject.hxx> +#include <rtl/ref.hxx> class SvStream; enum class DrawTextFlags; @@ -60,22 +62,24 @@ struct ImplMetaWriteData {} }; -class VCL_DLLPUBLIC MetaAction +class VCL_DLLPUBLIC MetaAction : public salhelper::SimpleReferenceObject { private: - sal_uLong mnRefCount; MetaActionType mnType; protected: - virtual ~MetaAction(); + virtual ~MetaAction() override; public: MetaAction(); explicit MetaAction( MetaActionType nType ); + MetaAction( MetaAction const & ); virtual void Execute( OutputDevice* pOut ); - virtual MetaAction* Clone(); + oslInterlockedCount GetRefCount() { return m_nCount; } + + virtual rtl::Reference<MetaAction> Clone(); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); @@ -84,10 +88,6 @@ public: virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); MetaActionType GetType() const { return mnType; } - sal_uLong GetRefCount() const { return mnRefCount; } - void ResetRefCount() { mnRefCount = 1; } - void Duplicate() { mnRefCount++; } - void Delete() { if ( 0 == --mnRefCount ) delete this; } public: static MetaAction* ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData ); @@ -105,7 +105,7 @@ protected: virtual ~MetaPixelAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -129,7 +129,7 @@ protected: virtual ~MetaPointAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -155,7 +155,7 @@ protected: virtual ~MetaLineAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -183,7 +183,7 @@ protected: virtual ~MetaRectAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -209,7 +209,7 @@ protected: virtual ~MetaRoundRectAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -236,7 +236,7 @@ protected: virtual ~MetaEllipseAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -262,7 +262,7 @@ protected: virtual ~MetaArcAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -291,7 +291,7 @@ protected: virtual ~MetaPieAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -320,7 +320,7 @@ protected: virtual ~MetaChordAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -348,7 +348,7 @@ protected: virtual ~MetaPolyLineAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -374,7 +374,7 @@ protected: virtual ~MetaPolygonAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -398,7 +398,7 @@ protected: virtual ~MetaPolyPolygonAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -425,7 +425,7 @@ protected: virtual ~MetaTextAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -464,7 +464,7 @@ public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Move( long nHorzMove, long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; @@ -495,7 +495,7 @@ protected: virtual ~MetaStretchTextAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -527,7 +527,7 @@ protected: virtual ~MetaTextRectAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -558,7 +558,7 @@ protected: virtual ~MetaTextLineAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -589,7 +589,7 @@ protected: virtual ~MetaBmpAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -616,7 +616,7 @@ protected: virtual ~MetaBmpScaleAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -647,7 +647,7 @@ protected: virtual ~MetaBmpScalePartAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -678,7 +678,7 @@ protected: virtual ~MetaBmpExAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -705,7 +705,7 @@ protected: virtual ~MetaBmpExScaleAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -736,7 +736,7 @@ protected: virtual ~MetaBmpExScalePartAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -768,7 +768,7 @@ protected: virtual ~MetaMaskAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -799,7 +799,7 @@ protected: virtual ~MetaMaskScaleAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -833,7 +833,7 @@ protected: virtual ~MetaMaskScalePartAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -866,7 +866,7 @@ protected: virtual ~MetaGradientAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -892,7 +892,7 @@ protected: virtual ~MetaGradientExAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -918,7 +918,7 @@ protected: virtual ~MetaHatchAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -944,7 +944,7 @@ protected: virtual ~MetaWallpaperAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -971,7 +971,7 @@ protected: virtual ~MetaClipRegionAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -996,7 +996,7 @@ protected: virtual ~MetaISectRectClipRegionAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1020,7 +1020,7 @@ protected: virtual ~MetaISectRegionClipRegionAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1045,7 +1045,7 @@ protected: virtual ~MetaMoveClipRegionAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1070,7 +1070,7 @@ protected: virtual ~MetaLineColorAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1093,7 +1093,7 @@ protected: virtual ~MetaFillColorAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1115,7 +1115,7 @@ protected: virtual ~MetaTextColorAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1137,7 +1137,7 @@ protected: virtual ~MetaTextFillColorAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1160,7 +1160,7 @@ protected: virtual ~MetaTextLineColorAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1183,7 +1183,7 @@ protected: virtual ~MetaOverlineColorAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1205,7 +1205,7 @@ protected: virtual ~MetaTextAlignAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1226,7 +1226,7 @@ protected: virtual ~MetaMapModeAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1249,7 +1249,7 @@ protected: virtual ~MetaFontAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1272,7 +1272,7 @@ protected: virtual ~MetaPushAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1290,7 +1290,7 @@ protected: virtual ~MetaPopAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; }; @@ -1307,7 +1307,7 @@ protected: virtual ~MetaRasterOpAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1329,7 +1329,7 @@ protected: virtual ~MetaTransparentAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1357,7 +1357,7 @@ protected: virtual ~MetaFloatTransparentAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1388,7 +1388,7 @@ protected: virtual ~MetaEPSAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1417,7 +1417,7 @@ protected: virtual ~MetaRefPointAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1451,7 +1451,7 @@ public: virtual void Scale( double fScaleX, double fScaleY ) override; virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1473,7 +1473,7 @@ protected: virtual ~MetaLayoutModeAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; @@ -1494,7 +1494,7 @@ protected: virtual ~MetaTextLanguageAction() override; public: virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() override; + virtual rtl::Reference<MetaAction> Clone() override; virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; |