summaryrefslogtreecommitdiff
path: root/vcl/source/uitest
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-02-13 19:08:14 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-14 10:44:08 +0000
commit8c00536d87010b14a95e9c81f2f5f1d683e5fa70 (patch)
tree92ac779cef9c4f5adb1421f8eee51a301dc8ef61 /vcl/source/uitest
parent5815ca4ef1126140e08f3a1d106bcadc41044505 (diff)
Convert WindowType to scoped enum
Change-Id: I85cfe02f28729e13f2c0dd3d91cd89e6f3e3b6a9 Reviewed-on: https://gerrit.libreoffice.org/34219 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/uitest')
-rw-r--r--vcl/source/uitest/uiobject.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 10c67b0ff071..407289dfd8d2 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -75,14 +75,14 @@ bool isDialogWindow(vcl::Window* pWindow)
{
WindowType nType = pWindow->GetType();
// DIALOG to FONTDIALOG
- if (nType >= 0x13a && nType <= 0x143)
+ if (nType >= WindowType::DIALOG && nType <= WindowType::FONTDIALOG)
return true;
- // MESSBOX, INFOBOX, QUERYBOX, WARNINGBOX, ERRORBOX
- if (nType >= 0x130 && nType <= 0x134)
+ // MESSBOX, INFOBOX, WARNINGBOX, ERRORBOX, QUERYBOX
+ if (nType >= WindowType::MESSBOX && nType <= WindowType::QUERYBOX)
return true;
- if (nType == WINDOW_TABDIALOG)
+ if (nType == WindowType::TABDIALOG)
return true;
return false;
@@ -261,7 +261,7 @@ StringMap WindowUIObject::get_state()
aMap["Visible"] = OUString::boolean(mxWindow->IsVisible());
aMap["ReallyVisible"] = OUString::boolean(mxWindow->IsReallyVisible());
aMap["Enabled"] = OUString::boolean(mxWindow->IsEnabled());
- aMap["WindowType"] = OUString::number(mxWindow->GetType(), 16);
+ aMap["WindowType"] = OUString::number((sal_uInt16)mxWindow->GetType(), 16);
Point aPos = mxWindow->GetPosPixel();
aMap["RelPosition"] = to_string(aPos);