summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Powers <jpowers27@cox.net>2011-08-21 21:35:58 -0700
committerJoseph Powers <jpowers27@cox.net>2011-08-21 21:35:58 -0700
commitcc3ba7e9377fd6b353d883910b2e651cc2319cd9 (patch)
tree979bdbe4d830afed11f759abd0fc2d264d9fce83
parentReplace List with std::list< GraphicCacheEntry* > (diff)
downloadcore-cc3ba7e9377fd6b353d883910b2e651cc2319cd9.tar.gz
core-cc3ba7e9377fd6b353d883910b2e651cc2319cd9.zip
unusedcode.easy: Cleanup GraphicObject
-rw-r--r--svtools/inc/svtools/grfmgr.hxx6
-rw-r--r--svtools/source/graphic/grfmgr.cxx44
-rw-r--r--unusedcode.easy6
3 files changed, 0 insertions, 56 deletions
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index b245e7df9afe..25d8929d7f87 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -359,7 +359,6 @@ public:
GraphicObject( const GraphicManager* pMgr = NULL );
GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr = NULL );
- GraphicObject( const Graphic& rGraphic, const String& rLink, const GraphicManager* pMgr = NULL );
GraphicObject( const GraphicObject& rCacheObj, const GraphicManager* pMgr = NULL );
GraphicObject( const ByteString& rUniqueID, const GraphicManager* pMgr = NULL );
~GraphicObject();
@@ -371,13 +370,11 @@ public:
sal_Bool HasSwapStreamHdl() const { return( mpSwapStreamHdl != NULL && mpSwapStreamHdl->IsSet() ); }
void SetSwapStreamHdl();
void SetSwapStreamHdl( const Link& rHdl, const sal_uLong nSwapOutTimeout = 0UL );
- Link GetSwapStreamHdl() const;
sal_uLong GetSwapOutTimeout() const { return( mpSwapOutTimer ? mpSwapOutTimer->GetTimeout() : 0 ); }
void FireSwapInRequest();
void FireSwapOutRequest();
- void SetGraphicManager( const GraphicManager& rMgr );
GraphicManager& GetGraphicManager() const { return *mpMgr; }
sal_Bool IsCached(
@@ -444,7 +441,6 @@ public:
const Size& GetPrefSize() const { return maPrefSize; }
const MapMode& GetPrefMapMode() const { return maPrefMapMode; }
sal_uLong GetSizeBytes() const { return mnSizeBytes; }
- sal_uLong GetChecksum() const;
sal_Bool IsTransparent() const { return mbTransparent; }
sal_Bool IsAlpha() const { return mbAlpha; }
sal_Bool IsAnimated() const { return mbAnimated; }
@@ -452,9 +448,7 @@ public:
sal_Bool IsRenderGraphic() const { return mbIsRenderGraphic; }
sal_Bool HasRenderGraphic() const { return mbHasRenderGraphic; }
- void ResetAnimationLoopCount();
Link GetAnimationNotifyHdl() const { return maGraphic.GetAnimationNotifyHdl(); }
- void SetAnimationNotifyHdl( const Link& rLink );
sal_Bool SwapOut();
sal_Bool SwapOut( SvStream* pOStm );
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 63df21b3993d..f41b26e24278 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -82,16 +82,6 @@ GraphicObject::GraphicObject( const Graphic& rGraphic, const GraphicManager* pMg
ImplSetGraphicManager( pMgr );
}
-GraphicObject::GraphicObject( const Graphic& rGraphic, const String& rLink, const GraphicManager* pMgr ) :
- maGraphic ( rGraphic ),
- mpLink ( rLink.Len() ? ( new String( rLink ) ) : NULL ),
- mpUserData ( NULL )
-{
- ImplConstruct();
- ImplAssignGraphicData();
- ImplSetGraphicManager( pMgr );
-}
-
GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicManager* pMgr ) :
SvDataCopyStream(),
maGraphic ( rGraphicObj.GetGraphic() ),
@@ -393,11 +383,6 @@ ByteString GraphicObject::GetUniqueID() const
return aRet;
}
-sal_uLong GraphicObject::GetChecksum() const
-{
- return( ( maGraphic.IsSupportedGraphic() && !maGraphic.IsSwapOut() ) ? maGraphic.GetChecksum() : 0 );
-}
-
SvStream* GraphicObject::GetSwapStream() const
{
return( HasSwapStreamHdl() ? (SvStream*) mpSwapStreamHdl->Call( (void*) this ) : GRFMGR_AUTOSWAPSTREAM_NONE );
@@ -483,14 +468,6 @@ void GraphicObject::SetSwapStreamHdl( const Link& rHdl, const sal_uLong nSwapOut
delete mpSwapOutTimer, mpSwapOutTimer = NULL;
}
-Link GraphicObject::GetSwapStreamHdl() const
-{
- if( mpSwapStreamHdl )
- return *mpSwapStreamHdl;
- else
- return Link();
-}
-
void GraphicObject::FireSwapInRequest()
{
ImplAutoSwapIn();
@@ -508,11 +485,6 @@ void GraphicObject::GraphicManagerDestroyed()
ImplSetGraphicManager( NULL );
}
-void GraphicObject::SetGraphicManager( const GraphicManager& rMgr )
-{
- ImplSetGraphicManager( &rMgr );
-}
-
sal_Bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicAttr* pAttr, sal_uLong nFlags ) const
{
@@ -542,11 +514,6 @@ void GraphicObject::ReleaseFromCache()
mpMgr->ReleaseFromCache( *this );
}
-void GraphicObject::SetAnimationNotifyHdl( const Link& rLink )
-{
- maGraphic.SetAnimationNotifyHdl( rLink );
-}
-
sal_Bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicAttr* pAttr, sal_uLong nFlags )
{
@@ -1038,17 +1005,6 @@ Graphic GraphicObject::GetTransformedGraphic( const GraphicAttr* pAttr ) const /
return aGraphic;
}
-void GraphicObject::ResetAnimationLoopCount()
-{
- if( IsAnimated() && !IsSwappedOut() )
- {
- maGraphic.ResetAnimationLoopCount();
-
- if( mpSimpleCache )
- mpSimpleCache->maGraphic.ResetAnimationLoopCount();
- }
-}
-
sal_Bool GraphicObject::SwapOut()
{
sal_Bool bRet = ( !mbAutoSwapped ? maGraphic.SwapOut() : sal_False );
diff --git a/unusedcode.easy b/unusedcode.easy
index 79e27965b846..91b6e56b3459 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -248,12 +248,6 @@ GraphicConverter::ImplConvert(unsigned long, void*, unsigned long, void**, unsig
GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Point const&) const
GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Size const&) const
GraphicHelper::getDeviceInfo() const
-GraphicObject::GetChecksum() const
-GraphicObject::GetSwapStreamHdl() const
-GraphicObject::GraphicObject(Graphic const&, String const&, GraphicManager const*)
-GraphicObject::ResetAnimationLoopCount()
-GraphicObject::SetAnimationNotifyHdl(Link const&)
-GraphicObject::SetGraphicManager(GraphicManager const&)
GraphicReader::IsPreviewModeEnabled() const
GroupTable::SkipCurrentGroup()
HTMLControls::Insert(HTMLControl const*&, unsigned short&)