[Libreoffice-commits] core.git: include/svx

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Mar 12 09:07:23 UTC 2021


 include/svx/contdlg.hxx |    1 -
 include/svx/svdpntv.hxx |    9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3a3ad2b03dd24c49b6cf778fa63c0b4a5e39f7d5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Mar 11 14:23:16 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Mar 12 10:06:33 2021 +0100

    use some forward declares to avoid including vcl/window.hxx
    
    Change-Id: I67992b7743f98d6228a0a52d2e5a92e4f25eaa15
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112347
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx
index 4ad26c70816d..cb3034fd6636 100644
--- a/include/svx/contdlg.hxx
+++ b/include/svx/contdlg.hxx
@@ -26,7 +26,6 @@
 #include <sfx2/childwin.hxx>
 #include <svx/svxdllapi.h>
 #include <tools/poly.hxx>
-#include <vcl/window.hxx>
 
 class SfxBindings;
 class SfxModule;
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index ad68da20dec2..7fe2bcc9a23d 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -25,14 +25,14 @@
 #include <svl/undo.hxx>
 #include <svx/svddrag.hxx>
 #include <svx/svdlayer.hxx>
-#include <vcl/window.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svl/itemset.hxx>
-#include <vcl/timer.hxx>
 #include <svx/svxdllapi.h>
 #include <svtools/optionsdrawinglayer.hxx>
 #include <unotools/options.hxx>
+#include <vcl/event.hxx>
 #include <vcl/idle.hxx>
+#include <vcl/timer.hxx>
 #include <memory>
 
 
@@ -57,7 +57,6 @@ namespace sdr::contact {
     class ViewObjectContactRedirector;
 }
 
-
 // Defines for AnimationMode
 enum class SdrAnimationMode
 {
@@ -65,10 +64,12 @@ enum class SdrAnimationMode
     Disable
 };
 
-
 class SdrPaintView;
 namespace sdr::contact { class ViewObjectContactRedirector; }
 
+namespace vcl {
+    class Window;
+}
 
 
 class SvxViewChangedHint final : public SfxHint


More information about the Libreoffice-commits mailing list