[Libreoffice-commits] core.git: desktop/source

Tor Lillqvist tml at collabora.com
Wed Feb 11 07:09:36 PST 2015


 desktop/source/lib/init.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d8f74fb158a69016ec6fe5858e9eff53beb8d9fa
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Feb 5 10:54:56 2015 +0200

    We can put a few more lines inside the #ifndef IOS
    
    Change-Id: I607b2c06cad569a0e7495c3009a0883be1f22856

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6443019..37237d0 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -578,11 +578,12 @@ void doc_paintTile (LibreOfficeKitDocument* pThis,
     SolarMutexGuard aGuard;
 
 #if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS)
+
+#ifndef IOS
     ImplSVData* pSVData = ImplGetSVData();
     SvpSalInstance* pSalInstance = static_cast< SvpSalInstance* >(pSVData->mpDefInst);
     pSalInstance->setBitCountFormatMapping( 32, ::basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA );
 
-#ifndef IOS
     VirtualDevice aDevice(0, Size(1, 1), (sal_uInt16)32);
     boost::shared_array< sal_uInt8 > aBuffer( pBuffer, NoDelete< sal_uInt8 >() );
     aDevice.SetOutputSizePixelScaleOffsetAndBuffer(


More information about the Libreoffice-commits mailing list