diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-13 19:08:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-14 10:44:08 +0000 |
| commit | 8c00536d87010b14a95e9c81f2f5f1d683e5fa70 (patch) | |
| tree | 92ac779cef9c4f5adb1421f8eee51a301dc8ef61 /svtools | |
| parent | 5815ca4ef1126140e08f3a1d106bcadc41044505 (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 'svtools')
| -rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/control/ruler.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/dialogs/wizardmachine.cxx | 16 | ||||
| -rw-r--r-- | svtools/source/uno/popupwindowcontroller.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/uno/statusbarcontroller.cxx | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index bd87930beb8d..fcbdc002b123 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -357,7 +357,7 @@ SvTreeListBox::SvTreeListBox(vcl::Window* pParent, WinBits nWinStyle) : pEdCtrl = nullptr; eSelMode = SelectionMode::Single; nDragDropMode = DragDropMode::NONE; - SetType(WINDOW_TREELISTBOX); + SetType(WindowType::TREELISTBOX); InitTreeView(); diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 413e92cd9bea..874caa55e499 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -278,7 +278,7 @@ void Ruler::ImplInit( WinBits nWinBits ) else aDefSize.Width() = nDefHeight; SetOutputSizePixel( aDefSize ); - SetType(WINDOW_RULER); + SetType(WindowType::RULER); } Ruler::Ruler( vcl::Window* pParent, WinBits nWinStyle ) : diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index e6dd46ca926d..09235381fb74 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -319,14 +319,14 @@ namespace svt // is it a button? WindowType eType = pChildLoop->GetType(); - if ( (WINDOW_BUTTON == eType) - || (WINDOW_PUSHBUTTON == eType) - || (WINDOW_OKBUTTON == eType) - || (WINDOW_CANCELBUTTON == eType) - || (WINDOW_HELPBUTTON == eType) - || (WINDOW_IMAGEBUTTON == eType) - || (WINDOW_MENUBUTTON == eType) - || (WINDOW_MOREBUTTON == eType) + if ( (WindowType::BUTTON == eType) + || (WindowType::PUSHBUTTON == eType) + || (WindowType::OKBUTTON == eType) + || (WindowType::CANCELBUTTON == eType) + || (WindowType::HELPBUTTON == eType) + || (WindowType::IMAGEBUTTON == eType) + || (WindowType::MENUBUTTON == eType) + || (WindowType::MOREBUTTON == eType) ) { pChildLoop->SetStyle(pChildLoop->GetStyle() & ~WB_DEFBUTTON); diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 51d7bbc38dde..dd4f6cf7a820 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -196,7 +196,7 @@ Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow() FloatWinPopupFlags::NoMouseUpClose; WinBits nWinBits; - if ( pWin->GetType() == WINDOW_DOCKINGWINDOW ) + if ( pWin->GetType() == WindowType::DOCKINGWINDOW ) nWinBits = static_cast< DockingWindow* >( pWin.get() )->GetFloatStyle(); else nWinBits = pWin->GetStyle(); diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index 8bb37ea27ae7..0b00ac3bdf54 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -279,7 +279,7 @@ void SAL_CALL StatusbarController::statusChanged( const FeatureStateEvent& Event return; VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( m_xParentWindow ); - if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR && m_nID != 0 ) + if ( pWindow && pWindow->GetType() == WindowType::STATUSBAR && m_nID != 0 ) { OUString aStrValue; StatusBar* pStatusBar = static_cast<StatusBar *>(pWindow.get()); @@ -503,7 +503,7 @@ void StatusbarController::bindListener() if ( m_xParentWindow.is() ) { VclPtr< StatusBar > pStatusBar = dynamic_cast< StatusBar* >( VCLUnoHelper::GetWindow( m_xParentWindow ).get() ); - if ( pStatusBar && pStatusBar->GetType() == WINDOW_STATUSBAR ) + if ( pStatusBar && pStatusBar->GetType() == WindowType::STATUSBAR ) aRect = pStatusBar->GetItemRect( m_nID ); } } |