From c868dc4927bf25a231cc41c8509d8b53f9faf3e8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 20 Feb 2017 14:57:03 +0200 Subject: remove unused enumerators from WindowType Change-Id: I1e100302dd60ebbcdf187cf30befe0c767c6d6b8 Reviewed-on: https://gerrit.libreoffice.org/34474 Tested-by: Jenkins Reviewed-by: Noel Grandin --- toolkit/source/awt/vclxtoolkit.cxx | 7 ------- toolkit/source/awt/vclxwindow.cxx | 4 ---- toolkit/source/helper/unowrapper.cxx | 1 - 3 files changed, 12 deletions(-) (limited to 'toolkit/source') diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 2b4f3f856795..e35fd383f5c1 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 272108a9f9c0..e57eae28bc86 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 6b5ed794cf46..d3d92c342a8a 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: -- cgit