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 /forms | |
| 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 'forms')
| -rw-r--r-- | forms/source/richtext/richtextcontrol.cxx | 2 | ||||
| -rw-r--r-- | forms/source/solar/component/navbarcontrol.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index def1ea106bbf..45e898b8ed13 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -272,7 +272,7 @@ namespace frm VclPtrInstance<RichTextControl> pRichTextControl( pEngine, _pParentWindow, _nStyle, nullptr, pPeer.get() ); // some knittings - pRichTextControl->SetComponentInterface( pPeer.get() ); + pRichTextControl->SetComponentInterface( pPeer ); // outta here return pPeer; diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 5853ae148956..14e9c27ce74f 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -216,7 +216,7 @@ namespace frm // some knittings pNavBar->setDispatcher( pPeer.get() ); - pNavBar->SetComponentInterface( pPeer.get() ); + pNavBar->SetComponentInterface( pPeer ); // we want a faster repeating rate for the slots in this // toolbox |