Remove vcl/settings.hxx from vcl/svapp.hxx and vcl/outdev.hxx

Added vcl/settings.hxx to all cxx files which require it.
This helps to speed up compilation after changes to the settings.

Conflicts:
sc/source/ui/dbgui/pvlaydlg.cxx

Change-Id: I211a0735c47f72d6879f6f15339355abfe0e3cf4
Reviewed-on: https://gerrit.libreoffice.org/7933
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

17 files changed, 28 insertions, 0 deletions

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 57d817e78dce..361f775de517 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -29,6 +29,7 @@
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 95708f367127..7fda64fae340 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -27,6 +27,7 @@
 #include <vcl/button.hxx>
 #include <vcl/event.hxx>
 #include <vcl/combobox.hxx>
+#include <vcl/settings.hxx>
 
 #include <svdata.hxx>
 #include <ilstbox.hxx>
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 47ff23ead0e5..330d9b4a6384 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -26,6 +26,7 @@
 #include <vcl/ctrl.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/salnativewidgets.hxx>
+#include <vcl/settings.hxx>
 
 #include <textlayout.hxx>
 #include <svdata.hxx>
@@ -561,4 +562,13 @@ void Control::DrawControlText( OutputDevice& _rTargetDevice, Rectangle& _io_rRec
 #endif
 }
 
+Font
+Control::GetUnzoomedControlPointFont() const
+{
+    Font aFont( GetCanonicalFont( GetSettings().GetStyleSettings() ) );
+    if ( IsControlFont() )
+        aFont.Merge( GetControlFont() );
+    return aFont;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index cd75e6b46009..131f1c507cfc 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -27,6 +27,7 @@
 #include <vcl/edit.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
+#include <vcl/settings.hxx>
 
 #include <window.h>
 #include <svdata.hxx>
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 14998502be17..09eeeb8f6530 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -30,6 +30,7 @@
 #include "vcl/field.hxx"
 #include "vcl/event.hxx"
 #include "vcl/svapp.hxx"
+#include "vcl/settings.hxx"
 
 #include "svids.hrc"
 #include "svdata.hxx"
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 67102049c8fd..d4c537b34a11 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -29,6 +29,7 @@
 #include <vcl/event.hxx>
 #include <vcl/field.hxx>
 #include <vcl/unohelp.hxx>
+#include <vcl/settings.hxx>
 
 #include <svdata.hxx>
 
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 3bdb5131943d..7020ab79cf12 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -25,6 +25,8 @@
 #include "vcl/event.hxx"
 #include "vcl/fixed.hxx"
 #include "vcl/svapp.hxx"
+#include "vcl/settings.hxx"
+
 #include <comphelper/string.hxx>
 #include "controldata.hxx"
 #include "impimagetree.hxx"
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index 0e97fecc58e4..3cd6c3d54721 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -22,6 +22,7 @@
 
 #include <vcl/event.hxx>
 #include <vcl/group.hxx>
+#include <vcl/settings.hxx>
 
 #include <controldata.hxx>
 
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index ea5bd1e4148e..060db316c115 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -30,6 +30,7 @@
 #include "vcl/edit.hxx"
 #include "vcl/lstbox.hxx"
 #include "vcl/combobox.hxx"
+#include "vcl/settings.hxx"
 
 #include "svdata.hxx"
 #include "controldata.hxx"
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 15a2042c64c0..922ffc7e1d6a 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -25,6 +25,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/menubtn.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 
 void MenuButton::ImplInitMenuButtonData()
 {
diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx
index 4a4638887923..21af040341e6 100644
--- a/vcl/source/control/prgsbar.cxx
+++ b/vcl/source/control/prgsbar.cxx
@@ -20,6 +20,7 @@
 #include <tools/debug.hxx>
 #include <vcl/status.hxx>
 #include <vcl/prgsbar.hxx>
+#include <vcl/settings.hxx>
 
 #define PROGRESSBAR_OFFSET          3
 #define PROGRESSBAR_WIN_OFFSET      2
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index 00060bde8e9c..14bbac1a2e25 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -23,6 +23,7 @@
 #include "vcl/timer.hxx"
 #include "vcl/i18nhelp.hxx"
 #include "vcl/svapp.hxx"
+#include "vcl/settings.hxx"
 
 #include <boost/optional.hpp>
 
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 3fd321350f1d..f79812f193e8 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -22,6 +22,7 @@
 #include "vcl/decoview.hxx"
 #include "vcl/scrbar.hxx"
 #include "vcl/timer.hxx"
+#include "vcl/settings.hxx"
 
 #include "svdata.hxx"
 
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index df31de0311dc..2b9dde815806 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -22,6 +22,8 @@
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/slider.hxx>
+#include <vcl/settings.hxx>
+
 #include "thumbpos.hxx"
 
 // =======================================================================
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 0c1c45861b9e..aff23a3a0f8d 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -21,6 +21,7 @@
 #include <vcl/spin.h>
 #include <vcl/event.hxx>
 #include <vcl/spin.hxx>
+#include <vcl/settings.hxx>
 
 // =======================================================================
 
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 0f88c193d427..146b174d15a7 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -24,6 +24,7 @@
 #include "vcl/decoview.hxx"
 #include "vcl/spin.h"
 #include "vcl/spinfld.hxx"
+#include "vcl/settings.hxx"
 
 #include "controldata.hxx"
 #include "svdata.hxx"
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 222149b2799b..b8ccac827576 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -31,6 +31,7 @@
 #include "vcl/controllayout.hxx"
 #include "vcl/layout.hxx"
 #include "vcl/lstbox.hxx"
+#include "vcl/settings.hxx"
 
 #include "controldata.hxx"
 #include "svdata.hxx"