From 2c2bc72ba3c8f2ac31e4d02a095342a3dca9d349 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 7 Oct 2015 21:25:50 +0300 Subject: [PATCH 190/398] Make this compile for iOS again Change-Id: I36f88d7e1114096d1e7a7a1d29077c387c21a10a (cherry picked from commit 3c9da1fbfae9c00a5eb9ddcb106a01b075703fcd) --- desktop/source/lib/init.cxx | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 29e8e0d12faa..836fc00e1042 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -774,15 +774,6 @@ void doc_paintTile (LibreOfficeKitDocument* pThis, pDoc->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight, nTilePosX, nTilePosY, nTileWidth, nTileHeight); -#else - SystemGraphicsData aData; - aData.rCGContext = reinterpret_cast(pBuffer); - // the Size argument is irrelevant, I hope - ScopedVclPtrInstance pDevice(&aData, Size(1, 1), (sal_uInt16)0); - - pDoc->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight, - nTilePosX, nTilePosY, nTileWidth, nTileHeight); -#endif // Overwrite pBuffer's alpha channel with the separate alpha buffer. for (int nRow = 0; nRow < nCanvasHeight; ++nRow) @@ -795,6 +786,16 @@ void doc_paintTile (LibreOfficeKitDocument* pThis, } } +#else + SystemGraphicsData aData; + aData.rCGContext = reinterpret_cast(pBuffer); + // the Size argument is irrelevant, I hope + ScopedVclPtrInstance pDevice(&aData, Size(1, 1), (sal_uInt16)0); + + pDoc->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight, + nTilePosX, nTilePosY, nTileWidth, nTileHeight); +#endif + static bool bDebug = getenv("LOK_DEBUG") != 0; if (bDebug) { -- 2.12.0