From a9ea920dfbb7e065ef3f5b5f204732ee2ece47db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 22 Apr 2020 14:19:40 +0100 Subject: [PATCH] move InterimItemWindow to svtools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I058b1d96a3ddfaa1aa96f66d0ebc6fa68900a48c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92697 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- avmedia/inc/mediacontrol.hxx | 2 +- basctl/source/basicide/baside2.hxx | 2 +- basctl/source/inc/IDEComboBox.hxx | 2 +- chart2/source/controller/main/ElementSelector.hxx | 2 +- dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 2 +- include/{sfx2 => svtools}/InterimItemWindow.hxx | 4 ++-- include/svx/fillctrl.hxx | 2 +- include/svx/itemwin.hxx | 2 +- sc/source/ui/inc/cbnumberformat.hxx | 2 +- sc/source/ui/inc/inputwin.hxx | 2 +- sc/source/ui/inc/tbzoomsliderctrl.hxx | 2 +- sd/source/ui/inc/diactrl.hxx | 2 +- sd/source/ui/inc/gluectrl.hxx | 2 +- sfx2/Library_sfx.mk | 1 - sfx2/inc/pch/precompiled_sfx.hxx | 2 +- sfx2/source/inet/inettbc.cxx | 2 +- sfx2/source/view/classificationcontroller.cxx | 2 +- svtools/Library_svt.mk | 1 + {sfx2 => svtools}/source/control/InterimItemWindow.cxx | 2 +- svx/inc/pch/precompiled_svx.hxx | 2 +- svx/source/inc/findtextfield.hxx | 2 +- svx/source/inc/labelitemwindow.hxx | 2 +- svx/source/inc/tbxform.hxx | 2 +- svx/source/sidebar/paragraph/ParaSpacingWindow.hxx | 2 +- svx/source/tbxctrls/grafctrl.cxx | 2 +- svx/source/tbxctrls/tbcontrl.cxx | 2 +- svx/source/tbxctrls/tbunocontroller.cxx | 2 +- svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2 +- sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx | 2 +- sw/source/uibase/inc/inputwin.hxx | 2 +- sw/source/uibase/ribbar/workctrl.cxx | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) rename include/{sfx2 => svtools}/InterimItemWindow.hxx (93%) rename {sfx2 => svtools}/source/control/InterimItemWindow.cxx (98%) diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index 254c29dbc434..d88999df1f5b 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -21,7 +21,7 @@ #include -#include +#include #include #include #include diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 97d175368bea..76546f691d10 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/basctl/source/inc/IDEComboBox.hxx b/basctl/source/inc/IDEComboBox.hxx index 2a9c46609fc2..ff1023463edc 100644 --- a/basctl/source/inc/IDEComboBox.hxx +++ b/basctl/source/inc/IDEComboBox.hxx @@ -22,7 +22,7 @@ #include #include -#include +#include #include "doceventnotifier.hxx" #include "scriptdocument.hxx" diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index 178fb080eaae..a341cb785ba9 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -25,7 +25,7 @@ #include #include -#include +#include #include namespace chart diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 99c5ca2373d7..5e5c97768cd2 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/sfx2/InterimItemWindow.hxx b/include/svtools/InterimItemWindow.hxx similarity index 93% rename from include/sfx2/InterimItemWindow.hxx rename to include/svtools/InterimItemWindow.hxx index d79a1ead14ab..fa970095dfdf 100644 --- a/include/sfx2/InterimItemWindow.hxx +++ b/include/svtools/InterimItemWindow.hxx @@ -9,11 +9,11 @@ #pragma once -#include +#include #include #include -class SFX2_DLLPUBLIC InterimItemWindow : public Control +class SVT_DLLPUBLIC InterimItemWindow : public Control { public: virtual ~InterimItemWindow() override; diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index e7a77692b129..c6517f508d65 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SVX_FILLCTRL_HXX #include -#include +#include #include #include #include diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index a45e6ff62b08..b25361510ecc 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SVX_ITEMWIN_HXX #define INCLUDED_SVX_ITEMWIN_HXX -#include +#include #include #include #include diff --git a/sc/source/ui/inc/cbnumberformat.hxx b/sc/source/ui/inc/cbnumberformat.hxx index 7edd3b7fe362..df4c27af24a0 100644 --- a/sc/source/ui/inc/cbnumberformat.hxx +++ b/sc/source/ui/inc/cbnumberformat.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_CBNUMBERFORMAT_HXX #define INCLUDED_SC_SOURCE_UI_INC_CBNUMBERFORMAT_HXX -#include +#include class ScNumberFormat final : public InterimItemWindow { diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 4adf209daf1d..e439f5066bde 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index fbcc6c339bc4..17b9b5db94c3 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include namespace com { namespace sun { namespace star { namespace frame { class XDispatchProvider; } } } } diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 60b713a095d1..3aa9d11edde8 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_DIACTRL_HXX #define INCLUDED_SD_SOURCE_UI_INC_DIACTRL_HXX -#include +#include #include namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } } diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index ebaf5b607d78..650edc8d840a 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_GLUECTRL_HXX #define INCLUDED_SD_SOURCE_UI_INC_GLUECTRL_HXX -#include +#include #include enum class SdrEscapeDirection; diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index e04cad7e6667..2b07ae78f5aa 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -128,7 +128,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/bastyp/sfxhtml \ sfx2/source/bastyp/sfxresid \ sfx2/source/config/evntconf \ - sfx2/source/control/InterimItemWindow \ sfx2/source/control/asyncfunc \ sfx2/source/control/bindings \ sfx2/source/control/ctrlitem \ diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index a1b611911a30..3da9e17cc640 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -334,6 +334,7 @@ #include #include #include +#include #include #include #include @@ -399,7 +400,6 @@ #include #include #include -#include #include #include #include diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 3193100c5f7c..add489118a87 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -34,7 +34,7 @@ #include -#include +#include #include using namespace ::com::sun::star::uno; diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index 034606623afa..c093c8c3b65c 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index afa07288f2da..a2c968306bd9 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -90,6 +90,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/contnr/DocumentInfoPreview \ svtools/source/contnr/querydelete \ svtools/source/contnr/templwin \ + svtools/source/control/InterimItemWindow \ svtools/source/control/accessibleruler \ svtools/source/control/asynclink \ svtools/source/control/calendar \ diff --git a/sfx2/source/control/InterimItemWindow.cxx b/svtools/source/control/InterimItemWindow.cxx similarity index 98% rename from sfx2/source/control/InterimItemWindow.cxx rename to svtools/source/control/InterimItemWindow.cxx index 1263f2e56aa2..b597276eb93c 100644 --- a/sfx2/source/control/InterimItemWindow.cxx +++ b/svtools/source/control/InterimItemWindow.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include +#include InterimItemWindow::InterimItemWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OString& rID) diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index fb594240f278..1549099be3df 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -263,7 +263,6 @@ #include #include #include -#include #include #include #include @@ -305,6 +304,7 @@ #include #include #include +#include #include #include #include diff --git a/svx/source/inc/findtextfield.hxx b/svx/source/inc/findtextfield.hxx index b929773340bb..244312cb63f1 100644 --- a/svx/source/inc/findtextfield.hxx +++ b/svx/source/inc/findtextfield.hxx @@ -19,7 +19,7 @@ #pragma once -#include +#include namespace svt { diff --git a/svx/source/inc/labelitemwindow.hxx b/svx/source/inc/labelitemwindow.hxx index 1667cdc4edc6..798369c10fa0 100644 --- a/svx/source/inc/labelitemwindow.hxx +++ b/svx/source/inc/labelitemwindow.hxx @@ -9,7 +9,7 @@ #pragma once -#include +#include class LabelItemWindow final : public InterimItemWindow { diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx index 0d80e6e72480..394bf22a2547 100644 --- a/svx/source/inc/tbxform.hxx +++ b/svx/source/inc/tbxform.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SVX_SOURCE_INC_TBXFORM_HXX #include -#include +#include class SvxFmAbsRecWin final : public InterimItemWindow { diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx index 22caf2a9e0b9..77f308697f43 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx @@ -21,7 +21,7 @@ #include #include -#include +#include #include using namespace com::sun::star; diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 7e55776c2998..e073dcf60028 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index fef375d4aff6..6c221b287997 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index da2c2a1e40f5..0fcd4665edad 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -39,7 +39,7 @@ #include -#include +#include #include #include diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 7d27ff2ae51d..584784387da3 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include #include diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index 8c65bf55be8a..cfd34f49b6ee 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index 00735215eb74..9e3af918550a 100644 --- a/sw/source/uibase/inc/inputwin.hxx +++ b/sw/source/uibase/inc/inputwin.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_INPUTWIN_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_INPUTWIN_HXX -#include +#include #include #include diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 81bfd2274a15..bdb3d18e7ab1 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include #include