diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/GraphicObject.hxx | 36 | ||||
| -rw-r--r-- | include/vcl/graph.hxx | 7 |
2 files changed, 0 insertions, 43 deletions
diff --git a/include/vcl/GraphicObject.hxx b/include/vcl/GraphicObject.hxx index 64f912e4876d..057f232ea4ef 100644 --- a/include/vcl/GraphicObject.hxx +++ b/include/vcl/GraphicObject.hxx @@ -178,26 +178,15 @@ private: MapMode maPrefMapMode; sal_uLong mnSizeBytes; GraphicType meType; - OUString maLink; - Link<const GraphicObject*, SvStream*> maSwapStreamHdl; OUString maUserData; - std::unique_ptr<Timer> mxSwapOutTimer; std::unique_ptr<GrfSimpleCacheObj> mxSimpleCache; sal_uInt32 mnAnimationLoopCount; - // a unique increasing ID to be able to say which data change is older - sal_uLong mnDataChangeTimeStamp; - - bool mbAutoSwapped : 1; bool mbTransparent : 1; bool mbAnimated : 1; bool mbEPS : 1; - bool mbIsInSwapIn : 1; - bool mbIsInSwapOut : 1; void VCL_DLLPRIVATE ImplAssignGraphicData(); - static void VCL_DLLPRIVATE ImplEnsureGraphicManager(); - void VCL_DLLPRIVATE ImplAutoSwapIn(); bool VCL_DLLPRIVATE ImplGetCropParams( OutputDevice const * pOut, Point& rPt, @@ -299,12 +288,6 @@ private: bool bEnlarge ) const; - DECL_LINK( ImplAutoSwapOutHdl, Timer*, void ); -protected: - - SvStream* GetSwapStream() const; - void SetSwapState(); - public: GraphicObject(); GraphicObject( const Graphic& rGraphic ); @@ -315,12 +298,6 @@ public: bool operator==( const GraphicObject& rCacheObj ) const; bool operator!=( const GraphicObject& rCacheObj ) const { return !( *this == rCacheObj ); } - bool HasSwapStreamHdl() const { return maSwapStreamHdl.IsSet(); } - void SetSwapStreamHdl(const Link<const GraphicObject*, SvStream*>& rHdl); - - void FireSwapInRequest(); - void FireSwapOutRequest(); - const Graphic& GetGraphic() const; void SetGraphic( const Graphic& rGraphic, const GraphicObject* pCopyObj = nullptr); void SetGraphic( const Graphic& rGraphic, const OUString& rLink ); @@ -360,11 +337,6 @@ public: void SetAttr( const GraphicAttr& rAttr ); const GraphicAttr& GetAttr() const { return maAttr; } - bool HasLink() const { return !maLink.isEmpty(); } - void SetLink(); - void SetLink( const OUString& rLink ); - const OUString& GetLink() const { return maLink; } - bool HasUserData() const { return !maUserData.isEmpty(); } void SetUserData(); void SetUserData( const OUString& rUserData ); @@ -380,14 +352,6 @@ public: bool IsAnimated() const { return mbAnimated; } bool IsEPS() const { return mbEPS; } - bool SwapOut(); - bool SwapOut( SvStream* pOStm ); - bool SwapIn(); - - bool IsInSwapIn() const { return mbIsInSwapIn; } - bool IsInSwapOut() const { return mbIsInSwapOut; } - bool IsSwappedOut() const { return( mbAutoSwapped || maGraphic.IsSwapOut() ); } - bool Draw( OutputDevice* pOut, const Point& rPt, diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 9be22958b446..be62d12bc1e7 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -212,13 +212,6 @@ public: private: friend class GraphicObject; - bool SwapOut(); - void SwapOutAsLink(); - bool SwapOut( SvStream* pOStm ); - bool SwapIn(); - bool SwapIn( SvStream* pIStm ); - bool IsSwapOut() const; - public: void SetLink( const GfxLink& ); GfxLink GetLink() const; |