avmedia/source/viewer/mediaevent_impl.cxx | 1
chart2/source/controller/inc/ChartController.hxx | 11 ++++-----
include/svx/sdr/table/tablecontroller.hxx | 1
include/vcl/event.hxx | 5 +++-
include/vcl/vclenum.hxx | 14 ++++++++++++
include/vcl/window.hxx | 15 -------------
sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx | 2 -
sd/source/ui/accessibility/AccessibleViewForwarder.cxx | 2 -
sd/source/ui/inc/OutlineView.hxx | 1
sfx2/source/view/lokcharthelper.cxx | 1
sfx2/source/view/lokhelper.cxx | 1
sfx2/source/view/userinputinterception.cxx | 1
svtools/inc/table/tablecontrolinterface.hxx | 8 ------
svx/source/accessibility/AccessibleControlShape.cxx | 1
svx/source/accessibility/AccessibleShape.cxx | 1
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 1
svx/source/form/fmpage.cxx | 1
svx/source/form/fmshimp.cxx | 3 +-
svx/source/form/fmview.cxx | 1
svx/source/form/fmvwimp.cxx | 1
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 1
svx/source/svdraw/sdrpagewindow.cxx | 1
svx/source/svdraw/sdrpaintwindow.cxx | 1
svx/source/svdraw/svdedxv.cxx | 1
svx/source/svdraw/svdmrkv.cxx | 1
svx/source/svdraw/svdpntv.cxx | 1
svx/source/svdraw/svdview.cxx | 2 -
svx/source/table/tablecontroller.cxx | 1
sw/source/ui/dbui/mmaddressblockpage.cxx | 1
29 files changed, 48 insertions(+), 34 deletions(-)
New commits:
commit b1253218e428640c0079916ddd5688c8fbb7171e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Apr 6 09:15:23 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Apr 6 17:32:51 2021 +0200
forward declare vcl::window in vcl/event.hxx
Change-Id: Ib3fc1b72d3d45377e2d4ccd0ff3e6835d2c29930
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113631
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx
b/avmedia/source/viewer/mediaevent_impl.cxx
index 9fbaceea1145..c724b172ad3e 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -21,6 +21,7 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/event.hxx>
+#include <vcl/window.hxx>
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/inc/ChartController.hxx
b/chart2/source/controller/inc/ChartController.hxx
index 582573dc7612..09fda2b6fb00 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -55,6 +55,7 @@ namespace com::sun::star::awt { struct Point; }
namespace com::sun::star::document { class XUndoManager; }
namespace com::sun::star::frame { class XDispatch; }
namespace com::sun::star::frame { class XLayoutManagerEventBroadcaster; }
+namespace com::sun::star::graphic { class XGraphic; }
namespace com::sun::star::lang { class XInitialization; }
namespace com::sun::star::uno { class XComponentContext; }
namespace com::sun::star::util { class XCloseable; }
@@ -72,14 +73,12 @@ namespace svx::sidebar {
class SelectionChangeHandler;
}
-class DropTargetHelper;
-
-namespace com::sun::star {
- namespace graphic {
- class XGraphic;
- }
+namespace weld {
+ class Window;
}
+class DropTargetHelper;
+
namespace chart
{
diff --git a/include/svx/sdr/table/tablecontroller.hxx
b/include/svx/sdr/table/tablecontroller.hxx
index 3d94dcfb08b7..6b505ae4dfd3 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -29,6 +29,7 @@
#include <svx/svdview.hxx>
#include <memory>
+struct ImplSVEvent;
class SdrView;
class SdrObject;
class SfxItemSet;
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 229c1f5988d0..236062d69670 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -26,7 +26,6 @@
#include <vcl/settings.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/outdev.hxx>
-#include <vcl/window.hxx>
#include <optional>
class CommandEvent;
@@ -38,6 +37,10 @@ enum class TextDirectionality {
BottomToTop_LeftToRight
};
+namespace vcl {
+ class Window;
+}
+
class VCL_DLLPUBLIC KeyEvent
{
private:
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index d0c56ea43090..d18bfc70e5f0 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -400,6 +400,20 @@ namespace o3tl
template<> struct typed_flags<ShowFlags> : is_typed_flags<ShowFlags,
0x000e> {};
}
+enum class TrackingEventFlags
+{
+ NONE = 0x0000,
+ Cancel = 0x0001,
+ Key = 0x0002,
+ Focus = 0x0004,
+ Repeat = 0x0100,
+ End = 0x1000,
+};
+namespace o3tl
+{
+ template<> struct typed_flags<TrackingEventFlags> :
is_typed_flags<TrackingEventFlags, 0x1107> {};
+}
+
#endif // INCLUDED_VCL_VCLENUM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 095e597d6c28..4675d4254b30 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -101,21 +101,6 @@ namespace weld { class Window; }
template<class T> class VclPtr;
namespace tools { class JsonWriter; }
-enum class TrackingEventFlags
-{
- NONE = 0x0000,
- Cancel = 0x0001,
- Key = 0x0002,
- Focus = 0x0004,
- Repeat = 0x0100,
- End = 0x1000,
-};
-namespace o3tl
-{
- template<> struct typed_flags<TrackingEventFlags> :
is_typed_flags<TrackingEventFlags, 0x1107> {};
-}
-
-
// Type for GetWindow()
enum class GetWindowType
{
diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
index 27ac7a54376c..a3915844078b 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
@@ -21,7 +21,7 @@
#include <editeng/unoedhlp.hxx>
#include <svx/svdoutl.hxx>
#include <svx/svdview.hxx>
-
+#include <vcl/window.hxx>
#include <AccessibleOutlineEditSource.hxx>
namespace accessibility
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 25810ab7dc09..cc0900a836de 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -19,7 +19,7 @@
#include <AccessibleViewForwarder.hxx>
#include <svx/svdpntv.hxx>
-#include <vcl/outdev.hxx>
+#include <vcl/window.hxx>
#include <svx/sdrpaintwindow.hxx>
#include <osl/diagnose.h>
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 5fbcf3476337..058f6323a234 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -21,6 +21,7 @@
#include <memory>
#include <vcl/image.hxx>
+#include <vcl/vclevent.hxx>
#include <editeng/lrspitem.hxx>
#include <o3tl/deleter.hxx>
#include "View.hxx"
diff --git a/sfx2/source/view/lokcharthelper.cxx
b/sfx2/source/view/lokcharthelper.cxx
index f80637133744..1e85f269cf3d 100644
--- a/sfx2/source/view/lokcharthelper.cxx
+++ b/sfx2/source/view/lokcharthelper.cxx
@@ -17,6 +17,7 @@
#include <tools/fract.hxx>
#include <tools/UnitConversion.hxx>
#include <vcl/virdev.hxx>
+#include <vcl/window.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 0da6b9b88682..3ef17c92452b 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -20,6 +20,7 @@
#include <vcl/lok.hxx>
#include <vcl/svapp.hxx>
#include <vcl/commandevent.hxx>
+#include <vcl/window.hxx>
#include <sal/log.hxx>
#include <sfx2/app.hxx>
#include <sfx2/msg.hxx>
diff --git a/sfx2/source/view/userinputinterception.cxx
b/sfx2/source/view/userinputinterception.cxx
index 6e3f3c875e6c..ca1a1fd3f622 100644
--- a/sfx2/source/view/userinputinterception.cxx
+++ b/sfx2/source/view/userinputinterception.cxx
@@ -33,6 +33,7 @@
#include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/weak.hxx>
#include <vcl/event.hxx>
+#include <vcl/window.hxx>
#include <osl/diagnose.h>
namespace sfx2
diff --git a/svtools/inc/table/tablecontrolinterface.hxx
b/svtools/inc/table/tablecontrolinterface.hxx
index 5314b2952381..6a592728494e 100644
--- a/svtools/inc/table/tablecontrolinterface.hxx
+++ b/svtools/inc/table/tablecontrolinterface.hxx
@@ -21,17 +21,14 @@
#include <sal/types.h>
#include <vcl/seleng.hxx>
+#include <vcl/window.hxx>
#include <table/tabletypes.hxx>
#include <table/tablemodel.hxx>
-
namespace svt::table
{
-
-
//= TableControlAction
-
enum TableControlAction
{
/// moves the cursor in the table control one row up, if possible, by
keeping the current column
@@ -235,9 +232,6 @@ namespace svt::table
virtual ~ITableControl() {};
};
-
} // namespace svt::table
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx
b/svx/source/accessibility/AccessibleControlShape.cxx
index 60581f3d8342..5875601d45b9 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -45,6 +45,7 @@
#include <svx/svdpagv.hxx>
#include <svx/strings.hrc>
#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
#include <sal/log.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
diff --git a/svx/source/accessibility/AccessibleShape.cxx
b/svx/source/accessibility/AccessibleShape.cxx
index a319529b6422..1f719e93c47d 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -43,6 +43,7 @@
#include <svx/SvxShapeTypes.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <svx/svdview.hxx>
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index f456a454dcdd..660aebfd18e4 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -27,6 +27,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/window.hxx>
#include <o3tl/safeint.hxx>
#include <osl/mutex.hxx>
#include <tools/gen.hxx>
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index f7b875edcb02..705d7f9e1e6a 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -29,6 +29,7 @@
#include <svx/svdview.hxx>
#include <tools/urlobj.hxx>
#include <vcl/help.hxx>
+#include <vcl/window.hxx>
#include <fmprop.hxx>
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index e0986c8ef0b0..be30493722c9 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -92,9 +92,10 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
-#include <vcl/weld.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/weld.hxx>
+#include <vcl/window.hxx>
#include <algorithm>
#include <map>
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 9adf7d830cf6..5d195ef74245 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -49,6 +49,7 @@
#include <svx/sdrpaintwindow.hxx>
#include <svx/svxids.hrc>
#include <vcl/i18nhelp.hxx>
+#include <vcl/window.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index ef570569348f..c9e2af6a4ce2 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -77,6 +77,7 @@
#include <sal/log.hxx>
#include <vcl/svapp.hxx>
#include <vcl/stdtext.hxx>
+#include <vcl/window.hxx>
#include <connectivity/dbtools.hxx>
#include <algorithm>
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 830666da0d0f..dd8ba8d97b96 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -45,6 +45,7 @@
#include <vcl/canvastools.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/scopeguard.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/svx/source/svdraw/sdrpagewindow.cxx
b/svx/source/svdraw/sdrpagewindow.cxx
index c3230b12285d..59c672b9ba7a 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -32,6 +32,7 @@
#include <svx/fmview.hxx>
#include <sfx2/lokhelper.hxx>
#include <tools/debug.hxx>
+#include <vcl/window.hxx>
using namespace ::com::sun::star;
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx
b/svx/source/svdraw/sdrpaintwindow.cxx
index 9e570c85a59c..c0a46d49d0b6 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -25,6 +25,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/window.hxx>
#include <set>
#include <vector>
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 268981f99df0..e18738dba12a 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -42,6 +42,7 @@
#include <vcl/commandevent.hxx>
#include <vcl/cursor.hxx>
#include <vcl/weld.hxx>
+#include <vcl/window.hxx>
#include <comphelper/lok.hxx>
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx>
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 3e4c9c21b8b2..f32830f75caf 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -49,6 +49,7 @@
#include <svx/sdrhittesthelper.hxx>
#include <vcl/uitest/logger.hxx>
#include <vcl/uitest/eventdescription.hxx>
+#include <vcl/window.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/lok.hxx>
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 4d2b7b636a37..59d1a55a8888 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -20,6 +20,7 @@
#include <memory>
#include <svx/svdpntv.hxx>
#include <vcl/weld.hxx>
+#include <vcl/window.hxx>
#include <svx/sdrpaintwindow.hxx>
#include <svx/svdmodel.hxx>
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index f2d36bbf5f4e..c07eee69cee3 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -46,7 +46,7 @@
#include <svx/sdr/contact/objectcontactofpageview.hxx>
#include <sal/log.hxx>
#include <vcl/ptrstyle.hxx>
-
+#include <vcl/window.hxx>
SdrViewEvent::SdrViewEvent()
: pHdl(nullptr),
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index 453259c35068..68880ad34754 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -34,6 +34,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/window.hxx>
#include <svl/whiter.hxx>
#include <svl/stritem.hxx>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index a75bd92bf467..ec7f7ae75108 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -44,7 +44,6 @@
#include <mmaddressblockpage.hrc>
#include <helpids.h>
-using namespace svt;
using namespace ::com::sun::star;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::sdb;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
