diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-05-01 10:08:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-01 14:42:04 +0100 |
| commit | 26bda9f4a82c9b1956a10e3dc52a99bc2f850ada (patch) | |
| tree | 37766d78617725fdf87084cebb13a93111b35a6c /sd | |
| parent | 1680b036c5a9bf50b10580ee995f91ca6f873ef5 (diff) | |
convert message box return types to an enum
Change-Id: I20889dc94aac1119c1ee9da873ce911887c1c335
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/func/fuoaprms.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/fuprlout.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/Outliner.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 2153af4c2e7f..3a50ba4510d9 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -729,8 +729,8 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) // The dialog is made modal with respect to the whole application. QueryBox aQuestionBox ( NULL, (WB_YES_NO | WB_DEF_YES), String(SdResId(nStringId))); aQuestionBox.SetImage (QueryBox::GetStandardImage()); - sal_uInt16 nBoxResult = aQuestionBox.Execute(); - if(nBoxResult != BUTTONID_YES) + short nBoxResult = aQuestionBox.Execute(); + if (nBoxResult != RET_YES) break; } while( true ); diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index bb031057ad82..3efc8aecf4eb 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -450,7 +450,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SfxAbstractDialog* pDlg = pFact ? pFact->CreatSdActionDialog( NULL, &aSet, mpView ) : 0; - sal_uInt16 nResult = pDlg ? pDlg->Execute() : RET_CANCEL; + short nResult = pDlg ? pDlg->Execute() : static_cast<short>(RET_CANCEL); if( nResult == RET_OK ) { diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 9df2ef1ee815..67ae4cae1c7d 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -149,7 +149,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); AbstractSdPresLayoutDlg* pDlg = pFact ? pFact->CreateSdPresLayoutDlg(mpDocSh, NULL, aSet ) : 0; - sal_uInt16 nResult = pDlg ? pDlg->Execute() : RET_CANCEL; + sal_uInt16 nResult = pDlg ? pDlg->Execute() : static_cast<short>(RET_CANCEL); switch (nResult) { diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 1bd2eff6650a..d6b9e608ebca 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -1151,7 +1151,7 @@ bool Outliner::ShowWrapArroundDialog (void) String(SdResId(nStringId))); aQuestionBox.SetImage (QueryBox::GetStandardImage()); sal_uInt16 nBoxResult = ShowModalMessageBox(aQuestionBox); - bDoWrapArround = (nBoxResult == BUTTONID_YES); + bDoWrapArround = (nBoxResult == RET_YES); } return bDoWrapArround; |