dbaccess/source/ui/browser/genericcontroller.cxx | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 1c056790e8075196cf5dd77fc7b51de7cc397f02
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Mar 11 15:34:41 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Mar 12 10:03:02 2021 +0100
use VCLUnoHelper::GetWindow
instead of directly using VCLXWindow
Change-Id: I86499a1238595189dd430f2809af08b4869f7fd2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112351
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx
b/dbaccess/source/ui/browser/genericcontroller.cxx
index cb7957556ecb..83876d1bd0fd 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -18,7 +18,6 @@
*/
#include <dbaccess/genericcontroller.hxx>
-#include <toolkit/awt/vclxwindow.hxx>
#include <browserids.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
@@ -219,7 +218,6 @@ void SAL_CALL OGenericUnoController::initialize( const
Sequence< Any >& aArgumen
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( getMutex() );
- Reference< XWindow > xParent;
Reference< XFrame > xFrame;
PropertyValue aValue;
@@ -243,9 +241,8 @@ void SAL_CALL OGenericUnoController::initialize( const
Sequence< Any >& aArgumen
if ( !xFrame.is() )
throw IllegalArgumentException("need a frame", *this, 1 );
- xParent = xFrame->getContainerWindow();
- VCLXWindow* pParentComponent =
comphelper::getUnoTunnelImplementation<VCLXWindow>(xParent);
- VclPtr< vcl::Window > pParentWin = pParentComponent ?
pParentComponent->GetWindow() : nullptr;
+ Reference<XWindow> xParent = xFrame->getContainerWindow();
+ VclPtr<vcl::Window> pParentWin = VCLUnoHelper::GetWindow(xParent);
if (!pParentWin)
{
throw IllegalArgumentException("Parent window is null", *this, 1 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
