[Libreoffice-commits] core.git: 2 commits - include/opencl include/vcl svx/source vcl/inc

[Tor Lillqvist]

 include/opencl/openclwrapper.hxx               |    2 --
 include/vcl/window.hxx                         |   18 ------------------
 svx/source/tbxctrls/tbunosearchcontrollers.cxx |    2 ++
 vcl/inc/window.h                               |   17 +++++++++++++++++
 4 files changed, 19 insertions(+), 20 deletions(-)

New commits:
commit c59b417f1af8db415f1e86bbe4b60c198256c935
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 15 18:43:09 2015 +0200

    No need for <config_features.h> here
    
    Change-Id: Ieccd31d3cefd2fc397a296827de29d834ce093f0

diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index 24d8714..178c685 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -10,8 +10,6 @@
 #ifndef INCLUDED_SC_SOURCE_CORE_OPENCL_OPENCLWRAPPER_HXX
 #define INCLUDED_SC_SOURCE_CORE_OPENCL_OPENCLWRAPPER_HXX
 
-#include <config_features.h>
-
 #include <cassert>
 #include <vector>
 
commit 2f9ac73b80d65212eabc4ae753fab237474d0733
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 15 18:22:34 2015 +0200

    The likely useless ImplDoTiledRendering() is used in vcl only
    
    So move it to a locale include file in vcl. Now <vcl/window.hxx> does
    not need to include <config_features.h>.
    
    As such it is questionable whether what ImplDoTiledRendering()
    currently does makes any sense; de facto it now just means that we are
    on iOS. We have comphelper::LibreOfficeKit::isActive() which probably
    is what should be used to test whether tiled rendering is used. At
    least in the cases where LibreOfficeKit's "unstable" API is used for
    tasks that involve rendering of tiles. Hmm, that sounds like a
    circular argument.
    
    Change-Id: I52c984aec7510526c5294579966345b8340c8642

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 0e95d02..8257370 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_WINDOW_HXX
 #define INCLUDED_VCL_WINDOW_HXX
 
-#include <config_features.h>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/outdev.hxx>
@@ -439,23 +438,6 @@ enum class GetDlgWindowType
 const char* ImplDbgCheckWindow( const void* pObj );
 #endif
 
-inline bool ImplDoTiledRendering()
-{
-#if !HAVE_FEATURE_DESKTOP && !defined(ANDROID)
-    // We do tiled rendering only for iOS at the moment, actually, but
-    // let's see what happens if we assume it for Android, too.
-    // (That comment doesn't match what the code does, does it?)
-    return true;
-#else
-    // We need some way to know globally if this process will use
-    // tiled rendering or not. Or should this be a per-window setting?
-    // Or what?
-    return false;
-#endif
-}
-
-
-
 namespace vcl { class Window; }
 namespace vcl { class Cursor; }
 class Dialog;
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 4912f32..0ae19d6 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -19,6 +19,8 @@
 
 #include <tbunosearchcontrollers.hxx>
 
+#include <config_features.h>
+
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
 
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 5d792de..0c097df 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -22,6 +22,8 @@
 
 #include <sal/config.h>
 
+#include <config_features.h>
+
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <list>
@@ -411,6 +413,21 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool
                            sal_uInt16 nCode, MouseEventModifiers nMode );
 void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight );
 
+inline bool ImplDoTiledRendering()
+{
+#if !HAVE_FEATURE_DESKTOP && !defined(ANDROID)
+    // We do tiled rendering only for iOS at the moment, actually, but
+    // let's see what happens if we assume it for Android, too.
+    // (That comment doesn't match what the code does, does it?)
+    return true;
+#else
+    // We need some way to know globally if this process will use
+    // tiled rendering or not. Or should this be a per-window setting?
+    // Or what?
+    return false;
+#endif
+}
+
 #endif // INCLUDED_VCL_INC_WINDOW_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */