Move access to SystemDependentDataHolder to Bitmap (2)

I was too positive thinking that SalBitmap would be fine,
but it's locked to vcl. To be able to add system-dependent
BitmapBuffering I move the access to Bitmap now. This is
no functional change, but offers the same access as e.g.
B2DPolygon/B2DPolyPolygon offer already.

Also cleaned up usage/access to SystemDependentDataManager
which removes quite some code in constructors and makes
things easier in general.

Change-Id: I2baa40a12479fab0fe66063a018f058c6b8f5597
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141507
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>

2 files changed, 12 insertions, 0 deletions

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 165f0dc6ca05..ecbff7fbb8ef 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -87,6 +87,8 @@ class   AlphaMask;
 class   OutputDevice;
 class   SalBitmap;
 
+namespace basegfx { class SystemDependentDataHolder; }
+
 struct BitmapSystemData
 {
     #if defined(_WIN32)
@@ -497,6 +499,9 @@ public:
                                 bool bInvert = false,
                                 bool msoBrightness = false );
 
+    // access to SystemDependentDataHolder, to support overload in derived class(es)
+    const basegfx::SystemDependentDataHolder* accessSystemDependentDataHolder() const;
+
 public:
     /** ReassignWithSize and recalculate bitmap.
 
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index b7afb9589b3b..398358f1bfad 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -66,6 +66,7 @@ class MouseEvent;
 class GestureEventPan;
 struct ImplSVEvent;
 struct ConvertData;
+namespace basegfx { class SystemDependentDataManager; }
 
 namespace com::sun::star::uno {
     class XComponentContext;
@@ -828,6 +829,12 @@ public:
     */
     static OutputDevice*        GetDefaultDevice();
 
+    /** access the DataManager for buffering system-dependent data
+
+     @returns the global instance of the SystemDependentDataManager
+    */
+    static basegfx::SystemDependentDataManager& GetSystemDependentDataManager();
+
     /** Get the first top-level window of the application.
 
      @returns Pointer to top-level window (a Window object)