diff options
-rw-r--r-- | chart2/source/controller/dialogs/ObjectNameProvider.cxx | 1 | ||||
-rw-r--r-- | include/vcl/menu.hxx | 8 | ||||
-rw-r--r-- | include/vcl/vclevent.hxx | 7 | ||||
-rw-r--r-- | include/vcl/window.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/hintwin.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/framework/factories/FullScreenPane.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/presenter/CanvasUpdateRequester.cxx | 1 | ||||
-rw-r--r-- | sw/source/filter/html/parcss1.cxx | 1 | ||||
-rw-r--r-- | vcl/inc/impfontcharmap.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/svdata.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/unx/printergfx.hxx | 2 | ||||
-rw-r--r-- | vcl/source/bitmap/BitmapTools.cxx | 1 | ||||
-rw-r--r-- | vcl/unx/generic/print/common_gfx.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/GraphicHelpers.cxx | 1 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtftokenizer.cxx | 1 | ||||
-rw-r--r-- | writerperfect/source/common/WPFTResMgr.cxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 5 |
17 files changed, 31 insertions, 9 deletions
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 574de211aff5..66a7fa3637bf 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -33,6 +33,7 @@ #include "RegressionCurveHelper.hxx" #include <rtl/math.hxx> #include <rtl/ustring.hxx> +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/chart2/XTitle.hpp> diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index e3a0e8b8c529..ddf12f629c99 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -47,7 +47,6 @@ class PopupMenu; class KeyEvent; class CommandEvent; class MenuFloatingWindow; -namespace vcl { class Window; } class SalMenu; class MenuBarWindow; struct SystemMenuData; @@ -57,7 +56,12 @@ namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; }}}} -namespace vcl { struct MenuLayoutData; } +namespace vcl +{ +class Window; +struct MenuLayoutData; +typedef OutputDevice RenderContext; // same as in include/vcl/outdev.hxx +} #define MENU_APPEND (sal_uInt16(0xFFFF)) #define MENU_ITEM_NOTFOUND (sal_uInt16(0xFFFF)) diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index a60723167427..933ce2666fba 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -20,10 +20,8 @@ #ifndef INCLUDED_VCL_VCLEVENT_HXX #define INCLUDED_VCL_VCLEVENT_HXX -#include <tools/link.hxx> #include <vcl/dllapi.h> #include <vcl/vclptr.hxx> -#include <vcl/window.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -35,6 +33,11 @@ namespace com { namespace sun { namespace star { } }}} +namespace vcl +{ + class Window; +} + enum class VclEventId { NONE, diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 36370a7c8137..ac9e1a60b908 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -33,6 +33,7 @@ #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/uitest/factory.hxx> +#include <vcl/vclevent.hxx> #include <rtl/ustring.hxx> #include <rtl/ref.hxx> #include <cppuhelper/weakref.hxx> @@ -1548,7 +1549,6 @@ public: // Only for compatibility - because many people outside haven't included event.hxx // These require Window to be defined for VclPtr<Window> -#include <vcl/vclevent.hxx> #include <vcl/event.hxx> #endif // INCLUDED_VCL_WINDOW_HXX diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx index 32f71131717c..816bb40281f5 100644 --- a/sc/source/ui/view/hintwin.cxx +++ b/sc/source/ui/view/hintwin.cxx @@ -34,6 +34,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <svtools/colorcfg.hxx> +#include <vcl/settings.hxx> #define HINT_LINESPACE 2 #define HINT_INDENT 3 diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index 3253ea153fac..1329a05c4458 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <vcl/vclevent.hxx> +#include <vcl/window.hxx> #include <memory> class WorkWindow; diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index 456c37d43a58..2517c710c1d7 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx @@ -20,6 +20,7 @@ #include "CanvasUpdateRequester.hxx" #include <vcl/svapp.hxx> #include <com/sun/star/lang/XComponent.hpp> +#include <cppuhelper/weakref.hxx> #include <vector> using namespace ::com::sun::star; diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index c22f8412e140..e3c6c44921be 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -19,6 +19,7 @@ #include <stdlib.h> #include <limits.h> +#include <rtl/character.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> #include <svtools/htmltokn.h> diff --git a/vcl/inc/impfontcharmap.hxx b/vcl/inc/impfontcharmap.hxx index e03bf2665f38..197333a49b6e 100644 --- a/vcl/inc/impfontcharmap.hxx +++ b/vcl/inc/impfontcharmap.hxx @@ -20,6 +20,9 @@ #ifndef INCLUDED_VCL_INC_IMPFONTCHARMAP_HXX #define INCLUDED_VCL_INC_IMPFONTCHARMAP_HXX +#include <tools/ref.hxx> +#include <vcl/dllapi.h> + class ImplFontCharMap; typedef tools::SvRef<ImplFontCharMap> ImplFontCharMapRef; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 1d8d5ad56367..bc87e6887f1d 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -25,6 +25,7 @@ #include <tools/fldunit.hxx> #include <unotools/options.hxx> #include <vcl/svapp.hxx> +#include <vcl/window.hxx> #include <com/sun/star/lang/XComponent.hpp> diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx index 41a5f843cc39..f1fc5229ced3 100644 --- a/vcl/inc/unx/printergfx.hxx +++ b/vcl/inc/unx/printergfx.hxx @@ -29,6 +29,8 @@ #include <list> #include <vector> +enum class PolyFlags : sal_uInt8; + namespace psp { struct JobData; diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx index d9990167c534..d0b00e1d8b07 100644 --- a/vcl/source/bitmap/BitmapTools.cxx +++ b/vcl/source/bitmap/BitmapTools.cxx @@ -23,6 +23,7 @@ #include <tools/rcid.h> #include <tools/resmgr.hxx> +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> using namespace css; diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx index ef1a767e3414..b06767308b7a 100644 --- a/vcl/unx/generic/print/common_gfx.cxx +++ b/vcl/unx/generic/print/common_gfx.cxx @@ -30,9 +30,9 @@ #include <vcl/strhelper.hxx> #include "printerinfomanager.hxx" -#include "tools/debug.hxx" #include "tools/color.hxx" #include "tools/poly.hxx" +#include "tools/stream.hxx" using namespace psp ; diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx index 2096adf802c4..2ae112af294b 100644 --- a/writerfilter/source/dmapper/GraphicHelpers.cxx +++ b/writerfilter/source/dmapper/GraphicHelpers.cxx @@ -29,6 +29,7 @@ #include <oox/drawingml/drawingmltypes.hxx> #include <tools/resmgr.hxx> +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <svx/svdstr.hrc> diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index 5661d4137b5b..e5e1087d3645 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -9,6 +9,7 @@ #include <rtftokenizer.hxx> #include <tools/resmgr.hxx> +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <svx/dialogs.hrc> #include <rtl/strbuf.hxx> diff --git a/writerperfect/source/common/WPFTResMgr.cxx b/writerperfect/source/common/WPFTResMgr.cxx index fff256e7a6bf..9cc22f365140 100644 --- a/writerperfect/source/common/WPFTResMgr.cxx +++ b/writerperfect/source/common/WPFTResMgr.cxx @@ -3,7 +3,7 @@ #include "WPFTResMgr.hxx" #include <tools/resmgr.hxx> - +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> ResMgr &WPFTResMgr::GetResMgr() diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 0df51a5e577a..25c9d4f75467 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -20,14 +20,15 @@ #include <memory> #include "db.hxx" #include <osl/diagnose.h> +#include <osl/file.hxx> #include <osl/thread.h> #include <osl/process.h> +#include <rtl/character.hxx> #include <rtl/uri.hxx> -#include <osl/file.hxx> +#include <rtl/ustrbuf.hxx> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/awt/Toolkit.hpp> #include <com/sun/star/i18n/Collator.hpp> -#include <rtl/ustrbuf.hxx> #include "inputstream.hxx" #include <algorithm> #include <cassert> |