[Libreoffice-commits] core.git: include/svtools include/tools reportdesign/source sc/source sfx2/source svtools/source svx/source vcl/source
Noel Grandin
noel at peralex.com
Fri Oct 24 00:00:14 PDT 2014
include/svtools/svparser.hxx | 2 +-
include/tools/link.hxx | 10 +++++-----
reportdesign/source/ui/report/ScrollHelper.cxx | 2 +-
sc/source/ui/Accessibility/AccessibleText.cxx | 8 ++++----
sc/source/ui/inc/AccessibleText.hxx | 2 +-
sfx2/source/sidebar/SidebarController.cxx | 2 +-
sfx2/source/view/viewprn.cxx | 2 +-
svtools/source/contnr/treelistbox.cxx | 2 +-
svx/source/svdraw/svdotxat.cxx | 2 +-
vcl/source/filter/graphicfilter.cxx | 2 +-
10 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 0a82645c360158f9cc0fdabe2a52f1ff8f981bed
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 24 08:57:19 2014 +0200
loplugin: cstylecast
Change-Id: Ia0f5f0d0efbe4693aba347bff32cd694117251fe
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index 4d176ec..d3294ea 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -138,7 +138,7 @@ public:
inline bool IsParserWorking() const { return SVPAR_WORKING == eState; }
Link GetAsynchCallLink() const
- { return STATIC_LINK( this, SvParser, NewDataRead ); }
+ { return STATIC_LINK( const_cast<SvParser*>(this), SvParser, NewDataRead ); }
long CallAsyncCallLink() { return NewDataRead( this, 0 ); }
diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index 9b7e7fe..db80283 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -45,32 +45,32 @@ typedef long (*PSTUB)( void*, void* );
#define IMPL_STUB(Class, Method, ArgType) \
long Class::LinkStub##Method( void* pThis, void* pCaller) \
{ \
- return ((Class*)pThis )->Method( (ArgType)pCaller ); \
+ return static_cast<Class*>(pThis)->Method( (ArgType)pCaller ); \
}
#define IMPL_STATIC_LINK( Class, Method, ArgType, ArgName ) \
long Class::LinkStub##Method( void* pThis, void* pCaller) \
{ \
- return Method( (Class*)pThis, (ArgType)pCaller ); \
+ return Method( static_cast<Class*>(pThis), (ArgType)pCaller ); \
} \
long Class::Method( Class* pThis, ArgType ArgName )
#define IMPL_STATIC_LINK_NOINSTANCE( Class, Method, ArgType, ArgName ) \
long Class::LinkStub##Method( void* pThis, void* pCaller) \
{ \
- return Method( (Class*)pThis, (ArgType)pCaller ); \
+ return Method( static_cast<Class*>(pThis), (ArgType)pCaller ); \
} \
long Class::Method( SAL_UNUSED_PARAMETER Class*, ArgType ArgName )
#define IMPL_STATIC_LINK_NOINSTANCE_NOARG( Class, Method ) \
long Class::LinkStub##Method( void* pThis, void* pCaller) \
{ \
- return Method( (Class*)pThis, pCaller ); \
+ return Method( static_cast<Class*>(pThis), pCaller ); \
} \
long Class::Method( SAL_UNUSED_PARAMETER Class*, SAL_UNUSED_PARAMETER void* )
#define LINK( Inst, Class, Member ) \
- Link( (Class*)Inst, (PSTUB)&Class::LinkStub##Member )
+ Link( static_cast<Class*>(Inst), (PSTUB)&Class::LinkStub##Member )
#define STATIC_LINK( Inst, Class, Member ) LINK(Inst, Class, Member)
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 453bd45a8..9dd32a5 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -82,7 +82,7 @@ void OScrollWindowHelper::impl_initScrollBar( ScrollBar& _rScrollBar ) const
aSettings.SetStyleSettings( aStyle );
_rScrollBar.SetSettings( aSettings );
- _rScrollBar.SetScrollHdl( LINK( this, OScrollWindowHelper, ScrollHdl ) );
+ _rScrollBar.SetScrollHdl( LINK( const_cast<OScrollWindowHelper*>(this), OScrollWindowHelper, ScrollHdl ) );
_rScrollBar.SetLineSize( SCR_LINE_SIZE );
}
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 94b2833..fb98dc2 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -939,7 +939,7 @@ SvxEditViewForwarder* ScAccessibleCellTextData::GetEditViewForwarder( bool /* bC
return NULL;
}
-IMPL_LINK(ScAccessibleCellTextData, NotifyHdl, EENotify*, aNotify)
+IMPL_LINK(ScAccessibleTextData, NotifyHdl, EENotify*, aNotify)
{
if( aNotify )
{
@@ -1287,7 +1287,7 @@ SvxTextForwarder* ScAccessiblePreviewCellTextData::GetTextForwarder()
}
if (pEditEngine)
- pEditEngine->SetNotifyHdl( LINK(this, ScAccessibleCellTextData, NotifyHdl) );
+ pEditEngine->SetNotifyHdl( LINK(this, ScAccessiblePreviewCellTextData, NotifyHdl) );
return pForwarder;
}
@@ -1395,7 +1395,7 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder()
bDataValid = true;
- pEditEngine->SetNotifyHdl( LINK(this, ScAccessibleCellTextData, NotifyHdl) );
+ pEditEngine->SetNotifyHdl( LINK(this, ScAccessiblePreviewHeaderCellTextData, NotifyHdl) );
return pForwarder;
}
@@ -1629,7 +1629,7 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder()
mbDataValid = true;
- mpEditEngine->SetNotifyHdl( LINK(this, ScAccessibleCellTextData, NotifyHdl) );
+ mpEditEngine->SetNotifyHdl( LINK(this, ScAccessibleNoteTextData, NotifyHdl) );
return mpForwarder;
}
diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx
index b697137..541450a 100644
--- a/sc/source/ui/inc/AccessibleText.hxx
+++ b/sc/source/ui/inc/AccessibleText.hxx
@@ -56,6 +56,7 @@ public:
virtual void UpdateData() = 0;
virtual void SetDoUpdate(bool bValue) = 0;
virtual bool IsDirty() const = 0;
+ DECL_LINK( NotifyHdl, EENotify* );
private:
mutable SfxBroadcaster maBroadcaster;
@@ -96,7 +97,6 @@ public:
virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE;
virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) SAL_OVERRIDE;
- DECL_LINK( NotifyHdl, EENotify* );
protected:
virtual void GetCellText(const ScAddress& rCellPos, OUString& rText) SAL_OVERRIDE;
private:
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 320f2b2..2da9d48 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -867,7 +867,7 @@ void SidebarController::ShowPopupMenu (
const ::std::vector<TabBar::DeckMenuData>& rMenuData) const
{
::boost::shared_ptr<PopupMenu> pMenu = CreatePopupMenu(rMenuData);
- pMenu->SetSelectHdl(LINK(this, SidebarController, OnMenuItemSelected));
+ pMenu->SetSelectHdl(LINK(const_cast<SidebarController*>(this), SidebarController, OnMenuItemSelected));
// pass toolbox button rect so the menu can stay open on button up
Rectangle aBox (rButtonBox);
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 5dbdc3b..bef2e88 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -423,7 +423,7 @@ public:
SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSetupDialog* pParent );
~SfxDialogExecutor_Impl() { delete _pOptions; }
- Link GetLink() const { return LINK( this, SfxDialogExecutor_Impl, Execute); }
+ Link GetLink() const { return LINK(const_cast<SfxDialogExecutor_Impl*>(this), SfxDialogExecutor_Impl, Execute); }
const SfxItemSet* GetOptions() const { return _pOptions; }
void DisableHelp() { _bHelpDisabled = true; }
};
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 13c5d4b..154ead8 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1436,7 +1436,7 @@ IMPL_STATIC_LINK( SvTreeListBox, DragFinishHdl_Impl, sal_Int8*, pAction )
Link SvTreeListBox::GetDragFinishedHdl() const
{
AddBoxToDDList_Impl( *this );
- return STATIC_LINK( this, SvTreeListBox, DragFinishHdl_Impl );
+ return STATIC_LINK( const_cast<SvTreeListBox*>(this), SvTreeListBox, DragFinishHdl_Impl );
}
/*
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 47e402e..293e011 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -170,7 +170,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight( Rectangle& rR, bool bHgt, bool b
if (pOutlinerParaObject)
{
rOutliner.SetText(*pOutlinerParaObject);
- rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
+ rOutliner.SetFixedCellHeight(static_cast<const SdrTextFixedCellHeightItem&>(GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
}
if (bWdtGrow)
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 79be1aa..27f08fb 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2168,7 +2168,7 @@ void GraphicFilter::ResetLastError()
const Link GraphicFilter::GetFilterCallback() const
{
- const Link aLink( LINK( this, GraphicFilter, FilterCallback ) );
+ const Link aLink( LINK( const_cast<GraphicFilter*>(this), GraphicFilter, FilterCallback ) );
return aLink;
}
More information about the Libreoffice-commits
mailing list