diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-03 11:39:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-03 13:24:18 +0200 |
| commit | 7b14b4b377c1b94e4899860e1a45abd55230cdca (patch) | |
| tree | 755b3dbe5f35ae94a0484d5f5a552c0e42fa7fc8 /toolkit | |
| parent | 84f1c0f7cafc0afb01eac53995d987cbe9b0c771 (diff) | |
remove some dead WindowType values
Change-Id: I7eb67e48a87e8cc2babbd46d482294877b08ab99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97828
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 4 | ||||
| -rw-r--r-- | toolkit/source/helper/unowrapper.cxx | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index eee471e9894e..b5407feef977 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -588,7 +588,6 @@ std::pair<WinBits,MessBoxStyle> ImplGetWinBits( sal_uInt32 nComponentAttribs, Wi if ( bMessBox || ( nCompType == WindowType::DIALOG ) || ( nCompType == WindowType::MODELESSDIALOG ) - || ( nCompType == WindowType::MODALDIALOG ) || ( nCompType == WindowType::DOCKINGWINDOW ) || ( nCompType == WindowType::TABDIALOG ) || ( nCompType == WindowType::BUTTONDIALOG ) @@ -729,7 +728,6 @@ ComponentInfo const aComponentInfos [] = { OUStringLiteral("messbox"), WindowType::MESSBOX }, { OUStringLiteral("metricbox"), WindowType::METRICBOX }, { OUStringLiteral("metricfield"), WindowType::METRICFIELD }, - { OUStringLiteral("modaldialog"), WindowType::MODALDIALOG }, { OUStringLiteral("modelessdialog"), WindowType::MODELESSDIALOG }, { OUStringLiteral("morebutton"), WindowType::MOREBUTTON }, { OUStringLiteral("multilineedit"), WindowType::MULTILINEEDIT }, @@ -1412,7 +1410,6 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, // some time later css::uno::Exception... bool bException = true; if ( ( nType == WindowType::DIALOG ) - || ( nType == WindowType::MODALDIALOG ) || ( nType == WindowType::MODELESSDIALOG ) || ( nType == WindowType::MESSBOX ) || ( nType == WindowType::INFOBOX ) @@ -1549,7 +1546,6 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, static_cast<VCLXFormattedSpinField*>(*ppNewComp)->SetFormatter( static_cast<FormatterBase*>(static_cast<MetricField*>(pNewWindow.get())) ); break; case WindowType::DIALOG: - case WindowType::MODALDIALOG: case WindowType::MODELESSDIALOG: { // Modal/Modeless only via Show/Execute diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index aae650261e2d..1078973864dc 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -54,7 +54,6 @@ static css::uno::Reference< css::awt::XWindowPeer > CreateXWindow( vcl::Window c case WindowType::METRICBOX: case WindowType::COMBOBOX: return new VCLXComboBox; case WindowType::SPINFIELD: - case WindowType::NUMERICFIELD: case WindowType::CURRENCYFIELD: return new VCLXNumericField; case WindowType::DATEFIELD: return new VCLXDateField; case WindowType::MULTILINEEDIT: @@ -69,9 +68,7 @@ static css::uno::Reference< css::awt::XWindowPeer > CreateXWindow( vcl::Window c case WindowType::FIXEDTEXT: return new VCLXFixedText; case WindowType::MULTILISTBOX: case WindowType::LISTBOX: return new VCLXListBox; - case WindowType::LONGCURRENCYFIELD: return new VCLXCurrencyField; case WindowType::DIALOG: - case WindowType::MODALDIALOG: case WindowType::TABDIALOG: case WindowType::BUTTONDIALOG: case WindowType::MODELESSDIALOG: return new VCLXDialog; |