[Libreoffice-commits] core.git: 2 commits - include/svtools include/vcl svtools/source vcl/inc vcl/source
Noel Grandin
noel at peralex.com
Wed Sep 9 23:20:56 PDT 2015
include/svtools/grfmgr.hxx | 2 +-
include/vcl/animate.hxx | 6 +++---
include/vcl/btndlg.hxx | 1 -
include/vcl/graph.hxx | 4 ++--
svtools/source/graphic/grfcache.cxx | 2 +-
vcl/inc/impgraph.hxx | 6 +++---
vcl/source/gdi/graph.cxx | 4 ++--
vcl/source/gdi/impgraph.cxx | 6 +++---
vcl/source/window/btndlg.cxx | 9 ++-------
9 files changed, 17 insertions(+), 23 deletions(-)
New commits:
commit 9c162ddbea1507193b83fea2e2310f9eda5cfdb9
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 8 14:41:10 2015 +0200
remove unused Link<> field
Change-Id: I121f133513a9897f38bd87be96c2cea39fbfc836
diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index 5ab5a50..cf5206e 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -91,7 +91,6 @@ private:
sal_uInt16 mnCurButtonId;
sal_uInt16 mnFocusButtonId;
bool mbFormat;
- Link<> maClickHdl;
SAL_DLLPRIVATE void ImplInitButtonDialogData();
SAL_DLLPRIVATE VclPtr<PushButton> ImplCreatePushButton( ButtonDialogFlags nBtnFlags );
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 9c02cf9..ec9589a 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -260,13 +260,8 @@ void ButtonDialog::StateChanged( StateChangedType nType )
void ButtonDialog::Click()
{
- if ( !maClickHdl )
- {
- if ( IsInExecute() )
- EndDialog( GetCurButtonId() );
- }
- else
- maClickHdl.Call( this );
+ if ( IsInExecute() )
+ EndDialog( GetCurButtonId() );
}
void ButtonDialog::AddButton( const OUString& rText, sal_uInt16 nId,
commit 4db28b21499b866c44a6727118a9a94bf2f590ef
Author: Noel Grandin <noel at peralex.com>
Date: Tue Sep 8 14:28:58 2015 +0200
convert Link<> to typed
Change-Id: I7aa46c5cbaf70bea5756a4066bc620b3c40dedee
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 3ea3097..c72e0ee 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -415,7 +415,7 @@ public:
bool IsAnimated() const { return mbAnimated; }
bool IsEPS() const { return mbEPS; }
- Link<> GetAnimationNotifyHdl() const { return GetGraphic().GetAnimationNotifyHdl(); }
+ Link<Animation*,void> GetAnimationNotifyHdl() const { return GetGraphic().GetAnimationNotifyHdl(); }
bool SwapOut();
bool SwapOut( SvStream* pOStm );
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 801d9e4..3bc5ecb 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -152,8 +152,8 @@ public:
CycleMode GetCycleMode() const { return meCycleMode; }
- void SetNotifyHdl( const Link<>& rLink ) { maNotifyLink = rLink; }
- const Link<>& GetNotifyHdl() const { return maNotifyLink; }
+ void SetNotifyHdl( const Link<Animation*,void>& rLink ) { maNotifyLink = rLink; }
+ const Link<Animation*,void>& GetNotifyHdl() const { return maNotifyLink; }
size_t Count() const { return maList.size(); }
bool Insert( const AnimationBitmap& rAnimationBitmap );
@@ -205,7 +205,7 @@ private:
std::vector< AnimationBitmap* > maList;
std::vector< ImplAnimView* > maViewList;
- Link<> maNotifyLink;
+ Link<Animation*,void> maNotifyLink;
BitmapEx maBitmapEx;
Timer maTimer;
Size maGlobalSize;
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index cc2890d..c7d2ceb 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -155,8 +155,8 @@ public:
void StopAnimation( OutputDevice* pOutputDevice = NULL,
long nExtraData = 0L );
- void SetAnimationNotifyHdl( const Link<>& rLink );
- Link<> GetAnimationNotifyHdl() const;
+ void SetAnimationNotifyHdl( const Link<Animation*,void>& rLink );
+ Link<Animation*,void> GetAnimationNotifyHdl() const;
sal_uLong GetAnimationLoopCount() const;
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 59bbeb2..ccc2440 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -262,7 +262,7 @@ void GraphicCacheEntry::ImplFillSubstitute( Graphic& rSubstitute )
// create substitute for graphic;
const Size aPrefSize( rSubstitute.GetPrefSize() );
const MapMode aPrefMapMode( rSubstitute.GetPrefMapMode() );
- const Link<> aAnimationNotifyHdl( rSubstitute.GetAnimationNotifyHdl() );
+ const Link<Animation*,void> aAnimationNotifyHdl( rSubstitute.GetAnimationNotifyHdl() );
const GraphicType eOldType = rSubstitute.GetType();
const bool bDefaultType = ( rSubstitute.GetType() == GRAPHIC_DEFAULT );
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 51937b5..fdcbb9e 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -118,10 +118,10 @@ private:
void ImplStopAnimation( OutputDevice* pOutputDevice = NULL,
long nExtraData = 0 );
- void ImplSetAnimationNotifyHdl( const Link<>& rLink );
- Link<> ImplGetAnimationNotifyHdl() const;
+ void ImplSetAnimationNotifyHdl( const Link<Animation*,void>& rLink );
+ Link<Animation*,void> ImplGetAnimationNotifyHdl() const;
- sal_uLong ImplGetAnimationLoopCount() const;
+ sal_uLong ImplGetAnimationLoopCount() const;
private:
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 9eafd50..80fd0f5 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -459,12 +459,12 @@ void Graphic::StopAnimation( OutputDevice* pOutDev, long nExtraData )
mpImpGraphic->ImplStopAnimation( pOutDev, nExtraData );
}
-void Graphic::SetAnimationNotifyHdl( const Link<>& rLink )
+void Graphic::SetAnimationNotifyHdl( const Link<Animation*,void>& rLink )
{
mpImpGraphic->ImplSetAnimationNotifyHdl( rLink );
}
-Link<> Graphic::GetAnimationNotifyHdl() const
+Link<Animation*,void> Graphic::GetAnimationNotifyHdl() const
{
return mpImpGraphic->ImplGetAnimationNotifyHdl();
}
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 72abc23..186815a 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -914,15 +914,15 @@ void ImpGraphic::ImplStopAnimation( OutputDevice* pOutDev, long nExtraData )
mpAnimation->Stop( pOutDev, nExtraData );
}
-void ImpGraphic::ImplSetAnimationNotifyHdl( const Link<>& rLink )
+void ImpGraphic::ImplSetAnimationNotifyHdl( const Link<Animation*,void>& rLink )
{
if( mpAnimation )
mpAnimation->SetNotifyHdl( rLink );
}
-Link<> ImpGraphic::ImplGetAnimationNotifyHdl() const
+Link<Animation*,void> ImpGraphic::ImplGetAnimationNotifyHdl() const
{
- Link<> aLink;
+ Link<Animation*,void> aLink;
if( mpAnimation )
aLink = mpAnimation->GetNotifyHdl();
More information about the Libreoffice-commits
mailing list