diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-13 10:40:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-13 14:48:24 +0200 |
| commit | 32b09faca508ae4aac7e100c98a2fe56d3302eef (patch) | |
| tree | df4c3f089cd83b361c3f5133344397d9d888e9b5 /accessibility | |
| parent | sw XHTML export: fix handling of list labels (diff) | |
| download | core-32b09faca508ae4aac7e100c98a2fe56d3302eef.tar.gz core-32b09faca508ae4aac7e100c98a2fe56d3302eef.zip | |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/source/extended/accessibletabbar.cxx | 2 | ||||
| -rw-r--r-- | accessibility/source/standard/accessiblemenucomponent.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index f450bfc526f0..218ed1cab071 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -458,7 +458,7 @@ namespace accessibility Reference< awt::XFont > xFont; if ( m_pTabBar ) { - auto xDev = m_pTabBar->GetComponentInterfaceAs<awt::XDevice>(); + Reference< awt::XDevice > xDev( m_pTabBar->GetComponentInterface(), UNO_QUERY ); if ( xDev.is() ) { vcl::Font aFont; diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index e004c2b1942b..be9b1e6f453e 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -301,7 +301,7 @@ Reference< awt::XFont > OAccessibleMenuComponent::getFont( ) vcl::Window* pWindow = m_pMenu->GetWindow(); if ( pWindow ) { - auto xDev = pWindow->GetComponentInterfaceAs<awt::XDevice>(); + Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), UNO_QUERY ); if ( xDev.is() ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); |