diff options
40 files changed, 50 insertions, 43 deletions
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index d88999df1f5b..33c063fc9dad 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -21,7 +21,7 @@ #include <avmedia/mediaitem.hxx> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <vcl/timer.hxx> #include <vcl/idle.hxx> #include <vcl/weld.hxx> diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 9f69d9e4086b..110e8f483388 100644 --- 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 <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <vcl/idle.hxx> #include <vcl/weld.hxx> diff --git a/basctl/source/inc/IDEComboBox.hxx b/basctl/source/inc/IDEComboBox.hxx index 32b8bc43c576..ade0fd6732cc 100644 --- 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 <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include "doceventnotifier.hxx" #include "scriptdocument.hxx" diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index a341cb785ba9..01cfd273c3ba 100644 --- 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 <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <cppuhelper/weakref.hxx> namespace chart diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 1c4669c17324..47aa5c98c7e3 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -16,7 +16,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 135b7dcb1f15..e4aa8b852b02 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XStatusListener.hpp> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <vcl/toolbox.hxx> #include <vcl/timer.hxx> #include <cppuhelper/implbase.hxx> diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 8876160df615..1d73f3fc526d 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -22,7 +22,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/Color.hpp> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <svtools/toolboxcontroller.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 56acf0a018c9..1603ab6b3185 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <svtools/toolboxcontroller.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 1d863c596b3f..76988f88f7a9 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -20,7 +20,7 @@ #include <uielement/edittoolbarcontroller.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <svtools/toolboxcontroller.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 6492896eba4e..2e9c7cb891cb 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -29,7 +29,7 @@ #include <svtools/brwbox.hxx> #include <svtools/brwhead.hxx> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <vcl/vclmedit.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index 0001bca0c605..b896fdae76e2 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SVX_FILLCTRL_HXX #include <memory> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <sfx2/tbxctrl.hxx> #include <sfx2/weldutils.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 1feb6d9fd0cf..a270d25f0e3c 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 <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <svtools/toolbarmenu.hxx> #include <svx/dlgctrl.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/labelitemwindow.hxx b/include/svx/labelitemwindow.hxx index 4f79113339ea..5271482b11ad 100644 --- a/include/svx/labelitemwindow.hxx +++ b/include/svx/labelitemwindow.hxx @@ -9,7 +9,7 @@ #pragma once -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <svx/svxdllapi.h> class SVXCORE_DLLPUBLIC LabelItemWindow final : public InterimItemWindow diff --git a/include/svtools/InterimItemWindow.hxx b/include/vcl/InterimItemWindow.hxx index fa970095dfdf..3ba842a3eca1 100644 --- a/include/svtools/InterimItemWindow.hxx +++ b/include/vcl/InterimItemWindow.hxx @@ -9,11 +9,11 @@ #pragma once -#include <svtools/svtdllapi.h> -#include <vcl/layout.hxx> +#include <vcl/dllapi.h> +#include <vcl/ctrl.hxx> #include <vcl/weld.hxx> -class SVT_DLLPUBLIC InterimItemWindow : public Control +class VCL_DLLPUBLIC InterimItemWindow : public Control { public: virtual ~InterimItemWindow() override; diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 24f6a9b8df9c..6e05c824d5af 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <tbzoomsliderctrl.hxx> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <vcl/event.hxx> #include <vcl/image.hxx> #include <vcl/toolbox.hxx> diff --git a/sc/source/ui/inc/cbnumberformat.hxx b/sc/source/ui/inc/cbnumberformat.hxx index df4c27af24a0..f558811fecf0 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 <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> class ScNumberFormat final : public InterimItemWindow { diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 584011fa4a59..30eb93bcb398 100644 --- 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 <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <sfx2/childwin.hxx> #include <svl/lstner.hxx> #include <vcl/button.hxx> diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 815e15c104c1..bb3660fabe14 100644 --- 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 <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <sfx2/tbxctrl.hxx> namespace com::sun::star::frame { class XDispatchProvider; } diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index a9155c1d66d7..cbc7590cc9c8 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -18,8 +18,10 @@ */ #include <vcl/fieldvalues.hxx> -#include <svl/intitem.hxx> +#include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> +#include <svl/intitem.hxx> #include <strings.hrc> diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 26b6798206d3..b9a54d62e9d0 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 <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <sfx2/tbxctrl.hxx> namespace com::sun::star::frame { class XFrame; } diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index ecf1acede60c..632f37604491 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 <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <sfx2/tbxctrl.hxx> enum class SdrEscapeDirection; diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 5120b4494745..d713ff85f6d2 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2020-04-30 12:39:28 using: + Generated on 2020-05-21 16:43:16 using: ./bin/update_pch sfx2 sfx --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -86,6 +86,7 @@ #include <sal/saldllapi.h> #include <sal/types.h> #include <vcl/EnumContext.hxx> +#include <vcl/InterimItemWindow.hxx> #include <vcl/Scanline.hxx> #include <vcl/alpha.hxx> #include <vcl/bitmapex.hxx> @@ -339,7 +340,6 @@ #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> diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 18818b2f2596..1e11800c3b91 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -34,7 +34,7 @@ #include <svtools/inettbc.hxx> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <sfx2/sfxsids.hrc> using namespace ::com::sun::star::uno; diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index a870f58f119f..0559ac6464f9 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -49,7 +49,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/globname.hxx> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <sfx2/tbxctrl.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/msg.hxx> diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index c093c8c3b65c..53eccc0ba587 100644 --- 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 <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <sfx2/classificationhelper.hxx> #include <sfx2/objsh.hxx> #include <sfx2/strings.hrc> diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 568fb6a63a59..3723fe67bb42 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -90,7 +90,6 @@ $(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/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 45da207e9fb8..7a73d1b51b3c 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2020-04-26 15:54:56 using: + Generated on 2020-05-21 16:43:20 using: ./bin/update_pch svx svx --cutoff=3 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -73,6 +73,7 @@ #include <vcl/BitmapFilter.hxx> #include <vcl/EnumContext.hxx> #include <vcl/GraphicObject.hxx> +#include <vcl/InterimItemWindow.hxx> #include <vcl/Scanline.hxx> #include <vcl/alpha.hxx> #include <vcl/bitmapex.hxx> @@ -157,6 +158,7 @@ #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineCap.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/XFormComponent.hpp> @@ -211,6 +213,7 @@ #include <com/sun/star/view/XSelectionSupplier.hpp> #include <comphelper/broadcasthelper.hxx> #include <comphelper/comphelperdllapi.h> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/proparrhlp.hxx> #include <comphelper/propertycontainer.hxx> @@ -287,6 +290,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/dllapi.h> #include <sfx2/dockwin.hxx> +#include <sfx2/lokhelper.hxx> #include <sfx2/module.hxx> #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> @@ -321,7 +325,6 @@ #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> @@ -332,6 +335,7 @@ #include <svtools/unitconv.hxx> #include <svtools/valueset.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/UnitConversion.hxx> #include <tools/color.hxx> #include <tools/date.hxx> #include <tools/datetime.hxx> diff --git a/svx/source/inc/findtextfield.hxx b/svx/source/inc/findtextfield.hxx index 244312cb63f1..1ac5519a2dcd 100644 --- a/svx/source/inc/findtextfield.hxx +++ b/svx/source/inc/findtextfield.hxx @@ -19,7 +19,7 @@ #pragma once -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> namespace svt { diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx index 4b0d1534076c..35471e9f1645 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 <sfx2/tbxctrl.hxx> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> class SvxFmAbsRecWin final : public InterimItemWindow { diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx index 70ffd6d749fa..3f18dbb3e3ad 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx @@ -20,7 +20,7 @@ #include <editeng/ulspitem.hxx> #include <vcl/EnumContext.hxx> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <svx/relfld.hxx> using namespace com::sun::star; diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 8f81f01ede64..1db6225da1e3 100644 --- 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 <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <sfx2/sfxdlg.hxx> #include <tools/urlobj.hxx> diff --git a/svx/source/tbxctrls/linemetricbox.hxx b/svx/source/tbxctrls/linemetricbox.hxx index ca6d36740779..3596227b0679 100644 --- a/svx/source/tbxctrls/linemetricbox.hxx +++ b/svx/source/tbxctrls/linemetricbox.hxx @@ -18,7 +18,7 @@ */ #pragma once -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <svx/svxdllapi.h> class XLineWidthItem; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index d099caca0aa8..70288fcd23ba 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -35,7 +35,7 @@ #include <svl/style.hxx> #include <svtools/ctrltool.hxx> #include <svtools/borderhelper.hxx> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <sfx2/tplpitem.hxx> #include <sfx2/sfxstatuslistener.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 0fcd4665edad..8e42177bfd79 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -39,7 +39,7 @@ #include <memory> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <sfx2/sidebar/SidebarToolBox.hxx> #include <boost/property_tree/ptree.hpp> diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index c68c168b6599..f7c0d2a9fc7b 100644 --- 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 <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <svl/ctloptions.hxx> #include <svl/srchitem.hxx> #include <svtools/acceleratorexecute.hxx> diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index cfd34f49b6ee..e2cff7390d09 100644 --- 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 <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index 9e3af918550a..6698e192421c 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 <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <vcl/menu.hxx> #include <vcl/toolbox.hxx> diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 05b362287a25..3e93d5320c1d 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -18,7 +18,7 @@ */ #include <i18nutil/unicode.hxx> -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 35590174946e..8e309d24dc86 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -190,6 +190,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/control/fixedhyper \ vcl/source/control/hyperlabel \ vcl/source/control/fmtfield \ + vcl/source/control/InterimItemWindow \ vcl/source/control/imgctrl \ vcl/source/control/imivctl1 \ vcl/source/control/imivctl2 \ diff --git a/svtools/source/control/InterimItemWindow.cxx b/vcl/source/control/InterimItemWindow.cxx index b597276eb93c..f9f54d757fd5 100644 --- a/svtools/source/control/InterimItemWindow.cxx +++ b/vcl/source/control/InterimItemWindow.cxx @@ -7,7 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <svtools/InterimItemWindow.hxx> +#include <vcl/InterimItemWindow.hxx> +#include <vcl/layout.hxx> InterimItemWindow::InterimItemWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OString& rID) |