summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-10-02 17:05:35 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-10-03 09:58:36 +0100
commitb3584b90aacd307490bfd15d2ace63e805a8b57a (patch)
tree1f1fafb20fd1dc2e19bddc2a3f4c07596096f37d
parente292cb0df0bd4de5804f875a68f9075e7129ebd4 (diff)
probable attempts to find the parent dialog
Change-Id: I033f3cd9b42df21c9b63dc03e8e0136971d5dc24
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx2
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx2
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx4
-rw-r--r--sd/source/ui/dlg/tpaction.cxx2
4 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 19eba7de6f98..8f76496d7ea4 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -335,7 +335,7 @@ DBG_NAME(OTableSubscriptionPage)
if (aErrorInfo.isValid())
{
// establishing the connection failed. Show an error window and exit.
- OSQLMessageBox aMessageBox( GetParent()->GetParent(), aErrorInfo );
+ OSQLMessageBox aMessageBox( GetParentDialog(), aErrorInfo );
aMessageBox.Execute();
m_aTables.Enable(sal_False);
m_aTablesList.Enable(sal_False);
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 4b3078b2cb3e..0a40d8e22c0c 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -112,7 +112,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId )
{
case FIELD_PRPOERTY_COLUMNNAME:
{
- OCopyTableWizard* pWiz = static_cast<OCopyTableWizard*>(GetParent()->GetParent());
+ OCopyTableWizard* pWiz = static_cast<OCopyTableWizard*>(GetParentDialog());
// first we have to check if this name already exists
sal_Bool bDoubleName = sal_False;
sal_Bool bCase = sal_True;
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index d4f23032c388..84084d7e721d 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -96,7 +96,7 @@ ScTabPageSortFields::ScTabPageSortFields( Window* pParent,
aStrRow ( SC_RESSTR( SCSTR_ROW ) ),
//
nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ),
- pDlg ( (ScSortDlg*)(GetParent()->GetParent()) ),
+ pDlg ( (ScSortDlg*)(GetParentDialog()) ),
pViewData ( NULL ),
aSortData ( ((const ScSortItem&)
rArgSet.Get( nWhichSort )).
@@ -517,7 +517,7 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
rArgSet.Get( nWhichSort )).GetSortData() ),
pViewData ( NULL ),
pDoc ( NULL ),
- pDlg ( (ScSortDlg*)(GetParent() ? GetParent()->GetParent() : 0 ) ),
+ pDlg ( (ScSortDlg*)(GetParentDialog()) ),
pColRes ( NULL ),
pColWrap ( NULL )
{
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index d9372e4b9632..5e0753acb62c 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -708,7 +708,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl)
if( aMedium.IsStorage() )
{
- WaitObject aWait( GetParent()->GetParent() );
+ WaitObject aWait( GetParentDialog() );
// ist es eine Draw-Datei?
// mit READ oeffnen, sonst schreiben die Storages evtl. in die Datei!