[Libreoffice-commits] .: Branch 'feature/gtk3' - 2 commits - vcl/generic vcl/headless vcl/inc

[Michael Meeks]

 vcl/generic/print/genprnpsp.cxx |    2 +-
 vcl/headless/svpgdi.cxx         |    8 ++++----
 vcl/inc/vcl/sysdata.hxx         |    1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 047e770ede15b26191533027082feedb33adfbda
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Oct 10 11:55:14 2011 +0100

    generic: overcome Mac specific build errors

diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 9e5e2c6..cdae650 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -109,7 +109,7 @@ static String getPdfDir( const PrinterInfo& rInfo )
 
 static void getPaLib()
 {
-#if defined( UNX )
+#if defined( UNX ) && !( defined( QUARTZ ) || defined( IOS ) )
     if( ! driverLib )
     {
         OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( _XSALSET_LIBNAME ) );
diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx
index 2e00618..b97e854 100644
--- a/vcl/inc/vcl/sysdata.hxx
+++ b/vcl/inc/vcl/sysdata.hxx
@@ -147,6 +147,7 @@ struct SystemGraphicsData
         : nSize( sizeof( SystemGraphicsData ) )
 #if defined( WNT )
         , hDC( 0 )
+#elif defined( QUARTZ ) || defined( IOS )
 #elif defined( UNX )
         , pDisplay( NULL )
         , hDrawable( 0 )
commit 63649f11fa31fc5262a2abf0916b71cb50a200a8
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Oct 10 11:25:42 2011 +0100

    headless: add required clip map reset for simpler clipping cases

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 3609bd9..e44240d 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -270,11 +270,10 @@ SvpSalGraphics::ClipUndoHandle SvpSalGraphics::ensureClipFor( const basegfx::B2I
 bool SvpSalGraphics::setClipRegion( const Region& i_rClip )
 {
     m_aClipRegion = i_rClip;
+    m_aClipMap.reset();
     if( i_rClip.IsEmpty() )
-    {
-        m_aClipMap.reset();
         m_bClipSetup = true;
-    }
+
     else if( i_rClip.GetRectCount() == 1 )
     {
         m_aClipMap.reset();
@@ -285,6 +284,7 @@ bool SvpSalGraphics::setClipRegion( const Region& i_rClip )
     }
     else
         m_bClipSetup = false;
+
     return true;
 }
 
@@ -555,7 +555,7 @@ void SvpSalGraphics::copyBits( const SalTwoRect* pPosAry,
 }
 
 void SvpSalGraphics::drawBitmap( const SalTwoRect* pPosAry,
-                                        const SalBitmap& rSalBitmap )
+                                 const SalBitmap& rSalBitmap )
 {
     const SvpSalBitmap& rSrc = static_cast<const SvpSalBitmap&>(rSalBitmap);
     B2IRange aSrcRect( pPosAry->mnSrcX, pPosAry->mnSrcY,