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

[Markus Mohrhard]

 vcl/unx/kde/salnativewidgets-kde.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ef76fbe1f53eb7f30c0837cfae8552143831dd50
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Nov 14 15:02:16 2014 +0100

    fix building the KDE backend
    
    Change-Id: I03c8629bf27a43d6f4cc08bb8f64ed71b9055fdc

diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index aa86e31..a06fe1d 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -26,6 +26,7 @@
 #include <unx/saldisp.hxx>
 #include <unx/salgdi.h>
 #include <unx/kde/kdedata.hxx>
+#include "unx/pixmap.hxx"
 
 #include <vcl/settings.hxx>
 #include "fontmanager.hxx"
@@ -314,7 +315,7 @@ class WidgetPainter
     */
         bool drawStyledWidget( QWidget *pWidget,
                 ControlState nState, const ImplControlValue& aValue,
-                KDESalGraphics* pGraphics,
+                X11SalGraphics* pGraphics,
                 ControlPart nPart = PART_ENTIRE_CONTROL );
 
     /** 'Get' method for push button.
@@ -506,7 +507,7 @@ WidgetPainter::~WidgetPainter( void )
 
 bool WidgetPainter::drawStyledWidget( QWidget *pWidget,
     ControlState nState, const ImplControlValue& aValue,
-    KDESalGraphics* pGraphics, ControlPart nPart )
+    X11SalGraphics* pGraphics, ControlPart nPart )
 {
     if ( !pWidget )
         return false;
@@ -853,7 +854,7 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget,
         return false;
 
     // Bitblt it to the screen
-    pGraphics->RenderPixmapToScreen( xPixmap, qWidgetPos.x(), qWidgetPos.y() );
+    pGraphics->RenderPixmapToScreen( &xPixmap, qWidgetPos.x(), qWidgetPos.y() );
 
     // Restore widget's position
     pWidget->move( qWidgetPos );