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

Andrzej Hunt andrzej.hunt at collabora.com
Wed Jun 25 06:33:54 PDT 2014


 desktop/source/lib/init.cxx |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit e5fb98294aed7c88873eb8aa50cb6aca994e024b
Author: Andrzej Hunt <andrzej.hunt at collabora.com>
Date:   Wed Jun 25 14:30:28 2014 +0100

    LOK: Tiled Rendering only useable on Linux.
    
    Change-Id: I90daddddb08c26c594109ecf926cb4ea64308770

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 7e112f4..df54617 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -448,6 +448,7 @@ void doc_paintTile (LibreOfficeKitDocument* pThis,
 
     Application::AcquireSolarMutex(1);
     {
+#if defined(UNX) && !defined(MACOSX)
         ImplSVData* pSVData = ImplGetSVData();
         SvpSalInstance* pSalInstance = static_cast< SvpSalInstance* >(pSVData->mpDefInst);
         pSalInstance->setBitCountFormatMapping( 32, ::basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA );
@@ -465,6 +466,16 @@ void doc_paintTile (LibreOfficeKitDocument* pThis,
         basebmp::BitmapDeviceSharedPtr pBmpDev = pSalDev->getBitmapDevice();
 
         *pRowStride = pBmpDev->getScanlineStride();
+#else
+        (void) pBuffer;
+        (void) nCanvasWidth;
+        (void) nCanvasHeight;
+        (void) pRowStride;
+        (void) nTilePosX;
+        (void) nTilePosY;
+        (void) nTileWidth;
+        (void) nTileHeight;
+#endif
     }
     Application::ReleaseSolarMutex();
 }


More information about the Libreoffice-commits mailing list