diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 17:15:51 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 10:21:05 +0200 |
commit | 93fed09bfbeae299aa56c7c6d929d57607ac087b (patch) | |
tree | aa90672b1496a1d1497e19e658a5892fb79792ee | |
parent | a8e7b4966846dc1005898add66a965eba9409840 (diff) |
Dialog::EndDialog nResult param is of type long/VclResponseType
Change-Id: I31f1941daf158676518fcf259ef8a9e84863473e
-rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/CollectionView.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/taborder.cxx | 2 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.cxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/brkdlg.cxx | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index f239f7f33df0..6764c45f15fa 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -402,7 +402,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, OKHdl) OUString aOUStr( &cChar, 1 ); m_pShowText->SetText( aOUStr ); } - EndDialog( sal_True ); + EndDialog( RET_OK ); return 0; } @@ -497,7 +497,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharDoubleClickHdl) sal_UCS4 cChar = m_pShowSet->GetSelectCharacter(); m_pShowText->SetText(OUString(&cChar, 1)); } - EndDialog( sal_True ); + EndDialog( RET_OK ); return 0; } diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index f437d31d9f58..aa50eb9bc4ca 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -174,7 +174,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click) return 0; } m_pName->SetText(sName); - EndDialog( sal_True ); + EndDialog( RET_OK ); } } catch( const Exception& ) diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 80a10be07203..8c64920aad01 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -281,7 +281,7 @@ namespace pcr // TODO: UNO action (to bracket all the single actions which are being created) m_xModel->setControlModels( aSortedControlModelSeq ); - EndDialog( sal_True ); + EndDialog( RET_OK ); return 0; } diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 64bd9778e43d..9851aa811a7c 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -305,7 +305,7 @@ ImpPDFTabGeneralPage* ImpPDFTabDialog::getGeneralPage() const IMPL_LINK_NOARG(ImpPDFTabDialog, CancelHdl) { - EndDialog( sal_False ); + EndDialog( RET_CANCEL ); return 0; } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 2a4b1fa7b7d4..93ace60721cd 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -806,7 +806,7 @@ IMPL_LINK_NOARG(SvtFileDialog, CancelHdl_Impl) } else { - EndDialog( sal_False ); + EndDialog( RET_CANCEL ); } return 1L; } @@ -1113,7 +1113,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid ) if ( nRet ) { - pThis->EndDialog( sal_True ); + pThis->EndDialog( RET_OK ); } return nRet; @@ -1380,7 +1380,7 @@ void SvtFileDialog::OpenMultiSelection_Impl() nRet = 1; if ( nRet ) - EndDialog( sal_True ); + EndDialog( RET_OK ); } diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 4b30c539971b..b2299f777194 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -113,7 +113,7 @@ IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl) sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId(); Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : Color( COL_AUTO ); m_aTabBgColor = aColor; - EndDialog( sal_True ); + EndDialog( RET_OK ); return 0; } @@ -125,7 +125,7 @@ IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorOKHdl_Impl) sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId(); Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : Color( COL_AUTO ); m_aTabBgColor = aColor; - EndDialog( sal_True ); + EndDialog( RET_OK ); return 0; } @@ -156,7 +156,7 @@ void ScTabBgColorDlg::ScTabBgColorValueSet::KeyInput( const KeyEvent& rKEvt ) sal_uInt16 nItemId = GetSelectItemId(); const Color& aColor = nItemId ? ( GetItemColor( nItemId ) ) : Color( COL_AUTO ); m_pTabBgColorDlg->m_aTabBgColor = aColor; - m_pTabBgColorDlg->EndDialog(sal_True); + m_pTabBgColorDlg->EndDialog(RET_OK); } break; } diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index b258ba270f0b..239f19586dd9 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -311,7 +311,7 @@ IMPL_LINK( CustomAnimationCreateTabPage, implDoubleClickHdl, Control*, pControl if( pControl == mpLBEffects ) { if( mpLBEffects->GetSelectEntryCount() ) - mpParent->EndDialog( sal_True ); + mpParent->EndDialog( RET_OK ); } return 0; } diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index 6f1ebc68b54d..ce7448d5caa2 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -157,7 +157,7 @@ short BreakDlg::Execute() IMPL_LINK_NOARG(BreakDlg, InitialUpdate) { pDrView->DoImportMarkedMtf(pProgrInfo); - EndDialog(sal_True); + EndDialog(RET_OK); return 0L; } |