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

[Libreoffice Gerrit user]

 vcl/source/gdi/salgdilayout.cxx |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

New commits:
commit 1240a0749e6a23a1a150df61e6a2e05c6b7b55be
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Fri Aug 31 09:54:38 2018 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Fri Aug 31 10:12:04 2018 +0300

    Fix accidental placement of code inside #if HAVE_FEATURE_OPENGL
    
    No reason for SalGraphics::getSystemDependentDataManager() to be inside
    the #if HAVE_FEATURE_OPENGL. Fixes build for iOS.
    
    Change-Id: I3d8174a4841d793f8d7ea2c3ebf3be2888229a3e

diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 08fb2fae49f7..16396a60a98b 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -66,19 +66,6 @@ SalGraphics::~SalGraphics()
 {
 }
 
-#if HAVE_FEATURE_OPENGL
-
-namespace
-{
-    void disableOpenGLAndTerminateForRestart()
-    {
-        OpenGLZone::hardDisable();
-#ifdef _WIN32
-        TerminateProcess(GetCurrentProcess(), EXITHELPER_NORMAL_RESTART);
-#endif
-    }
-}
-
 basegfx::SystemDependentDataManager& SalGraphics::getSystemDependentDataManager()
 {
     typedef ::std::map< basegfx::SystemDependentData_SharedPtr, sal_uInt32 > EntryMap;
@@ -204,6 +191,19 @@ basegfx::SystemDependentDataManager& SalGraphics::getSystemDependentDataManager(
     return *aSystemDependentDataBuffer.get();
 }
 
+#if HAVE_FEATURE_OPENGL
+
+namespace
+{
+    void disableOpenGLAndTerminateForRestart()
+    {
+        OpenGLZone::hardDisable();
+#ifdef _WIN32
+        TerminateProcess(GetCurrentProcess(), EXITHELPER_NORMAL_RESTART);
+#endif
+    }
+}
+
 rtl::Reference<OpenGLContext> SalGraphics::GetOpenGLContext() const
 {
     OpenGLSalGraphicsImpl *pImpl = dynamic_cast<OpenGLSalGraphicsImpl*>(GetImpl());
@@ -223,6 +223,7 @@ rtl::Reference<OpenGLContext> SalGraphics::GetOpenGLContext() const
     }
     return nullptr;
 }
+
 #endif
 
 bool SalGraphics::drawTransformedBitmap(