diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-06 14:21:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-05-07 13:27:55 +0000 |
| commit | 2c8dc0373377a6e801c9a9246ffdc3641f3be4ec (patch) | |
| tree | 12389cf068030129f4d9b9fc51e12bad45957888 /dbaccess | |
| parent | 90d8bf72d9ea8fa678707326a3cc4b84fae154a1 (diff) | |
convert BUTTONDIALOG constants to scoped enum
Change-Id: Icbf73fe55ad604f762dd2b98fd39189bab82f061
Reviewed-on: https://gerrit.libreoffice.org/15648
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/dlg/sqlmessage.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/UITools.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/relationdesign/RelationTableView.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 36341e32751f..aa4f5034e90e 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -442,7 +442,7 @@ namespace OSL_FAIL( "lcl_addButton: invalid button id!" ); break; } - _rDialog.AddButton( _eType, nButtonID, _bDefault ? BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON : 0 ); + _rDialog.AddButton( _eType, nButtonID, _bDefault ? ButtonDialogFlags::Default | ButtonDialogFlags::Focus : ButtonDialogFlags::NONE ); } } @@ -593,7 +593,7 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle ) else { OSL_ENSURE( WB_OK & _nStyle, "OSQLMessageBox::impl_createStandardButtons: unsupported dialog style requested!" ); - AddButton( StandardButtonType::OK, RET_OK, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON ); + AddButton( StandardButtonType::OK, RET_OK, ButtonDialogFlags::Default | ButtonDialogFlags::Focus ); } if ( !m_sHelpURL.isEmpty() ) @@ -635,7 +635,7 @@ void OSQLMessageBox::impl_addDetailsButton() if ( bMoreDetailsAvailable ) { - AddButton( StandardButtonType::More, RET_MORE, 0 ); + AddButton( StandardButtonType::More, RET_MORE); PushButton* pButton = GetPushButton( RET_MORE ); OSL_ENSURE( pButton, "OSQLMessageBox::impl_addDetailsButton: just added this button, why isn't it there?" ); pButton->SetClickHdl( LINK( this, OSQLMessageBox, ButtonClickHdl ) ); diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 397f2a639663..71df15d4e64c 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1289,7 +1289,7 @@ sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _ ScopedVclPtrInstance< OSQLMessageBox > aAsk(_pParent, ModuleRes(_nTitle ), aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query); if ( _bAll ) { - aAsk->AddButton(ModuleRes(STR_BUTTON_TEXT_ALL), RET_ALL, 0); + aAsk->AddButton(ModuleRes(STR_BUTTON_TEXT_ALL), RET_ALL); aAsk->GetPushButton(RET_ALL)->SetHelpId(HID_CONFIRM_DROP_BUTTON_ALL); } return aAsk->Execute(); diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 06f5839c8483..71efb0999d33 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -347,9 +347,9 @@ void ORelationTableView::lookForUiActivities() ScopedVclPtrInstance< OSQLMessageBox > aDlg(this,ModuleRes(STR_QUERY_REL_EDIT_RELATION),OUString(),0); aDlg->SetText(sTitle); aDlg->RemoveButton(aDlg->GetButtonId(0)); - aDlg->AddButton( ModuleRes(STR_QUERY_REL_EDIT), RET_OK, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON); - aDlg->AddButton( ModuleRes(STR_QUERY_REL_CREATE), RET_YES, 0); - aDlg->AddButton( StandardButtonType::Cancel,RET_CANCEL,0); + aDlg->AddButton( ModuleRes(STR_QUERY_REL_EDIT), RET_OK, ButtonDialogFlags::Default | ButtonDialogFlags::Focus); + aDlg->AddButton( ModuleRes(STR_QUERY_REL_CREATE), RET_YES); + aDlg->AddButton( StandardButtonType::Cancel,RET_CANCEL); sal_uInt16 nRet = aDlg->Execute(); if( nRet == RET_CANCEL) { |