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>

69 files changed, 99 insertions, 17 deletions

diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 1b8d0bd45f3e..160a3b5ad45b 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -45,6 +45,7 @@
 #include "vcl/print.hxx"
 #include "vcl/pdfwriter.hxx"
 #include "vcl/printerinfomanager.hxx"
+#include "vcl/settings.hxx"
 
 #include "saldatabasic.hxx"
 #include "generic/genprn.h"
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index ad4d43f97801..10f663f137cc 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -36,6 +36,7 @@
 #include "vcl/bmpacc.hxx"
 #include "vcl/svapp.hxx"
 #include "vcl/sysdata.hxx"
+#include "vcl/settings.hxx"
 
 #include "generic/printergfx.hxx"
 #include "salbmp.hxx"
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 1d713a1a885d..ec9c475c5395 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -32,6 +32,7 @@
 #include "tools/debug.hxx"
 
 #include "vcl/vclevent.hxx"
+#include "vcl/bitmapex.hxx"
 #include "tools/solar.h"
 #include "vcl/svapp.hxx"
 #include "vcl/dllapi.h"
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index d78ed1e67637..217a2c747d64 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -41,6 +41,7 @@
 #include "vcl/group.hxx"
 #include "vcl/field.hxx"
 #include "vcl/msgbox.hxx"
+#include "vcl/settings.hxx"
 #include "vcl/wrkwin.hxx"
 #include "vcl/threadex.hxx"
 
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 9ea5ed544cea..69a0836584d1 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -28,6 +28,7 @@
 #include "vcl/svapp.hxx"
 #include "vcl/wrkwin.hxx"
 #include "vcl/help.hxx"
+#include "vcl/settings.hxx"
 
 #include "helpwin.hxx"
 #include "svdata.hxx"
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 4ba786009cb0..95eebf0337ee 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -32,6 +32,7 @@
 
 #include "vcl/configsettings.hxx"
 #include "vcl/svapp.hxx"
+#include "vcl/settings.hxx"
 #include "vcl/wrkwin.hxx"
 #include "vcl/msgbox.hxx"
 #include "vcl/button.hxx"
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"
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 7e8037d6bbdc..cbd0f9847189 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -27,8 +27,9 @@
 #include <textund2.hxx>
 #include <svl/ctloptions.hxx>
 #include <vcl/window.hxx>
-
+#include <vcl/settings.hxx>
 #include <vcl/edit.hxx>
+
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
 
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 53d49cc0138c..1f43143bba78 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/textview.hxx>
 #include <vcl/texteng.hxx>
+#include <vcl/settings.hxx>
 #include <textdoc.hxx>
 #include <vcl/textdata.hxx>
 #include <textdat2.hxx>
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index ca5e548418f5..2c616175a0d0 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -33,6 +33,7 @@
 
 #include <svids.hrc>
 #include <vcl/scrbar.hxx>
+#include <vcl/settings.hxx>
 
 
 class TextWindow : public Window
diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx
index 26ad204368fa..4bdc040b24fa 100644
--- a/vcl/source/edit/xtextedt.cxx
+++ b/vcl/source/edit/xtextedt.cxx
@@ -20,6 +20,7 @@
 
 #include <vcl/xtextedt.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 #include <unotools/textsearch.hxx>
 #include <com/sun/star/util/SearchOptions.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 29df8b440699..8e7e1ae69a91 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -36,6 +36,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/wmf.hxx>
+#include <vcl/settings.hxx>
 #include "igif/gifread.hxx"
 #include "jpeg/jpeg.hxx"
 #include "ixbm/xbmread.hxx"
diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx
index 0092b308ace9..52e99a5e262b 100644
--- a/vcl/source/gdi/base14.cxx
+++ b/vcl/source/gdi/base14.cxx
@@ -20,6 +20,7 @@
 
 #include "pdfwriter_impl.hxx"
 #include <rtl/strbuf.hxx>
+#include <vcl/settings.hxx>
 
 using namespace vcl;
 
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index c9a0196f0c9d..7a3320c767c8 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -33,6 +33,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/bmpacc.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/settings.hxx>
 
 #include <image.h>
 #include <impimagetree.hxx>
diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx
index 3dc04e349d15..43ee86e58764 100644
--- a/vcl/source/gdi/imagerepository.cxx
+++ b/vcl/source/gdi/imagerepository.cxx
@@ -20,6 +20,7 @@
 
 #include <vcl/bitmapex.hxx>
 #include <vcl/imagerepository.hxx>
+#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include "impimagetree.hxx"
 
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 7f77d10a07cd..fafd07c90007 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -25,6 +25,7 @@
 #include <vcl/bmpacc.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/image.hxx>
+#include <vcl/settings.hxx>
 
 #include <image.h>
 
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index b2c73b0ac324..b372c9d8c585 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -30,6 +30,7 @@
 #include <vcl/print.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/unowrap.hxx>
+#include <vcl/settings.hxx>
 #include <svsys.h>
 #include <vcl/sysdata.hxx>
 
@@ -305,7 +306,7 @@ OutputDevice::OutputDevice() :
     maRegion(true),
     maFillColor( COL_WHITE ),
     maTextLineColor( COL_TRANSPARENT ),
-    maSettings( Application::GetSettings() )
+    mxSettings( new AllSettings(Application::GetSettings()) )
 {
 
     mpGraphics          = NULL;
@@ -2468,7 +2469,7 @@ void OutputDevice::EnableOutput( sal_Bool bEnable )
 
 void OutputDevice::SetSettings( const AllSettings& rSettings )
 {
-    maSettings = rSettings;
+    *mxSettings = rSettings;
 
     if( mpAlphaVDev )
         mpAlphaVDev->SetSettings( rSettings );
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 3a42baff65e3..fb3c099a158a 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -41,6 +41,7 @@
 #include "vcl/bmpacc.hxx"
 #include "vcl/outdev.hxx"
 #include "vcl/edit.hxx"
+#include <vcl/settings.hxx>
 // declare system types in sysdata.hxx
 #include <svsys.h>
 #include "vcl/sysdata.hxx"
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index 3fca6def1552..55f28e479693 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -30,6 +30,7 @@
 #include <vcl/window.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/settings.hxx>
 
 #include "pdfwriter_impl.hxx"
 
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 4c66cedd069f..d24ba589dad1 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -55,6 +55,7 @@
 #include <vcl/lineinfo.hxx>
 #include "vcl/cvtgrf.hxx"
 #include "vcl/strhelper.hxx"
+#include "vcl/settings.hxx"
 
 #include <fontsubset.hxx>
 #include <outdev.h>
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 52373f082ccf..4bcebbddc11e 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -47,6 +47,7 @@
 
 #include <boost/shared_array.hpp>
 
+class StyleSettings;
 class FontSelectPattern;
 class ImplFontMetricData;
 class FontSubsetInfo;
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index da23512cf691..ab522688e0f5 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -29,6 +29,7 @@
 #include <vcl/print.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/unowrap.hxx>
+#include <vcl/settings.hxx>
 
 #include <window.h>
 #include <outdev.h>
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index eac17edeebd1..f6d7d59b34af 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -26,7 +26,7 @@
 #include <vcl/svapp.hxx>
 #include <wall2.hxx>
 #include <vcl/dibtools.hxx>
-
+#include <vcl/settings.hxx>
 
 // -----------------------------------------------------------------------
 
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 1a5da7b41b5c..c9ead5972c9b 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -34,6 +34,7 @@
 #include <vcl/help.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/metric.hxx>
+#include <vcl/settings.hxx>
 
 using namespace ::com::sun::star::uno;
 
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index a8b26d9a836d..7f4ac6312fda 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -31,6 +31,7 @@
 #include <vcl/tabpage.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/vclmedit.hxx>
+#include <vcl/settings.hxx>
 #include <svdata.hxx>
 #include <svids.hrc>
 #include <window.h>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 4be4403aa3a9..d9b66f3053c3 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -45,6 +45,8 @@
 #include <vcl/decoview.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/unowrap.hxx>
+#include <vcl/settings.hxx>
+
 #include <iostream>
 
 #if !HAVE_FEATURE_DESKTOP
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index dd26062c43df..b4ac50f920e4 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -31,8 +31,9 @@
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabdlg.hxx>
 #include <vcl/button.hxx>
-
+#include <vcl/settings.hxx>
 #include <vcl/unohelp.hxx>
+
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
 
 using namespace ::com::sun::star;
diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx
index 6fe92e26fb3c..c67d86b600f1 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.cxx
@@ -25,6 +25,7 @@
 
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 70a1b5d7b5c8..a1a18dbd8254 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -21,6 +21,7 @@
 #include <vcl/dockingarea.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/menu.hxx>
+#include <vcl/settings.hxx>
 
 #include <svdata.hxx>
 
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 495d8074e4db..6fd6295a2c7b 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -34,6 +34,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/unowrap.hxx>
+#include <vcl/settings.hxx>
 
 
 // =======================================================================
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 957423f1259a..4d852f7c86c4 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -26,6 +26,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/unowrap.hxx>
+#include <vcl/settings.hxx>
 
 #include <svdata.hxx>
 #include <window.h>
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index e459fadc527d..c91cfea9a3a4 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -28,6 +28,7 @@
 #include <vcl/event.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/floatwin.hxx>
+#include <vcl/settings.hxx>
 
 #include <tools/rc.h>
 #include <tools/debug.hxx>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 344e4b5b920c..4da3a8f3d8b3 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -12,6 +12,7 @@
 #include <vcl/layout.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 #include "window.h"
 
 VclContainer::VclContainer(Window *pParent, WinBits nStyle)
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 8d3e3f4b4bd4..bf0f1911be44 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -41,6 +41,7 @@
 #include "vcl/controllayout.hxx"
 #include "vcl/toolbox.hxx"
 #include "vcl/dockingarea.hxx"
+#include "vcl/settings.hxx"
 
 #include "salinst.hxx"
 #include "svdata.hxx"
diff --git a/vcl/source/window/mnemonicengine.cxx b/vcl/source/window/mnemonicengine.cxx
index fce1a76df1ff..b903c31837d8 100644
--- a/vcl/source/window/mnemonicengine.cxx
+++ b/vcl/source/window/mnemonicengine.cxx
@@ -22,6 +22,7 @@
 #include <vcl/i18nhelp.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
+#include <vcl/settings.hxx>
 
 namespace vcl
 {
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index c733c03d6d67..1f3019a09fc5 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -33,7 +33,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/button.hxx>
 #include <vcl/mnemonic.hxx>
-
+#include <vcl/settings.hxx>
 
 
 // =======================================================================
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 28d86623b0fd..ff5121212b39 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -33,6 +33,7 @@
 #include "vcl/layout.hxx"
 #include "vcl/svapp.hxx"
 #include "vcl/unohelp.hxx"
+#include "vcl/settings.hxx"
 
 #include "unotools/localedatawrapper.hxx"
 
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 9d57294e9815..4cb24ee0e702 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -27,6 +27,7 @@
 #include <vcl/taskpanelist.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/lineinfo.hxx>
+#include <vcl/settings.hxx>
 
 #include <rtl/instance.hxx>
 
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index e4ca66dfb945..55b934382fc4 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -30,6 +30,7 @@
 #include <vcl/image.hxx>
 #include <vcl/help.hxx>
 #include <vcl/splitwin.hxx>
+#include <vcl/settings.hxx>
 
 #include <rsc/rsc-vcl-shared-types.hxx>
 
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index d31c6447f4a8..81ee2495d9e6 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -27,6 +27,7 @@
 #include <vcl/help.hxx>
 #include <vcl/status.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/settings.hxx>
 
 #include <svdata.hxx>
 #include <window.h>
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 67225eaac30a..5a59ac6506b5 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -26,6 +26,7 @@
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/bitmapex.hxx>
+#include <vcl/settings.hxx>
 
 #include <svdata.hxx>
 
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 3cc5a8ffc6de..509de9750fa2 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -35,6 +35,7 @@
 #include <vcl/gradient.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/menu.hxx>
+#include <vcl/settings.hxx>
 
 #include <svdata.hxx>
 #include <window.h>
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 00b11d82cc6d..277d5cf8c09f 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -31,6 +31,7 @@
 #include <vcl/mnemonic.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/ImageListProvider.hxx>
+#include <vcl/settings.hxx>
 
 #include <svdata.hxx>
 #include <brdwin.hxx>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 661362ac1a5c..1d93c80dd9cd 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -52,6 +52,7 @@
 #include "vcl/popupmenuwindow.hxx"
 #include "vcl/lazydelete.hxx"
 #include "vcl/virdev.hxx"
+#include "vcl/settings.hxx"
 
 // declare system types in sysdata.hxx
 #include "svsys.h"
@@ -993,7 +994,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste
     // setup the scale factor for Hi-DPI displays
     mnDPIScaleFactor = std::max((sal_Int32)1, (mpWindowImpl->mpFrameData->mnDPIY + 48) / 96);
 
-    const StyleSettings& rStyleSettings = maSettings.GetStyleSettings();
+    const StyleSettings& rStyleSettings = mxSettings->GetStyleSettings();
     sal_uInt16 nScreenZoom = rStyleSettings.GetScreenZoom();
     mnDPIX          = (mpWindowImpl->mpFrameData->mnDPIX*nScreenZoom)/100;
     mnDPIY          = (mpWindowImpl->mpFrameData->mnDPIY*nScreenZoom)/100;
@@ -1730,7 +1731,7 @@ void Window::ImplInitResolutionSettings()
     // recalculate AppFont-resolution and DPI-resolution
     if ( mpWindowImpl->mbFrame )
     {
-        const StyleSettings& rStyleSettings = maSettings.GetStyleSettings();
+        const StyleSettings& rStyleSettings = mxSettings->GetStyleSettings();
         sal_uInt16 nScreenZoom = rStyleSettings.GetScreenZoom();
         mnDPIX = (mpWindowImpl->mpFrameData->mnDPIX*nScreenZoom)/100;
         mnDPIY = (mpWindowImpl->mpFrameData->mnDPIY*nScreenZoom)/100;
@@ -1762,7 +1763,7 @@ void Window::ImplInitResolutionSettings()
 void Window::ImplPointToLogic( Font& rFont ) const
 {
     Size    aSize = rFont.GetSize();
-    sal_uInt16  nScreenFontZoom = maSettings.GetStyleSettings().GetScreenFontZoom();
+    sal_uInt16  nScreenFontZoom = mxSettings->GetStyleSettings().GetScreenFontZoom();
 
     if ( aSize.Width() )
     {
@@ -1789,7 +1790,7 @@ void Window::ImplPointToLogic( Font& rFont ) const
 void Window::ImplLogicToPoint( Font& rFont ) const
 {
     Size    aSize = rFont.GetSize();
-    sal_uInt16  nScreenFontZoom = maSettings.GetStyleSettings().GetScreenFontZoom();
+    sal_uInt16  nScreenFontZoom = mxSettings->GetStyleSettings().GetScreenFontZoom();
 
     if ( IsMapModeEnabled() )
         aSize = LogicToPixel( aSize );
@@ -5674,7 +5675,7 @@ void Window::SetSettings( const AllSettings& rSettings, sal_Bool bChild )
             ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow->SetSettings( rSettings, sal_True );
     }
 
-    AllSettings aOldSettings = maSettings;
+    AllSettings aOldSettings(*mxSettings);
     OutputDevice::SetSettings( rSettings );
     sal_uLong nChangeFlags = aOldSettings.GetChangeFlags( rSettings );
 
@@ -5711,8 +5712,8 @@ void Window::UpdateSettings( const AllSettings& rSettings, sal_Bool bChild )
             ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow->UpdateSettings( rSettings, sal_True );
     }
 
-    AllSettings aOldSettings = maSettings;
-    sal_uLong nChangeFlags = maSettings.Update( maSettings.GetWindowUpdate(), rSettings );
+    AllSettings aOldSettings(*mxSettings);
+    sal_uLong nChangeFlags = mxSettings->Update( mxSettings->GetWindowUpdate(), rSettings );
     nChangeFlags |= SETTINGS_IN_UPDATE_SETTINGS; // Set this flag so the receiver of the data changed
                                                  // event can distinguish between the changing of global
                                                  // setting and a local change ( with SetSettings )
@@ -5727,9 +5728,9 @@ void Window::UpdateSettings( const AllSettings& rSettings, sal_Bool bChild )
     *  so we can spare all our users the hassle of reacting on
     *  this in their respective DataChanged.
     */
-    MouseSettings aSet( maSettings.GetMouseSettings() );
+    MouseSettings aSet( mxSettings->GetMouseSettings() );
     aSet.SetWheelBehavior( aOldSettings.GetMouseSettings().GetWheelBehavior() );
-    maSettings.SetMouseSettings( aSet );
+    mxSettings->SetMouseSettings( aSet );
 
     if( (nChangeFlags & SETTINGS_STYLE) && IsBackground() )
     {
@@ -9379,7 +9380,7 @@ void Window::EnableNativeWidget( sal_Bool bEnable )
 
         // send datachanged event to allow for internal changes required for NWF
         // like clipmode, transparency, etc.
-        DataChangedEvent aDCEvt( DATACHANGED_SETTINGS, &maSettings, SETTINGS_STYLE );
+        DataChangedEvent aDCEvt( DATACHANGED_SETTINGS, mxSettings.get(), SETTINGS_STYLE );
         DataChanged( aDCEvt );
 
         // sometimes the borderwindow is queried, so keep it in sync
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 2a047ff7e2dc..2c2a8f05f61b 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -34,6 +34,7 @@
 #include <vcl/scrbar.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/tabctrl.hxx>
+#include <vcl/settings.hxx>
 
 #include <window.h>
 #include <outfont.hxx>
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index bfbc5582d7b1..607f413acfc5 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -57,6 +57,8 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
 #include <postx.h>
 
 #include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
+
 #include <unx/salunx.h>
 #include <sal/types.h>
 #include "unx/i18n_im.hxx"
diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx
index 06c57486d03d..a6a7f43370e3 100644
--- a/vcl/unx/generic/dtrans/bmp.cxx
+++ b/vcl/unx/generic/dtrans/bmp.cxx
@@ -31,6 +31,7 @@
 #include <tools/stream.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/svapp.hxx>
+#include "vcl/bitmap.hxx"
 
 using namespace x11;
 
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index e150ebca23d6..84ec4f657873 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -47,6 +47,8 @@
 #include <boost/unordered_set.hpp>
 
 #include <vcl/sysdata.hxx>
+#include <vcl/settings.hxx>
+
 #include "generic/printergfx.hxx"
 #include "fontmanager.hxx"
 #include "vcl/jobdata.hxx"
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index dc0c3f928575..5204b036c9ba 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -28,6 +28,7 @@
 #include "vcl/strhelper.hxx"
 #include "vcl/helper.hxx"
 #include "vcl/svapp.hxx"
+#include "vcl/settings.hxx"
 #include "cupsmgr.hxx"
 #include "tools/urlobj.hxx"
 #include "tools/stream.hxx"
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index dbbcbd104e85..1f140f3141a3 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -35,9 +35,10 @@
 #include <vcl/apptypes.hxx>
 #include <generic/genpspgraphics.h>
 #include <rtl/strbuf.hxx>
-
 #include <rtl/uri.hxx>
 
+#include <vcl/settings.hxx>
+
 #include <dlfcn.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 721f9b1d1236..01915a7c5576 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -36,6 +36,7 @@
 #include <boost/unordered_map.hpp>
 
 #include "vcl/vclenum.hxx"
+#include <vcl/settings.hxx>
 #include "fontmanager.hxx"
 #include <vcl/decoview.hxx>
 
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 3fb2eb55624f..37d1bfad73da 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -36,6 +36,8 @@
 #include <vcl/floatwin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
+#include <vcl/settings.hxx>
+
 #if !GTK_CHECK_VERSION(3,0,0)
 #  include <unx/x11/xlimits.hxx>
 #endif
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 1480d5e78568..e91c748196cd 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -14,6 +14,7 @@
 #include <unx/gtk/gtkdata.hxx>
 #include <unx/gtk/gtkinst.hxx>
 #include <unx/gtk/gtkgdi.hxx>
+#include <vcl/settings.hxx>
 #include "fontmanager.hxx"
 
 GtkStyleContext* GtkSalGraphics::mpButtonStyle = NULL;