Kaydet (Commit) 4db28b21 authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: I7aa46c5cbaf70bea5756a4066bc620b3c40dedee
üst 50661996
...@@ -415,7 +415,7 @@ public: ...@@ -415,7 +415,7 @@ public:
bool IsAnimated() const { return mbAnimated; } bool IsAnimated() const { return mbAnimated; }
bool IsEPS() const { return mbEPS; } bool IsEPS() const { return mbEPS; }
Link<> GetAnimationNotifyHdl() const { return GetGraphic().GetAnimationNotifyHdl(); } Link<Animation*,void> GetAnimationNotifyHdl() const { return GetGraphic().GetAnimationNotifyHdl(); }
bool SwapOut(); bool SwapOut();
bool SwapOut( SvStream* pOStm ); bool SwapOut( SvStream* pOStm );
......
...@@ -152,8 +152,8 @@ public: ...@@ -152,8 +152,8 @@ public:
CycleMode GetCycleMode() const { return meCycleMode; } CycleMode GetCycleMode() const { return meCycleMode; }
void SetNotifyHdl( const Link<>& rLink ) { maNotifyLink = rLink; } void SetNotifyHdl( const Link<Animation*,void>& rLink ) { maNotifyLink = rLink; }
const Link<>& GetNotifyHdl() const { return maNotifyLink; } const Link<Animation*,void>& GetNotifyHdl() const { return maNotifyLink; }
size_t Count() const { return maList.size(); } size_t Count() const { return maList.size(); }
bool Insert( const AnimationBitmap& rAnimationBitmap ); bool Insert( const AnimationBitmap& rAnimationBitmap );
...@@ -205,7 +205,7 @@ private: ...@@ -205,7 +205,7 @@ private:
std::vector< AnimationBitmap* > maList; std::vector< AnimationBitmap* > maList;
std::vector< ImplAnimView* > maViewList; std::vector< ImplAnimView* > maViewList;
Link<> maNotifyLink; Link<Animation*,void> maNotifyLink;
BitmapEx maBitmapEx; BitmapEx maBitmapEx;
Timer maTimer; Timer maTimer;
Size maGlobalSize; Size maGlobalSize;
......
...@@ -155,8 +155,8 @@ public: ...@@ -155,8 +155,8 @@ public:
void StopAnimation( OutputDevice* pOutputDevice = NULL, void StopAnimation( OutputDevice* pOutputDevice = NULL,
long nExtraData = 0L ); long nExtraData = 0L );
void SetAnimationNotifyHdl( const Link<>& rLink ); void SetAnimationNotifyHdl( const Link<Animation*,void>& rLink );
Link<> GetAnimationNotifyHdl() const; Link<Animation*,void> GetAnimationNotifyHdl() const;
sal_uLong GetAnimationLoopCount() const; sal_uLong GetAnimationLoopCount() const;
......
...@@ -262,7 +262,7 @@ void GraphicCacheEntry::ImplFillSubstitute( Graphic& rSubstitute ) ...@@ -262,7 +262,7 @@ void GraphicCacheEntry::ImplFillSubstitute( Graphic& rSubstitute )
// create substitute for graphic; // create substitute for graphic;
const Size aPrefSize( rSubstitute.GetPrefSize() ); const Size aPrefSize( rSubstitute.GetPrefSize() );
const MapMode aPrefMapMode( rSubstitute.GetPrefMapMode() ); const MapMode aPrefMapMode( rSubstitute.GetPrefMapMode() );
const Link<> aAnimationNotifyHdl( rSubstitute.GetAnimationNotifyHdl() ); const Link<Animation*,void> aAnimationNotifyHdl( rSubstitute.GetAnimationNotifyHdl() );
const GraphicType eOldType = rSubstitute.GetType(); const GraphicType eOldType = rSubstitute.GetType();
const bool bDefaultType = ( rSubstitute.GetType() == GRAPHIC_DEFAULT ); const bool bDefaultType = ( rSubstitute.GetType() == GRAPHIC_DEFAULT );
......
...@@ -118,10 +118,10 @@ private: ...@@ -118,10 +118,10 @@ private:
void ImplStopAnimation( OutputDevice* pOutputDevice = NULL, void ImplStopAnimation( OutputDevice* pOutputDevice = NULL,
long nExtraData = 0 ); long nExtraData = 0 );
void ImplSetAnimationNotifyHdl( const Link<>& rLink ); void ImplSetAnimationNotifyHdl( const Link<Animation*,void>& rLink );
Link<> ImplGetAnimationNotifyHdl() const; Link<Animation*,void> ImplGetAnimationNotifyHdl() const;
sal_uLong ImplGetAnimationLoopCount() const; sal_uLong ImplGetAnimationLoopCount() const;
private: private:
......
...@@ -459,12 +459,12 @@ void Graphic::StopAnimation( OutputDevice* pOutDev, long nExtraData ) ...@@ -459,12 +459,12 @@ void Graphic::StopAnimation( OutputDevice* pOutDev, long nExtraData )
mpImpGraphic->ImplStopAnimation( pOutDev, nExtraData ); mpImpGraphic->ImplStopAnimation( pOutDev, nExtraData );
} }
void Graphic::SetAnimationNotifyHdl( const Link<>& rLink ) void Graphic::SetAnimationNotifyHdl( const Link<Animation*,void>& rLink )
{ {
mpImpGraphic->ImplSetAnimationNotifyHdl( rLink ); mpImpGraphic->ImplSetAnimationNotifyHdl( rLink );
} }
Link<> Graphic::GetAnimationNotifyHdl() const Link<Animation*,void> Graphic::GetAnimationNotifyHdl() const
{ {
return mpImpGraphic->ImplGetAnimationNotifyHdl(); return mpImpGraphic->ImplGetAnimationNotifyHdl();
} }
......
...@@ -914,15 +914,15 @@ void ImpGraphic::ImplStopAnimation( OutputDevice* pOutDev, long nExtraData ) ...@@ -914,15 +914,15 @@ void ImpGraphic::ImplStopAnimation( OutputDevice* pOutDev, long nExtraData )
mpAnimation->Stop( pOutDev, nExtraData ); mpAnimation->Stop( pOutDev, nExtraData );
} }
void ImpGraphic::ImplSetAnimationNotifyHdl( const Link<>& rLink ) void ImpGraphic::ImplSetAnimationNotifyHdl( const Link<Animation*,void>& rLink )
{ {
if( mpAnimation ) if( mpAnimation )
mpAnimation->SetNotifyHdl( rLink ); mpAnimation->SetNotifyHdl( rLink );
} }
Link<> ImpGraphic::ImplGetAnimationNotifyHdl() const Link<Animation*,void> ImpGraphic::ImplGetAnimationNotifyHdl() const
{ {
Link<> aLink; Link<Animation*,void> aLink;
if( mpAnimation ) if( mpAnimation )
aLink = mpAnimation->GetNotifyHdl(); aLink = mpAnimation->GetNotifyHdl();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment