summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/dialog/imapwnd.cxx82
-rw-r--r--svx/source/dialog/imapwnd.hxx2
-rw-r--r--svx/source/dialog/svxruler.cxx8
-rw-r--r--svx/source/gallery2/galbrws1.cxx4
-rw-r--r--svx/source/gallery2/galbrws1.hxx2
-rw-r--r--svx/source/gallery2/galbrws2.cxx16
-rw-r--r--svx/source/mnuctrls/SmartTagCtl.cxx6
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx6
8 files changed, 63 insertions, 63 deletions
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 464200d2e140..5525ebe2543e 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -709,61 +709,61 @@ void IMapWindow::DoPropertyDialog()
}
}
-IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu )
+IMPL_LINK_TYPED( IMapWindow, MenuSelectHdl, Menu*, pMenu, bool )
{
- if (pMenu)
- {
- sal_uInt16 nId = pMenu->GetCurItemId();
+ if (!pMenu)
+ return false;
- switch(nId)
- {
- case( MN_URL ):
- DoPropertyDialog();
- break;
+ sal_uInt16 nId = pMenu->GetCurItemId();
- case( MN_MACRO ):
- DoMacroAssign();
- break;
+ switch(nId)
+ {
+ case( MN_URL ):
+ DoPropertyDialog();
+ break;
- case( MN_ACTIVATE ):
- {
- const bool bNewState = !pMenu->IsItemChecked( MN_ACTIVATE );
+ case( MN_MACRO ):
+ DoMacroAssign();
+ break;
- pMenu->CheckItem( MN_ACTIVATE, bNewState );
- SetCurrentObjState( bNewState );
- UpdateInfo( false );
- }
- break;
+ case( MN_ACTIVATE ):
+ {
+ const bool bNewState = !pMenu->IsItemChecked( MN_ACTIVATE );
- case( MN_FRAME_TO_TOP ):
- pView->PutMarkedToTop();
- break;
+ pMenu->CheckItem( MN_ACTIVATE, bNewState );
+ SetCurrentObjState( bNewState );
+ UpdateInfo( false );
+ }
+ break;
- case( MN_MOREFRONT ):
- pView->MovMarkedToTop();
- break;
+ case( MN_FRAME_TO_TOP ):
+ pView->PutMarkedToTop();
+ break;
- case( MN_MOREBACK ):
- pView->MovMarkedToBtm();
- break;
+ case( MN_MOREFRONT ):
+ pView->MovMarkedToTop();
+ break;
- case( MN_FRAME_TO_BOTTOM ):
- pView->PutMarkedToBtm();
- break;
+ case( MN_MOREBACK ):
+ pView->MovMarkedToBtm();
+ break;
- case( MN_MARK_ALL ):
- pView->MarkAll();
- break;
+ case( MN_FRAME_TO_BOTTOM ):
+ pView->PutMarkedToBtm();
+ break;
- case( MN_DELETE1 ):
- pView->DeleteMarked();
+ case( MN_MARK_ALL ):
+ pView->MarkAll();
+ break;
- default :
- break;
- }
+ case( MN_DELETE1 ):
+ pView->DeleteMarked();
+
+ default :
+ break;
}
- return 0;
+ return false;
}
void IMapWindow::CreateDefaultObject()
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index e772f875228f..63bef585e09a 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -99,7 +99,7 @@ class IMapWindow : public GraphCtrl, public DropTargetHelper
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
mxDocumentFrame;
- DECL_LINK( MenuSelectHdl, Menu* );
+ DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool );
protected:
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index a068ee569643..d51af7132c8e 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -3398,14 +3398,14 @@ void SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint)
}
-IMPL_LINK( SvxRuler, MenuSelect, Menu *, pMenu )
+IMPL_LINK_TYPED( SvxRuler, MenuSelect, Menu *, pMenu, bool )
{
/* Handler of the context menus for switching the unit of measurement */
SetUnit(FieldUnit(pMenu->GetCurItemId()));
- return 0;
+ return false;
}
-IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu )
+IMPL_LINK_TYPED( SvxRuler, TabMenuSelect, Menu *, pMenu, bool )
{
/* Handler of the tab menu for setting the type */
if(mxTabStopItem.get() && mxTabStopItem->Count() > mxRulerImpl->nIdx)
@@ -3419,7 +3419,7 @@ IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu )
UpdateTabs();
mxRulerImpl->nIdx = 0;
}
- return 0;
+ return false;
}
void SvxRuler::Command( const CommandEvent& rCommandEvent )
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index bf1e04d68bd0..9eaefc72f438 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -608,10 +608,10 @@ IMPL_LINK_NOARG_TYPED(GalleryBrowser1, ShowContextMenuHdl, void*, void)
}
}
-IMPL_LINK( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu )
+IMPL_LINK_TYPED( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu, bool )
{
ImplExecute( pMenu->GetCurItemId() );
- return 0L;
+ return false;
}
IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl)
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 74a655206452..4cd406432846 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -112,7 +112,7 @@ private:
DECL_LINK_TYPED( ClickNewThemeHdl, Button*, void );
DECL_LINK( SelectThemeHdl, void* );
DECL_LINK_TYPED( ShowContextMenuHdl, void*, void );
- DECL_LINK( PopupMenuHdl, Menu* );
+ DECL_LINK_TYPED( PopupMenuHdl, Menu*, bool );
DECL_LINK( EndNewThemePropertiesDlgHdl, VclAbstractDialog2* );
DECL_LINK( EndThemePropertiesDlgHdl, VclAbstractDialog2* );
DECL_LINK_TYPED( DestroyThemePropertiesDlgHdl, void*, void );
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 6f0d17364d10..2f4fcf57431f 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -121,8 +121,8 @@ private:
static void Execute( const CommandInfo &rCmdInfo,
const css::uno::Sequence< css::beans::PropertyValue > &rArguments );
- DECL_LINK( MenuSelectHdl, Menu* );
- DECL_LINK( BackgroundMenuSelectHdl, Menu* );
+ DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool );
+ DECL_LINK_TYPED( BackgroundMenuSelectHdl, Menu*, bool );
public:
GalleryThemePopup( const GalleryTheme* pTheme,
sal_uIntPtr nObjectPos,
@@ -340,10 +340,10 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos
maPopupMenu.Execute( pWindow, aPos );
}
-IMPL_LINK( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu )
+IMPL_LINK_TYPED( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu, bool )
{
if( !pMenu )
- return 0;
+ return false;
sal_uInt16 nId( pMenu->GetCurItemId() );
switch ( nId )
@@ -362,13 +362,13 @@ IMPL_LINK( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu )
mpBrowser->Execute( nId );
}
- return 0;
+ return false;
}
-IMPL_LINK( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu )
+IMPL_LINK_TYPED( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu, bool )
{
if( !pMenu )
- return 0;
+ return false;
sal_uInt16 nPos( pMenu->GetCurItemId() - 1 );
OUString aURL( mpBrowser->GetURL().GetMainURL( INetURLObject::NO_DECODE ) );
@@ -392,7 +392,7 @@ IMPL_LINK( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu )
if ( it != m_aCommandInfo.end() )
Execute( it->second, aArgs );
- return 0;
+ return false;
}
} // end anonymous namespace
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index baa04e225fcc..f08889f8f7aa 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -154,10 +154,10 @@ void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const S
-IMPL_LINK( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
+IMPL_LINK_TYPED( SvxSmartTagsControl, MenuSelect, Menu *, pMen, bool )
{
if ( !mpSmartTagItem )
- return 0;
+ return false;
sal_uInt16 nMyId = pMen->GetCurItemId();
@@ -185,7 +185,7 @@ IMPL_LINK( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
//SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, sal_True);
//GetBindings().GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SfxCallMode::ASYNCHRON, &aBool, 0L );
- return 0;
+ return false;
}
SvxSmartTagsControl::~SvxSmartTagsControl()
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 129dcd6ed2ae..4bb0294f3409 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -165,7 +165,7 @@ private:
void SetupEntry(vcl::RenderContext& rRenderContext, vcl::Window* pParent, sal_uInt16 nItem, const Rectangle& rRect, const OUString& rStyleName, bool bIsNotSelected);
static bool AdjustFontForItemHeight(OutputDevice* pDevice, Rectangle& rTextRect, long nHeight);
void SetOptimalSize();
- DECL_LINK( MenuSelectHdl, Menu * );
+ DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool );
};
class SvxFontNameBox_Impl : public FontNameBox
@@ -365,7 +365,7 @@ void SvxStyleBox_Impl::ReleaseFocus()
m_xFrame->getContainerWindow()->setFocus();
}
-IMPL_LINK( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu)
+IMPL_LINK_TYPED( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu, bool)
{
OUString sEntry = OUString( GetSelectEntry() );
ReleaseFocus(); // It must be after getting entry pos!
@@ -390,7 +390,7 @@ IMPL_LINK( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu)
break;
}
}
- return 0;
+ return false;
}
void SvxStyleBox_Impl::Select()
generated by cgit (git 2.34.1) at 2025-01-11 09:10:27 +0000