OutputDevice::AcquireGraphics should be protected, not public

Change-Id: I1aacc4a908798fda24de6b6f09b58dcf5d392e70

3 files changed, 18 insertions, 9 deletions

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 71f8022175c4..07590f373360 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -22,22 +22,27 @@
 
 #include <tools/gen.hxx>
 #include <tools/solar.h>
-#include <vcl/dllapi.h>
 #include <tools/rc.hxx>
 #include <tools/color.hxx>
+#include <tools/poly.hxx>
+
+#include <vcl/dllapi.h>
 #include <vcl/font.hxx>
 #include <vcl/region.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/salnativewidgets.hxx>
-#include <tools/poly.hxx>
+
 #include <basegfx/vector/b2enums.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <unotools/fontdefs.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
+
+#include <unotools/fontdefs.hxx>
+
 #include <boost/scoped_ptr.hpp>
+
 #include <com/sun/star/drawing/LineCap.hpp>
+#include <com/sun/star/uno/Reference.h>
 
 #include <vector>
 
@@ -388,6 +393,7 @@ public:
     SAL_DLLPRIVATE SalGraphics const *GetGraphics() const;
     SAL_DLLPRIVATE SalGraphics*       GetGraphics();
 
+protected:
     /** Acquire a graphics device that the output device uses to draw on.
 
      There is an LRU of OutputDevices that is used to get the graphics. The
@@ -417,6 +423,7 @@ public:
      */
     virtual void                ImplReleaseGraphics( bool bRelease = true ) = 0;
 
+public:
     /** Initialize the graphics device's data structures.
      */
     SAL_DLLPRIVATE void         ImplInitOutDevData();
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 58651d520027..a51122e71bae 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -230,8 +230,6 @@ private:
     bool                        mbIsQueuePrinter;
     Link                        maErrorHdl;
 
-    bool                        AcquireGraphics() const SAL_OVERRIDE;
-    void                        ImplReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE;
     void                        ImplReleaseFonts() SAL_OVERRIDE;
     SAL_DLLPRIVATE void         ImplInitData();
     SAL_DLLPRIVATE void         ImplInit( SalPrinterQueueInfo* pInfo );
@@ -256,6 +254,9 @@ public:
     SAL_DLLPRIVATE void         ImplEndPage();
 
 protected:
+    virtual bool                AcquireGraphics() const SAL_OVERRIDE;
+    virtual void                ImplReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE;
+
     virtual long                GetGradientStepCount( long nMinRect ) SAL_OVERRIDE;
     virtual bool                UsePolyPolygonForComplexGradient() SAL_OVERRIDE;
 
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 6b1af90a0b45..16272703a592 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -60,9 +60,10 @@ private:
     #define REFDEV_FORCE_ZERO_EXTLEAD 0x80
     SAL_DLLPRIVATE bool ForceZeroExtleadBug() const
         { return ((meRefDevMode & REFDEV_FORCE_ZERO_EXTLEAD) != 0); }
-public:
-    bool AcquireGraphics() const SAL_OVERRIDE;
-    void ImplReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE;
+
+protected:
+    virtual bool AcquireGraphics() const SAL_OVERRIDE;
+    virtual void ImplReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE;
 
 public:
     /** Create a virtual device of size 1x1