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

[Tor Lillqvist]

 include/vcl/svapp.hxx            |   10 ++++++----
 test/source/bootstrapfixture.cxx |    3 +++
 vcl/source/app/svapp.cxx         |    1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit b56c9aaa80639f93531ae7aa2a929eca158c4401
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu May 22 11:12:44 2014 +0300

    Avoid including <config_features.h> in <vcl/svapp.hxx>
    
    Change-Id: I711621c89e8f75d4450867e303ccdc8017bcd9d7

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 3509c62..810aa2b 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_VCL_SVAPP_HXX
 #define INCLUDED_VCL_SVAPP_HXX
 
-#include <config_features.h>
-
 #include <sal/config.h>
 #include <sal/types.h>
 
@@ -851,9 +849,11 @@ public:
     */
     static ImplSVEvent *        PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent );
 
-#if !HAVE_FEATURE_DESKTOP
     /** Send zoom event
 
+     Experimental work in progress. Available only for iOS and Android, and unclear whether actually
+     is needed now with tiled rendering.
+
      @param     nEvent          Event ID for zoom event
      @param     pWin            Pointer to window to which the event is sent
      @param     pZoomEvent      Zoom event to send
@@ -862,12 +862,14 @@ public:
 
     /* Send scroll event
 
+     Experimental work in progress. Available only for iOS and Android, and unclear whether actually
+     is needed now with tiled rendering.
+
      @param      nEvent          Event ID for scroll event
      @param      pWin            Pointer to window to which the event is sent
      @param      pScrollEvent    Scroll event to send
     */
     static ImplSVEvent *         PostScrollEvent( sal_uLong nEvent, Window *pWin, ScrollEvent* pScrollEvent );
-#endif
 
     /** Remove mouse and keypress events from a window... any also zoom and scroll events
      if the platform supports it.
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index b7c49ba..e8dcfa8 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -6,6 +6,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+
+#include <config_features.h>
+
 #include <test/bootstrapfixture.hxx>
 #include <tools/errinf.hxx>
 #include <rtl/strbuf.hxx>
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 7855260..b27b9c3 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
 #include <config_libraries.h>
 
 #include "comphelper/processfactory.hxx"