diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2023-03-31 19:15:11 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-04-01 14:42:17 +0200 |
commit | bfdf5d290be3fccb631d50cfea52fbe43fff4dce (patch) | |
tree | 7b89956506092aa6ee68cc559a83b158170439e6 /basctl | |
parent | cd013e66711c056c52ffd0839e782f6ee9c2dabd (diff) |
use more XVclWindowPeer
Rather than using it's superclass XWindowPeer and implicitly relying on it being XVclWindowPeer and casting it everywhere.
Change-Id: Icfb46f3b920d00f4a167a31803a71bbb0368d05c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149894
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/accessibility/accessibledialogcontrolshape.cxx | 1 | ||||
-rw-r--r-- | basctl/source/accessibility/accessibledialogwindow.cxx | 1 | ||||
-rw-r--r-- | basctl/source/basicide/baside2.hxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/textwindowpeer.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/textwindowpeer.hxx | 4 | ||||
-rw-r--r-- | basctl/source/dlged/dlged.cxx | 1 |
7 files changed, 9 insertions, 6 deletions
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 36e84bfea9fc..62a260948ff9 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -22,6 +22,7 @@ #include <dlgeddef.hxx> #include <dlgedview.hxx> #include <dlgedobj.hxx> +#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 08e40ff76c41..71a41aa6848a 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -26,6 +26,7 @@ #include <dlgedpage.hxx> #include <dlgedview.hxx> #include <dlgedobj.hxx> +#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 73b98ef7412e..2c9bc3f9930f 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -103,7 +103,7 @@ private: bool bDoSyntaxHighlight; bool bDelayHighlight; - virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface(bool bCreate = true) override; + virtual css::uno::Reference< css::awt::XVclWindowPeer > GetComponentInterface(bool bCreate = true) override; CodeCompleteDataCache aCodeCompleteCache; VclPtr<CodeCompleteWindow> pCodeCompleteWnd; OUString GetActualSubName( sal_uInt32 nLine ); // gets the actual subroutine name according to line number diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index d24955ea3788..6e4208747f4a 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -2091,10 +2091,10 @@ void ComplexEditorWindow::SetLineNumberDisplay(bool b) Resize(); } -uno::Reference< awt::XWindowPeer > +uno::Reference< awt::XVclWindowPeer > EditorWindow::GetComponentInterface(bool bCreate) { - uno::Reference< awt::XWindowPeer > xPeer( + uno::Reference< awt::XVclWindowPeer > xPeer( Window::GetComponentInterface(false)); if (!xPeer.is() && bCreate) { diff --git a/basctl/source/basicide/textwindowpeer.cxx b/basctl/source/basicide/textwindowpeer.cxx index fc458453778b..421468a27918 100644 --- a/basctl/source/basicide/textwindowpeer.cxx +++ b/basctl/source/basicide/textwindowpeer.cxx @@ -62,7 +62,7 @@ TextWindowPeer::CreateAccessibleContext() { } -css::uno::Reference<css::awt::XWindowPeer> basctl::createTextWindowPeer( +css::uno::Reference<css::awt::XVclWindowPeer> basctl::createTextWindowPeer( TextView & view) { return new TextWindowPeer(view); diff --git a/basctl/source/basicide/textwindowpeer.hxx b/basctl/source/basicide/textwindowpeer.hxx index 077ad32cd79f..e29c4a412dcb 100644 --- a/basctl/source/basicide/textwindowpeer.hxx +++ b/basctl/source/basicide/textwindowpeer.hxx @@ -25,13 +25,13 @@ namespace com::sun::star::awt { -class XWindowPeer; +class XVclWindowPeer; } class TextView; namespace basctl { -css::uno::Reference<css::awt::XWindowPeer> createTextWindowPeer(TextView& view); +css::uno::Reference<css::awt::XVclWindowPeer> createTextWindowPeer(TextView& view); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index cede03ac4f41..1917e3ff4a56 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/awt/Toolkit.hpp> #include <com/sun/star/awt/UnoControlDialog.hpp> +#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/resource/StringResource.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/util/NumberFormatsSupplier.hpp> |