diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-05-21 16:43:40 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-05-22 13:27:41 +0200 |
commit | 78b7e1dfba4fb776db801c478a830057ff67d965 (patch) | |
tree | efdd4185035a725f0058bab4043e5bda3bfad953 /svx | |
parent | aff8471dbffdd6d26e63533d7ffa8ddea6b2396b (diff) |
move InterimItemWindow to vcl
Change-Id: If0a4a14708810c44d087b51961f2ecb3fda4df23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94649
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/pch/precompiled_svx.hxx | 8 | ||||
-rw-r--r-- | svx/source/inc/findtextfield.hxx | 2 | ||||
-rw-r--r-- | svx/source/inc/tbxform.hxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaSpacingWindow.hxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/grafctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/linemetricbox.hxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunocontroller.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2 |
9 files changed, 14 insertions, 10 deletions
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> |