[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - canvas/source

[Michael Meeks]

 canvas/source/cairo/cairo_xlib_cairo.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0ac6ad70d230f9115bd4dfa1ff45bf5991142603
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date:   Mon Jan 17 20:37:33 2011 +0100

    fix after struct member renaminge (pXRenderFormat)
    
    the right one, this time.... sorry.

diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx
index f469d1b..3ce0994 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.cxx
@@ -76,7 +76,7 @@ namespace cairo
         nScreen(pSysDat.nScreen),
         nDepth(pSysDat.nDepth),
         aColormap(pSysDat.aColormap),
-        pXRenderFormat(pSysDat.pRenderFormat)
+        pRenderFormat(pSysDat.pXRenderFormat)
     {}
 
     X11SysData::X11SysData( const SystemEnvData& pSysDat ) :
commit 74da9d0752269ff4c750d89fe3d9024d46dfd81d
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date:   Mon Jan 17 20:33:32 2011 +0100

    fix after variable renaming (pXrenderformat)

diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx
index a7df2f7..f469d1b 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.cxx
@@ -76,7 +76,7 @@ namespace cairo
         nScreen(pSysDat.nScreen),
         nDepth(pSysDat.nDepth),
         aColormap(pSysDat.aColormap),
-        pRenderFormat(pSysDat.pRenderFormat)
+        pXRenderFormat(pSysDat.pRenderFormat)
     {}
 
     X11SysData::X11SysData( const SystemEnvData& pSysDat ) :
@@ -263,7 +263,7 @@ namespace cairo
 
         aSystemGraphicsData.nSize = sizeof(SystemGraphicsData);
         aSystemGraphicsData.hDrawable = getDrawable();
-        aSystemGraphicsData.pRenderFormat = getRenderFormat();
+        aSystemGraphicsData.pXRenderFormat = getRenderFormat();
 
         return boost::shared_ptr<VirtualDevice>(
             new VirtualDevice( &aSystemGraphicsData, getDepth() ));