diff options
26 files changed, 24 insertions, 24 deletions
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 5593941cd702..5962bf2a7c8e 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -23,7 +23,7 @@ #include <vcl/msgbox.hxx> #include <vcl/window.hxx> #include <svl/solar.hrc> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <vcl/FilterConfigItem.hxx> #include "giflzwc.hxx" diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 5fe884766ae6..6749dfe0d819 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <math.h> #include <tools/stream.hxx> diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index a4efe851836f..010eaed494ca 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -23,7 +23,7 @@ #include <vcl/bmpacc.hxx> #include <vcl/msgbox.hxx> #include <svl/solar.hrc> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <vcl/FilterConfigItem.hxx> //============================ PBMWriter ================================== diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index 77aa72d52d04..e611f9a49ae0 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -23,7 +23,7 @@ #include <vcl/bmpacc.hxx> #include <vcl/msgbox.hxx> #include <svl/solar.hrc> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <vcl/FilterConfigItem.hxx> //============================ PGMWriter ================================== diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index 9b95717af7cb..b4e40bc9e7d7 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -20,7 +20,7 @@ #include <vcl/metaact.hxx> #include <vcl/graphicfilter.hxx> #include <svl/solar.hrc> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <math.h> #include <vcl/bmpacc.hxx> diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx index 3e0fbb9181c4..2ad2798c20ce 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -23,7 +23,7 @@ #include <vcl/bmpacc.hxx> #include <vcl/msgbox.hxx> #include <svl/solar.hrc> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <vcl/FilterConfigItem.hxx> //============================ PPMWriter ================================== diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index e75475240b02..4ec0de709be2 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -33,7 +33,7 @@ #include <vcl/gradient.hxx> #include <unotools/configmgr.hxx> #include <svl/solar.hrc> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <vcl/FilterConfigItem.hxx> #include <vcl/graphictools.hxx> #include "strings.hrc" diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index eb18c689c76a..fca5570b467f 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -20,7 +20,7 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <vcl/FilterConfigItem.hxx> //============================ RASWriter ================================== diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index 8a83d67571ec..8a261565be49 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -23,7 +23,7 @@ #include <vcl/msgbox.hxx> #include <vcl/bmpacc.hxx> #include <svl/solar.hrc> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <vcl/FilterConfigItem.hxx> #define NewSubfileType 254 diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index 4d2d69a341f3..e60841146628 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -20,7 +20,7 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> //============================ XPMWriter ================================== diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index c5ec1a74eb89..e3f5f0454514 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -22,7 +22,7 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> #include <vcl/svapp.hxx> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <svl/solar.hrc> #include <vcl/FilterConfigItem.hxx> diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 932046fbe449..1e918ccd0141 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <comphelper/extract.hxx> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <vcl/cvtgrf.hxx> using ::rtl::OUString; diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index d98cddade4a3..3f2421218849 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -26,7 +26,7 @@ #include <vcl/gradient.hxx> #include <rtl/ustring.hxx> #include <tools/stream.hxx> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <sfx2/docfile.hxx> #include <svx/unoapi.hxx> #include <svx/svdobj.hxx> diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index e82cc5d6e594..cd20021f4b3a 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -70,7 +70,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <com/sun/star/text/FontRelief.hpp> #include <editeng/frmdiritem.hxx> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <com/sun/star/table/XTable.hpp> #include <com/sun/star/table/XMergeableCell.hpp> #include <com/sun/star/table/BorderLine.hpp> diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index eebf32b49d91..581fea705637 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -32,7 +32,7 @@ #include <vcl/virdev.hxx> #include <rtl/ustring.hxx> #include <rtl/strbuf.hxx> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <vcl/wmf.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docinf.hxx> diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk index 47fdf39b5214..38047d484d4c 100644 --- a/svtools/Package_inc.mk +++ b/svtools/Package_inc.mk @@ -58,7 +58,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/f $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filechangedchecker.hxx,svtools/filechangedchecker.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fontsubstconfig.hxx,svtools/fontsubstconfig.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/framestatuslistener.hxx,svtools/framestatuslistener.hxx)) diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index 7cce49bfdd6e..19597874dc79 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -24,7 +24,7 @@ #include <osl/file.hxx> #include <osl/module.hxx> #include <svl/solar.hrc> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include "exportdialog.hxx" #include <uno/mapping.hxx> #include <com/sun/star/frame/XModel.hpp> diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index 4d952ef7fbb7..fd33a9dfaa77 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -21,7 +21,7 @@ #ifndef _EXPORTDIALOG_HXX_ #define _EXPORTDIALOG_HXX_ -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 6ce719e1bc3b..6a5b80064766 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -31,7 +31,7 @@ #include <unotools/localfilehelper.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <vcl/graphicfilter.hxx> #include <boost/scoped_ptr.hpp> diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index c453ea477a7d..23b9046c4fc3 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <vcl/svapp.hxx> #include <svl/itemprop.hxx> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <osl/mutex.hxx> #include <editeng/unotext.hxx> #include <svx/svdobj.hxx> diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk index 6310fed90549..1ddefa6ebf43 100644 --- a/vcl/Package_inc.mk +++ b/vcl/Package_inc.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/field.hxx,vcl/field.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fixed.hxx,vcl/fixed.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fixedhyper.hxx,vcl/fixedhyper.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/floatwin.hxx,vcl/floatwin.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fltcall.hxx,vcl/fltcall.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fntstyle.hxx,vcl/fntstyle.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/font.hxx,vcl/font.hxx)) $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fontcapabilities.hxx,vcl/fontcapabilities.hxx)) diff --git a/svtools/inc/svtools/fltcall.hxx b/vcl/inc/vcl/fltcall.hxx index 91e4d289a6d1..91e4d289a6d1 100644 --- a/svtools/inc/svtools/fltcall.hxx +++ b/vcl/inc/vcl/fltcall.hxx diff --git a/vcl/source/filter/jpeg/jpeg.hxx b/vcl/source/filter/jpeg/jpeg.hxx index df033bd7b98b..a3329c44f4ce 100644 --- a/vcl/source/filter/jpeg/jpeg.hxx +++ b/vcl/source/filter/jpeg/jpeg.hxx @@ -21,7 +21,7 @@ #define _JPEG_HXX #include <vcl/graph.hxx> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx index 3e22e0385f17..e778be13ea55 100644 --- a/vcl/source/filter/wmf/emfwr.hxx +++ b/vcl/source/filter/wmf/emfwr.hxx @@ -24,7 +24,7 @@ #include <vcl/graph.hxx> #include <vcl/gdimtf.hxx> #include <vcl/virdev.hxx> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> // ------------- // - EMFWriter - diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 146493eda72c..a6eedcec9977 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -32,7 +32,7 @@ #include <vcl/font.hxx> #include <vcl/bmpacc.hxx> #include <vcl/lineinfo.hxx> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> #define ERROR 0 #define NULLREGION 1 diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx index f71abaa8ea93..b05a8d217ec1 100644 --- a/vcl/source/filter/wmf/wmfwr.hxx +++ b/vcl/source/filter/wmf/wmfwr.hxx @@ -24,7 +24,7 @@ #include <vcl/graph.hxx> #include <vcl/gdimtf.hxx> #include <vcl/virdev.hxx> -#include <svtools/fltcall.hxx> +#include <vcl/fltcall.hxx> // ----------------------------------------------------------------------------- |