[Libreoffice-commits] core.git: accessibility/source basctl/source dbaccess/source include/toolkit toolkit/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Mon Apr 12 07:50:10 UTC 2021
accessibility/source/standard/vclxaccessibledropdowncombobox.cxx | 1 +
accessibility/source/standard/vclxaccessibledropdownlistbox.cxx | 8 +-------
accessibility/source/standard/vclxaccessiblelistbox.cxx | 2 +-
basctl/source/basicide/textwindowpeer.cxx | 1 +
dbaccess/source/ui/uno/ColumnControl.cxx | 1 +
include/toolkit/awt/vclxwindow.hxx | 8 +++-----
toolkit/source/controls/tkscrollbar.cxx | 1 +
toolkit/source/controls/unocontrol.cxx | 1 +
toolkit/source/controls/unocontrols.cxx | 1 +
toolkit/source/hatchwindow/hatchwindowfactory.cxx | 1 +
10 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit 2577a6be556b688d9c3dbca8dea2860586e63e11
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Apr 11 20:24:16 2021 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Apr 12 09:49:17 2021 +0200
forward decl vcl::Window in toolkit/awt/vclxwindow.hxx
Change-Id: I488f994fc890cacd20a6fdc224a098fe0caf3070
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113960
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index 97fcebb04a2b..1e5e7608c3bb 100644
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -21,6 +21,7 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <vcl/vclevent.hxx>
+#include <vcl/window.hxx>
using namespace ::com::sun::star;
diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
index 2bee1b51f8fc..28991e818d4a 100644
--- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
@@ -17,11 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <standard/vclxaccessibledropdownlistbox.hxx>
-
#include <toolkit/awt/vclxwindow.hxx>
-
+#include <vcl/window.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
@@ -34,21 +32,17 @@ VCLXAccessibleDropDownListBox::VCLXAccessibleDropDownListBox (VCLXWindow* pVCLWi
{
}
-
bool VCLXAccessibleDropDownListBox::IsValid() const
{
return GetWindow();
}
-
// XServiceInfo
-
OUString VCLXAccessibleDropDownListBox::getImplementationName()
{
return "com.sun.star.comp.toolkit.AccessibleDropDownListBox";
}
-
Sequence< OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNames()
{
return comphelper::concatSequences(VCLXAccessibleBox::getSupportedServiceNames(),
diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx
index 26602167379a..25319aa912ea 100644
--- a/accessibility/source/standard/vclxaccessiblelistbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx
@@ -18,8 +18,8 @@
*/
#include <standard/vclxaccessiblelistbox.hxx>
-
#include <toolkit/awt/vclxwindow.hxx>
+#include <vcl/window.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
diff --git a/basctl/source/basicide/textwindowpeer.cxx b/basctl/source/basicide/textwindowpeer.cxx
index 8375f353f8a3..fc458453778b 100644
--- a/basctl/source/basicide/textwindowpeer.cxx
+++ b/basctl/source/basicide/textwindowpeer.cxx
@@ -27,6 +27,7 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <vcl/texteng.hxx>
#include <vcl/textview.hxx>
+#include <vcl/window.hxx>
#include "textwindowpeer.hxx"
namespace {
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index 6cf6e248e55e..51930de95119 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -20,6 +20,7 @@
#include "ColumnControl.hxx"
#include "ColumnPeer.hxx"
#include <apitools.hxx>
+#include <vcl/window.hxx>
#include <com/sun/star/awt/PosSize.hpp>
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 090a52cde8d4..289d242a297b 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -17,12 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
+#pragma once
#include <toolkit/dllapi.h>
#include <toolkit/awt/vclxdevice.hxx>
-#include <vcl/window.hxx>
+#include <vcl/vclptr.hxx>
#include <com/sun/star/awt/XWindow2.hpp>
#include <com/sun/star/awt/XVclWindowPeer.hpp>
@@ -45,6 +44,7 @@
namespace comphelper { class OInterfaceContainerHelper2; }
namespace com::sun::star::accessibility { class XAccessibleContext; }
+namespace vcl { class Window; }
class VclWindowEvent;
@@ -225,6 +225,4 @@ public:
virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL getStyleSettings() override;
};
-#endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index d2d1c2248921..f3c6ac33cb35 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -25,6 +25,7 @@
#include <cppuhelper/queryinterface.hxx>
#include <toolkit/awt/vclxwindows.hxx>
+#include <vcl/window.hxx>
#include <helper/unopropertyarrayhelper.hxx>
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 54061dd2cabb..a97cb2229942 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -35,6 +35,7 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
#include <toolkit/helper/property.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <controls/accessiblecontrolcontext.hxx>
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 7d958e837b3b..d3395e6fd40c 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -42,6 +42,7 @@
#include <comphelper/processfactory.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
+#include <vcl/window.hxx>
#include <algorithm>
diff --git a/toolkit/source/hatchwindow/hatchwindowfactory.cxx b/toolkit/source/hatchwindow/hatchwindowfactory.cxx
index 3e50db64ee82..7a06cc747d35 100644
--- a/toolkit/source/hatchwindow/hatchwindowfactory.cxx
+++ b/toolkit/source/hatchwindow/hatchwindowfactory.cxx
@@ -24,6 +24,7 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
#include "hatchwindow.hxx"
More information about the Libreoffice-commits
mailing list