summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls
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 /svx/source/tbxctrls
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 'svx/source/tbxctrls')
-rw-r--r--svx/source/tbxctrls/SvxColorValueSet.cxx2
-rw-r--r--svx/source/tbxctrls/verttexttbxctrl.cxx3
2 files changed, 2 insertions, 3 deletions
diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx
index cde72ac18c96..65955445e602 100644
--- a/svx/source/tbxctrls/SvxColorValueSet.cxx
+++ b/svx/source/tbxctrls/SvxColorValueSet.cxx
@@ -124,7 +124,7 @@ void SvxColorValueSet::Resize()
{
vcl::Window *pParent = GetParent();
//don't do this for the drop down color palettes
- if (pParent && pParent->GetType() != WINDOW_FLOATINGWINDOW)
+ if (pParent && pParent->GetType() != WindowType::FLOATINGWINDOW)
layoutToGivenHeight(GetOutputSizePixel().Height(), GetItemCount());
ValueSet::Resize();
}
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index dce2e51c909e..3b1a33daf093 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -80,8 +80,7 @@ void SvxVertCTLTextTbxCtrl::StateChanged(
{
ToolBox& rTbx = GetToolBox();
vcl::Window* pParent = rTbx.GetParent();
- WindowType nWinType = pParent->GetType();
- if(WINDOW_FLOATINGWINDOW == nWinType)
+ if(WindowType::FLOATINGWINDOW == pParent->GetType())
{
Size aSize(rTbx.CalcWindowSizePixel());
rTbx.SetPosSizePixel( Point(), aSize );