diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-03-04 13:03:57 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-04 16:07:48 +0000 |
commit | cc71e03d3b249989639d2073e8e9635d5de0b158 (patch) | |
tree | d6d0efa0d70af925201c69c6417dfc4834486da7 | |
parent | 045e4115656063aa8d77e0581eaeea6cbf9e1c9e (diff) |
audit GetParent harder wrt GetParentDialog
weed out assumption that widgets are direct children of Dialogs
Change-Id: Ib2cf0c8862bd5e82b13380634ed82ca7fcc746b8
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hyphen.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/numfmt.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ext/macromigration/macromigrationpages.cxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/taborder.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/graphctl.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/config/optload.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/printdlg.cxx | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index afad83fed451..87e4b163945e 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1422,7 +1422,7 @@ namespace svx rLoseFocusHdl.Call( this ); m_rScrollBar.SetThumbPos( m_rScrollBar.GetThumbPos() + ( _bUp? -1 : 1 ) ); - ( static_cast< HangulHanjaEditDictDialog* >( GetParent() ) )->UpdateScrollbar(); + ( static_cast< HangulHanjaEditDictDialog* >( GetParentDialog() ) )->UpdateScrollbar(); } SuggestionEdit::SuggestionEdit( Window* pParent, const ResId& rResId, diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 983893ac63b0..82bef8d49f11 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -52,11 +52,11 @@ void HyphenEdit::KeyInput( const KeyEvent& rKEvt ) switch ( nCode ) { case KEY_LEFT: - ( (SvxHyphenWordDialog*)GetParent() )->SelLeft(); + ( (SvxHyphenWordDialog*)GetParentDialog() )->SelLeft(); break; case KEY_RIGHT: - ( (SvxHyphenWordDialog*)GetParent() )->SelRight(); + ( (SvxHyphenWordDialog*)GetParentDialog() )->SelRight(); break; case KEY_TAB: diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 8f97f013b3a6..a2f375a97244 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1119,7 +1119,7 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb ) } else { - SfxNoLayoutSingleTabDialog* pParent = dynamic_cast< SfxNoLayoutSingleTabDialog* >( GetParent() ); + SfxNoLayoutSingleTabDialog* pParent = dynamic_cast< SfxNoLayoutSingleTabDialog* >( GetParentDialog() ); OKButton* pOKButton = pParent ? pParent->GetOKButton() : NULL; if ( pOKButton ) pOKButton->Click(); diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index 415319af433d..ebf8936584c5 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -71,13 +71,13 @@ namespace dbmm //-------------------------------------------------------------------- const MacroMigrationDialog& MacroMigrationPage::getDialog() const { - return *dynamic_cast< const MacroMigrationDialog* >( GetParent() ); + return *dynamic_cast< const MacroMigrationDialog* >( GetParentDialog() ); } //-------------------------------------------------------------------- MacroMigrationDialog& MacroMigrationPage::getDialog() { - return *dynamic_cast< MacroMigrationDialog* >( GetParent() ); + return *dynamic_cast< MacroMigrationDialog* >( GetParentDialog() ); } //==================================================================== diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 74f1efa1e8a5..83bd64d60a9a 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -322,7 +322,7 @@ namespace pcr { SvTreeListBox::ModelHasMoved( _pSource ); - ((TabOrderDialog*)Window::GetParent())->SetModified(); + ((TabOrderDialog*)GetParentDialog())->SetModified(); } //------------------------------------------------------------------------ @@ -332,7 +332,7 @@ namespace pcr Image aImage; for (long i=0; i<labs(nRelPos); i++) { - ((TabOrderDialog*)Window::GetParent())->SetModified(); + ((TabOrderDialog*)GetParentDialog())->SetModified(); ////////////////////////////////////////////////////////////////////// // move entries diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 3dc8edebcfa3..bc73f5dca82e 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -290,7 +290,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) pView->DeleteMarked(); bProc = sal_True; if( !pView->AreObjectsMarked() ) - ((Dialog*)GetParent())->GrabFocusToFirstControl(); + GetParentDialog()->GrabFocusToFirstControl(); } } break; @@ -314,12 +314,12 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) } else { - ((Dialog*)GetParent())->GrabFocusToFirstControl(); + GetParentDialog()->GrabFocusToFirstControl(); } } else { - ((Dialog*)GetParent())->GrabFocusToFirstControl(); + GetParentDialog()->GrabFocusToFirstControl(); } bProc = sal_True; } diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index aa04658203e3..a9d2f17b51c8 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -794,7 +794,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ModifyHdl) { String sFldTypeName = aCategoryBox.GetText(); - SfxNoLayoutSingleTabDialog *pDlg = dynamic_cast<SfxNoLayoutSingleTabDialog*>(GetParent()); + SfxNoLayoutSingleTabDialog *pDlg = dynamic_cast<SfxNoLayoutSingleTabDialog*>(GetParentDialog()); PushButton *pBtn = pDlg ? pDlg->GetOKButton() : NULL; if (pBtn) pBtn->Enable(sFldTypeName.Len() != 0); diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 819673043e15..d31b346c258a 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -189,7 +189,7 @@ void PrintDialog::PrintPreviewWindow::Command( const CommandEvent& rEvt ) if( rEvt.GetCommand() == COMMAND_WHEEL ) { const CommandWheelData* pWheelData = rEvt.GetWheelData(); - PrintDialog* pDlg = dynamic_cast<PrintDialog*>(GetParent()); + PrintDialog* pDlg = dynamic_cast<PrintDialog*>(GetParentDialog()); if( pDlg ) { if( pWheelData->GetDelta() > 0 ) |