mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused enumerators from WindowType

Browse Source 
Change-Id: I1e100302dd60ebbcdf187cf30befe0c767c6d6b8
Reviewed-on: https://gerrit.libreoffice.org/34474
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2017-02-20 14:57:03 +02:00
parent 2ae33d4a3b
commit c868dc4927
8 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/tools/wintypes.hxx
View File

@ -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 ,

3
svtools/source/dialogs/wizardmachine.cxx
View File

@ -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)

7
toolkit/source/awt/vclxtoolkit.cxx
View File

@ -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 )

4
toolkit/source/awt/vclxwindow.cxx
View File

@ -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 )

1
toolkit/source/helper/unowrapper.cxx
View File

@ -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:

4
vcl/source/uitest/uiobject.cxx
View File

@ -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

14
vcl/source/window/accessibility.cxx
View File

@ -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 ||

2
vcl/source/window/dlgctrl.cxx
View File

@ -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)
);
}