From 32b09faca508ae4aac7e100c98a2fe56d3302eef Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 13 May 2021 10:40:44 +0200 Subject: Revert "simplify the vcl<->toolkit connection" because it introduces a link-time dependency of vcl on toolkit, and toolkit already depends on vcl This reverts commit f7a86c5cdf4323c99d26512bf78de7f7c380667d. Change-Id: Ibdd4f3e8221d70e2abd8fcbda67f85af3ac0396e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115547 Tested-by: Jenkins Reviewed-by: Noel Grandin --- extensions/source/bibliography/bibload.cxx | 2 +- extensions/source/bibliography/framectr.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'extensions') diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 4d170744b687..cb1edd54fef4 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -227,7 +227,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, pMyWindow->createBottomFrame(pView); - auto xWin = pMyWindow->GetComponentInterfaceAs(); + Reference< awt::XWindow > xWin ( pMyWindow->GetComponentInterface(), UNO_QUERY ); Reference< XController > xCtrRef( new BibFrameController_Impl( xWin, m_xDatMan.get() ) ); diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 8915012c4c71..e83580689435 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -661,7 +661,7 @@ void BibFrameController_Impl::addStatusListener( m_xLastQueriedFocusWin = lcl_GetFocusChild( VCLUnoHelper::GetWindow( m_xWindow ) ); if (m_xLastQueriedFocusWin) { - Reference xEdit = m_xLastQueriedFocusWin->GetComponentInterfaceAs(); + Reference xEdit(m_xLastQueriedFocusWin->GetComponentInterface(), css::uno::UNO_QUERY); aEvent.IsEnabled = xEdit && xEdit->isEditable() && !xEdit->getSelectedText().isEmpty(); } } @@ -670,7 +670,7 @@ void BibFrameController_Impl::addStatusListener( m_xLastQueriedFocusWin = lcl_GetFocusChild( VCLUnoHelper::GetWindow( m_xWindow ) ); if (m_xLastQueriedFocusWin) { - auto xEdit = m_xLastQueriedFocusWin->GetComponentInterfaceAs(); + Reference xEdit(m_xLastQueriedFocusWin->GetComponentInterface(), css::uno::UNO_QUERY); aEvent.IsEnabled = xEdit && !xEdit->getSelectedText().isEmpty(); } } @@ -680,7 +680,7 @@ void BibFrameController_Impl::addStatusListener( m_xLastQueriedFocusWin = lcl_GetFocusChild( VCLUnoHelper::GetWindow( m_xWindow ) ); if (m_xLastQueriedFocusWin) { - auto xEdit = m_xLastQueriedFocusWin->GetComponentInterfaceAs(); + Reference xEdit(m_xLastQueriedFocusWin->GetComponentInterface(), css::uno::UNO_QUERY); if (xEdit && !xEdit->isEditable()) { uno::Reference< datatransfer::clipboard::XClipboard > xClip = m_xLastQueriedFocusWin->GetClipboard(); -- cgit