[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - vcl/inc vcl/unx

[Markus Mohrhard]

 vcl/inc/salgdiimpl.hxx          |    5 +++++
 vcl/inc/unx/salgdi.h            |    4 +++-
 vcl/unx/generic/gdi/gdiimpl.hxx |    5 +++++
 vcl/unx/generic/gdi/salgdi.cxx  |    6 ++++--
 4 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit d2d0f95a9a1f8c4b61bb71b7238931d7c93a414c
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Wed Oct 22 17:35:01 2014 +0200

    forgot to populate the Impl
    
    Change-Id: Ic7b49a06f5e4576c29b74d86e4025e21a01dc53d

diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 0d1a584..81052cf 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -32,6 +32,8 @@
 #include "sallayout.hxx"
 #include "vclpluginapi.h"
 
+#include <boost/scoped_ptr.hpp>
+
 #include <deque>
 
 class ImplFontMetricData;
@@ -91,7 +93,7 @@ class VCLPLUG_GEN_PUBLIC X11SalGraphics : public SalGraphics
     friend class X11SalGraphicsImpl;
 
 private:
-    SalGraphicsImpl* mpImpl;
+    boost::scoped_ptr<SalGraphicsImpl> mpImpl;
 
 protected:
     SalFrame*               m_pFrame; // the SalFrame which created this Graphics or NULL
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 539856d..b824bbc 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -51,12 +51,14 @@
 #include <unx/x11/xlimits.hxx>
 
 #include "salgdiimpl.hxx"
+#include "gdiimpl.hxx"
 
 #include "generic/printergfx.hxx"
 #include "xrender_peer.hxx"
 
-X11SalGraphics::X11SalGraphics()
-    : m_nXScreen( 0 ),
+X11SalGraphics::X11SalGraphics():
+    mpImpl(new X11SalGraphicsImpl(*this)),
+    m_nXScreen( 0 ),
     pFontGC_(NULL)
 {
     m_pFrame            = NULL;
commit 95ab940d4d04456cdeb6350041f813a8ada35cb7
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Wed Oct 22 17:34:14 2014 +0200

    add missing header guards
    
    Change-Id: I73f7a25a180696b8581e673de8f39dd007fe5358

diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx
index 1230d1c..329f3bb 100644
--- a/vcl/inc/salgdiimpl.hxx
+++ b/vcl/inc/salgdiimpl.hxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#ifndef INCLUDED_VCL_INC_SALGDIIMPL_HXX
+#define INCLUDED_VCL_INC_SALGDIIMPL_HXX
+
 #include <vcl/dllapi.h>
 
 #include <rtl/ustring.hxx>
@@ -197,4 +200,6 @@ public:
 
 };
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 254eaa9..ebc9bf1 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#ifndef INCULDED_VCL_GENERIC_GDI_GDIIMPL_HXX
+#define INCLUDED_VCL_GENERIC_GDI_GDIIMPL_HXX
+
 #include <prex.h>
 #include <postx.h>
 
@@ -259,4 +262,6 @@ public:
 
 };
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */