summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej Hunt <andrzej.hunt@collabora.com>2014-06-25 14:41:45 +0100
committerAndrzej Hunt <andrzej.hunt@collabora.com>2014-06-25 14:41:45 +0100
commit0a5e6614bd4a11f5e19f5089bf7ff3b3f3d0f28e (patch)
treeeb33732125eef3a1fefb079950fd836cd382d438
parente5fb98294aed7c88873eb8aa50cb6aca994e024b (diff)
LOK: tiled rendering / svp includes are Linux only too for now.
Change-Id: Iacd8554698f309f79208fd8390800ae2c5fd8085
-rw-r--r--desktop/source/lib/init.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index df54617f64ca..0f72bd6fe0ea 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -49,11 +49,14 @@
#include <salinst.hxx>
+// Tiled Rendering is Linux only for now.
+#if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS)
// And let's also grab the SvpSalInstance and SvpSalVirtualDevice
#include <headless/svpinst.hxx>
#include <headless/svpvd.hxx>
#include <basebmp/bitmapdevice.hxx>
+#endif
using namespace css;
using namespace utl;
@@ -448,7 +451,7 @@ void doc_paintTile (LibreOfficeKitDocument* pThis,
Application::AcquireSolarMutex(1);
{
-#if defined(UNX) && !defined(MACOSX)
+#if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS)
ImplSVData* pSVData = ImplGetSVData();
SvpSalInstance* pSalInstance = static_cast< SvpSalInstance* >(pSVData->mpDefInst);
pSalInstance->setBitCountFormatMapping( 32, ::basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA );