summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-08-22 11:11:44 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-23 08:47:52 +0200
commitdcc667ac5ef0d7b4bbdfba0727ef6e2be3ed5313 (patch)
tree78e04f13656eddd5a528506dda41f96fce6aad7f /svtools
parente725111f8283f4dbefde7b14efbe9afd850095df (diff)
convert message box style bits to scoped enum
and fix harmless bug in ImpSVGDialog::ImpSVGDialog, which there since commit 6456f1d81090dd5fe44455c09ae3ede7ec6ac38a Date: Fri Feb 4 14:52:54 2011 +0100 ka102: added/removed files for SVG import and module cleanup Change-Id: I66b2ec2b029431ab453e54e962863e4ed7d78962 Reviewed-on: https://gerrit.libreoffice.org/41412 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/misc/ehdl.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index b8122c59a872..2941c80397d7 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -52,34 +52,34 @@ static DialogMask aWndFunc(
SolarMutexGuard aGuard;
// determine necessary WinBits from the flags
- WinBits eBits=0;
+ MessBoxStyle eBits = MessBoxStyle::NONE;
if ( (nFlags & (DialogMask::ButtonsCancel | DialogMask::ButtonsRetry)) == (DialogMask::ButtonsCancel | DialogMask::ButtonsRetry))
- eBits = WB_RETRY_CANCEL;
+ eBits = MessBoxStyle::RetryCancel;
else if ( (nFlags & DialogMask::ButtonsOkCancel) == DialogMask::ButtonsOkCancel )
- eBits = WB_OK_CANCEL;
+ eBits = MessBoxStyle::OkCancel;
else if ( (nFlags & DialogMask::ButtonsOk) == DialogMask::ButtonsOk )
- eBits = WB_OK;
+ eBits = MessBoxStyle::Ok;
else if ( (nFlags & DialogMask::ButtonsYesNoCancel) == DialogMask::ButtonsYesNoCancel )
- eBits = WB_YES_NO_CANCEL;
+ eBits = MessBoxStyle::YesNoCancel;
else if ( (nFlags & DialogMask::ButtonsYesNo) == DialogMask::ButtonsYesNo )
- eBits = WB_YES_NO;
+ eBits = MessBoxStyle::YesNo;
switch(nFlags & DialogMask(0x0f00))
{
case DialogMask::ButtonDefaultsOk:
- eBits |= WB_DEF_OK;
+ eBits |= MessBoxStyle::DefaultOk;
break;
case DialogMask::ButtonDefaultsCancel:
- eBits |= WB_DEF_CANCEL;
+ eBits |= MessBoxStyle::DefaultCancel;
break;
case DialogMask::ButtonDefaultsYes:
- eBits |= WB_DEF_YES;
+ eBits |= MessBoxStyle::DefaultYes;
break;
case DialogMask::ButtonDefaultsNo:
- eBits |= WB_DEF_NO;
+ eBits |= MessBoxStyle::DefaultNo;
break;
default: break;
}