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

[Douglas Mencken]

 vcl/source/app/settings.cxx         |    5 ++++-
 vcl/source/window/accessibility.cxx |    1 -
 vcl/source/window/syschild.cxx      |    3 ---
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 8d48f6329518c6dfd25348aadc5d05e807d57d49
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Mon Oct 6 08:18:55 2014 -0400

    vcl/source: get rid of redundant svsys.h includes
    
    + adapted for WNT (it does really need it for app/settings.cxx)
    
    Change-Id: I33a65d24f7c6c46a36718e4421ae88de180a9739
    Reviewed-on: https://gerrit.libreoffice.org/11814
    Reviewed-by: Douglas Mencken <dougmencken at gmail.com>
    Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
    Tested-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index a30fd34..8048875 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -21,7 +21,10 @@
 
 #include <officecfg/Office/Common.hxx>
 
-#include <svsys.h>
+#ifdef WNT
+#include "win/svsys.h"
+#endif
+
 #include "comphelper/processfactory.hxx"
 #include <rtl/bootstrap.hxx>
 #include "tools/debug.hxx"
diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index 0f3b416..49c95ac 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -55,7 +55,6 @@
 #include "vcl/settings.hxx"
 
 // declare system types in sysdata.hxx
-#include "svsys.h"
 #include "vcl/sysdata.hxx"
 
 #include "salframe.hxx"
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 78c31f1..d930c3d 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -24,9 +24,6 @@
 
 #include <tools/rc.h>
 
-// declare system types in sysdata.hxx
-#include <svsys.h>
-
 #include <vcl/window.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/svapp.hxx>