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/edit.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/edit.cxx')
| -rw-r--r-- | vcl/source/control/edit.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 395c52587de8..4b6adef6bce7 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -21,6 +21,7 @@ #include <vcl/event.hxx> #include <vcl/cursor.hxx> #include <vcl/menu.hxx> +#include <vcl/toolkit/controllayout.hxx> #include <vcl/toolkit/edit.hxx> #include <vcl/weld.hxx> #include <vcl/specialchars.hxx> @@ -33,7 +34,6 @@ #include <window.h> #include <svdata.hxx> #include <strings.hrc> -#include <controldata.hxx> #include <com/sun/star/i18n/BreakIterator.hpp> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> @@ -1716,7 +1716,7 @@ void Edit::KeyInput( const KeyEvent& rKEvt ) void Edit::FillLayoutData() const { - mpControlData->mpLayoutData.reset( new vcl::ControlLayoutData ); + mpLayoutData.reset( new vcl::ControlLayoutData ); const_cast<Edit*>(this)->Invalidate(); } |