diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-09 21:28:38 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-10 11:25:42 +0200 |
commit | 74c0eb0626b9ce8849f82249466866515bce6f22 (patch) | |
tree | 95c97c5eb3590bd4a3961af420bd0aba545afbec | |
parent | 4a760a8d0b1cf12c6092f733db74ff5b1c83b733 (diff) |
Replace IMPL_STATIC_LINK[_TYPED] with more useful variants
Change-Id: I1b3bf6ac16346ecf6085874d80ac6495e773dd37
-rw-r--r-- | cui/source/customize/macropg.cxx | 14 | ||||
-rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 40 | ||||
-rw-r--r-- | cui/source/dialogs/insdlg.cxx | 24 | ||||
-rw-r--r-- | cui/source/dialogs/thesdlg.cxx | 3 | ||||
-rw-r--r-- | cui/source/inc/SpellDialog.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/cuitabline.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/insdlg.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/macroass.hxx | 12 | ||||
-rw-r--r-- | cui/source/inc/macropg.hxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/macroass.cxx | 36 | ||||
-rw-r--r-- | cui/source/tabpages/tpline.cxx | 8 |
11 files changed, 75 insertions, 76 deletions
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index ae4daa6c9bc4..4c2063bb42a2 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -574,9 +574,9 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents) } // select event handler on the listbox -IMPL_STATIC_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG ) +IMPL_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG ) { - _SvxMacroTabPage_Impl* pImpl = pThis->mpImpl; + _SvxMacroTabPage_Impl* pImpl = mpImpl; SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox(); SvTreeListEntry* pE = rListBox.FirstSelected(); sal_uLong nPos; @@ -588,18 +588,18 @@ IMPL_STATIC_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG ) return 0; } - pThis->EnableButtons(); + EnableButtons(); return 0; } -IMPL_STATIC_LINK( _SvxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) +IMPL_LINK( _SvxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) { - return GenericHandler_Impl( pThis, pBtn ); + return GenericHandler_Impl( this, pBtn ); } -IMPL_STATIC_LINK( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTabListBox *, EMPTYARG ) +IMPL_LINK( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTabListBox *, EMPTYARG ) { - return GenericHandler_Impl( pThis, NULL ); + return GenericHandler_Impl( this, NULL ); } // handler for double click on the listbox, and for the assign/delete buttons diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index c571832e0207..325f6f346c88 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -441,33 +441,33 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent /* Initialize, asynchronous to prevent virtial calls from a constructor */ -IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG ) +IMPL_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG ) { - pThis->SetUpdateMode( false ); + SetUpdateMode( false ); //show or hide AutoCorrect depending on the modules abilities - pThis->m_pAutoCorrPB->Show(pThis->rParent.HasAutoCorrection()); - pThis->SpellContinue_Impl(); - pThis->m_pSentenceED->ResetUndo(); - pThis->m_pUndoPB->Enable(false); + m_pAutoCorrPB->Show(rParent.HasAutoCorrection()); + SpellContinue_Impl(); + m_pSentenceED->ResetUndo(); + m_pUndoPB->Enable(false); // get current language - pThis->UpdateBoxes_Impl(); + UpdateBoxes_Impl(); // fill dictionary PopupMenu - pThis->InitUserDicts(); - - pThis->LockFocusChanges(true); - if( pThis->m_pChangePB->IsEnabled() ) - pThis->m_pChangePB->GrabFocus(); - else if( pThis->m_pIgnorePB->IsEnabled() ) - pThis->m_pIgnorePB->GrabFocus(); - else if( pThis->m_pClosePB->IsEnabled() ) - pThis->m_pClosePB->GrabFocus(); - pThis->LockFocusChanges(false); + InitUserDicts(); + + LockFocusChanges(true); + if( m_pChangePB->IsEnabled() ) + m_pChangePB->GrabFocus(); + else if( m_pIgnorePB->IsEnabled() ) + m_pIgnorePB->GrabFocus(); + else if( m_pClosePB->IsEnabled() ) + m_pClosePB->GrabFocus(); + LockFocusChanges(false); //show grammar CheckBox depending on the modules abilities - pThis->m_pCheckGrammarCB->Check( pThis->rParent.IsGrammarChecking() ); - pThis->SetUpdateMode( true ); - pThis->Show(); + m_pCheckGrammarCB->Check( rParent.IsGrammarChecking() ); + SetUpdateMode( true ); + Show(); return 0; }; diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 00ca41532978..d48e043b382f 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -739,22 +739,22 @@ short SfxInsertFloatingFrameDialog::Execute() -IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB ) +IMPL_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB ) { - if ( pCB == pThis->m_pCBMarginWidthDefault ) + if ( pCB == m_pCBMarginWidthDefault ) { if ( pCB->IsChecked() ) - pThis->m_pNMMarginWidth->SetText( OUString::number(DEFAULT_MARGIN_WIDTH) ); - pThis->m_pFTMarginWidth->Enable( !pCB->IsChecked() ); - pThis->m_pNMMarginWidth->Enable( !pCB->IsChecked() ); + m_pNMMarginWidth->SetText( OUString::number(DEFAULT_MARGIN_WIDTH) ); + m_pFTMarginWidth->Enable( !pCB->IsChecked() ); + m_pNMMarginWidth->Enable( !pCB->IsChecked() ); } - if ( pCB == pThis->m_pCBMarginHeightDefault ) + if ( pCB == m_pCBMarginHeightDefault ) { if ( pCB->IsChecked() ) - pThis->m_pNMMarginHeight->SetText( OUString::number(DEFAULT_MARGIN_HEIGHT) ); - pThis->m_pFTMarginHeight->Enable( !pCB->IsChecked() ); - pThis->m_pNMMarginHeight->Enable( !pCB->IsChecked() ); + m_pNMMarginHeight->SetText( OUString::number(DEFAULT_MARGIN_HEIGHT) ); + m_pFTMarginHeight->Enable( !pCB->IsChecked() ); + m_pNMMarginHeight->Enable( !pCB->IsChecked() ); } return 0L; @@ -762,10 +762,10 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB ) -IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG ) +IMPL_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG ) { vcl::Window* pOldParent = Application::GetDefDialogParent(); - Application::SetDefDialogParent( pThis ); + Application::SetDefDialogParent( this ); // create the file dialog sfx2::FileDialogHelper aFileDlg( @@ -776,7 +776,7 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG ) // show the dialog if ( aFileDlg.Execute() == ERRCODE_NONE ) - pThis->m_pEDURL->SetText( + m_pEDURL->SetText( INetURLObject( aFileDlg.GetPath() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET ) ); Application::SetDefDialogParent( pOldParent ); diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index aa58d7145858..81e7c7347b05 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -437,9 +437,8 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox return 0; } -IMPL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pBox ) +IMPL_STATIC_LINK_NOINSTANCE( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pBox ) { - (void) pThis; if (pBox && pBox->GetEntryCount() >= 2) pBox->SelectEntryPos( 1 ); // pos 0 is a 'header' that is not selectable return 0; diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index d60ec62b9d7c..38a08cf447b2 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -186,7 +186,7 @@ private: DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* ); DECL_LINK( HandleHyperlink, FixedHyperlink * ); - DECL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog * ); + DECL_LINK( InitHdl, SpellDialog * ); int AddToDictionaryExecute( sal_uInt16 ItemId, PopupMenu *pMenu ); void StartSpellOptDlg_Impl(); diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 6c4143c34535..678042b3e02b 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -178,7 +178,7 @@ private: // handler for gallery popup menu button + size DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); DECL_LINK( MenuCreateHdl_Impl, MenuButton * ); - DECL_STATIC_LINK( SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* ); + DECL_LINK( GraphicArrivedHdl_Impl, SvxBrushItem* ); DECL_LINK( SizeHdl_Impl, MetricField * ); DECL_LINK( RatioHdl_Impl, CheckBox * ); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index eda64bad3349..9d08cc57bb75 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -136,8 +136,8 @@ private: VclPtr<NumericField> m_pNMMarginHeight; VclPtr<CheckBox> m_pCBMarginHeightDefault; - DECL_STATIC_LINK(SfxInsertFloatingFrameDialog, OpenHdl, PushButton* ); - DECL_STATIC_LINK(SfxInsertFloatingFrameDialog, CheckHdl, CheckBox* ); + DECL_LINK(OpenHdl, PushButton* ); + DECL_LINK(CheckHdl, CheckBox* ); void Init(); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 76193c19a7d2..a5a5b4f6b0ae 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -35,14 +35,14 @@ class _SfxMacroTabPage_Impl; class _SfxMacroTabPage : public SfxTabPage { SvxMacroTableDtor aTbl; - DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox * ); - DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox * ); - DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox * ); + DECL_DLLPRIVATE_LINK( SelectEvent_Impl, SvTabListBox * ); + DECL_DLLPRIVATE_LINK( SelectGroup_Impl, ListBox * ); + DECL_DLLPRIVATE_LINK( SelectMacro_Impl, ListBox * ); - DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, DoubleClickHdl_Impl, Control* ); - DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton * ); + DECL_DLLPRIVATE_LINK( DoubleClickHdl_Impl, Control* ); + DECL_DLLPRIVATE_LINK( AssignDeleteHdl_Impl, PushButton * ); - DECL_DLLPRIVATE_STATIC_LINK_TYPED( _SfxMacroTabPage, TimeOut_Impl, Idle*, void ); + DECL_DLLPRIVATE_LINK_TYPED( TimeOut_Impl, Idle*, void ); protected: _SfxMacroTabPage_Impl* mpImpl; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index a5a9eb501530..b9bea10ccf31 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -57,9 +57,9 @@ class _SvxMacroTabPage_Impl; class _SvxMacroTabPage : public SfxTabPage { - DECL_STATIC_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox * ); - DECL_STATIC_LINK( _SvxMacroTabPage, AssignDeleteHdl_Impl, PushButton * ); - DECL_STATIC_LINK( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTabListBox * ); + DECL_LINK( SelectEvent_Impl, SvTabListBox * ); + DECL_LINK( AssignDeleteHdl_Impl, PushButton * ); + DECL_LINK( DoubleClickHdl_Impl, SvTabListBox * ); static long GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* pBtn ); diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index ecde19457844..f752b806db72 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -261,9 +261,9 @@ bool _SfxMacroTabPage::IsReadOnly() const return mpImpl->bReadOnly; } -IMPL_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG ) +IMPL_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG ) { - _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; + _SfxMacroTabPage_Impl* pImpl = mpImpl; SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox(); SvTreeListEntry* pE = rListBox.FirstSelected(); sal_uLong nPos; @@ -274,14 +274,14 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG ) return 0; } - pThis->ScriptChanged(); - pThis->EnableButtons(); + ScriptChanged(); + EnableButtons(); return 0; } -IMPL_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG ) +IMPL_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG ) { - _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; + _SfxMacroTabPage_Impl* pImpl = mpImpl; pImpl->pGroupLB->GroupSelected(); const OUString sScriptURI = pImpl->pMacroLB->GetSelectedScriptURI(); OUString aLabelText; @@ -289,19 +289,19 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG ) aLabelText = pImpl->maStaticMacroLBLabel; pImpl->pMacroFrame->set_label( aLabelText ); - pThis->EnableButtons(); + EnableButtons(); return 0; } -IMPL_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, EMPTYARG ) +IMPL_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, EMPTYARG ) { - pThis->EnableButtons(); + EnableButtons(); return 0; } -IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) +IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) { - _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; + _SfxMacroTabPage_Impl* pImpl = mpImpl; SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox(); SvTreeListEntry* pE = rListBox.FirstSelected(); sal_uLong nPos; @@ -316,7 +316,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) // remove from the table sal_uInt16 nEvent = (sal_uInt16)reinterpret_cast<sal_uLong>(pE->GetUserData()); - pThis->aTbl.Erase( nEvent ); + aTbl.Erase( nEvent ); OUString sScriptURI; if( bAssEnabled ) @@ -324,13 +324,13 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) sScriptURI = pImpl->pMacroLB->GetSelectedScriptURI(); if( sScriptURI.startsWith( "vnd.sun.star.script:" ) ) { - pThis->aTbl.Insert( + aTbl.Insert( nEvent, SvxMacro( sScriptURI, OUString( SVX_MACRO_LANGUAGE_SF ) ) ); } else { OSL_ENSURE( false, "_SfxMacroTabPage::AssignDeleteHdl_Impl: this branch is *not* dead? (out of interest: tell fs, please!)" ); - pThis->aTbl.Insert( + aTbl.Insert( nEvent, SvxMacro( sScriptURI, OUString( SVX_MACRO_LANGUAGE_STARBASIC ) ) ); } } @@ -342,21 +342,21 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) rListBox.MakeVisible( pE ); rListBox.SetUpdateMode( true ); - pThis->EnableButtons(); + EnableButtons(); return 0; } -IMPL_STATIC_LINK_TYPED( _SfxMacroTabPage, TimeOut_Impl, Idle*, EMPTYARG, void ) +IMPL_LINK_TYPED( _SfxMacroTabPage, TimeOut_Impl, Idle*, EMPTYARG, void ) { // FillMacroList() can take a long time -> show wait cursor and disable input - SfxTabDialog* pTabDlg = pThis->GetTabDialog(); + SfxTabDialog* pTabDlg = GetTabDialog(); // perhaps the tabpage is part of a SingleTabDialog then pTabDlg == NULL if ( pTabDlg ) { pTabDlg->EnterWait(); pTabDlg->EnableInput( false ); } - pThis->FillMacroList(); + FillMacroList(); if ( pTabDlg ) { pTabDlg->EnableInput( true ); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 25dfd8cb5f2c..99cad0db63a8 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1739,14 +1739,14 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) // #58425# Symbols on a list (e.g. StarChart) // Handler for the symbol selection's popup menu (NumMenueButton) // The following link originates from SvxNumOptionsTabPage -IMPL_STATIC_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem) +IMPL_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem) { - PopupMenu* pPopup = pThis->m_pSymbolMB->GetPopupMenu()->GetPopupMenu( MN_GALLERY ); + PopupMenu* pPopup = m_pSymbolMB->GetPopupMenu()->GetPopupMenu( MN_GALLERY ); SvxBmpItemInfo* pBmpInfo = 0; - for ( size_t i = 0; i < pThis->aGrfBrushItems.size(); i++ ) + for ( size_t i = 0; i < aGrfBrushItems.size(); i++ ) { - SvxBmpItemInfo* pInfo = pThis->aGrfBrushItems[ i ]; + SvxBmpItemInfo* pInfo = aGrfBrushItems[ i ]; if( pInfo->pBrushItem == pItem ) { pBmpInfo = pInfo; break; |