mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use VCLUnoHelper::GetWindow

Browse Source 
instead of directly using VCLXWindow

Change-Id: I80c70c9773b1963ec4d58c833ff2fdba9cfc4b92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112353
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2021-03-11 15:48:09 +00:00
parent 07d278c911
commit 32b7c32aa8
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/source/propctrlr/propcontroller.cxx
View File

@@ -38,7 +38,7 @@
#include <com/sun/star/util/VetoException.hpp> #include <com/sun/star/util/VetoException.hpp>
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <tools/diagnose_ex.h> #include <tools/diagnose_ex.h>
#include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/weld.hxx> #include <vcl/weld.hxx>
#include <vcl/weldutils.hxx> #include <vcl/weldutils.hxx>
@@ -344,8 +344,7 @@ namespace pcr
} }
else else
{ {
VCLXWindow* pContainerWindow = comphelper::getUnoTunnelImplementation<VCLXWindow>(xContainerWindow); VclPtr<vcl::Window> pParentWin = VCLUnoHelper::GetWindow(xContainerWindow);
VclPtr<vcl::Window> pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : nullptr;
if (!pParentWin) if (!pParentWin)
throw RuntimeException("The frame is invalid. Unable to extract the container window.",*this); throw RuntimeException("The frame is invalid. Unable to extract the container window.",*this);
xBuilder.reset(Application::CreateInterimBuilder(pParentWin, sUIFile, true)); xBuilder.reset(Application::CreateInterimBuilder(pParentWin, sUIFile, true));