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 /toolkit/source/controls | |
parent | 013a4f1f5c9ea5fb511568c53a7e76d1b365a65d (diff) |
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 'toolkit/source/controls')
-rw-r--r-- | toolkit/source/controls/svmedit.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/toolkit/source/controls/svmedit.cxx b/toolkit/source/controls/svmedit.cxx index 2abd5e4ebed2..383f2280412e 100644 --- a/toolkit/source/controls/svmedit.cxx +++ b/toolkit/source/controls/svmedit.cxx @@ -26,10 +26,11 @@ MultiLineEdit::MultiLineEdit(vcl::Window* pParent, WinBits nWinStyle) } // virtual -VCLXWindow* MultiLineEdit::GetComponentInterface(bool bCreate) +css::uno::Reference<css::awt::XWindowPeer> MultiLineEdit::GetComponentInterface(bool bCreate) { - VCLXWindow* xPeer = VclMultiLineEdit::GetComponentInterface(false); - if (!xPeer && bCreate) + css::uno::Reference<css::awt::XWindowPeer> xPeer( + VclMultiLineEdit::GetComponentInterface(false)); + if (!xPeer.is() && bCreate) { rtl::Reference<VCLXMultiLineEdit> xVCLMEdit(new VCLXMultiLineEdit); xVCLMEdit->SetWindow(this); |