[Libreoffice-commits] core.git: include/tools svtools/source toolkit/source vcl/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Feb 21 06:07:13 UTC 2017
include/tools/wintypes.hxx | 9 ---------
svtools/source/dialogs/wizardmachine.cxx | 3 +--
toolkit/source/awt/vclxtoolkit.cxx | 7 -------
toolkit/source/awt/vclxwindow.cxx | 4 ----
toolkit/source/helper/unowrapper.cxx | 1 -
vcl/source/uitest/uiobject.cxx | 4 ++--
vcl/source/window/accessibility.cxx | 14 ++------------
vcl/source/window/dlgctrl.cxx | 2 +-
8 files changed, 6 insertions(+), 38 deletions(-)
New commits:
commit c868dc4927bf25a231cc41c8509d8b53f9faf3e8
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Feb 20 14:57:03 2017 +0200
remove unused enumerators from WindowType
Change-Id: I1e100302dd60ebbcdf187cf30befe0c767c6d6b8
Reviewed-on: https://gerrit.libreoffice.org/34474
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 1fbe05b..7c0c29a 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -33,22 +33,13 @@ enum class WindowType : sal_uInt16
ERRORBOX ,
QUERYBOX ,
WINDOW ,
- SYSWINDOW ,
WORKWINDOW ,
CONTAINER ,
FLOATINGWINDOW ,
DIALOG ,
MODELESSDIALOG ,
MODALDIALOG ,
- SYSTEMDIALOG ,
- PATHDIALOG ,
- FILEDIALOG ,
- PRINTERSETUPDIALOG ,
- PRINTDIALOG ,
- COLORDIALOG ,
- FONTDIALOG ,
CONTROL ,
- BUTTON ,
PUSHBUTTON ,
OKBUTTON ,
CANCELBUTTON ,
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 0923538..17be17e 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -319,8 +319,7 @@ namespace svt
// is it a button?
WindowType eType = pChildLoop->GetType();
- if ( (WindowType::BUTTON == eType)
- || (WindowType::PUSHBUTTON == eType)
+ if ( (WindowType::PUSHBUTTON == eType)
|| (WindowType::OKBUTTON == eType)
|| (WindowType::CANCELBUTTON == eType)
|| (WindowType::HELPBUTTON == eType)
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 2b4f3f8..e35fd38 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -324,13 +324,6 @@ WinBits ImplGetWinBits( sal_uInt32 nComponentAttribs, WindowType nCompType )
|| ( nCompType == WindowType::DIALOG )
|| ( nCompType == WindowType::MODELESSDIALOG )
|| ( nCompType == WindowType::MODALDIALOG )
- || ( nCompType == WindowType::SYSTEMDIALOG )
- || ( nCompType == WindowType::PATHDIALOG )
- || ( nCompType == WindowType::FILEDIALOG )
- || ( nCompType == WindowType::PRINTERSETUPDIALOG )
- || ( nCompType == WindowType::PRINTDIALOG )
- || ( nCompType == WindowType::COLORDIALOG )
- || ( nCompType == WindowType::FONTDIALOG )
|| ( nCompType == WindowType::DOCKINGWINDOW )
|| ( nCompType == WindowType::TABDIALOG )
|| ( nCompType == WindowType::BUTTONDIALOG )
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 272108a..e57eae2 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1754,7 +1754,6 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any&
switch ( eWinType )
{
case WindowType::COMBOBOX:
- case WindowType::BUTTON:
case WindowType::PUSHBUTTON:
case WindowType::OKBUTTON:
case WindowType::CANCELBUTTON:
@@ -1790,7 +1789,6 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any&
if ( ( eWinType == WindowType::FIXEDTEXT )
|| ( eWinType == WindowType::CHECKBOX )
|| ( eWinType == WindowType::RADIOBUTTON )
- || ( eWinType == WindowType::BUTTON )
|| ( eWinType == WindowType::PUSHBUTTON )
|| ( eWinType == WindowType::OKBUTTON )
|| ( eWinType == WindowType::CANCELBUTTON )
@@ -2057,7 +2055,6 @@ css::uno::Any VCLXWindow::getProperty( const OUString& PropertyName )
case WindowType::RADIOBUTTON:
case WindowType::LISTBOX:
case WindowType::COMBOBOX:
- case WindowType::BUTTON:
case WindowType::PUSHBUTTON:
case WindowType::OKBUTTON:
case WindowType::CANCELBUTTON:
@@ -2081,7 +2078,6 @@ css::uno::Any VCLXWindow::getProperty( const OUString& PropertyName )
if ( ( eWinType == WindowType::FIXEDTEXT )
|| ( eWinType == WindowType::CHECKBOX )
|| ( eWinType == WindowType::RADIOBUTTON )
- || ( eWinType == WindowType::BUTTON )
|| ( eWinType == WindowType::PUSHBUTTON )
|| ( eWinType == WindowType::OKBUTTON )
|| ( eWinType == WindowType::CANCELBUTTON )
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 6b5ed79..d3d92c3 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -86,7 +86,6 @@ css::uno::Reference< css::awt::XWindowPeer > CreateXWindow( vcl::Window* pWindow
case WindowType::SCROLLBAR: return new VCLXScrollBar;
case WindowType::TIMEFIELD: return new VCLXTimeField;
- case WindowType::SYSWINDOW:
case WindowType::WORKWINDOW:
case WindowType::DOCKINGWINDOW:
case WindowType::FLOATINGWINDOW:
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 407289d..fee55d8 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -74,8 +74,8 @@ namespace {
bool isDialogWindow(vcl::Window* pWindow)
{
WindowType nType = pWindow->GetType();
- // DIALOG to FONTDIALOG
- if (nType >= WindowType::DIALOG && nType <= WindowType::FONTDIALOG)
+ // DIALOG to MODALDIALOG
+ if (nType >= WindowType::DIALOG && nType <= WindowType::MODALDIALOG)
return true;
// MESSBOX, INFOBOX, WARNINGBOX, ERRORBOX, QUERYBOX
diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index 2e68320..fa155db 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -302,9 +302,6 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
case WindowType::MODELESSDIALOG:
case WindowType::MODALDIALOG:
- case WindowType::SYSTEMDIALOG:
- case WindowType::PRINTERSETUPDIALOG:
- case WindowType::PRINTDIALOG:
case WindowType::TABDIALOG:
case WindowType::BUTTONDIALOG:
case WindowType::DIALOG: nRole = accessibility::AccessibleRole::DIALOG; break;
@@ -315,15 +312,9 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
case WindowType::HELPBUTTON:
case WindowType::IMAGEBUTTON:
case WindowType::MOREBUTTON:
- case WindowType::SPINBUTTON:
- case WindowType::BUTTON: nRole = accessibility::AccessibleRole::PUSH_BUTTON; break;
+ case WindowType::SPINBUTTON: nRole = accessibility::AccessibleRole::PUSH_BUTTON; break;
case WindowType::MENUBUTTON: nRole = accessibility::AccessibleRole::BUTTON_MENU; break;
- case WindowType::PATHDIALOG: nRole = accessibility::AccessibleRole::DIRECTORY_PANE; break;
- case WindowType::FILEDIALOG: nRole = accessibility::AccessibleRole::FILE_CHOOSER; break;
- case WindowType::COLORDIALOG: nRole = accessibility::AccessibleRole::COLOR_CHOOSER; break;
- case WindowType::FONTDIALOG: nRole = accessibility::AccessibleRole::FONT_CHOOSER; break;
-
case WindowType::RADIOBUTTON: nRole = accessibility::AccessibleRole::RADIO_BUTTON; break;
case WindowType::TRISTATEBOX:
case WindowType::CHECKBOX: nRole = accessibility::AccessibleRole::CHECK_BOX; break;
@@ -380,8 +371,7 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
case WindowType::TABPAGE: nRole = accessibility::AccessibleRole::PANEL; break;
case WindowType::TABCONTROL: nRole = accessibility::AccessibleRole::PAGE_TAB_LIST; break;
- case WindowType::DOCKINGWINDOW:
- case WindowType::SYSWINDOW: nRole = (mpWindowImpl->mbFrame) ? accessibility::AccessibleRole::FRAME :
+ case WindowType::DOCKINGWINDOW: nRole = (mpWindowImpl->mbFrame) ? accessibility::AccessibleRole::FRAME :
accessibility::AccessibleRole::PANEL; break;
case WindowType::FLOATINGWINDOW: nRole = ( mpWindowImpl->mbFrame ||
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index e1e4495..b4a2edf 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -523,7 +523,7 @@ namespace
isEnabledInLayout(pWindow) && pWindow->IsInputEnabled() &&
//Pure window shouldn't get window after controls such as
//buttons.
- (pWindow->GetType() != WindowType::WINDOW && pWindow->GetType() != WindowType::SYSWINDOW &&
+ (pWindow->GetType() != WindowType::WINDOW &&
pWindow->GetType() != WindowType::WORKWINDOW && pWindow->GetType() != WindowType::CONTROL)
);
}
More information about the Libreoffice-commits
mailing list