extensions/source/bibliography/bibload.cxx | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 07d278c911d738f06c3bbb6354336ac03c8146e1
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Mar 11 15:39:43 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Mar 12 10:03:32 2021 +0100
awt::XWindow has setVisible so don't need to fetch VCLXWindow to do that
Change-Id: Idc471c7a1dfd10821c8644a02d482cf8edc09fd7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112352
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/extensions/source/bibliography/bibload.cxx
b/extensions/source/bibliography/bibload.cxx
index 2bacc3c31477..cb1edd54fef4 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -38,7 +38,6 @@
#include <com/sun/star/text/BibliographyDataField.hpp>
#include <com/sun/star/form/XLoadable.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
-#include <toolkit/awt/vclxwindow.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
@@ -211,9 +210,7 @@ void BibliographyLoader::loadView(const Reference< XFrame >
& rFrame,
m_xDatMan->createDatabaseForm( aBibDesc );
- Reference< awt::XWindow > aWindow = rFrame->getContainerWindow();
- VCLXWindow* pParentComponent =
comphelper::getUnoTunnelImplementation<VCLXWindow>(aWindow);
- assert(pParentComponent);
+ Reference<awt::XWindow> aWindow = rFrame->getContainerWindow();
VclPtr<vcl::Window> pParent = VCLUnoHelper::GetWindow( aWindow );
@@ -238,10 +235,10 @@ void BibliographyLoader::loadView(const Reference< XFrame
> & rFrame,
rFrame->setComponent( xWin, xCtrRef);
pBeamer->SetXController(xCtrRef);
- if (pParentComponent)
+ if (aWindow)
{
// not earlier because SetFocus() is triggered in setVisible()
- pParentComponent->setVisible(true);
+ aWindow->setVisible(true);
}
Reference<XLoadable>(m_xDatMan)->load();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
