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>

1 files changed, 3 insertions, 3 deletions

diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 90fd8b7684b8..cde59c6f9e0f 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -26,14 +26,14 @@
 #include <memory>
 
 // forward
-namespace vcl { struct ImplControlData; }
 class StyleSettings;
-
+namespace vcl { struct ControlLayoutData; }
 
 class VCL_DLLPUBLIC Control : public vcl::Window
 {
 protected:
-    std::unique_ptr<vcl::ImplControlData> mpControlData;
+    mutable std::unique_ptr<vcl::ControlLayoutData>  mpLayoutData;
+    VclPtr<OutputDevice>        mpReferenceDevice;
 
 private:
     bool                    mbHasControlFocus;