summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-03-11 15:34:41 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-03-12 10:03:02 +0100
commit1c056790e8075196cf5dd77fc7b51de7cc397f02 (patch)
tree20e9047d47bbbdce6d9732ce187c22f6f6269083 /dbaccess
parent2b4cd99d3360ccffb9829a02412824864d045753 (diff)
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 <caolanm@redhat.com>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx7
1 files changed, 2 insertions, 5 deletions
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 );