move InterimItemWindow to svtools

Change-Id: I058b1d96a3ddfaa1aa96f66d0ebc6fa68900a48c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92697 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-22 14:19:40 +01:00 · 2020-04-22 14:19:40 +01:00 · a9ea920dfb
commit a9ea920dfb
parent cf13fe3e6f
31 changed files with 31 additions and 31 deletions
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@ -21,7 +21,7 @@

 #include <avmedia/mediaitem.hxx>

-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/weld.hxx>
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@ -26,7 +26,7 @@

 #include <basic/sbmod.hxx>
 #include <basic/sbstar.hxx>
-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/weld.hxx>

--- a/basctl/source/inc/IDEComboBox.hxx
+++ b/basctl/source/inc/IDEComboBox.hxx
@ -22,7 +22,7 @@

 #include <svl/stritem.hxx>
 #include <sfx2/tbxctrl.hxx>
-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>

 #include "doceventnotifier.hxx"
 #include "scriptdocument.hxx"
--- a/chart2/source/controller/main/ElementSelector.hxx
+++ b/chart2/source/controller/main/ElementSelector.hxx
@ -25,7 +25,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <svtools/toolboxcontroller.hxx>

-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <cppuhelper/weakref.hxx>

 namespace chart
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@ -15,7 +15,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>

-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
--- a/include/svtools/InterimItemWindow.hxx
+++ b/include/svtools/InterimItemWindow.hxx
@ -9,11 +9,11 @@

 #pragma once

-#include <sfx2/dllapi.h>
+#include <svtools/svtdllapi.h>
 #include <vcl/layout.hxx>
 #include <vcl/weld.hxx>

-class SFX2_DLLPUBLIC InterimItemWindow : public Control
+class SVT_DLLPUBLIC InterimItemWindow : public Control
 {
 public:
    virtual ~InterimItemWindow() override;
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@ -21,7 +21,7 @@
 #define INCLUDED_SVX_FILLCTRL_HXX

 #include <memory>
-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/weldutils.hxx>
 #include <svx/svxdllapi.h>
--- 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 <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <svtools/toolbarmenu.hxx>
 #include <svx/dlgctrl.hxx>
 #include <svx/svxdllapi.h>
--- 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 <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>

 class ScNumberFormat final : public InterimItemWindow
 {
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@ -23,7 +23,7 @@
 #include <vector>
 #include <memory>
 #include <vcl/toolbox.hxx>
-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <sfx2/childwin.hxx>
 #include <svl/lstner.hxx>
 #include <vcl/button.hxx>
--- a/sc/source/ui/inc/tbzoomsliderctrl.hxx
+++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx
@ -22,7 +22,7 @@
 #include <vcl/customweld.hxx>
 #include <vcl/window.hxx>
 #include <svl/poolitem.hxx>
-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <sfx2/tbxctrl.hxx>

 namespace com { namespace sun { namespace star { namespace frame { class XDispatchProvider; } } } }
--- 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 <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <sfx2/tbxctrl.hxx>

 namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
--- 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 <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <sfx2/tbxctrl.hxx>

 enum class SdrEscapeDirection;
--- 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 \
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@ -334,6 +334,7 @@
 #include <svl/urihelper.hxx>
 #include <svl/visitem.hxx>
 #include <svl/whiter.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/helpopt.hxx>
 #include <svtools/imagemgr.hxx>
@ -399,7 +400,6 @@
 #include <openflag.hxx>
 #include <openuriexternally.hxx>
 #include <openurlhint.hxx>
-#include <sfx2/InterimItemWindow.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/bindings.hxx>
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@ -34,7 +34,7 @@

 #include <svtools/inettbc.hxx>

-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <sfx2/sfxsids.hrc>

 using namespace ::com::sun::star::uno;
--- a/sfx2/source/view/classificationcontroller.cxx
+++ b/sfx2/source/view/classificationcontroller.cxx
@ -16,7 +16,7 @@
 #include <com/sun/star/frame/XFrame.hpp>

 #include <toolkit/helper/vclunohelper.hxx>
-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <sfx2/classificationhelper.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/strings.hrc>
--- 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 \
--- a/svtools/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 <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>

 InterimItemWindow::InterimItemWindow(vcl::Window* pParent, const OUString& rUIXMLDescription,
                                     const OString& rID)
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@ -263,7 +263,6 @@
 #include <o3tl/underlyingenumvalue.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <salhelper/simplereferenceobject.hxx>
-#include <sfx2/InterimItemWindow.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/bindings.hxx>
@ -305,6 +304,7 @@
 #include <svl/typedwhich.hxx>
 #include <svl/undo.hxx>
 #include <svl/zforlist.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/popupwindowcontroller.hxx>
--- a/svx/source/inc/findtextfield.hxx
+++ b/svx/source/inc/findtextfield.hxx
@ -19,7 +19,7 @@

 #pragma once

-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>

 namespace svt
 {
--- a/svx/source/inc/labelitemwindow.hxx
+++ b/svx/source/inc/labelitemwindow.hxx
@ -9,7 +9,7 @@

 #pragma once

-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>

 class LabelItemWindow final : public InterimItemWindow
 {
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@ -20,7 +20,7 @@
 #define INCLUDED_SVX_SOURCE_INC_TBXFORM_HXX

 #include <sfx2/tbxctrl.hxx>
-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>

 class SvxFmAbsRecWin final : public InterimItemWindow
 {
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
@ -21,7 +21,7 @@

 #include <editeng/ulspitem.hxx>
 #include <vcl/EnumContext.hxx>
-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <svx/relfld.hxx>

 using namespace com::sun::star;
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@ -26,7 +26,7 @@
 #include <sfx2/viewsh.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <tools/urlobj.hxx>

--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@ -37,7 +37,7 @@
 #include <svl/style.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/borderhelper.hxx>
-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/sfxstatuslistener.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@ -39,7 +39,7 @@

 #include <memory>

-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <sfx2/sidebar/SidebarToolBox.hxx>
 #include <boost/property_tree/ptree.hpp>

--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@ -47,7 +47,7 @@
 #include <com/sun/star/util/SearchAlgorithms.hpp>
 #include <com/sun/star/util/SearchAlgorithms2.hpp>

-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <svl/ctloptions.hxx>
 #include <svl/srchitem.hxx>
 #include <svtools/acceleratorexecute.hxx>
--- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
+++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
@ -21,7 +21,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <svtools/toolboxcontroller.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>

--- 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 <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/toolbox.hxx>

--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@ -18,7 +18,7 @@
 */

 #include <i18nutil/unicode.hxx>
-#include <sfx2/InterimItemWindow.hxx>
+#include <svtools/InterimItemWindow.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>