diff options
| -rw-r--r-- | include/sot/filelist.hxx | 4 | ||||
| -rw-r--r-- | include/svtools/grfmgr.hxx | 4 | ||||
| -rw-r--r-- | include/tools/stream.hxx | 12 | ||||
| -rw-r--r-- | include/vcl/graph.hxx | 4 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 1 |
5 files changed, 6 insertions, 19 deletions
diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx index 430568c4151e..1939f7164368 100644 --- a/include/sot/filelist.hxx +++ b/include/sot/filelist.hxx @@ -25,7 +25,7 @@ #include <vector> -class SOT_DLLPUBLIC FileList : public SvDataCopyStream +class SOT_DLLPUBLIC FileList { ::std::vector< OUString > aStrList; @@ -36,7 +36,7 @@ protected: public: FileList() {}; - virtual ~FileList() override; + ~FileList(); // Zuweisungsoperator FileList& operator=( const FileList& rFileList ); diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index c264ef8fea06..0c01023f4c9c 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -166,7 +166,7 @@ public: } }; -class SVT_DLLPUBLIC GraphicObject : public SvDataCopyStream +class SVT_DLLPUBLIC GraphicObject { friend class GraphicManager; friend class SdrGrafObj; @@ -325,7 +325,7 @@ public: GraphicObject( const Graphic& rGraphic ); GraphicObject( const GraphicObject& rCacheObj, const GraphicManager* pMgr = nullptr ); explicit GraphicObject( const OString& rUniqueID ); - virtual ~GraphicObject() override; + ~GraphicObject(); GraphicObject& operator=( const GraphicObject& rCacheObj ); bool operator==( const GraphicObject& rCacheObj ) const; diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 56be8a7419a9..3a1843dfbe22 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -679,18 +679,6 @@ public: virtual bool good() const override; }; -/** Data Copy Stream - - This class is the foundation for all classes, using SvData - (SO2\DTRANS.HXX/CXX) for transportation (e.g., graphics). -*/ -class TOOLS_DLLPUBLIC SvDataCopyStream -{ -public: - // repeated execution of Load or Assign is allowed - virtual ~SvDataCopyStream(){} -}; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 3bd6a2c7f4e0..81914051d6e7 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -100,7 +100,7 @@ public: bool getSnapHorVerLines() const { return mbSnapHorVerLines; } }; -class VCL_DLLPUBLIC Graphic : public SvDataCopyStream +class VCL_DLLPUBLIC Graphic { private: @@ -121,7 +121,7 @@ public: Graphic( const Animation& rAnimation ); Graphic( const GDIMetaFile& rMtf ); Graphic( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ); - virtual ~Graphic() override; + ~Graphic(); Graphic& operator=( const Graphic& rGraphic ); Graphic& operator=( Graphic&& rGraphic ); diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 7c0d55db1651..2fde6911d5b6 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -91,7 +91,6 @@ GraphicObject::GraphicObject( const Graphic& rGraphic ) : } GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicManager* pMgr ) : - SvDataCopyStream(), maGraphic ( rGraphicObj.GetGraphic() ), maAttr ( rGraphicObj.maAttr ), maLink ( rGraphicObj.maLink ), |