diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-07-29 19:54:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-30 20:35:46 +0200 |
| commit | 942dcd6d8684ffdbc9bc67030c502e9db1965eb5 (patch) | |
| tree | 5f715b4fdc6a97110a46ae8c7cf1dde8671d27f6 /vcl/source/control/listbox.cxx | |
| parent | 9dcf5816c90e9819861332f11e014ef7b78e2fe7 (diff) | |
flatten vcl::ImplControlData
the struct is already visible in the headers, so it's not a pimpl
pattern, and it's only two pointers, so no point in allocating
separately.
The tdf#91081 bug comment I removed is no longer relevant,
this general class of problem was solved with the introduction
of VclPtr.
Change-Id: Ie5d896baf0167273f8936930dd65891919c5bf7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119679
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/control/listbox.cxx')
| -rw-r--r-- | vcl/source/control/listbox.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index 444d7e899727..58987498ab81 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -20,13 +20,13 @@ #include <vcl/builder.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> +#include <vcl/toolkit/controllayout.hxx> #include <vcl/toolkit/lstbox.hxx> #include <vcl/settings.hxx> #include <vcl/uitest/uiobject.hxx> #include <sal/log.hxx> #include <svdata.hxx> -#include <controldata.hxx> #include <listbox.hxx> #include <dndeventdispatcher.hxx> #include <comphelper/lok.hxx> @@ -627,7 +627,7 @@ void ListBox::Resize() void ListBox::FillLayoutData() const { - mpControlData->mpLayoutData.reset( new vcl::ControlLayoutData ); + mpLayoutData.reset( new vcl::ControlLayoutData ); const ImplListBoxWindow* rMainWin = mpImplLB->GetMainWindow(); if( mpFloatWin ) { |