diff options
| author | Tobias Lippert <drtl@fastmail.fm> | 2014-01-02 23:52:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-20 16:22:17 +0000 |
| commit | a18a1a454505193b922e1d5dc3215526f01f5efd (patch) | |
| tree | 5a7ed351f2bdd8aab7b62a57fb2f22916b51f229 | |
| parent | c2485b4c38a574416dc3948fec85b0232109eb61 (diff) | |
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>
623 files changed, 902 insertions, 134 deletions
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 437dc4856d71..acbda971a2a9 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <vcl/svapp.hxx> #include <vcl/controllayout.hxx> +#include <vcl/settings.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/convert.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index cdbf9436da0d..eb6b9f23b232 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <vcl/svapp.hxx> #include <vcl/controllayout.hxx> +#include <vcl/settings.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/convert.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index 8e1730bcf5d5..96812ccfc22c 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -27,6 +27,7 @@ #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <toolkit/awt/vclxfont.hxx> #include <toolkit/helper/convert.hxx> diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 3fe24269436c..090e0bf5f49d 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -26,6 +26,7 @@ #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <toolkit/helper/convert.hxx> diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index 889908635d0a..57c054db528d 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -27,6 +27,7 @@ #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <toolkit/helper/convert.hxx> diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx index 953ebde4a679..2251266df119 100644 --- a/accessibility/source/helper/accresmgr.cxx +++ b/accessibility/source/helper/accresmgr.cxx @@ -21,6 +21,7 @@ #include <tools/simplerm.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> using namespace accessibility; // ----------------------------------------------------------------------------- diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index 3bf4d15fd5bf..1db0ff737867 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -34,7 +34,7 @@ #include <vcl/window.hxx> #include <vcl/menu.hxx> #include <vcl/unohelp2.hxx> - +#include <vcl/settings.hxx> using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 04f531ec6e52..1e0cdbca8f8c 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -41,7 +41,7 @@ #include <vcl/window.hxx> #include <vcl/menu.hxx> #include <vcl/unohelp2.hxx> - +#include <vcl/settings.hxx> using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index d4b2408f97d5..21e1d45da04e 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -33,6 +33,7 @@ #include <vcl/svapp.hxx> #include <vcl/controllayout.hxx> #include <vcl/unohelp2.hxx> +#include <vcl/settings.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index 3a11316e0d6a..740ce1a5804e 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -23,7 +23,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/menu.hxx> - +#include <vcl/settings.hxx> using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index cc426a9d6561..c72ae8e1e041 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -35,6 +35,7 @@ #include <vcl/window.hxx> #include <vcl/menu.hxx> #include <vcl/unohelp2.hxx> +#include <vcl/settings.hxx> using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx index 5e90402186e4..3db137b25e4b 100644 --- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx +++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index dbf5d300d627..7659f31b4e85 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -34,6 +34,7 @@ #include <vcl/unohelp2.hxx> #include <vcl/status.hxx> #include <vcl/controllayout.hxx> +#include <vcl/settings.hxx> using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index f4a5e138051e..a1b2646fbbb8 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -34,6 +34,7 @@ #include <vcl/unohelp2.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> +#include <vcl/settings.hxx> using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx index d0002ab51ebf..598ac7e1dde5 100644 --- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx +++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx @@ -31,6 +31,7 @@ #include <vcl/svapp.hxx> #include <vcl/unohelp2.hxx> #include <vcl/ctrl.hxx> +#include <vcl/settings.hxx> #include <vector> diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index f63f0e4bb89c..f32aab008385 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -35,6 +35,7 @@ #include <vcl/toolbox.hxx> #include <vcl/unohelp2.hxx> #include <vcl/help.hxx> +#include <vcl/settings.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/externallock.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index c0f28c08fd9f..b0b84faa4034 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -26,6 +26,7 @@ #include <tools/time.hxx> #include <svtools/miscopt.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <vcl/lstbox.hxx> #include <unotools/syslocale.hxx> #include <sfx2/viewfrm.hxx> diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx index 686a22bf1936..d3e9199bc026 100644 --- a/avmedia/source/framework/mediamisc.cxx +++ b/avmedia/source/framework/mediamisc.cxx @@ -20,6 +20,7 @@ #include <tools/resmgr.hxx> #include <svl/solar.hrc> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> namespace avmedia { diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index c9dd46de11d6..4078efe153bd 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -33,6 +33,7 @@ #include <toolkit/helper/convert.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> namespace basctl { diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 6138f29affc5..dc482853cbce 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -36,6 +36,7 @@ #include <toolkit/helper/externallock.hxx> #include <toolkit/helper/convert.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> namespace basctl { diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 520b61c98ad5..1aa12a407315 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -49,6 +49,7 @@ #include <svl/visitem.hxx> #include <svl/whiter.hxx> #include <vcl/xtextedt.hxx> +#include <vcl/settings.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/msgbox.hxx> #include <cassert> diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 4d8f0d93e1cd..07b0a9944ef5 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -44,6 +44,7 @@ #include <svl/urihelper.hxx> #include <vcl/xtextedt.hxx> #include <vcl/txtattr.hxx> +#include <vcl/settings.hxx> #include <svtools/textwindowpeer.hxx> #include <tools/stream.hxx> #include <comphelper/syntaxhighlight.hxx> diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 14ef27f6cb53..d7b216716337 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -52,6 +52,7 @@ #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <xmlscript/xmldlg_imexp.hxx> namespace basctl diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 03a31eebb785..1100f469c87c 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -55,6 +55,7 @@ #include <svx/xmlsecctrl.hxx> #include <sfx2/viewfac.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> namespace basctl { diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx index ca2da1555df3..26f4875bffd4 100644 --- a/basctl/source/basicide/bastype3.hxx +++ b/basctl/source/basicide/bastype3.hxx @@ -22,6 +22,7 @@ #include <svheader.hxx> #include <svtools/svmedit.hxx> #include <iderid.hxx> +#include <vcl/accel.hxx> namespace basctl { diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index dd20ff6b4870..a370b3460420 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -41,6 +41,7 @@ #include <svl/srchitem.hxx> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/script/XLibraryContainerPassword.hpp> +#include <vcl/settings.hxx> #include <boost/scoped_ptr.hpp> diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index 344345fd3baf..0770a1b8f7da 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -20,6 +20,7 @@ #include "layout.hxx" #include "bastypes.hxx" +#include <vcl/settings.hxx> #include <boost/make_shared.hpp> diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index 3ee023b6149c..22eb1ff1369e 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -12,6 +12,7 @@ #include <vcl/xtextedt.hxx> #include <vcl/textview.hxx> +#include <vcl/settings.hxx> namespace basctl { diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index e31364102b3f..fb10cd44ed62 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -37,6 +37,7 @@ #include <vcl/unohelp.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> namespace basctl { diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index 94637f380858..ca398561c4df 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -8,6 +8,7 @@ */ #include "basictest.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <comphelper/processfactory.hxx> using namespace ::com::sun::star; diff --git a/basic/source/classes/global.cxx b/basic/source/classes/global.cxx index 2efb9da1201d..f0fa7426eeb3 100644 --- a/basic/source/classes/global.cxx +++ b/basic/source/classes/global.cxx @@ -12,6 +12,7 @@ #include <rtl/instance.hxx> #include <unotools/transliterationwrapper.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "global.hxx" diff --git a/basic/source/comp/basiccharclass.cxx b/basic/source/comp/basiccharclass.cxx index 529be3fb287e..59ae7242c226 100644 --- a/basic/source/comp/basiccharclass.cxx +++ b/basic/source/comp/basiccharclass.cxx @@ -21,6 +21,7 @@ #include <unotools/charclass.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> BasicCharClass::BasicCharClass() { diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx index 59be1072d676..6438b5b8f6a6 100644 --- a/basic/source/runtime/basrdll.cxx +++ b/basic/source/runtime/basrdll.cxx @@ -22,6 +22,7 @@ #include <svl/solar.hrc> #include <tools/debug.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <basic/sbstar.hxx> #include <basic/basrdll.hxx> diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index efbd2da6f1a0..9749ece67d6f 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -26,6 +26,7 @@ #include <vcl/mapmod.hxx> #include <vcl/wrkwin.hxx> #include <vcl/timer.hxx> +#include <vcl/settings.hxx> #include <basic/sbxvar.hxx> #include <basic/sbx.hxx> #include <svl/zforlist.hxx> diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 83e81e6cca06..2adbc6124f0a 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -39,6 +39,7 @@ #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <rtl/instance.hxx> #include <rtl/math.hxx> diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index 6db87a7e1961..65d4940c7058 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -18,6 +18,7 @@ */ #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svl/zforlist.hxx> #include <tools/errcode.hxx> #include <tools/color.hxx> diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index 43620d3d4668..c3b52f04eae7 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -26,6 +26,8 @@ #include <stdlib.h> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <math.h> #include <string.h> #include <ctype.h> diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index aa99cffe9c30..c73221285e95 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -47,6 +47,8 @@ #include <vcl/unohelp.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> +#include <vcl/graph.hxx> +#include <vcl/settings.hxx> #include <algorithm> #include <o3tl/compat_functional.hxx> diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 342facf7c49b..3d6f4c4dbfba 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -53,6 +53,7 @@ #include <comphelper/InlineContainer.hxx> #include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/drawing/ShapeCollection.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 5cdda02b0d62..43f560fa1d28 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -39,6 +39,7 @@ // header for class Bitmap #include <vcl/bitmap.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 6836e8f0d9b8..01ea4c277285 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -41,6 +41,7 @@ #include <vcl/image.hxx> #include <vcl/layout.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <rtl/math.hxx> #include <com/sun/star/util/XCloneable.hpp> diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index 47e00d25df1a..b392b717a2df 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/XDiagram.hpp> +#include <vcl/settings.hxx> using ::com::sun::star::uno::Reference; using namespace ::com::sun::star; diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx index 7b6743d8b09c..05b04b07fe0a 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx @@ -21,6 +21,7 @@ #include "ResId.hxx" #include "TabPages.hrc" #include "TabPageNotifiable.hxx" +#include <vcl/settings.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index cbe03b0fba96..f8633d8462fd 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -20,6 +20,7 @@ #include "tp_Trendline.hxx" #include "ResId.hxx" #include "TabPages.hrc" +#include <vcl/settings.hxx> namespace chart { diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 439c13cd9993..f51dd49efe85 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -69,6 +69,7 @@ // header for class SdrDragMethod #include <svx/svddrgmt.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <osl/mutex.hxx> // for InfoBox diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index a1c3870afe35..c56489f000fb 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -22,6 +22,7 @@ #include "HelpIds.hrc" #include <vcl/help.hxx> +#include <vcl/settings.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 003e3354a271..22e78a15f85a 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -49,6 +49,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <algorithm> #include <functional> diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 7aa0f9743e44..a683903c9b44 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -57,6 +57,7 @@ #include <svl/zformat.hxx> // header for class Application #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 7402c3d0bae3..ddef6003f4ed 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -29,6 +29,7 @@ #include <vcl/toolbox.hxx> #include <vcl/scrbar.hxx> #include <vcl/virdev.hxx> +#include <vcl/settings.hxx> #include <sfx2/app.hxx> #include <sfx2/sfxdlg.hxx> diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 255817fa5875..1b984c5d23f3 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -22,6 +22,7 @@ #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> #include <vcl/scrbar.hxx> +#include <vcl/settings.hxx> #include <SpellAttrib.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 1591f4e72c7c..e4bdbb540a98 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -20,6 +20,7 @@ #include <vcl/layout.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <tools/stream.hxx> #include <rtl/bootstrap.hxx> diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 782421f95aa9..952bf399c5c4 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -30,6 +30,7 @@ #include <svx/ucsubset.hxx> #include <sfx2/objsh.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <svl/stritem.hxx> #include <cuires.hrc> diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 37689118b68c..2e8b4462ef56 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -31,6 +31,7 @@ #include <svtools/apearcfg.hxx> #include <vcl/mnemonic.hxx> #include <vcl/i18nhelp.hxx> +#include <vcl/settings.hxx> using ::std::vector; diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 7319f4a64ede..458f310ff926 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -60,6 +60,7 @@ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> +#include <vcl/settings.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 87c672cb5061..0e3886bc0b6e 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -32,6 +32,7 @@ #include <sot/stg.hxx> #include <svtools/sores.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <dialmgr.hxx> diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index e9769ab2ab08..e4ba4c047b6a 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -22,6 +22,7 @@ #include <tools/time.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <unotools/useroptions.hxx> diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx index 318ce4dcf46d..5409156db54f 100644 --- a/cui/source/factory/cuiresmgr.cxx +++ b/cui/source/factory/cuiresmgr.cxx @@ -20,6 +20,7 @@ #include <dialmgr.hxx> #include <svl/solar.hrc> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> // struct DialogsResMgr -------------------------------------------------- ResMgr* CuiResMgr::GetResMgr() diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 74ed49469ecc..13255efa306f 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -19,6 +19,7 @@ #include "optHeaderTabListbox.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svtools/headbar.hxx> #include <svtools/svlbitm.hxx> #include <svtools/treelistentry.hxx> diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 988527052a36..4e3769423ea8 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -33,6 +33,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <comphelper/processfactory.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 846e5e987355..16f3655526e4 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -30,6 +30,7 @@ #include <unotools/moduleoptions.hxx> #include <unotools/pathoptions.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <boost/shared_ptr.hpp> #include <svx/svxdlg.hxx> #include <helpid.hrc> diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 3f65a6b1221f..5476f8d8d8c9 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -28,6 +28,7 @@ #include <unotools/intlwrapper.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <svx/dialogs.hrc> #include <linguistic/misc.hxx> diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 682469f5fab9..e2544a61f11a 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -84,6 +84,7 @@ #include <com/sun/star/office/Quickstart.hpp> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "optgdlg.hxx" #include <svx/ofaitem.hxx> @@ -537,6 +538,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", rSet) , nSizeLB_InitialSelection(0) , nStyleLB_InitialSelection(0) + , aIconStyleItemId(STYLE_SYMBOLS_THEMES_MAX, 0) , pAppearanceCfg(new SvtTabAppearanceCfg) , pCanvasSettings(new CanvasSettings) , mpDrawinglayerOpt(new SvtOptionsDrawinglayer) @@ -625,10 +627,10 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) // prefer the icon style set by the desktop native widgets modules sal_uLong nAutoStyle = aStyleSettings.GetPreferredSymbolsStyle(); // fallback to the statically defined values - if ( nAutoStyle == STYLE_SYMBOLS_AUTO || !aIconStyleItemId[nAutoStyle] ) + if ( nAutoStyle == STYLE_SYMBOLS_AUTO || !aIconStyleItemId.at(nAutoStyle) ) nAutoStyle = aStyleSettings.GetAutoSymbolsStyle(); - if ( aIconStyleItemId[nAutoStyle] ) - aAutoStr += m_pIconStyleLB->GetEntry( aIconStyleItemId[nAutoStyle] ); + if ( aIconStyleItemId.at(nAutoStyle) ) + aAutoStr += m_pIconStyleLB->GetEntry( aIconStyleItemId.at(nAutoStyle) ); m_pIconStyleLB->RemoveEntry( 0 ); m_pIconStyleLB->InsertEntry( aAutoStr += ")", 0 ); @@ -879,7 +881,7 @@ void OfaViewTabPage::Reset( const SfxItemSet& ) m_pIconSizeLB->SaveValue(); if( aMiscOptions.GetSymbolsStyle() != STYLE_SYMBOLS_AUTO ) - nStyleLB_InitialSelection = aIconStyleItemId[aMiscOptions.GetCurrentSymbolsStyle()]; + nStyleLB_InitialSelection = aIconStyleItemId.at(aMiscOptions.GetCurrentSymbolsStyle()); m_pIconStyleLB->SelectEntryPos( nStyleLB_InitialSelection ); m_pIconStyleLB->SaveValue(); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 3b5799fda5be..6f2f7c80fc99 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -106,7 +106,7 @@ private: // item ID for the given icon theme // might be zero when the theme is not installed and the item is removed - sal_uLong aIconStyleItemId[STYLE_SYMBOLS_THEMES_MAX]; + std::vector<unsigned> aIconStyleItemId; SvtTabAppearanceCfg* pAppearanceCfg; CanvasSettings* pCanvasSettings; SvtOptionsDrawinglayer* mpDrawinglayerOpt; diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 4f99dba4e580..0ff50b94a03e 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -25,6 +25,7 @@ #include <unotools/saveopt.hxx> #include <svl/intitem.hxx> #include <vcl/edit.hxx> +#include <vcl/settings.hxx> #include <cuires.hrc> #include <unotools/useroptions.hxx> diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index f6e2be5aedfa..8b6a21c2377e 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -20,6 +20,7 @@ #include <vcl/msgbox.hxx> #include <vcl/field.hxx> #include <vcl/fixed.hxx> +#include <vcl/settings.hxx> #include <tools/shl.hxx> #include <i18nlangtag/mslangid.hxx> #include <unotools/lingucfg.hxx> diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 20990c3a425b..a697b9f39cb9 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -18,6 +18,7 @@ */ #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <sfx2/filedlghelper.hxx> #include <svl/zforlist.hxx> #include "optupdt.hxx" diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index b9c6aeeec3f2..0588e384bdc7 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -19,6 +19,7 @@ #include <vcl/edit.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/system/SystemShellExecute.hpp> diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 13dc1e893fa0..aa4d775277f4 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -97,6 +97,7 @@ #include <vcl/layout.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> +#include <vcl/settings.hxx> #include "svtools/treelistentry.hxx" #ifdef LINUX diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index f033a6de95e2..4c05ba49e1ed 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -40,6 +40,7 @@ #include <svx/flagsdef.hxx> #include <svl/intitem.hxx> #include <sfx2/request.hxx> +#include <vcl/settings.hxx> namespace svx { diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index a438073716f4..8016ee4b7258 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -22,6 +22,7 @@ #include <vcl/msgbox.hxx> #include <vcl/field.hxx> #include <vcl/keycodes.hxx> +#include <vcl/settings.hxx> #include <sot/exchange.hxx> #include <svtools/transfer.hxx> #include <unotools/syslocale.hxx> diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index c7d9c9a65333..b6d2e426ecef 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -20,6 +20,7 @@ #include <unotools/pathoptions.hxx> #include <vcl/builder.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <tools/urlobj.hxx> #include <sfx2/dialoghelper.hxx> #include <sfx2/objsh.hxx> diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index ed31b01a8ea9..84ab485aa989 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -36,6 +36,7 @@ #include <dialmgr.hxx> #include <sfx2/htmlmode.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include "svx/flagsdef.hxx" #include <sfx2/request.hxx> #include <svl/intitem.hxx> diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 0c049c4a000f..e4bc0aef15c3 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -33,6 +33,7 @@ #include <cuires.hrc> #include <svx/dialogs.hrc> #include <vcl/builder.hxx> +#include <vcl/settings.hxx> #define CM_1_TO_TWIP 567 #define TWIP_TO_INCH 1440 diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 1fd3866e5edf..4795f177e742 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -24,6 +24,7 @@ #include <sfx2/module.hxx> #include <swpossizetabpage.hxx> #include <tools/shl.hxx> +#include <vcl/settings.hxx> #include <svx/dialogs.hrc> #include <svx/svddef.hxx> diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 28fe6fc91900..4c462c363ed5 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -23,6 +23,7 @@ #include <sfx2/module.hxx> #include <sfx2/request.hxx> #include <tools/shl.hxx> +#include <vcl/settings.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index c3deb390a6d3..5fc426dc69e4 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -22,6 +22,7 @@ #include <sfx2/objsh.hxx> #include <vcl/builder.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <unotools/localedatawrapper.hxx> #include <i18nlangtag/lang.h> #include <svx/dialogs.hrc> diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 364247c36c50..d93450500c91 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -38,6 +38,7 @@ #include <sfx2/objsh.hxx> #include <vcl/graph.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include "cuicharmap.hxx" #include <editeng/flstitem.hxx> #include <svx/dlgutil.hxx> diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 8e3b90ada452..8e10a774e103 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -21,6 +21,7 @@ #include <tools/shl.hxx> #include <svtools/ruler.hxx> #include <svx/dialogs.hrc> +#include <vcl/settings.hxx> #include <cuires.hrc> #include <editeng/lrspitem.hxx> diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index ec2f06d2f298..fff7dcf1756a 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -30,6 +30,7 @@ #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #include <svx/dialmgr.hxx> #include <vcl/bmpacc.hxx> +#include <vcl/settings.hxx> #include <svx/dialogs.hrc> #include <cuires.hrc> diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 6144adef2066..327d58203d42 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -20,6 +20,7 @@ #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> #include <sfx2/dialoghelper.hxx> diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 70ecfa999c5c..de6311b01b8d 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -51,6 +51,7 @@ #include "sfx2/opengrf.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> +#include <vcl/settings.hxx> #define MAX_BMP_WIDTH 16 #define MAX_BMP_HEIGHT 16 diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 44d1413f79ce..01893344ff19 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -20,6 +20,7 @@ #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> #include <sfx2/module.hxx> diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index b45c7757f31d..e12ded378d06 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -20,6 +20,7 @@ #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 996b7b28f28f..d01342bfdd1d 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -108,6 +108,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\ dbaccess/source/ui/control/ColumnControlWindow \ dbaccess/source/ui/control/curledit \ dbaccess/source/ui/control/dbtreelistbox \ + dbaccess/source/ui/control/FieldControls \ dbaccess/source/ui/control/FieldDescControl \ dbaccess/source/ui/control/listviewitems \ dbaccess/source/ui/control/marktree \ diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx index 66140cf7c948..471d0497c36f 100644 --- a/dbaccess/source/core/resource/core_resource.cxx +++ b/dbaccess/source/core/resource/core_resource.cxx @@ -23,6 +23,7 @@ // ---- needed as long as we have no contexts for components --- #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <rtl/instance.hxx> #include <svl/solar.hrc> diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 6211f5502d38..001c174fcc5f 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -59,6 +59,7 @@ #include "databaseobjectview.hxx" #include "imageprovider.hxx" #include <vcl/waitobj.hxx> +#include <vcl/settings.hxx> #include <tools/stream.hxx> #include <rtl/ustrbuf.hxx> #include "IApplicationController.hxx" diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 0495f5059f01..130a39c04721 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -32,6 +32,7 @@ #include "listviewitems.hxx" #include <vcl/image.hxx> #include <vcl/mnemonic.hxx> +#include <vcl/settings.hxx> #include "browserids.hxx" #include "AppDetailPageHelper.hxx" #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index f5cc75e3b7d9..05253c24c217 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -26,6 +26,7 @@ #include <vcl/syswin.hxx> #include <vcl/menu.hxx> #include <vcl/mnemonic.hxx> +#include <vcl/settings.hxx> #include "IApplicationController.hxx" using namespace ::dbaui; diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index 381ed4a11871..3f794cfb3e72 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -21,6 +21,7 @@ #include "moduledbu.hxx" #include "memory" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <tools/debug.hxx> namespace dbaui diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index d35e8cdd9b11..056aa434e2a5 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -36,6 +36,7 @@ #include "tabletree.hxx" #include "AppSwapWindow.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "AppTitleWindow.hxx" #include "dsntypes.hxx" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index 8a3d7a7dda2c..edd48b43a31d 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -28,6 +28,7 @@ #include <sfx2/sfx.hrc> #include <svtools/imgdef.hxx> #include <tools/diagnose_ex.h> +#include <vcl/settings.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index aa502ff4564c..44d08805bbbe 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -125,6 +125,7 @@ #include <vcl/toolbox.hxx> #include <vcl/waitobj.hxx> #include <vcl/wrkwin.hxx> +#include <vcl/settings.hxx> #include <memory> diff --git a/dbaccess/source/ui/control/FieldControls.cxx b/dbaccess/source/ui/control/FieldControls.cxx new file mode 100644 index 000000000000..9d9ea9e9f1a7 --- /dev/null +++ b/dbaccess/source/ui/control/FieldControls.cxx @@ -0,0 +1,123 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * 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/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include "FieldControls.hxx" +#include "SqlNameEdit.hxx" + +#include <vcl/settings.hxx> + +namespace dbaui { + +namespace { + +void lcl_setSpecialReadOnly( sal_Bool _bReadOnly, Window* _pWin ) +{ + StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings(); + const Color& rNewColor = _bReadOnly ? aSystemStyle.GetDialogColor() : aSystemStyle.GetFieldColor(); + _pWin->SetBackground(Wallpaper(rNewColor)); + _pWin->SetControlBackground(rNewColor); +} + +} + +OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, + rtl::OUString& _rAllowedChars, + sal_uInt16 nHelpId, + short nPosition, + WinBits nWinStyle) + :OSQLNameEdit(pParent, nWinStyle, _rAllowedChars) + ,m_nPos(nPosition) +{ + m_strHelpText = ModuleRes(nHelpId); +} + +void +OPropColumnEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +{ + SetReadOnly(_bReadOnly); + lcl_setSpecialReadOnly(_bReadOnly,this); +} + + + +OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) + :Edit(pParent, nWinStyle) + ,m_nPos(nPosition) +{ + m_strHelpText = ModuleRes(nHelpId); +} + +OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition) + :Edit(pParent, _rRes) + ,m_nPos(nPosition) +{ + m_strHelpText = ModuleRes(nHelpId); +} + +void +OPropEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +{ + SetReadOnly(_bReadOnly); + lcl_setSpecialReadOnly(_bReadOnly,this); +} + +void +OPropNumericEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +{ + SetReadOnly(_bReadOnly); + lcl_setSpecialReadOnly(_bReadOnly,this); +} + + +OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) + :NumericField(pParent, nWinStyle) + ,m_nPos(nPosition) +{ + m_strHelpText = ModuleRes(nHelpId); +} + +OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition) + :NumericField(pParent, _rRes) + ,m_nPos(nPosition) +{ + m_strHelpText = ModuleRes(nHelpId); +} + +OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) + :ListBox(pParent, nWinStyle) + ,m_nPos(nPosition) +{ + m_strHelpText = ModuleRes(nHelpId); +} +OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition) + :ListBox(pParent, _rRes) + ,m_nPos(nPosition) +{ + m_strHelpText = ModuleRes(nHelpId); +} + + +void +OPropListBoxCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +{ + SetReadOnly(_bReadOnly); + lcl_setSpecialReadOnly(_bReadOnly,this); +} + +} // end namespace dbaui diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index fa9cb5447967..b14bf5ae81f5 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -21,6 +21,7 @@ #include <tools/debug.hxx> #include <vcl/split.hxx> +#include <vcl/settings.hxx> #define SPLITTER_WIDTH 80 diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index 98165e9829d8..4799a80f7435 100644 --- a/dbaccess/source/ui/control/curledit.cxx +++ b/dbaccess/source/ui/control/curledit.cxx @@ -19,6 +19,7 @@ #include "curledit.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <osl/diagnose.h> namespace dbaui diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index f60b59d8d532..b012cba4f5fe 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -20,6 +20,7 @@ #include "marktree.hxx" #include "dbu_control.hrc" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 1418c218be49..8f3938532b88 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -34,6 +34,7 @@ #include "undosqledit.hxx" #include "QueryDesignView.hxx" #include <svl/smplhint.hxx> +#include <vcl/settings.hxx> using namespace dbaui; diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index d302a039f3e8..3e089a7401af 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -28,6 +28,7 @@ #include "indexfieldscontrol.hxx" #include "indexcollection.hxx" #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/sdb/SQLContext.hpp> #include "UITools.hxx" #include <svtools/imgdef.hxx> diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 824abc2ce0c8..e72494df1a50 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -21,6 +21,7 @@ #include "dbu_dlg.hrc" #include <osl/diagnose.h> #include "dbaccess_helpid.hrc" +#include <vcl/settings.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index d7c9b67f84fe..2fabcb4ca785 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -30,6 +30,7 @@ #include <comphelper/extract.hxx> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <tools/diagnose_ex.h> +#include <vcl/settings.hxx> #include <algorithm> using namespace dbaui; diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 15f2acb601a7..1a76c21ebaf5 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -31,6 +31,7 @@ #include <svl/stritem.hxx> #include "dbustrings.hrc" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <vcl/waitobj.hxx> #include <com/sun/star/i18n/Collator.hpp> #include <com/sun/star/sdb/SQLContext.hpp> diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 21c8ee6e0039..cea9025c5da7 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -26,6 +26,7 @@ #include <vcl/fixed.hxx> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> namespace dbaui { diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index aef6c7dc29d4..2724d1e090f6 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/Date.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <map> #include <vector> #include <comphelper/stl_types.hxx> diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 0fb95c02d8e3..2503fa79c969 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -27,16 +27,6 @@ namespace dbaui { - namespace - { - void lcl_setSpecialReadOnly( sal_Bool _bReadOnly, Window* _pWin ) - { - StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings(); - const Color& rNewColor = _bReadOnly ? aSystemStyle.GetDialogColor() : aSystemStyle.GetFieldColor(); - _pWin->SetBackground(Wallpaper(rNewColor)); - _pWin->SetControlBackground(rNewColor); - } - } class OPropColumnEditCtrl : public OSQLNameEdit { @@ -44,29 +34,17 @@ namespace dbaui short m_nPos; OUString m_strHelpText; public: - inline OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly) - { - SetReadOnly(_bReadOnly); - lcl_setSpecialReadOnly(_bReadOnly,this); - } + virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); + }; - inline OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, - OUString& _rAllowedChars, - sal_uInt16 nHelpId, - short nPosition, - WinBits nWinStyle) - :OSQLNameEdit(pParent, nWinStyle, _rAllowedChars) - ,m_nPos(nPosition) - { - m_strHelpText = ModuleRes(nHelpId); - } + class OPropEditCtrl : public Edit { OModuleClient m_aModuleClient; @@ -74,67 +52,34 @@ namespace dbaui OUString m_strHelpText; public: - inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); + OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly) - { - SetReadOnly(_bReadOnly); - lcl_setSpecialReadOnly(_bReadOnly,this); - } + virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); }; - inline OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) - :Edit(pParent, nWinStyle) - ,m_nPos(nPosition) - { - m_strHelpText = ModuleRes(nHelpId); - } - inline OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition) - :Edit(pParent, _rRes) - ,m_nPos(nPosition) - { - m_strHelpText = ModuleRes(nHelpId); - } - class OPropNumericEditCtrl : public NumericField { short m_nPos; OUString m_strHelpText; public: - inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); + OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly) - { - SetReadOnly(_bReadOnly); - lcl_setSpecialReadOnly(_bReadOnly,this); - } - }; + virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); - inline OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) - :NumericField(pParent, nWinStyle) - ,m_nPos(nPosition) - { - m_strHelpText = ModuleRes(nHelpId); - } - inline OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition) - :NumericField(pParent, _rRes) - ,m_nPos(nPosition) - { - m_strHelpText = ModuleRes(nHelpId); - } + }; class OPropListBoxCtrl : public ListBox { @@ -142,33 +87,18 @@ namespace dbaui OUString m_strHelpText; public: - inline OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - inline OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); + OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); - inline sal_Bool IsModified() const { return GetSelectEntryPos() != GetSavedValue(); } + sal_Bool IsModified() const { return GetSelectEntryPos() != GetSavedValue(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly) - { - SetReadOnly(_bReadOnly); - lcl_setSpecialReadOnly(_bReadOnly,this); - } + virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); + }; - inline OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) - :ListBox(pParent, nWinStyle) - ,m_nPos(nPosition) - { - m_strHelpText = ModuleRes(nHelpId); - } - inline OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition) - :ListBox(pParent, _rRes) - ,m_nPos(nPosition) - { - m_strHelpText = ModuleRes(nHelpId); - } } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDCONTROLS_HXX diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx index 0c9a056200c5..ac802e59f058 100644 --- a/dbaccess/source/ui/inc/HtmlReader.hxx +++ b/dbaccess/source/ui/inc/HtmlReader.hxx @@ -24,6 +24,7 @@ #include <editeng/svxenum.hxx> #include <tools/stream.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> namespace dbaui { diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index e9068d12e02e..71742ef03ad8 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -32,6 +32,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase1.hxx> #include <tools/stream.hxx> diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 6707591ca3f7..5d30bd92bff5 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -23,6 +23,7 @@ #include "apitools.hxx" #include <vcl/dialog.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <vcl/msgbox.hxx> namespace com { namespace sun { namespace star { diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index cbacdfc76acf..61e3e676f29a 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> #include <vcl/toolbox.hxx> #include <svtools/treelistbox.hxx> #include <unotools/viewoptions.hxx> diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 814cd38aeba3..ea8b68bc14f5 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index dcb03ea4aa9d..ceb52b4fe019 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -55,6 +55,7 @@ #include <rtl/tencinfo.h> #include "UITools.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> using namespace dbaui; using namespace ::com::sun::star::uno; diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 9951a4d1419e..83021aadd035 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -46,6 +46,7 @@ #include "QEnumTypes.hxx" #include "UITools.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> using namespace dbaui; using namespace ::com::sun::star::uno; diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index d9e5c58ab58e..21cc78652dc1 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -51,6 +51,7 @@ #include "UITools.hxx" #include <toolkit/helper/vclunohelper.hxx> #include <vcl/outdev.hxx> +#include <vcl/settings.hxx> #include <svtools/rtfout.hxx> #include <svtools/htmlcfg.hxx> #include <connectivity/formattedcolumnvalue.hxx> diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index dae1258b3783..6a03ebd4fb49 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -24,6 +24,7 @@ #include "UITools.hxx" #include <svtools/imgdef.hxx> #include <vcl/event.hxx> +#include <vcl/settings.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 9cd2d9bafd38..95afe5f22e07 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -53,6 +53,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <vcl/stdtext.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 18cab465e9ef..685da8d69468 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -25,6 +25,7 @@ #include "dbu_misc.hrc" #include "WizardPages.hrc" #include <vcl/scrbar.hxx> +#include <vcl/settings.hxx> #include "svtools/treelistentry.hxx" #include <com/sun/star/sdbc/DataType.hpp> diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index 36afe62d77f1..ec66d0411c23 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -26,6 +26,7 @@ #include <math.h> #include <osl/diagnose.h> #include <vcl/lineinfo.hxx> +#include <vcl/settings.hxx> using namespace dbaui; const long DESCRIPT_LINE_WIDTH = 15; diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index 31dd26d43b54..ce3a7cafce43 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -37,6 +37,7 @@ #include "dbustrings.hrc" #include <comphelper/extract.hxx> #include "UITools.hxx" +#include <vcl/settings.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 718c7c5cf82b..75db5a29385c 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -34,6 +34,7 @@ #include "QueryMoveTabWinUndoAct.hxx" #include "QuerySizeTabWinUndoAct.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "TableWindowData.hxx" #include "JAccess.hxx" #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 3fb10b21430b..54754ad0e28a 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -35,6 +35,7 @@ #include "dbustrings.hrc" #include "QTableWindow.hxx" #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include "QueryDesignFieldUndoAct.hxx" #include "sqlmessage.hxx" #include "UITools.hxx" diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 8041308c9127..f4e6a73a5e51 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -27,6 +27,7 @@ #include <osl/diagnose.h> #include <vcl/svapp.hxx> #include <vcl/wall.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index 7b104816ec3f..ae990328e79b 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -23,6 +23,7 @@ #include <vcl/svapp.hxx> #include <vcl/help.hxx> #include <vcl/menu.hxx> +#include <vcl/settings.hxx> #include <tools/debug.hxx> #include "dbustrings.hrc" #include <sfx2/cntids.hrc> diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index c549510ca52e..4bc0b92ea678 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -21,6 +21,7 @@ #include "QueryDesignView.hxx" #include <tools/debug.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "JoinController.hxx" #include <toolkit/helper/vclunohelper.hxx> #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index caf3e433b328..0782c3a4938f 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include "RelationControl.hxx" #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> using namespace dbaui; using namespace ::com::sun::star::uno; diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index cdd1ad4a4955..f84984f28304 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -21,6 +21,7 @@ #include <tools/debug.hxx> #include "RelationTableView.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "ConnectionLine.hxx" using namespace dbaui; diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 2677a5b395a7..2bb1d3feff4e 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -20,6 +20,7 @@ #include "TableDesignHelpBar.hxx" #include <tools/debug.hxx> #include <svtools/svmedit.hxx> +#include <vcl/settings.hxx> #include "dbaccess_helpid.hrc" #include <boost/scoped_ptr.hpp> using namespace dbaui; diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 92e286e34484..36302780cd0c 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -29,6 +29,7 @@ #include <comphelper/types.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <unotools/syslocale.hxx> +#include <vcl/settings.hxx> #include "UITools.hxx" using namespace ::dbaui; diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 04ea9cb6f31b..a59c6f112f51 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -23,6 +23,7 @@ #include "dbu_tbl.hrc" #include "TableDesignHelpBar.hxx" #include <vcl/fixed.hxx> +#include <vcl/settings.hxx> #include "dbaccess_helpid.hrc" #include "moduledbu.hxx" #include <boost/scoped_ptr.hpp> diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index b9290c4b6ced..316580e75f18 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -93,6 +93,7 @@ #include <rtl/bootstrap.hxx> #include <vcl/help.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <sfx2/sfx.hrc> #include <sfx2/app.hxx> #include <svl/itemset.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 5534a219b416..8a12b207b5c5 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -30,6 +30,7 @@ #include "com/sun/star/deployment/DependencyException.hpp" #include "com/sun/star/deployment/DeploymentException.hpp" #include "cppuhelper/weakref.hxx" +#include <vcl/settings.hxx> #define USER_PACKAGE_MANAGER "user" #define SHARED_PACKAGE_MANAGER "shared" diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index dc694a257540..d19f175bf365 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -29,6 +29,7 @@ #include "comphelper/unwrapargs.hxx" #include <i18nlangtag/languagetag.hxx> #include "vcl/svapp.hxx" +#include <vcl/settings.hxx> #include "vcl/msgbox.hxx" #include "com/sun/star/lang/XServiceInfo.hpp" #include "com/sun/star/task/XJobExecutor.hpp" diff --git a/drawinglayer/source/processor2d/getdigitlanguage.cxx b/drawinglayer/source/processor2d/getdigitlanguage.cxx index 5d058fcbe0da..fff455c98cac 100644 --- a/drawinglayer/source/processor2d/getdigitlanguage.cxx +++ b/drawinglayer/source/processor2d/getdigitlanguage.cxx @@ -12,6 +12,7 @@ #include "i18nlangtag/lang.h" #include "svl/ctloptions.hxx" #include "vcl/svapp.hxx" +#include "vcl/settings.hxx" #include "getdigitlanguage.hxx" diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 7fc3f5371043..168eb814fa7f 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -47,6 +47,8 @@ #include <unotools/accessiblerelationsethelper.hxx> #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <vcl/unohelp.hxx> +#include <vcl/settings.hxx> + #include <editeng/editeng.hxx> #include <editeng/unoprnms.hxx> #include <editeng/unoipset.hxx> diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 40f3ed8a6946..6ee3a7e3ad21 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -20,6 +20,7 @@ #include <tools/gen.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Rectangle.hpp> diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index f383cafdcf81..cf9327e4ff22 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -22,6 +22,7 @@ #include <vcl/dialog.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/linguistic2/LanguageGuessing.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 1503ba6683b5..b640a3b26877 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -21,6 +21,8 @@ #include <vcl/dialog.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <impedit.hxx> #include <editeng/editeng.hxx> #include <editeng/editview.hxx> diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 8bfefb3d8638..2c8b98eeace4 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -24,6 +24,7 @@ #include <vcl/svapp.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> +#include <vcl/settings.hxx> #include <editeng/adjustitem.hxx> #include <editeng/tstpitem.hxx> diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 7f2cf425d51a..deff249ada8a 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -57,6 +57,7 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/graphicfilter.hxx> +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <editeng/editids.hrc> #include <editeng/editrids.hrc> diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 8a87a64642e3..e92f83646bf5 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/text/RelOrientation.hpp> #include <editeng/brushitem.hxx> #include <vcl/font.hxx> +#include <vcl/settings.hxx> #include <editeng/editids.hrc> #include <editeng/editrids.hrc> #include <editeng/numdef.hxx> diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index fcb91ddf2650..d9088887457a 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -22,6 +22,7 @@ #include <tools/urlobj.hxx> #include <i18nlangtag/mslangid.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <sot/storinfo.hxx> #include <svl/fstathelper.hxx> #include <svtools/helpopt.hxx> diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index e20eb82a28eb..88ac6ba958ca 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -35,6 +35,7 @@ #include <editeng/svxrtf.hxx> #include <editeng/editids.hrc> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/document/XDocumentProperties.hpp> diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index a20ca1c4dd7b..012c23ba5561 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -29,6 +29,7 @@ #include "tableselectionpage.hxx" #include <vcl/waitobj.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include "abpfinalpage.hxx" #include "fieldmappingpage.hxx" #include "fieldmappingimpl.hxx" diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index c8efed9260a9..d77a626fbecc 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.hxx @@ -21,6 +21,8 @@ #define EXTENSIONS_ABP_DATASOURCEHANDLING_HXX #include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> + #include "abptypes.hxx" //======================================================================== diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 1387502deb1b..af3635991e63 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/awt/XWindow.hpp> #include <toolkit/helper/vclunohelper.hxx> #include <cppuhelper/implbase1.hxx> +#include <vcl/settings.hxx> #include "general.hxx" #include "sections.hrc" #include "bibresid.hxx" diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 06cf39225a97..f306179fd779 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -28,6 +28,7 @@ #include <svtools/miscopt.hxx> #include <svtools/imgdef.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <vcl/mnemonic.hxx> #include "bibbeam.hxx" #include "toolbar.hrc" diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 680a485e84ea..2edf862b6090 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -46,6 +46,7 @@ #include <sal/log.hxx> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <tools/urlobj.hxx> #include <osl/file.hxx> diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index df48176199a0..e7488dc614f2 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -66,6 +66,7 @@ #include "com/sun/star/awt/RasterOperation.hpp" #include "com/sun/star/awt/Gradient.hpp" #include "com/sun/star/awt/XGraphics.hpp" +#include <com/sun/star/uno/XComponentContext.hpp> #include "cppuhelper/implbase3.hxx" #include "cppuhelper/implbase2.hxx" diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index f75694b8c2c8..5ebeac6e2a3d 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -30,6 +30,7 @@ #include <tools/diagnose_ex.h> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> //............................................................................ namespace pcr diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index ac4e88dcc39d..5fcf21478149 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -55,6 +55,8 @@ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include <svx/flagsdef.hxx> +#include <vcl/settings.hxx> + //............................................................................ namespace pcr { diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index 80b3d0eb6caf..abf7b86bb93b 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <memory> diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 787de5642c26..caaaec807b83 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -44,6 +44,7 @@ #include <i18nlangtag/languagetag.hxx> #include <vcl/button.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> //================================================================== #include <limits> diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index d36249cb36de..75f2d392eb37 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/awt/XTabControllerModel.hpp> #include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <vcl/dialog.hxx> diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index 4f0c8f36410f..0de4b76c36bd 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.cxx @@ -20,6 +20,7 @@ #include <oooresourceloader.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <tools/simplerm.hxx> #include <tools/rcid.h> #include <cppuhelper/implbase1.hxx> diff --git a/filter/source/graphic/GraphicExportDialog.cxx b/filter/source/graphic/GraphicExportDialog.cxx index ace8e75d825c..f784636ffbf9 100644 --- a/filter/source/graphic/GraphicExportDialog.cxx +++ b/filter/source/graphic/GraphicExportDialog.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <svtools/GraphicExportOptionsDialog.hxx> +#include <unotools/syslocale.hxx> using namespace css; using namespace css::uno; diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index e818bd051c8b..434f057d1cf2 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -31,6 +31,7 @@ #include <vcl/msgbox.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/gradient.hxx> +#include <vcl/settings.hxx> #include <unotools/configmgr.hxx> #include <svl/solar.hrc> #include <vcl/fltcall.hxx> diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 9bea5b39fa3f..cf255a83f134 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -37,6 +37,7 @@ #include <sot/storinfo.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/wmf.hxx> +#include <vcl/settings.hxx> #include "viscache.hxx" // SvxItem-Mapping. Is needed to successfully include the SvxItem-Header diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 17e03cbadf77..9d968a0465dc 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -23,6 +23,7 @@ #include "impdialog.hrc" #include "vcl/svapp.hxx" #include "vcl/msgbox.hxx" +#include <vcl/settings.hxx> #include "sfx2/passwd.hxx" #include "svtools/miscopt.hxx" diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index e709c9c735d9..13f4f4f32724 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -36,6 +36,7 @@ #include "unotools/localfilehelper.hxx" #include <vcl/FilterConfigItem.hxx> #include <vcl/graphicfilter.hxx> +#include <vcl/settings.hxx> #include "svl/solar.hrc" #include "comphelper/string.hxx" #include "comphelper/storagehelper.hxx" diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index 2ce7bb0a767b..39835a6f5d58 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -26,6 +26,7 @@ #include <vcl/unohelp.hxx> #include <vcl/font.hxx> #include <vcl/outdev.hxx> +#include <vcl/settings.hxx> static const sal_Int32 nFontEM = 2048; diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 4851258810d3..ffdfe689f27b 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -23,6 +23,8 @@ #include <rtl/crc.h> #include <vcl/unohelp.hxx> +#include <vcl/outdev.hxx> +#include <vcl/settings.hxx> #include <tools/helpers.hxx> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <sax/tools/converter.hxx> diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 1edb72cc0d73..9884cf7706e5 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <tools/resmgr.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <rtl/instance.hxx> #include <comphelper/processfactory.hxx> diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 899df4521129..bdaf676f8851 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/awt/XVclWindowPeer.hpp> #include <vcl/svapp.hxx> +#include <vcl/keycodes.hxx> #include <tools/wintypes.hxx> #include <connectivity/dbtools.hxx> diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 937f46f21197..afb857dd7a44 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -32,6 +32,7 @@ #include <svl/zforlist.hxx> #include <svl/numuno.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <tools/debug.hxx> #include <tools/wintypes.hxx> #include <i18nlangtag/languagetag.hxx> diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index 55083bfadb80..b48002f59c11 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -27,6 +27,7 @@ #include <connectivity/dbtools.hxx> #include <tools/debug.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> namespace frm { diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx index 3e643500b029..a2a92e173170 100644 --- a/forms/source/resource/frm_resource.cxx +++ b/forms/source/resource/frm_resource.cxx @@ -23,6 +23,7 @@ // ---- needed as long as we have no contexts for components --- #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> //--------------------------------------------------- #include <svl/solar.hrc> diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index 0f2997db6d37..98221cc4a61e 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -28,6 +28,7 @@ #include <tools/mapunit.hxx> #include <vcl/mapmod.hxx> #include <vcl/outdev.hxx> +#include <vcl/settings.hxx> #include <unotools/lingucfg.hxx> #include <svl/undo.hxx> #include <osl/mutex.hxx> diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index a5dbc96c83a3..164b573e48ba 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -33,6 +33,7 @@ #include <tools/mapunit.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #define EMPTY_PAPER_SIZE 0x7FFFFFFF diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 825191ae3d79..d727aeff764f 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -37,6 +37,7 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> //-------------------------------------------------------------------------- extern "C" void SAL_CALL createRegistryInfo_ONavigationBarControl() diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx index 3e7160a48957..97debb2901f5 100644 --- a/formula/source/core/resource/core_resource.cxx +++ b/formula/source/core/resource/core_resource.cxx @@ -23,6 +23,7 @@ // ---- needed as long as we have no contexts for components --- #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <rtl/instance.hxx> #include <svl/solar.hrc> diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 24a22c2056f0..ebcbd737566b 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -20,6 +20,7 @@ #include <comphelper/string.hxx> #include <svl/zforlist.hxx> #include <svl/stritem.hxx> +#include <vcl/settings.hxx> #include "parawin.hxx" #include "parawin.hrc" diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 36f4a5abb07b..9792a865b0d2 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -73,6 +73,7 @@ #include <osl/file.h> #include <vcl/dibtools.hxx> #include <vcl/waitobj.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/task/InteractionHandler.hpp> #include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp" diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index 3cd22e602f37..b700fbd370f8 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -22,6 +22,7 @@ #include "resourceprovider.hxx" #include <osl/mutex.hxx> #include <vcl/fpicker.hrc> +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <tools/simplerm.hxx> diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index ff01b34561c2..30fd281d93c4 100644 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx @@ -21,6 +21,7 @@ #include "classes/fwlresid.hxx" #include <osl/mutex.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <rtl/strbuf.hxx> diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 0df49f784035..7f889605d9b3 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -51,6 +51,8 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> +#include <vcl/settings.hxx> + #include <osl/mutex.hxx> #include <osl/file.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index 78b02981db65..4d49b4ee4168 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/util/DateTime.hpp> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <unotools/dynamicmenuoptions.hxx> #include <svtools/menuoptions.hxx> diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx index 0ae4d3e579ad..4316f8f1a545 100644 --- a/framework/source/fwe/classes/fwkresid.cxx +++ b/framework/source/fwe/classes/fwkresid.cxx @@ -21,6 +21,7 @@ #include "classes/fwkresid.hxx" #include <osl/mutex.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <rtl/strbuf.hxx> diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 68cca5dd72e4..7b69a975f925 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -33,6 +33,7 @@ #include <sal/macros.h> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> +#include <vcl/settings.hxx> #include <rtl/ustrbuf.hxx> #include <comphelper/attributelist.hxx> diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 333d3254731b..3a82a28621d3 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -41,6 +41,8 @@ #include <toolkit/awt/vclxwindow.hxx> #include <vcl/i18nhelp.hxx> #include <vcl/dockingarea.hxx> +#include <vcl/settings.hxx> + #include <boost/bind.hpp> using namespace ::com::sun::star; diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 043322ddb14f..16e8661997d1 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -45,6 +45,7 @@ #include <osl/file.hxx> #include <vcl/xtextedt.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <comphelper/processfactory.hxx> #include <tools/date.hxx> #include <tools/time.hxx> diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index f7299658b692..079d4a28bd44 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -56,6 +56,7 @@ #include <vcl/syswin.hxx> #include <vcl/taskpanelist.hxx> #include <vcl/toolbox.hxx> +#include <vcl/settings.hxx> //_________________________________________________________________________________________________________________ // namespaces diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 80498550560f..1d64c569801e 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -36,6 +36,7 @@ #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> #include <vcl/toolbox.hxx> +#include <vcl/settings.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::awt; diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 08723c87d4ca..c6bb47a9aae9 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -33,6 +33,7 @@ #include <cppuhelper/supportsservice.hxx> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <vcl/i18nhelp.hxx> #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 3881275f8a55..4105279a73e0 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -29,6 +29,7 @@ #include <vcl/menu.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 72f5c7e73627..e90bbaf8ce3c 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -34,6 +34,7 @@ #include <vcl/i18nhelp.hxx> #include <vcl/outdev.hxx> #include <vcl/print.hxx> +#include <vcl/settings.hxx> #include <svtools/ctrltool.hxx> #include <osl/mutex.hxx> diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 736c2d5fe3f6..61b1aaa6fd28 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -68,6 +68,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> +#include <vcl/settings.hxx> #include <osl/mutex.hxx> #include <osl/file.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 98f63dc234e8..b602b3932a72 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -37,6 +37,7 @@ #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> +#include <vcl/settings.hxx> #include <rtl/ustrbuf.hxx> #include <cppuhelper/implbase1.hxx> #include <osl/file.hxx> diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 399a89ec6047..577ca6198bda 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -49,6 +49,7 @@ #include <vcl/status.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <functional> diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index f4a599a060a9..810fdf81b0b3 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -69,6 +69,8 @@ #include <vcl/syswin.hxx> #include <vcl/taskpanelist.hxx> #include <vcl/toolbox.hxx> +#include <vcl/settings.hxx> + #include <svtools/menuoptions.hxx> #include <boost/bind.hpp> #include <svtools/acceleratorexecute.hxx> diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 2e2f633dc391..aea77062fcd8 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -48,6 +48,7 @@ #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <vcl/image.hxx> +#include <vcl/settings.hxx> #include <rtl/ustrbuf.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx index b73911119a6a..74fdbe4d96eb 100644 --- a/include/editeng/hangulhanja.hxx +++ b/include/editeng/hangulhanja.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> #include <editeng/editengdllapi.h> #include <i18nlangtag/mslangid.hxx> diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx index ad820f4e46cb..a6bc26f9a8e0 100644 --- a/include/framework/menuconfiguration.hxx +++ b/include/framework/menuconfiguration.hxx @@ -28,6 +28,8 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> + #include <framework/fwedllapi.h> #include <cppuhelper/weak.hxx> diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 7985bd6817fe..a922ed3f1726 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -31,6 +31,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/util/AliasProgrammaticPair.hpp> #include <com/sun/star/sdb/XDatabaseContext.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> #include <unotools/configitem.hxx> diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx index 5b4428cea979..bbd7d85be31b 100644 --- a/include/svtools/table/tablerenderer.hxx +++ b/include/svtools/table/tablerenderer.hxx @@ -26,6 +26,8 @@ #include <boost/shared_ptr.hpp> +class StyleSettings; + //........................................................................ namespace svt { namespace table { diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx index 371a5c82b5b2..4cf0b451be54 100644 --- a/include/svx/ucsubset.hxx +++ b/include/svx/ucsubset.hxx @@ -24,6 +24,7 @@ #include <svx/ucsubset.hrc> #include <vcl/metric.hxx> +#include "tools/rc.hxx" #include <list> diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index fae2d1d1a74c..863d25f88e57 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -21,6 +21,7 @@ #define INCLUDED_VCL_BUTTON_HXX #include <tools/solar.h> +#include <tools/color.hxx> #include <vcl/dllapi.h> #include <vcl/image.hxx> #include <vcl/ctrl.hxx> diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index f5d61246db26..fb29c7168889 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -28,6 +28,7 @@ // forward namespace vcl { struct ImplControlData; struct ControlLayoutData; } +class StyleSettings; // ----------- // - Control - @@ -180,13 +181,7 @@ public: void SetReferenceDevice( OutputDevice* _referenceDevice ); OutputDevice* GetReferenceDevice() const; - Font GetUnzoomedControlPointFont() const - { - Font aFont( GetCanonicalFont( GetSettings().GetStyleSettings() ) ); - if ( IsControlFont() ) - aFont.Merge( GetControlFont() ); - return aFont; - } + Font GetUnzoomedControlPointFont() const; }; #endif // INCLUDED_VCL_CTRL_HXX diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 546331be8ea1..52eb6b52edd2 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -29,14 +29,15 @@ #include <vcl/region.hxx> #include <vcl/mapmod.hxx> #include <vcl/wall.hxx> -#include <vcl/settings.hxx> #include <vcl/salnativewidgets.hxx> #include <tools/poly.hxx> #include <basegfx/vector/b2enums.hxx> #include <com/sun/star/uno/Reference.h> #include <unotools/fontdefs.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <boost/scoped_ptr.hpp> #include <com/sun/star/drawing/LineCap.hpp> + #include <vector> struct ImplOutDevData; @@ -53,6 +54,7 @@ class ImplMultiTextLineInfo; class SalGraphics; class Gradient; class Hatch; +class AllSettings; class Bitmap; class BitmapReadAccess; class BitmapEx; @@ -70,6 +72,7 @@ class SalLayout; class ImplLayoutArgs; class ImplFontAttributes; class VirtualDevice; +class Window; struct SalTwoRect; namespace com { @@ -325,7 +328,7 @@ private: TextAlign meTextAlign; RasterOp meRasterOp; Wallpaper maBackground; - AllSettings maSettings; + boost::scoped_ptr<AllSettings> mxSettings; MapMode maMapMode; Point maRefPoint; sal_uInt16 mnAntialiasing; @@ -1169,7 +1172,7 @@ public: TextAlign GetTextAlign() const { return maFont.GetAlign(); } virtual void SetSettings( const AllSettings& rSettings ); - const AllSettings& GetSettings() const { return maSettings; } + const AllSettings& GetSettings() const { return *mxSettings; } SystemGraphicsData GetSystemGfxData() const; css::uno::Any GetSystemGfxDataAny() const; diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 558d528e61b3..3f86d1c54f3e 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -31,12 +31,14 @@ #include <comphelper/solarmutex.hxx> #include <rtl/ustring.hxx> #include <osl/thread.hxx> +#include <tools/gen.hxx> #include <tools/link.hxx> #include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/apptypes.hxx> -#include <vcl/settings.hxx> #include <vcl/vclevent.hxx> +#include <vcl/metric.hxx> +#include <unotools/localedatawrapper.hxx> class BitmapEx; class Link; diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index c4e79a4af781..8ff54aa0fe27 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -62,6 +62,7 @@ #include <unotools/fontdefs.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/graph.hxx> +#include <vcl/settings.hxx> #include <svtools/grfmgr.hxx> #include <rtl/strbuf.hxx> #include <sfx2/app.hxx> diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx index d3a1b3135706..c57a84c420de 100644 --- a/padmin/source/adddlg.cxx +++ b/padmin/source/adddlg.cxx @@ -26,6 +26,7 @@ #include "vcl/msgbox.hxx" #include "vcl/strhelper.hxx" +#include <vcl/settings.hxx> #include <tools/config.hxx> #include <osl/thread.h> diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx index f23ac720aefa..848da22e32a9 100644 --- a/padmin/source/helper.cxx +++ b/padmin/source/helper.cxx @@ -24,6 +24,7 @@ #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <tools/config.hxx> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/FolderPicker.hpp> diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx index 10128ca9b2c7..4794388798a8 100644 --- a/padmin/source/padialog.cxx +++ b/padmin/source/padialog.cxx @@ -37,6 +37,7 @@ #include "vcl/svapp.hxx" #include "vcl/event.hxx" #include "vcl/printerinfomanager.hxx" +#include <vcl/settings.hxx> #include "tools/stream.hxx" #include "tools/color.hxx" diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx index 4d2cad2d1092..2ed6b5bb7715 100644 --- a/padmin/source/pamain.cxx +++ b/padmin/source/pamain.cxx @@ -24,6 +24,7 @@ #include "vcl/vclmain.hxx" #include "vcl/wrkwin.hxx" #include "vcl/unowrap.hxx" +#include <vcl/settings.hxx> #include "padialog.hxx" #include "helper.hxx" diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 758102a89158..8af0d83053c1 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -21,6 +21,8 @@ #include "corestrings.hrc" #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> +#include <vcl/settings.hxx> + #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/awt/FontWidth.hpp> diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index c10b129ba705..2e8714e4d930 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -21,6 +21,7 @@ // ---- needed as long as we have no contexts for components --- #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> //--------------------------------------------------- #include <osl/thread.h> #include <com/sun/star/util/XMacroExpander.hpp> diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 9c5f33f0e54a..9849b2ab2a48 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -27,6 +27,8 @@ #include <vcl/waitobj.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <tools/diagnose_ex.h> #include "rptui_slotid.hrc" diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index e6fd029dadc3..1035917934b1 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -35,6 +35,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 5b152c83272c..873c7b50f165 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -44,6 +44,8 @@ #include <unotools/pathoptions.hxx> #include <vcl/svapp.hxx> #include <vcl/bmpacc.hxx> +#include <vcl/settings.hxx> + #include <tools/diagnose_ex.h> #include <rtl/ustrbuf.hxx> #include <svtools/valueset.hxx> diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 60cdac3ed691..80cefa6fc7b4 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -42,6 +42,8 @@ #include <comphelper/property.hxx> #include <vcl/mnemonic.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> + #include <algorithm> #include <cppuhelper/bootstrap.hxx> diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index f108e8319089..eb3b3f06919a 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -25,6 +25,8 @@ #include "RptDef.hxx" #include "helpids.hrc" #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> + #include "UITools.hxx" #include "uistrings.hrc" #include "ReportController.hxx" diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx index 19967ed3c059..204b55864527 100644 --- a/reportdesign/source/ui/inc/UITools.hxx +++ b/reportdesign/source/ui/inc/UITools.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include "ReportSection.hxx" #include <rtl/ref.hxx> #include <vcl/taskpanelist.hxx> diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index f5a2d453eae4..d37137cf072f 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -18,6 +18,8 @@ */ #include "ColorListener.hxx" #include <svl/smplhint.hxx> +#include <vcl/settings.hxx> + #include "uistrings.hrc" //===================================================================== diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index a4b89c5e7a8b..887d945d0063 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -30,6 +30,8 @@ #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> #include <svx/unoshape.hxx> +#include <vcl/settings.hxx> + #include <functional> namespace rptui diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 8a83ff7fd47d..c9b46f188dcd 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -30,6 +30,8 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> +#include <vcl/settings.hxx> + #include <com/sun/star/lang/NullPointerException.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 6c358a155ea7..17bdb834151f 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -38,6 +38,8 @@ #include "Navigator.hxx" #include "SectionWindow.hxx" #include "RptResId.hrc" + +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> namespace rptui diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index 5f74b67db042..bdd0318aeecd 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -20,6 +20,8 @@ #include "ColorChanger.hxx" #include "SectionWindow.hxx" #include "helpids.hrc" + +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/gradient.hxx> #include <vcl/lineinfo.hxx> diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 76d35ed189c3..aaf12fb84ac0 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -26,6 +26,8 @@ #include <svl/smplhint.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <com/sun/star/report/XFormattedField.hpp> #include <com/sun/star/awt/FontSlant.hpp> #include <FormattedFieldBeautifier.hxx> diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 50ee7fa41745..11789631455c 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -39,6 +39,7 @@ #include <svx/dbaexchange.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <toolkit/helper/convert.hxx> diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 41df08361778..edacb4d4b192 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -29,6 +29,8 @@ #include <svl/itempool.hxx> #include <unotools/syslocale.hxx> +#include <vcl/settings.hxx> + #include "RptDef.hxx" #include "dlgedfunc.hxx" #include "RptModel.hxx" diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index 1cb34da06091..ecfcdfd2356d 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -24,6 +24,8 @@ #include <tools/debug.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <toolkit/helper/convert.hxx> + +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> namespace rptui diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index c9aeb70413a1..23c76c6c979b 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -36,6 +36,8 @@ #include <functional> #include <algorithm> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <connectivity/dbtools.hxx> namespace rptui diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 639a3b787a41..5e36a05a0be9 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -28,6 +28,8 @@ #include <vcl/help.hxx> #include <vcl/gradient.hxx> #include <vcl/lineinfo.hxx> +#include <vcl/settings.hxx> + #include <toolkit/helper/vclunohelper.hxx> #include <unotools/syslocale.hxx> #include <svl/smplhint.hxx> diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index fd9fa72a7072..46625a3d864a 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -39,6 +39,8 @@ #include <svx/svdpagv.hxx> #include <svx/unoshape.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <boost/bind.hpp> #include "helpids.hrc" diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 53492a309565..33b196a70e09 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -24,6 +24,7 @@ #include <tools/shl.hxx> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svl/aeitem.hxx> #include <svl/itemiter.hxx> #include <svl/stritem.hxx> diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 1ae0d4e1ad3d..eff38fa156f7 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -55,6 +55,7 @@ #include <svl/itempool.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <unotools/ucbstreamhelper.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 40bcb0d0065a..5323fa647370 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -35,6 +35,7 @@ #include <svl/zformat.hxx> #include <vcl/image.hxx> #include <vcl/virdev.hxx> +#include <vcl/settings.hxx> #include <sal/macros.h> #include <tools/rcid.h> #include <unotools/charclass.hxx> diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 775e9263b835..004e2bfb6425 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -40,6 +40,7 @@ #include <unotools/fontcvt.hxx> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "sc.hrc" #include "attrib.hxx" diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 03e222cfcf84..c3784e70f5f5 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -20,6 +20,7 @@ #include <comphelper/processfactory.hxx> #include <i18nlangtag/languagetag.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <sfx2/objsh.hxx> #include <unotools/charclass.hxx> diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx index a4f8f9f876ca..e9e7e6cb15a3 100644 --- a/sc/source/core/tool/callform.cxx +++ b/sc/source/core/tool/callform.cxx @@ -18,6 +18,7 @@ */ #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <osl/module.hxx> #include <osl/file.hxx> #include <unotools/transliterationwrapper.hxx> diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx index 132f1634d162..bc465dd9b37b 100644 --- a/sc/source/core/tool/zforauto.cxx +++ b/sc/source/core/tool/zforauto.cxx @@ -20,6 +20,7 @@ #include <svl/zforlist.hxx> #include <svl/zformat.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "zforauto.hxx" #include "global.hxx" diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 1dd800da9af4..18668912eba1 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -32,6 +32,8 @@ #include <sfx2/printer.hxx> #include <sfx2/docfile.hxx> #include <vcl/font.hxx> +#include <vcl/settings.hxx> + #include <editeng/editstat.hxx> #include "scitems.hxx" #include <editeng/eeitem.hxx> diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index b1765bedcd3b..8439347af6d7 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <vcl/font.hxx> #include <sal/macros.h> #include <rtl/tencinfo.h> diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 87600c6f9aaf..221bbc55c626 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -30,6 +30,8 @@ #include <svx/unoapi.hxx> #include <editeng/writingmodeitem.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <rtl/math.hxx> #include <svl/zformat.hxx> #include "formulacell.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index cd119215d6bb..106954ca3f88 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -45,6 +45,7 @@ #include "scmod.hxx" #include <svtools/colorcfg.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> // ause #include "editutil.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx index a620ce20c00d..e52000678343 100644 --- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx @@ -29,6 +29,7 @@ #include <comphelper/accessiblekeybindinghelper.hxx> #include <com/sun/star/awt/KeyModifier.hpp> #include <vcl/keycodes.hxx> +#include <vcl/settings.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <comphelper/servicehelper.hxx> diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 8e6d16aeb514..b0c7d7e17424 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -48,6 +48,7 @@ #include <unotools/localedatawrapper.hxx> #include <vcl/help.hxx> #include <vcl/cursor.hxx> +#include <vcl/settings.hxx> #include <tools/urlobj.hxx> #include <comphelper/string.hxx> #include <formula/formulahelper.hxx> diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 04e6aeb69e9d..0d68b5a0b075 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -39,6 +39,7 @@ #include <editeng/scripttypeitem.hxx> #include <vcl/cursor.hxx> #include <vcl/help.hxx> +#include <vcl/settings.hxx> #include <svl/stritem.hxx> #include <stdio.h> diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx index 96da2d65547a..dde551d844ab 100644 --- a/sc/source/ui/cctrl/cbuttonw.cxx +++ b/sc/source/ui/cctrl/cbuttonw.cxx @@ -22,6 +22,7 @@ #include <vcl/window.hxx> #include <vcl/decoview.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "cbutton.hxx" //======================================================================== diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 2e88e1707bb8..0ae9ba297c28 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -22,6 +22,7 @@ #include "strload.hxx" #include <vcl/decoview.hxx> +#include <vcl/settings.hxx> #include <tools/wintypes.hxx> #include "AccessibleFilterMenu.hxx" diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 7ad70b24d60d..ce5753ca96e5 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -22,6 +22,7 @@ #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> #include <vcl/gradient.hxx> +#include <vcl/settings.hxx> #include <svl/itemset.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 2891094bf054..3e659f42489d 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -18,6 +18,7 @@ #include <svx/xtable.hxx> #include <svx/drawitem.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include "anyrefdg.hxx" #include "document.hxx" diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index eb595148de37..10984b133417 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -22,6 +22,7 @@ #include <svx/xtable.hxx> #include <svx/drawitem.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include "tokenarray.hxx" #include "stlpool.hxx" #include "tabvwsh.hxx" diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 9b05b8b7b329..e8c188a2dbc5 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -19,6 +19,7 @@ #include "csvcontrol.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "AccessibleCsvControl.hxx" diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 2440f850ff35..03972fd6338e 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -35,7 +35,7 @@ // *** edit engine *** #include "scitems.hxx" #include <editeng/eeitem.hxx> - +#include <vcl/settings.hxx> #include <editeng/colritem.hxx> #include <editeng/fhgtitem.hxx> diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 0363c09485d4..2f31ce13bb6d 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <comphelper/string.hxx> +#include <vcl/settings.hxx> #include "miscuno.hxx" using namespace com::sun::star::uno; diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 3822d16c6c62..9551630fcb99 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -20,6 +20,7 @@ #include "csvtablebox.hxx" #include <vcl/builder.hxx> #include <vcl/lstbox.hxx> +#include <vcl/settings.hxx> // ause #include "editutil.hxx" diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx index 9fe1bb02c373..9564ef4418f4 100644 --- a/sc/source/ui/dbgui/fieldwnd.cxx +++ b/sc/source/ui/dbgui/fieldwnd.cxx @@ -45,6 +45,7 @@ #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <vcl/mnemonic.hxx> +#include <vcl/settings.hxx> #include "pvlaydlg.hxx" #include "dpuiglobal.hxx" diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index dc616fb21d74..c0850f7ec7bc 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -46,6 +46,7 @@ #include <sfx2/dispatch.hxx> #include <vcl/msgbox.hxx> #include <vcl/layout.hxx> +#include <vcl/settings.hxx> #include "dbdocfun.hxx" #include "uiitems.hxx" diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index 9a55ed28028c..796386ba0887 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -26,6 +26,7 @@ #include "vcl/svapp.hxx" #include "vcl/msgbox.hxx" #include "vcl/window.hxx" +#include "vcl/settings.hxx" ScTextImportOptionsDlg::ScTextImportOptionsDlg(Window* pParent) : ModalDialog(pParent, "TextImportOptionsDialog", "modules/scalc/ui/textimportoptions.ui") diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx index 9c59b040525a..5c7c9c28905f 100644 --- a/sc/source/ui/formdlg/privsplt.cxx +++ b/sc/source/ui/formdlg/privsplt.cxx @@ -18,6 +18,7 @@ */ #include "privsplt.hxx" +#include <vcl/settings.hxx> /************************************************************************* #* Member: ScPrivatSplit diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 7ff2ef561598..4b88ede4bab6 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -38,6 +38,7 @@ class ScAccessibleEditLineTextData; struct EENotify; class ScRangeList; class ScTabViewShell; +class Accelerator; //======================================================================== diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index a536b22dbbfa..726bc8129b97 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -32,6 +32,7 @@ #include <vcl/svapp.hxx> #include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <sfx2/viewfrm.hxx> #include <comphelper/processfactory.hxx> diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 10a0dfd210ef..bde1f16718c1 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -10,6 +10,8 @@ #include "namedefdlg.hxx" #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> + #include <sfx2/app.hxx> #include "document.hxx" diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index a6c1edfaa0ef..583325185863 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -33,6 +33,7 @@ #include "sfx2/app.hxx" #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <map> diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index f059d755aed7..df0863f2ddfa 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -26,6 +26,7 @@ #include <sfx2/navigat.hxx> #include <svl/stritem.hxx> #include <svl/urlbmk.hxx> +#include <vcl/settings.hxx> #include <unotools/charclass.hxx> #include <stdlib.h> diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 7572edff7c2e..8e1b0383eb77 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -24,6 +24,7 @@ #include <svl/stritem.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "navipi.hxx" #include "popmenu.hxx" #include "scresid.hxx" diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index ba6140272ac1..33ddc5bbeb1e 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -33,6 +33,8 @@ #include <sfx2/objsh.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <unotools/useroptions.hxx> #include "editutil.hxx" diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 58baf7cd97cd..31d758b63959 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -30,6 +30,7 @@ #include <sfx2/objsh.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "tphfedit.hxx" #include "editutil.hxx" diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index b204b7259976..239054c5a2b8 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -21,6 +21,8 @@ #include "scitems.hxx" +#include <vcl/settings.hxx> + #include "tptable.hxx" #include "global.hxx" #include "attrib.hxx" diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index 00dc4d0641a4..6149faba9245 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -34,6 +34,7 @@ #include <editeng/colritem.hxx> #include <editeng/lineitem.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svx/sidebar/ColorControl.hxx> #include <boost/bind.hpp> #include <svx/sidebar/PopupContainer.hxx> diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index 7a03d9b03bc2..88f3883bae6b 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -27,6 +27,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <editeng/lineitem.hxx> namespace sc { namespace sidebar { diff --git a/sc/source/ui/sidebar/CellBorderUpdater.cxx b/sc/source/ui/sidebar/CellBorderUpdater.cxx index d281cdc95f52..fccecb190114 100644 --- a/sc/source/ui/sidebar/CellBorderUpdater.cxx +++ b/sc/source/ui/sidebar/CellBorderUpdater.cxx @@ -20,6 +20,7 @@ #include <CellBorderUpdater.hxx> #include <vcl/bmpacc.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> namespace sc { namespace sidebar { diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index e3af22d8f17a..d6f55cee2e9c 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -23,6 +23,7 @@ #include <CellAppearancePropertyPanel.hrc> #include <CellLineStyleValueSet.hxx> #include <vcl/i18nhelp.hxx> +#include <vcl/settings.hxx> #include <editeng/boxitem.hxx> #include <editeng/borderline.hxx> #include <editeng/lineitem.hxx> diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx index 6cfbd0c43bd5..4819d0f73b23 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx @@ -19,6 +19,7 @@ #include <CellLineStyleValueSet.hxx> #include <i18nlangtag/mslangid.hxx> +#include <vcl/settings.hxx> namespace sc { namespace sidebar { diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index e980235a1372..3e04371c3525 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -42,6 +42,7 @@ #include <vcl/cursor.hxx> #include <vcl/graph.hxx> #include <vcl/hatch.hxx> +#include <vcl/settings.hxx> #include <sot/formats.hxx> #include <comphelper/classids.hxx> #include <sal/macros.h> diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 6cbcff78d6a5..3bdbdce67af8 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -19,6 +19,7 @@ #include "scitems.hxx" #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include "gridwin.hxx" #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index c0f9456a185b..42ddaf6544ba 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -27,6 +27,7 @@ #include <editeng/scripttypeitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/printer.hxx> +#include <vcl/settings.hxx> #include <svx/svdview.hxx> #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index aedfc2a4175b..239f25f1de6e 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -19,6 +19,7 @@ #include <sfx2/dispatch.hxx> #include <vcl/help.hxx> +#include <vcl/settings.hxx> #include <tools/poly.hxx> #include <svtools/colorcfg.hxx> diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index fdb43f62698d..624df51021de 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -26,6 +26,7 @@ #include <unotools/pathoptions.hxx> #include <svl/itempool.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "notemark.hxx" #include "document.hxx" diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 2ca1ceb2f854..93a44348d9a5 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -19,6 +19,7 @@ #include <vcl/svapp.hxx> #include <vcl/taskpanelist.hxx> +#include <vcl/settings.hxx> #include "olinewin.hxx" #include "olinetab.hxx" diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 7aa693a6bedc..fff66e521180 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -39,6 +39,7 @@ #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> #include <vcl/lineinfo.hxx> #include <vcl/gradient.hxx> +#include <vcl/settings.hxx> #include <svx/unoapi.hxx> #include "output.hxx" diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 5fc4d502df79..5e09b9414db3 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -43,6 +43,7 @@ #include <vcl/metric.hxx> #include <vcl/outdev.hxx> #include <vcl/pdfextoutdevdata.hxx> +#include <vcl/settings.hxx> #include "output.hxx" #include "document.hxx" diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index fda65f6f72a4..b64163517f18 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -25,6 +25,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "output.hxx" #include "drwlayer.hxx" diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index fbbf67a52642..38b9b90ce5a7 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -32,6 +32,7 @@ #include <svl/itemset.hxx> #include <tools/multisel.hxx> #include <vcl/waitobj.hxx> +#include <vcl/settings.hxx> #include "preview.hxx" #include "prevwsh.hxx" diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 879bfa80de1b..798b7b1c6450 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -33,6 +33,7 @@ #include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include <vcl/help.hxx> +#include <vcl/settings.hxx> #include <tools/urlobj.hxx> #include <sfx2/docfile.hxx> #include <sfx2/printer.hxx> diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 43e87eb2421b..2dc23dc8d122 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -30,6 +30,7 @@ #include <sfx2/viewfrm.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "spelldialog.hxx" #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index ce9d4af38ca7..a7752b70f3ad 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -21,6 +21,8 @@ #include "viewdata.hxx" #include "dbfunc.hxx" +#include <vcl/settings.hxx> + //================================================================== ScTabSplitter::ScTabSplitter( Window* pParent, WinBits nWinStyle, ScViewData* pData ) : diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 3a53aa0eb2b7..5bf2db8977bb 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -23,6 +23,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> #include <vcl/help.hxx> +#include <vcl/settings.hxx> #include "tabview.hxx" #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 34984ff71021..6eee7b5ba3a4 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -49,6 +49,7 @@ #include "viewuno.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> using namespace com::sun::star; diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index 66ea64548770..5e27bbf6b52e 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -30,6 +30,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <vcl/wrkwin.hxx> +#include <vcl/settings.hxx> #include <sfx2/request.hxx> #include <sfx2/objsh.hxx> #include <svl/stritem.hxx> diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index a0c048046f8a..97bc9c3c54b5 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -50,8 +50,8 @@ #include <xmlscript/xmldlg_imexp.hxx> #include <tools/urlobj.hxx> #include <comphelper/namedvaluecollection.hxx> - #include <util/MiscUtils.hxx> +#include <vcl/settings.hxx> using namespace ::com::sun::star; using namespace awt; diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index f00fbaffb274..5e84b13281ea 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -94,6 +94,7 @@ #include "../ui/inc/FrameView.hxx" #include <tools/tenccvt.hxx> +#include <vcl/settings.hxx> using namespace ::sd; using namespace ::com::sun::star; diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 32d89ff8d427..d1211c4f6aea 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -20,6 +20,8 @@ #include <com/sun/star/embed/XVisualObject.hpp> #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <vcl/wrkwin.hxx> +#include <vcl/settings.hxx> + #include <sfx2/printer.hxx> #include <sfx2/app.hxx> #include "Outliner.hxx" diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 4b8717ac0d7b..1acaf252d718 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -29,6 +29,8 @@ #include "../ui/inc/DrawDocShell.hxx" #include <editeng/eeitem.hxx> + +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <editeng/autokernitem.hxx> diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 7759f980090f..89500cfe80ad 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -44,6 +44,8 @@ #include <sfx2/app.hxx> #include <svl/languageoptions.hxx> #include <oox/export/drawingml.hxx> + +#include <vcl/settings.hxx> #include <vcl/metric.hxx> #include <vcl/outdev.hxx> #include <vcl/virdev.hxx> diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index 7771dd9dc7ec..d76e90cb6b6f 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -38,6 +38,7 @@ #include "sdpage.hxx" #include "sdresid.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "glob.hrc" diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 02ca215a3996..a1027f6517eb 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -44,6 +44,8 @@ #include <cppuhelper/supportsservice.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <rtl/ref.hxx> + +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 257d7fe67cc8..fcc0c17bf50c 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -30,6 +30,7 @@ #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> +#include <vcl/settings.hxx> #include <svx/svdetc.hxx> #include <svx/svdstr.hrc> diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index ec3b3e60dba3..ee6763c7eda7 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -49,6 +49,8 @@ #include <vcl/decoview.hxx> #include <vcl/combobox.hxx> #include <vcl/menu.hxx> +#include <vcl/settings.hxx> + #include <svtools/ctrlbox.hxx> #include <svtools/ctrltool.hxx> #include <sfx2/objsh.hxx> diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 1529c2f429fa..641d7ff6af94 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -33,6 +33,8 @@ #include "CustomAnimation.hrc" #include "CustomAnimationPreset.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include "sdresid.hxx" #include "svtools/svlbitm.hxx" diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index efb6c6e85a8e..256f0ec3a555 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -29,6 +29,8 @@ #include <com/sun/star/document/XEventBroadcaster.hpp> #include <comphelper/string.hxx> #include <svx/svxids.hrc> + +#include <vcl/settings.hxx> #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 4989dceb63ed..d25d45ce0c62 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -22,6 +22,7 @@ #include <vcl/help.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 564c5c6f853c..412ca0cce32c 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -67,6 +67,8 @@ #include <vcl/svapp.hxx> #include <vcl/gradient.hxx> #include <vcl/cursor.hxx> +#include <vcl/settings.hxx> + #include <tools/helpers.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 4964e43396cf..b3d80e3393f0 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -26,6 +26,7 @@ #include "com/sun/star/i18n/CollatorOptions.hpp" #include "com/sun/star/deployment/DependencyException.hpp" #include "com/sun/star/deployment/DeploymentException.hpp" +#include <vcl/settings.hxx> #include "glob.hrc" diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 93a057ca733f..5b8fe765c8ea 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -27,6 +27,7 @@ #include <tools/debug.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <sfx2/doctempl.hxx> #include <sfx2/templatelocnames.hrc> #include <com/sun/star/frame/DocumentTemplates.hpp> diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 9fe24b3c8eef..79f23a01980d 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -28,6 +28,8 @@ #include <sfx2/dispatch.hxx> #include <sfx2/progress.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> + #include "anminfo.hxx" #include "animobjs.hxx" #include "animobjs.hrc" @@ -41,6 +43,7 @@ #include "ViewShell.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> // #i42894# #include <EffectMigration.hxx> diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index bd4ad0c7ac8d..6a93c8d11606 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/presentation/FadeEffect.hpp> #include <fadedef.h> #include <vcl/ctrl.hxx> +#include <vcl/settings.hxx> #include <svx/svdoutl.hxx> #include <svx/svdpagv.hxx> #include <svx/svdorect.hxx> diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index bf25bbed693d..1950ddb0d6b1 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -28,7 +28,9 @@ #include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> #include <svx/svxids.hrc> + #include <vcl/menu.hxx> +#include <vcl/settings.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dockwin.hxx> diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx index 60f69389100c..67a172057fb6 100644 --- a/sd/source/ui/presenter/SlideRenderer.hxx +++ b/sd/source/ui/presenter/SlideRenderer.hxx @@ -25,6 +25,8 @@ #include <com/sun/star/drawing/XSlideRenderer.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/rendering/XSpriteCanvas.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> + #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase2.hxx> #include <boost/noncopyable.hpp> diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 040f613dafd5..bfd795bd0e4e 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -32,6 +32,8 @@ #include "sdresid.hxx" #include "helpids.h" #include "strings.hrc" + +#include <vcl/settings.hxx> #include <vcl/virdev.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 357194234c59..be0c76628829 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -66,6 +66,8 @@ #include "res_bmp.hrc" #include "sdresid.hxx" #include "vcl/canvastools.hxx" +#include <vcl/settings.hxx> + #include "comphelper/anytostring.hxx" #include "cppuhelper/exc_hlp.hxx" #include "rtl/ref.hxx" diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 9f0d2b13f9d6..265ffac5673a 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -76,6 +76,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index 2c8addba7662..091249582316 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx @@ -20,6 +20,7 @@ #include "controller/SlsProperties.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> namespace sd { namespace slidesorter { namespace controller { diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 1ec3f117f854..5dacf9fd87f3 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -37,6 +37,7 @@ #include <vcl/scrbar.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <sfx2/dispatch.hxx> #include "sdresid.hxx" diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 8a530ff576d3..eb437bebe724 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -57,6 +57,8 @@ #include <svx/xlnclit.hxx> #include <vcl/svapp.hxx> #include <vcl/scrbar.hxx> +#include <vcl/settings.hxx> + #include <tools/poly.hxx> #include <vcl/lineinfo.hxx> #include <algorithm> diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index 00fb13cebc13..397d45b08e91 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -26,6 +26,8 @@ #include <vcl/outdev.hxx> #include <vcl/image.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <svtools/colorcfg.hxx> namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 5f4435064de8..4f146193ae3a 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -25,8 +25,9 @@ #include "sdpage.hxx" #include "sdresid.hxx" #include "glob.hrc" -#include <vcl/help.hxx> +#include <vcl/settings.hxx> +#include <vcl/help.hxx> namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 8aa954ac9f60..9a02cf4f59c2 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -30,6 +30,8 @@ #include <sfx2/viewfrm.hxx> #include <vcl/bmpacc.hxx> #include <vcl/layout.hxx> +#include <vcl/settings.hxx> + #include <svl/style.hxx> #include <sfx2/bindings.hxx> #include <sfx2/app.hxx> diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 21642e5d0459..de318e410411 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -26,6 +26,8 @@ #include "sdpage.hxx" #include "ViewShell.hxx" #include <vcl/virdev.hxx> +#include <vcl/settings.hxx> + #include <svx/svdpagv.hxx> #include <svx/svdoutl.hxx> #include <editeng/eeitem.hxx> diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index c197cc278596..36597d6eaaad 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -39,6 +39,8 @@ #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <editeng/UnoForbiddenCharsTable.hxx> #include <svx/svdoutl.hxx> #include <editeng/forbiddencharacterstable.hxx> diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index b400a2e1d525..faafb29a74b4 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -19,6 +19,8 @@ #include "Outliner.hxx" #include <vcl/wrkwin.hxx> +#include <vcl/settings.hxx> + #include <svl/srchitem.hxx> #include <editeng/colritem.hxx> #include <editeng/eeitem.hxx> diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index dfc1c2e247d1..91a694e60380 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -78,6 +78,8 @@ #include <sfx2/viewfrm.hxx> #include <svl/whiter.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> + #include <tools/diagnose_ex.h> #include "fubullet.hxx" diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index ae0891d90b4c..f75d77fc8957 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -35,6 +35,8 @@ #include "Client.hxx" #include <vcl/svapp.hxx> #include <vcl/tabpage.hxx> +#include <vcl/settings.hxx> + #include <osl/mutex.hxx> #include <sfx2/viewfrm.hxx> #include <com/sun/star/drawing/framework/ResourceId.hpp> diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 282e73a86d77..8555b8e78525 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -26,6 +26,8 @@ #include <sfx2/dispatch.hxx> #include <svx/svdpagv.hxx> #include <vcl/scrbar.hxx> +#include <vcl/settings.hxx> + #include <tools/poly.hxx> #include <svx/fmshell.hxx> #include <editeng/eeitem.hxx> diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 8fd8643e8bd8..a0967763598f 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/drawing/framework/ResourceId.hpp> #include <rtl/ustrbuf.hxx> #include "unokywds.hxx" +#include <vcl/settings.hxx> #include <vector> #include "ViewShell.hxx" diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx index 26279941d69c..253a6e77cd72 100644 --- a/sd/source/ui/view/grviewsh.cxx +++ b/sd/source/ui/view/grviewsh.cxx @@ -24,6 +24,8 @@ #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/scrbar.hxx> +#include <vcl/settings.hxx> + #include <tools/helpers.hxx> namespace sd { diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 3e5ed9bdcfd9..56ad2741787c 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -42,6 +42,8 @@ #include <svx/svdotext.hxx> #include <sfx2/dispatch.hxx> #include <vcl/scrbar.hxx> +#include <vcl/settings.hxx> + #include <svl/whiter.hxx> #include <editeng/editstat.hxx> #include <svl/itempool.hxx> diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 4b01b7d94bd7..a2e25358b268 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -30,7 +30,11 @@ #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> #include <svx/svdundo.hxx> + +#include <vcl/settings.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> + #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> #include <svx/svdpagv.hxx> diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 158ae91204bc..8af9d12a5506 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -40,6 +40,7 @@ #include "WindowUpdater.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> namespace sd { diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 70fe8b87af17..7975b05da11a 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "vcl/svapp.hxx" +#include "vcl/settings.hxx" #include "PresenterHelpView.hxx" #include "PresenterButton.hxx" #include "PresenterCanvasHelper.hxx" diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 6fd964bd72e8..28d93889d22d 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "vcl/svapp.hxx" +#include "vcl/settings.hxx" #include "PresenterNotesView.hxx" #include "PresenterButton.hxx" #include "PresenterCanvasHelper.hxx" diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index c1a2706baee1..19c07652ee9f 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -18,6 +18,7 @@ */ #include "vcl/svapp.hxx" +#include "vcl/settings.hxx" #include "PresenterSlideSorter.hxx" #include "PresenterButton.hxx" diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 69fb531b9a1b..8396f26dee3e 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -18,6 +18,7 @@ */ #include "vcl/svapp.hxx" +#include "vcl/settings.hxx" #include "PresenterToolBar.hxx" #include "PresenterBitmapContainer.hxx" diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index c3813fd0bc1b..f6b5b5496b5e 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -21,6 +21,7 @@ //#define ENABLE_PANE_RESIZING #include "vcl/svapp.hxx" +#include "vcl/settings.hxx" #include "PresenterWindowManager.hxx" #include "PresenterController.hxx" #include "PresenterGeometryHelper.hxx" diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 61bdf8c3de67..7303a78677e7 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -37,6 +37,7 @@ #include <i18nlangtag/languagetag.hxx> #include <sfx2/request.hxx> #include <vcl/dibtools.hxx> +#include "unotools/charclass.hxx" #include "fileobj.hxx" #include "impldde.hxx" diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 206d45808e4e..a8dba1d974c7 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -94,6 +94,7 @@ #include <svtools/imgdef.hxx> #include <vcl/unohelp.hxx> #include <vcl/i18nhelp.hxx> +#include <vcl/settings.hxx> #include <ucbhelper/content.hxx> #include <vcl/msgbox.hxx> diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 02bde57458a9..4d3dc95e328f 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -28,6 +28,7 @@ #include <osl/mutex.hxx> #include <vcl/bitmapex.hxx> #include <vcl/bmpacc.hxx> +#include "tools/rc.hxx" #include <sfx2/app.hxx> #include "app.hrc" #ifndef __SHUTDOWNICON_HXX__ diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx index 441c523e88a4..e83b4246aa04 100644 --- a/sfx2/source/bastyp/sfxresid.cxx +++ b/sfx2/source/bastyp/sfxresid.cxx @@ -20,6 +20,7 @@ #include <sfx2/sfxresid.hxx> #include <sfx2/app.hxx> +#include "tools/resmgr.hxx" // ----------------------------------------------------------------------- diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 866c60e83117..9715bdb8ed18 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -24,6 +24,7 @@ #include <tools/rcid.h> #include <tools/stream.hxx> +#include "tools/resmgr.hxx" #include <sfx2/module.hxx> #include <sfx2/objface.hxx> diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index ee1c016a8f61..300fc9f658b3 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -33,6 +33,7 @@ #include <vcl/svapp.hxx> #include <vcl/scrbar.hxx> #include <vcl/help.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index cd4a6d2c8b13..26f3eacee864 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -24,6 +24,7 @@ #include <sfx2/thumbnailviewitem.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/sfx2/source/dialog/dialoghelper.cxx b/sfx2/source/dialog/dialoghelper.cxx index fb710dfe5dfb..3ee59daac68e 100644 --- a/sfx2/source/dialog/dialoghelper.cxx +++ b/sfx2/source/dialog/dialoghelper.cxx @@ -11,6 +11,7 @@ #include <tools/datetime.hxx> #include <vcl/builder.hxx> #include <vcl/layout.hxx> +#include <vcl/settings.hxx> #include <vector> //these tab pages both have the same basic layout with a preview on the diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 7dbc52fc58ce..7ee19bf4d9ef 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -48,6 +48,7 @@ #include <com/sun/star/document/CmisProperty.hpp> #include <vcl/timer.hxx> +#include <vcl/settings.hxx> #include <sfx2/dinfdlg.hxx> #include <sfx2/securitypage.hxx> #include <sfx2/sfxresid.hxx> diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index e14b8bba8209..9dd631f99034 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -19,6 +19,7 @@ #include <sfx2/sfx.hrc> #include <sfx2/viewsh.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> using namespace std; diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 3a0cf048db92..764661ddcc30 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -21,6 +21,7 @@ #include <boost/scoped_ptr.hpp> #include <vcl/menu.hxx> +#include <vcl/settings.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <svl/style.hxx> diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 1dc45b033f7c..dacebcabddb5 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -25,6 +25,7 @@ #include <sfx2/sfxresid.hxx> #include <svl/eitem.hxx> +#include <vcl/settings.hxx> //...................................................................................................................... namespace sfx2 diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index c90207f4f520..44164b417533 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -27,6 +27,7 @@ #include <vcl/layout.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <tools/datetime.hxx> #include <svtools/treelistentry.hxx> #include <svtools/miscopt.hxx> diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 46efe15b8931..250976621077 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -49,6 +49,7 @@ #include <unotools/localfilehelper.hxx> #include <vcl/virdev.hxx> #include <vcl/oldprintadaptor.hxx> +#include <vcl/settings.hxx> #include <sfx2/app.hxx> #include <sfx2/sfxresid.hxx> diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 4641beaada05..913452b67807 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -44,6 +44,7 @@ #include <cppuhelper/interfacecontainer.hxx> #include <osl/mutex.hxx> #include <cppuhelper/implbase1.hxx> +#include <vcl/settings.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 8a71251f5762..ad4432cbb248 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -59,6 +59,7 @@ #include <sfx2/imagemgr.hxx> #include <sfx2/sfxresid.hxx> #include "../doc/doc.hrc" +#include <vcl/settings.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index f532191c4273..507b647572b8 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -52,6 +52,7 @@ #include <framework/addonmenu.hxx> #include <framework/menuconfiguration.hxx> +#include <vcl/settings.hxx> using namespace ::com::sun::star::container; using namespace ::com::sun::star::frame; diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 3db9949517bb..b3c77e7efae9 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -25,6 +25,7 @@ #include <tools/svborder.hxx> #include <tools/rc.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> using namespace css; using namespace cssu; diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 5537e2b8d1eb..10d58803375b 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -50,7 +50,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> #include <toolkit/helper/vclunohelper.hxx> - +#include <vcl/settings.hxx> #include <sfx2/app.hxx> #include "view.hrc" diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index 66a54ed5bc1a..c36e2c877f68 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -24,6 +24,8 @@ #include <vcl/gdimtf.hxx> #include <vcl/virdev.hxx> #include <vcl/metric.hxx> +#include <vcl/settings.hxx> + #include <cppcanvas/vclfactory.hxx> #include <cppcanvas/basegfxfactory.hxx> #include <basegfx/range/b2drange.hxx> diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index 18021e0dd5bd..b7bf7a3ed25b 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -25,6 +25,7 @@ #include <svtools/colorcfg.hxx> #include <tools/shl.hxx> +#include "tools/rc.hxx" #include <sfx2/module.hxx> #include "starmath.hrc" diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index e1b75787d792..4a26f395d4ed 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -36,6 +36,8 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/unohelp2.hxx> +#include <vcl/settings.hxx> + #include <tools/gen.hxx> #include <osl/mutex.hxx> #include <svl/itemset.hxx> diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index a381af91b40e..2e65cbbe6593 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -18,6 +18,8 @@ */ #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <sal/macros.h> #include "cfgitem.hxx" diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 2c63fc077ac1..79ca6ccd7ea0 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -67,6 +67,8 @@ #include <vcl/mapmod.hxx> #include <tools/mapunit.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> + #include <sfx2/sfx.hrc> #include <document.hxx> #include <action.hxx> diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index ee8e05d59940..c8aaf98f7627 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -27,6 +27,8 @@ #include "starmath.hrc" #include <vcl/menu.hxx> +#include <vcl/settings.hxx> + #include <editeng/editview.hxx> #include <editeng/editeng.hxx> #include <editeng/editstat.hxx> diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 1ab966b0432f..683f0799940f 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -25,6 +25,7 @@ #include <editeng/unolingu.hxx> #include <unotools/syslocale.hxx> #include <sal/macros.h> +#include <vcl/settings.hxx> #include "parse.hxx" #include "starmath.hrc" #include "smdll.hxx" diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx index e556fd720147..ded70748944e 100644 --- a/starmath/source/toolbox.cxx +++ b/starmath/source/toolbox.cxx @@ -24,6 +24,8 @@ #include <sfx2/dispatch.hxx> #include <sfx2/imgmgr.hxx> #include <vcl/wrkwin.hxx> +#include <vcl/settings.hxx> + #include "toolbox.hxx" #include "starmath.hrc" #include "toolbox.hrc" diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 058c62f81538..eb9df3af59bb 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -58,6 +58,8 @@ #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> #include <vcl/wrkwin.hxx> +#include <vcl/settings.hxx> + #include <fstream> #include "unomodel.hxx" diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 26438c012534..5b9057c5486f 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -22,6 +22,7 @@ #include "datwin.hxx" #include <svtools/colorcfg.hxx> #include <vcl/salgtype.hxx> +#include <vcl/settings.hxx> #include <tools/multisel.hxx> #include <algorithm> diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 5d815685c849..1ed74e3bf5d3 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -24,7 +24,8 @@ #include <vcl/help.hxx> #include <vcl/image.hxx> - +#include <vcl/settings.hxx> +#include <rtl/string.hxx> #include <tools/debug.hxx> //=================================================================== diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index 72cad0faafa2..98949a0527bd 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -28,6 +28,7 @@ #include <vcl/edit.hxx> #include <tools/resid.hxx> #include <vcl/spinfld.hxx> +#include <vcl/settings.hxx> #include <svtools/svtresid.hxx> #include <svtools/svtools.hrc> diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 38ceee041a93..e1de6a70bc77 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -39,6 +39,7 @@ ------------- */ #include <vcl/svapp.hxx> #include <vcl/event.hxx> +#include <vcl/settings.hxx> #include <rtl/instance.hxx> //----------------------------------------------------------------------------- diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 8b03e4bf51cc..ddded1e761ac 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -35,6 +35,7 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <vcl/event.hxx> #include <rtl/instance.hxx> #include <rtl/strbuf.hxx> diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index c45df0d2720b..baed68e798c1 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "itemholder2.hxx" diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 9a0b250227f0..77ce11d48a74 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -30,6 +30,7 @@ #include <svtools/imgdef.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <list> diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index f238686d1b86..e2cfa0edddbb 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> +#include <vcl/settings.hxx> #include <rtl/instance.hxx> //_________________________________________________________________________________________________________________ diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index 10c69742dc39..3c6052186a7c 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -30,6 +30,7 @@ #include "svtools/DocumentInfoPreview.hxx" #include "svtools/imagemgr.hxx" #include "vcl/txtattr.hxx" +#include "vcl/settings.hxx" #include "tools/datetime.hxx" #include "tools/urlobj.hxx" #include "unotools/pathoptions.hxx" diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index e97f64cdf7c1..7723df81c477 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -44,6 +44,7 @@ #include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <vcl/waitobj.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/io/XPersist.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/ucb/XCommandInfo.hpp> diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 489554e6dc31..f38925475c4f 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -29,6 +29,7 @@ #include <vcl/i18nhelp.hxx> #include <vcl/mnemonic.hxx> #include <vcl/controllayout.hxx> +#include <vcl/settings.hxx> #include <svtools/ivctrl.hxx> #include "imivctl.hxx" diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index f3512a54d3a0..442141f1c3eb 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -23,6 +23,8 @@ #include <vcl/bitmapex.hxx> #include <vcl/controllayout.hxx> #include <vcl/mnemonic.hxx> +#include <vcl/settings.hxx> + using namespace ::com::sun::star::accessibility; /***************************************************************************** diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 80e0d0880436..71d802fd32dd 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -24,6 +24,7 @@ #include <unotools/intlwrapper.hxx> #include <vcl/builder.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> // SvSimpleTableContainer ------------------------------------------------------ diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 71b26be70f4a..ca90c8453a81 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -20,6 +20,7 @@ #include <vcl/svapp.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/help.hxx> +#include <vcl/settings.hxx> #include <stack> diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 8674c2448b6a..ec0311da59c2 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -33,6 +33,7 @@ #include <svtools/templatefoldercache.hxx> #include <svtools/imgdef.hxx> #include <vcl/txtattr.hxx> +#include <vcl/settings.hxx> #include <svtools/svtools.hrc> #include "templwin.hrc" #include <svtools/helpid.hrc> diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 9f1b47b4dc34..2e27e1718ddb 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -29,6 +29,7 @@ #include <vcl/accel.hxx> #include <vcl/i18nhelp.hxx> #include <vcl/builder.hxx> +#include <vcl/settings.hxx> #include <sot/formats.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <rtl/instance.hxx> diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index ca9171b35c07..d1708d60b5e9 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -26,6 +26,7 @@ #include <vcl/floatwin.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> +#include <vcl/settings.hxx> #include <comphelper/processfactory.hxx> #include <unotools/calendarwrapper.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 36fe26dc6def..a75e2d555593 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -24,6 +24,7 @@ #include <vcl/svapp.hxx> #include <vcl/field.hxx> #include <vcl/helper.hxx> +#include <vcl/settings.hxx> #include <sal/macros.h> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 93f486496de0..e3bb7a8ec889 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -25,6 +25,7 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> +#include <vcl/settings.hxx> #include <sal/macros.h> #include <svtools/svtools.hrc> #include <svtools/svtresid.hxx> diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 9f04b9fa9e6c..b422d0c13080 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -24,6 +24,7 @@ #include <unotools/localedatawrapper.hxx> #include <vcl/svapp.hxx> #include <vcl/builder.hxx> +#include <vcl/settings.hxx> #include <svl/zformat.hxx> #include <svtools/fmtfield.hxx> #include <i18nlangtag/languagetag.hxx> diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index eda70d234a0a..1a25cbe05f8c 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -25,6 +25,7 @@ #include <vcl/help.hxx> #include <vcl/image.hxx> #include <vcl/salnativewidgets.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index a67c3842b547..b15ef3b61210 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -18,9 +18,9 @@ */ #include <svtools/hyperlabel.hxx> -#include <vcl/bitmap.hxx> #include <tools/color.hxx> - +#include <vcl/bitmap.hxx> +#include <vcl/settings.hxx> #include <vcl/tabpage.hxx> diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 16a169758130..d75d61456b50 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -22,6 +22,7 @@ #include <vector> #include <algorithm> #include <vcl/bitmap.hxx> +#include <vcl/settings.hxx> #include <tools/color.hxx> #include <rtl/ustring.hxx> #include <boost/scoped_ptr.hpp> diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index d4a72f940511..0778237b06d0 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -22,6 +22,7 @@ #include <vcl/svapp.hxx> #include <tools/poly.hxx> #include <vcl/i18nhelp.hxx> +#include <vcl/settings.hxx> #include <svtools/ruler.hxx> #include <svtools/svtresid.hxx> diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 5535e4c0df1a..0c66ed7cd8dc 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -18,6 +18,7 @@ */ #include <svtools/scrwin.hxx> +#include <vcl/settings.hxx> //=================================================================== diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx index f579dc2bd83d..04fbe3e0da7c 100644 --- a/svtools/source/control/stdmenu.cxx +++ b/svtools/source/control/stdmenu.cxx @@ -20,6 +20,7 @@ #include <string.h> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <vcl/i18nhelp.hxx> #include <svtools/ctrltool.hxx> #include <svtools/stdmenu.hxx> diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 62ca3708999c..16d7c7a4a0a6 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -28,6 +28,7 @@ #include <vcl/button.hxx> #include <vcl/edit.hxx> #include <vcl/image.hxx> +#include <vcl/settings.hxx> #include "svtaccessiblefactory.hxx" #include <filectrl.hrc> #include <svtools/svtresid.hxx> diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 779975bdc9c7..9c394116c310 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -26,6 +26,7 @@ #include <vcl/image.hxx> #include <vcl/taskpanelist.hxx> #include <vcl/toolbox.hxx> +#include <vcl/settings.hxx> #include "svtools/valueset.hxx" #include "svtools/toolbarmenu.hxx" diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index e0d2dd5dffd9..0a9036614c27 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -25,6 +25,7 @@ #include <unotools/accessiblestatesethelper.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "svtools/toolbarmenu.hxx" diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 786ad106566e..e5a7a98e4faf 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -19,6 +19,7 @@ #include <unotools/accessiblestatesethelper.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svtools/valueset.hxx> #include "valueimp.hxx" #include <comphelper/servicehelper.hxx> diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index c4487aab253f..934dba08407a 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -23,6 +23,8 @@ #include <vcl/svapp.hxx> #include <vcl/scrbar.hxx> #include <vcl/help.hxx> +#include <vcl/settings.hxx> + #include <com/sun/star/accessibility/AccessibleEventObject.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx index 21b1728905d6..7b7a24320320 100644 --- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx +++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx @@ -27,6 +27,7 @@ #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <toolkit/awt/vclxfont.hxx> #include <toolkit/helper/externallock.hxx> #include <toolkit/helper/convert.hxx> diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 7c1edfc554c3..75ee7d760030 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -32,6 +32,7 @@ #include <vcl/stdtext.hxx> #include <vcl/waitobj.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/ui/dialogs/AddressBookSourcePilot.hpp> #include <com/sun/star/awt/XWindow.hpp> diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index 706ad184e55b..1f9c0cc33d60 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -26,6 +26,7 @@ #include <rtl/ref.hxx> #include <svl/solar.hrc> #include <vcl/fltcall.hxx> +#include <vcl/settings.hxx> #include "exportdialog.hxx" #include <uno/mapping.hxx> #include <tools/fldunit.hxx> diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 554a5558739f..1abe65c55433 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -31,6 +31,7 @@ #include <vcl/wmf.hxx> #include <svl/solar.hrc> #include <vcl/virdev.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/text/GraphicCrop.hpp> #include <comphelper/servicehelper.hxx> diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx index 9bd715a0ca5f..2b10a72a0597 100644 --- a/svtools/source/hatchwindow/ipwin.cxx +++ b/svtools/source/hatchwindow/ipwin.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <ipwin.hxx> #include <hatchwindow.hxx> diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 4f269db54910..48719a369d7f 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -22,6 +22,7 @@ #include <tools/wintypes.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svtools/ehdl.hxx> #include <svtools/svtresid.hxx> diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 781980d62095..82953df3c97a 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -23,6 +23,7 @@ #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include "vcl/image.hxx" +#include "vcl/settings.hxx" #include <sot/storage.hxx> #include <comphelper/classids.hxx> #include <unotools/ucbhelper.hxx> diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx index 96b2b3496336..16a3a1d8191c 100644 --- a/svtools/source/misc/langhelp.cxx +++ b/svtools/source/misc/langhelp.cxx @@ -11,6 +11,7 @@ #include <svtools/langhelp.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <rtl/ustring.hxx> void localizeWebserviceURI( OUString& rURI ) diff --git a/svtools/source/misc/svtresid.cxx b/svtools/source/misc/svtresid.cxx index 5efc4474a4e6..ff3b965a5e34 100644 --- a/svtools/source/misc/svtresid.cxx +++ b/svtools/source/misc/svtresid.cxx @@ -20,6 +20,7 @@ #include <tools/resmgr.hxx> #include <svtools/svtresid.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> static ResMgr* pMgr=NULL; diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 626325b59f8d..4abe983ec3cc 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -21,6 +21,7 @@ #include <svl/zformat.hxx> #include <svl/macitem.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svl/zforlist.hxx> #include <svtools/htmlout.hxx> diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx index 585d97e7bc50..97bdd43ebe4d 100644 --- a/svtools/source/table/gridtablerenderer.cxx +++ b/svtools/source/table/gridtablerenderer.cxx @@ -31,6 +31,7 @@ #include <vcl/image.hxx> #include <vcl/virdev.hxx> #include <vcl/decoview.hxx> +#include <vcl/settings.hxx> //...................................................................................................................... namespace svt { namespace table diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index 125754325515..fe5b9d1595be 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <tools/diagnose_ex.h> +#include <vcl/settings.hxx> using namespace ::com::sun::star::uno; using ::com::sun::star::accessibility::XAccessible; diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index b4ac861a5916..eb1237af43f7 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -34,6 +34,7 @@ #include <comphelper/flagguard.hxx> #include <vcl/scrbar.hxx> #include <vcl/seleng.hxx> +#include <vcl/settings.hxx> #include <rtl/ref.hxx> #include <vcl/image.hxx> #include <tools/diagnose_ex.h> diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx index 9970338ddfc2..91280fe857cc 100644 --- a/svtools/source/table/tabledatawindow.cxx +++ b/svtools/source/table/tabledatawindow.cxx @@ -25,6 +25,7 @@ #include "tablegeometry.hxx" #include <vcl/help.hxx> +#include <vcl/settings.hxx> //...................................................................................................................... namespace svt { namespace table diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index c4cb2d5163ee..40c6adff240f 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -30,6 +30,7 @@ #include <vcl/button.hxx> #include <vcl/help.hxx> #include <vcl/virdev.hxx> +#include <vcl/settings.hxx> #include <tools/diagnose_ex.h> #include <boost/optional.hpp> diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx index ba11c65931cf..c39462f27e80 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawer.cxx @@ -29,6 +29,7 @@ #include <vcl/image.hxx> #include <vcl/svapp.hxx> #include <vcl/vclevent.hxx> +#include <vcl/settings.hxx> //...................................................................................................................... namespace svt diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index 48b10b395b0b..bdfdf8c2a2b8 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -40,6 +40,7 @@ #include <comphelper/processfactory.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <vcl/image.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/awt/vclxwindow.hxx> diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index db52be321270..4dfbf8c363b2 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -31,6 +31,7 @@ #include <unotools/accessiblerelationsethelper.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svx/frmsel.hxx> #include <svx/dialmgr.hxx> #include "editeng/unolingu.hxx" diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 7b94a734de18..ebb713fb3399 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -28,6 +28,7 @@ #include <cppuhelper/typeprovider.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <osl/mutex.hxx> #include <tools/gen.hxx> #include <svl/smplhint.hxx> diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 78cb15124489..b84d9abe0637 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -27,6 +27,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/convert.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <osl/mutex.hxx> #include <rtl/uuid.h> #include <tools/debug.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index edfdab26ed8b..2d7d2ed61773 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 17ecfc2b82d8..4f91aaa17027 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -20,6 +20,7 @@ #include <vcl/wrkwin.hxx> #include <tools/shl.hxx> #include <vcl/metaact.hxx> +#include <vcl/settings.hxx> #include <svtools/valueset.hxx> #include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 47f9e3d6bfdb..49bd85526c85 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -41,6 +41,7 @@ #include <svx/svdopath.hxx> #include "svx/dlgutil.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <vcl/virdev.hxx> #include "dlgunit.hxx" #include <vcl/layout.hxx> diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index facf4d93c9e9..0339bee020be 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -20,6 +20,7 @@ #include <stdio.h> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svtools/colorcfg.hxx> #include <rtl/textenc.h> diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 8a3a656290e2..28aad0381cbb 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -22,6 +22,7 @@ #include <vcl/graphicfilter.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svx/svdograf.hxx> #include <svx/sdgcpitm.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 677cba81cb2f..050ac45158cc 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -33,6 +33,7 @@ #include <svx/sxmkitm.hxx> #include <vcl/builder.hxx> +#include <vcl/settings.hxx> SvxXConnectionPreview::SvxXConnectionPreview( Window* pParent, WinBits nStyle) : Control(pParent, nStyle) diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 632a873fb126..2680fa396fb8 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -26,6 +26,7 @@ #include <vcl/svapp.hxx> #include <vcl/bitmap.hxx> #include <vcl/field.hxx> +#include <vcl/settings.hxx> #include <svtools/colorcfg.hxx> #include <vcl/builder.hxx> diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx index ad4b33fca5de..89b50d8f6ba9 100644 --- a/svx/source/dialog/dialmgr.cxx +++ b/svx/source/dialog/dialmgr.cxx @@ -25,6 +25,7 @@ #include <svx/dialmgr.hxx> #include <svl/solar.hrc> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> static ResMgr* pResMgr=0; diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 8104faf58a29..61563c735e8e 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -37,6 +37,7 @@ #include "helpid.hrc" #include <algorithm> #include <svx/dialmgr.hxx> +#include <vcl/settings.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 78c7bb2d83da..430642f1141d 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -20,6 +20,7 @@ #include <tools/shl.hxx> #include <vcl/builder.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <sfx2/dialoghelper.hxx> #include <svx/xtable.hxx> #include <svx/xpool.hxx> diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 41744ebcbd5d..264c43314584 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -31,6 +31,7 @@ #include <comphelper/string.hxx> #include <svtools/imagemgr.hxx> #include <vcl/xtextedt.hxx> +#include <vcl/settings.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 1fbef2e101c4..d5865b4fb4b6 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -23,6 +23,7 @@ #include <vcl/builder.hxx> #include <vcl/metric.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <unicode/uchar.h> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/i18n/BreakIterator.hpp> diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 2a64e7a8a0c0..9133ef12f30b 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -20,6 +20,7 @@ #include "svx/fontlb.hxx" #include <vcl/builder.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "svtools/treelistentry.hxx" #include "svtools/viewdataentry.hxx" diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index f7ab7dae5d4e..769176ea2408 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -36,6 +36,7 @@ #include <editeng/outlobj.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/point/b2dpoint.hxx> +#include <vcl/settings.hxx> SFX_IMPL_DOCKINGWINDOW_WITHID( SvxFontWorkChildWindow, SID_FONTWORK ); diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index a2802890370d..c1066126e6b3 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -27,6 +27,7 @@ #include <svx/dialmgr.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> +#include <vcl/settings.hxx> #include <svx/dialogs.hrc> #include "frmsel.hrc" diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 81b4d6e0449a..e4c59655743a 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -20,6 +20,7 @@ #include <svl/itempool.hxx> #include <vcl/dialog.hxx> #include <vcl/wrkwin.hxx> +#include <vcl/settings.hxx> #include <unotools/syslocale.hxx> #include <rtl/math.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index c7c1cd4f59fe..c1ab88dc392f 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -52,6 +52,7 @@ #include <svx/svdtrans.hxx> #include <svx/svdopath.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "dlgunit.hxx" #define SELF_TARGET "_self" diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index e63d0befdef0..a32dd3d6fe03 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -24,6 +24,7 @@ #include <svx/dialmgr.hxx> #include "svx/dlgutil.hxx" #include <vcl/builder.hxx> +#include <vcl/settings.hxx> SvxXMeasurePreview::SvxXMeasurePreview( Window* pParent, WinBits nStyle) : Control(pParent, nStyle) diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index d645628ff58a..eaf6ffb7cff3 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -19,6 +19,7 @@ #include <vcl/bitmap.hxx> #include <vcl/builder.hxx> +#include <vcl/settings.hxx> #include <editeng/frmdiritem.hxx> #include <svx/pageitem.hxx> #include <svx/pagectrl.hxx> diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index adc29a3c59aa..1a0cb57875e9 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -20,6 +20,7 @@ #include <sfx2/dialoghelper.hxx> #include <svx/paraprev.hxx> #include <vcl/builder.hxx> +#include <vcl/settings.hxx> // class SvxParaPrevWindow ----------------------------------------------- diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 29a50f8d52bf..7054c898548e 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -39,6 +39,7 @@ #include <cppuhelper/implbase1.hxx> #include <svtools/colorcfg.hxx> #include <vcl/layout.hxx> +#include <vcl/settings.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::frame; diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 331ff4d6bdb6..dc42baaf5ab1 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -34,6 +34,7 @@ #include <sfx2/objsh.hxx> #include <vcl/graph.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <editeng/flstitem.hxx> #include <svx/dlgutil.hxx> #include <svx/xtable.hxx> diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 7c75ca08aa76..9a51bcb8544c 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -23,6 +23,7 @@ #include <tools/shl.hxx> #include <vcl/image.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svl/eitem.hxx> #include <svl/rectitem.hxx> #include <svl/smplhint.hxx> diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index a623eff48f6f..2c0abf8d10f3 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -21,6 +21,7 @@ #include <vcl/builder.hxx> #include <vcl/metric.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svtools/colorcfg.hxx> #include <svx/swframeexample.hxx> #include <com/sun/star/text/TextContentAnchorType.hpp> diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 33d7ee435ff5..2308b0f492e6 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -26,6 +26,7 @@ #endif #include <vcl/builder.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <rtl/tencinfo.h> #include <rtl/locale.h> #include <rtl/strbuf.hxx> diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 379ad056d9cc..ba7d7a236293 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -70,6 +70,7 @@ #include <vcl/image.hxx> #include <vcl/longcurr.hxx> #include <vcl/menu.hxx> +#include <vcl/settings.hxx> #include <math.h> diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index cabe7220e1f7..28d2509e608d 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -64,6 +64,7 @@ #include <tools/diagnose_ex.h> #include <tools/shl.hxx> #include <vcl/longcurr.hxx> +#include <vcl/settings.hxx> #include <math.h> #include <stdio.h> diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index ee5be0e6a3d4..29abc1bea421 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -44,6 +44,7 @@ #include <tools/resid.hxx> #include <tools/diagnose_ex.h> #include <vcl/menu.hxx> +#include <vcl/settings.hxx> #include "svx/fmresids.hrc" diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index baf32e1c7f89..e15cb99e6906 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -51,6 +51,7 @@ #include <svx/svxids.hrc> #include <tools/shl.hxx> #include <vcl/wrkwin.hxx> +#include <vcl/settings.hxx> #include <tools/diagnose_ex.h> #include <svtools/svlbitm.hxx> #include "svtools/treelistentry.hxx" diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 28e52b47eee6..d05c8b6ca25d 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -96,6 +96,7 @@ #include <tools/shl.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> +#include <vcl/settings.hxx> #include <algorithm> #include <functional> diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 900c6ba38e63..691e97016276 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -85,6 +85,7 @@ #include <tools/shl.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <osl/mutex.hxx> #include <algorithm> diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 8e77dfe2457d..6ba2729ad025 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -53,6 +53,7 @@ #include <sfx2/frame.hxx> #include <svx/dataaccessdescriptor.hxx> #include "svtools/treelistentry.hxx" +#include <vcl/settings.hxx> const long STD_WIN_SIZE_X = 120; const long STD_WIN_SIZE_Y = 150; diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index bc6eab52b840..9b04305739a1 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -25,6 +25,7 @@ #include <sfx2/dispatch.hxx> #include <vcl/toolbox.hxx> #include <vcl/fixed.hxx> +#include <vcl/settings.hxx> #include "fmitems.hxx" #include "formtoolbars.hxx" diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index f184019b387b..bdd1004083b9 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -25,6 +25,7 @@ #include "galbrws2.hxx" #include "GallerySplitter.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <sfx2/sidebar/Theme.hxx> #include <boost/bind.hpp> diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx index 0759219269a5..27275d2b8c9c 100644 --- a/svx/source/gallery2/galbrws.cxx +++ b/svx/source/gallery2/galbrws.cxx @@ -19,6 +19,7 @@ #include <vcl/split.hxx> #include <vcl/ctrl.hxx> +#include <vcl/settings.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> #include <sfx2/sfxsids.hrc> diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 25c33d0058b7..d10332a8ef3a 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -23,6 +23,7 @@ #include <tools/datetime.hxx> #include <unotools/datetime.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> #include <ucbhelper/content.hxx> #include <sfx2/app.hxx> #include "helpid.hrc" diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index fb483ed01a3d..483a83d3f659 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -42,6 +42,7 @@ #include "galbrws2.hxx" #include "gallery.hrc" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svx/fmmodel.hxx> #include <svx/dialmgr.hxx> #include <svx/svxdlg.hxx> diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 1d543f8b4ea1..dd1744a30d77 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -33,6 +33,7 @@ #include <avmedia/mediawindow.hxx> #include "gallery.hrc" #include <vcl/graphicfilter.hxx> +#include <vcl/settings.hxx> #define GALLERY_BRWBOX_TITLE 1 #define GALLERY_BRWBOX_PATH 2 diff --git a/svx/source/gallery2/galini.cxx b/svx/source/gallery2/galini.cxx index 45673fc11ad0..090b086565fe 100644 --- a/svx/source/gallery2/galini.cxx +++ b/svx/source/gallery2/galini.cxx @@ -22,6 +22,7 @@ #include <i18nlangtag/languagetag.hxx> #include <unotools/syslocale.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> OUString GalleryThemeEntry::ReadStrFromIni(const OUString &aKeyName ) { diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 0632722b0781..eaae215bb4dd 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -32,6 +32,7 @@ #include <sfx2/docfile.hxx> #include <avmedia/mediawindow.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svx/svdpage.hxx> #include <svx/svdograf.hxx> #include <svx/fmmodel.hxx> diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 732d8c16c5c7..81b13369527d 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -36,6 +36,7 @@ #include "svx/galmisc.hxx" #include "galobj.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <vcl/dibtools.hxx> #include "gallerydrawmodel.hxx" diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx index e8a07dd5e07f..b76fe9230cae 100644 --- a/svx/source/inc/formcontrolfactory.hxx +++ b/svx/source/inc/formcontrolfactory.hxx @@ -27,6 +27,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/XNumberFormats.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <memory> diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 15b20a79003d..1199a2f0ab14 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -27,6 +27,7 @@ #include <svtools/langtab.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <comphelper/processfactory.hxx> #include <svx/numfmtsh.hxx> diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index de02fe260390..af3609f9291b 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -33,6 +33,7 @@ #include "svx/svdstr.hrc" #include <svx/svdglob.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index 525eff3f82b4..ff5bed42ca2d 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -35,6 +35,7 @@ #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> #include <vcl/lazydelete.hxx> +#include <vcl/settings.hxx> #include <svx/svdstr.hrc> #include <svx/svdglob.hxx> #include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx> diff --git a/svx/source/sdr/overlay/overlayrectangle.cxx b/svx/source/sdr/overlay/overlayrectangle.cxx index 5af04c997886..4df39c0d1339 100644 --- a/svx/source/sdr/overlay/overlayrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrectangle.cxx @@ -25,6 +25,7 @@ #include <svx/sdr/overlay/overlaytools.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx index 7706bba9c4e2..1f2a39671c98 100644 --- a/svx/source/sdr/overlay/overlayselection.cxx +++ b/svx/source/sdr/overlay/overlayselection.cxx @@ -24,6 +24,7 @@ #include <svtools/optionsdrawinglayer.hxx> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> +#include <vcl/settings.hxx> #include <drawinglayer/primitive2d/invertprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index 71fc7682ea3b..da248ac5166d 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -30,6 +30,7 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index 06bafe870eb2..78d6e9be2398 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/graphic/XPrimitiveFactory2D.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <rtl/ref.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/sidebar/debug/ColorPanel.cxx b/svx/source/sidebar/debug/ColorPanel.cxx index 26485f3b8efe..0f6575224283 100644 --- a/svx/source/sidebar/debug/ColorPanel.cxx +++ b/svx/source/sidebar/debug/ColorPanel.cxx @@ -20,6 +20,7 @@ #include <vcl/image.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> namespace svx { namespace sidebar { diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index 7db6d4cf4932..b5a7e2665f26 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -24,6 +24,7 @@ #include <sfx2/sidebar/ResourceDefinitions.hrc> #include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <unotools/viewoptions.hxx> #include <svx/xlnwtit.hxx> #include <sfx2/bindings.hxx> diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx index d19c315d6a2f..4a2f1316fac7 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.cxx +++ b/svx/source/sidebar/line/LineWidthValueSet.cxx @@ -18,6 +18,7 @@ #include "LineWidthValueSet.hxx" #include <i18nlangtag/mslangid.hxx> +#include <vcl/settings.hxx> namespace svx { namespace sidebar { diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 94bd45b19881..0bb2ffbeedb2 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -32,6 +32,7 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include <vcl/graph.hxx> +#include <vcl/settings.hxx> #include <unotools/streamwrap.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/svx/source/sidebar/paragraph/ParaBulletsControl.cxx b/svx/source/sidebar/paragraph/ParaBulletsControl.cxx index 0ebc1db1fddd..45c59bc522f0 100644 --- a/svx/source/sidebar/paragraph/ParaBulletsControl.cxx +++ b/svx/source/sidebar/paragraph/ParaBulletsControl.cxx @@ -28,6 +28,7 @@ #include <svtools/unitconv.hxx> #include <svx/nbdtmg.hxx> #include <svx/nbdtmgfact.hxx> +#include <vcl/settings.hxx> namespace svx { namespace sidebar { diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 229a53011b63..1d3b76d2bda4 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -26,6 +26,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/sidebar/Theme.hxx> #include <svtools/unitconv.hxx> +#include <vcl/settings.hxx> #define _DEFAULT_LINE_SPACING 200 #define FIX_DIST_DEF 283 diff --git a/svx/source/sidebar/paragraph/ParaNumberingControl.cxx b/svx/source/sidebar/paragraph/ParaNumberingControl.cxx index 839aed9d5523..d7918cd51e19 100644 --- a/svx/source/sidebar/paragraph/ParaNumberingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaNumberingControl.cxx @@ -34,6 +34,8 @@ #include <svx/nbdtmg.hxx> #include <svx/nbdtmgfact.hxx> #include <editeng/unolingu.hxx> +#include <vcl/settings.hxx> + using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::beans; diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index b1549f29eb34..4a60f58e6787 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -37,6 +37,7 @@ #include <vcl/toolbox.hxx> #include <vcl/fixed.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svx/svxids.hrc> #include <svl/intitem.hxx> #include "svx/dialmgr.hxx" diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx b/svx/source/sidebar/possize/SidebarDialControl.cxx index e67006cecd35..e48fa55dee44 100644 --- a/svx/source/sidebar/possize/SidebarDialControl.cxx +++ b/svx/source/sidebar/possize/SidebarDialControl.cxx @@ -20,6 +20,7 @@ #include <vcl/builder.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> namespace svx { namespace sidebar { diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index ad52b0c7f765..53536f865264 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -24,6 +24,7 @@ #include <editeng/kernitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/sidebar/Theme.hxx> +#include <vcl/settings.hxx> namespace svx { namespace sidebar { diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index f4a7993d2e6c..b1fd5eb4e173 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -23,6 +23,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/sidebar/Theme.hxx> #include <editeng/udlnitem.hxx> +#include <vcl/settings.hxx> namespace svx { namespace sidebar { diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index 5f3c763245e9..5d3c74f664ff 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -36,6 +36,7 @@ #include <svtools/valueset.hxx> #include <editeng/brushitem.hxx> #include <vcl/graph.hxx> +#include <vcl/settings.hxx> #include <svx/nbdtmg.hxx> #include <svx/nbdtmgfact.hxx> diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 82a0cf46668f..65f4d1385dcd 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -22,6 +22,7 @@ #include <vcl/status.hxx> #include <vcl/menu.hxx> #include <vcl/image.hxx> +#include <vcl/settings.hxx> #include <svl/stritem.hxx> #include <svl/ptitem.hxx> #include <svl/itempool.hxx> diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 1d57809e91b4..6494c69c9fe0 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -22,6 +22,7 @@ #include <vcl/svapp.hxx> #include <vcl/status.hxx> #include <vcl/menu.hxx> +#include <vcl/settings.hxx> #include <sfx2/dispatch.hxx> #include <tools/urlobj.hxx> diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index df614d96bc2a..402807ab44ed 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -22,6 +22,7 @@ #include <vcl/menu.hxx> #include <vcl/image.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svx/zoomslideritem.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 6abacc5089ed..a0fe5a79ef9f 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -22,7 +22,7 @@ #include <svx/svdpntv.hxx> #include <vcl/gdimtf.hxx> #include <vcl/svapp.hxx> - +#include <vcl/settings.hxx> void PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect) { diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index ea2a91383285..fdd4e4e69629 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -44,6 +44,7 @@ #include <tools/stream.hxx> #include <unotools/intlwrapper.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "svx/svdglob.hxx" #include "svx/svdstr.hrc" diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index df1f835767d7..ef56971f09d7 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -22,6 +22,7 @@ #include <tools/bigint.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "svx/xattr.hxx" #include <svx/xpoly.hxx> #include <svx/svdetc.hxx> diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 4caca9417a72..753559a70493 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -55,6 +55,7 @@ #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/svdpage.hxx> #include <svx/svdotable.hxx> diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 039318f61ba2..160125880a08 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -25,7 +25,7 @@ #include <svx/svdetc.hxx> #include <svx/svdmrkv.hxx> #include <vcl/window.hxx> - +#include <vcl/settings.hxx> #include <vcl/virdev.hxx> #include <tools/poly.hxx> #include <vcl/bmpacc.hxx> diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index e4514e410d54..4a1f5582c5e2 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -80,10 +80,11 @@ #include <tools/tenccvt.hxx> #include <unotools/syslocale.hxx> -#include <vcl/svapp.hxx> #include <svx/sdr/properties/properties.hxx> #include <editeng/eeitem.hxx> #include <svl/itemset.hxx> +#include <vcl/settings.hxx> +#include <vcl/svapp.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 612e905a94c2..b1f51a9532d6 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -32,6 +32,8 @@ #include <sal/config.h> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <svl/whiter.hxx> #include <sfx2/request.hxx> diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx index 7f4924e4f45d..6b4753de25b1 100644 --- a/svx/source/tbxctrls/SvxColorValueSet.cxx +++ b/svx/source/tbxctrls/SvxColorValueSet.cxx @@ -20,6 +20,7 @@ #include <svx/xtable.hxx> #include <vcl/builder.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 00157c01bf7c..92f095e75d2b 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -23,7 +23,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/viewsh.hxx> #include <rtl/ustring.hxx> - +#include <vcl/settings.hxx> #include <svx/dialogs.hrc> #define DELAY_TIMEOUT 300 diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 1fb08a15f673..ea0d92491451 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/text/WritingMode.hpp> #include <vcl/toolbox.hxx> +#include <vcl/settings.hxx> #include <svl/itempool.hxx> diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index ff4c35e5c103..0af1446b99d3 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -28,6 +28,7 @@ // header for class ToolBox #include <vcl/toolbox.hxx> +#include <vcl/settings.hxx> //............................................................................. namespace svx diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 001b6461286c..fda4261b3667 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -25,6 +25,7 @@ #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 75ff6e158554..8d17b8dcb537 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -20,6 +20,7 @@ #include <string> #include <vcl/toolbox.hxx> #include <vcl/button.hxx> +#include <vcl/settings.hxx> #include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 5470bcd8f18a..f9deeb7ce8de 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -35,6 +35,7 @@ #include <svx/dialmgr.hxx> #include <svx/lboxctrl.hxx> #include <vcl/mnemonic.hxx> +#include <vcl/settings.hxx> #include <tools/urlobj.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index df8d31eb87dd..6ef5313364c6 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -47,6 +47,7 @@ #include <unotools/fontoptions.hxx> #include <vcl/mnemonic.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svl/smplhint.hxx> #include <svtools/colorcfg.hxx> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 7e4a40f2a35d..c2ad93a71096 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -26,6 +26,7 @@ #include <rtl/ref.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> +#include <vcl/settings.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <svtools/ctrltool.hxx> #include <svtools/ctrlbox.hxx> diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index fc441874341f..2396145eda09 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -23,6 +23,7 @@ #include <vcl/toolbox.hxx> #include <vcl/bmpacc.hxx> +#include <vcl/settings.hxx> #include <tools/debug.hxx> //........................................................................ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 9c95e19043b8..0e07e5105a5b 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -33,6 +33,8 @@ #include "svtools/treelistentry.hxx" // header for define RET_OK #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> + // header for class SvtLinguConfigItem #include <unotools/lingucfg.hxx> #include <unotools/linguprops.hxx> diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 69feb1e09cde..7fabfdb9bfdd 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -30,6 +30,7 @@ #include <svx/xdef.hxx> #include <svx/AffineMatrixItem.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> // class XLineTransparenceItem diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index 0b81754c596a..c3fda78cbed7 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -20,6 +20,7 @@ #include "svx/XPropertyTable.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <vcl/virdev.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index 5c03ccab5923..c0ac70934dd2 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -25,6 +25,7 @@ #include <svx/xtable.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index 3baa12335f2c..e92551b79d4a 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -21,6 +21,7 @@ #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> +#include <vcl/settings.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> #include <svx/xpool.hxx> diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index 6db53818b43f..a59ac71d756b 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -21,6 +21,7 @@ #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 87dee326fd7b..cecd97d68c5e 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -44,6 +44,7 @@ #include <rtl/ustring.hxx> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/streamwrap.hxx> #include <comphelper/sequenceashashmap.hxx> diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index a2cd3fc46e75..1cbc93967baa 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <viewsh.hxx> diff --git a/sw/source/core/access/accfield.cxx b/sw/source/core/access/accfield.cxx index 3ed4da8da4e6..a517d7da6b82 100644 --- a/sw/source/core/access/accfield.cxx +++ b/sw/source/core/access/accfield.cxx @@ -18,6 +18,7 @@ #include <comphelper/accessiblekeybindinghelper.hxx> #include <swurl.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <ndtxt.hxx> #include <txtinet.hxx> diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index 02fd8080d644..5339527d96c9 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -126,6 +126,7 @@ #include <unotools/transliterationwrapper.hxx> #include <vcl/mapmod.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <viscrs.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 1f007f576263..d5a09b126a3e 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -55,6 +55,7 @@ #include <wrong.hxx> #include <unotextrange.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <numrule.hxx> #include <IGrammarContact.hxx> #include <comphelper/flagguard.hxx> diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index 2b5c11c834c6..396c2df0e4a2 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -23,6 +23,7 @@ #include <i18nlangtag/languagetag.hxx> #include <hintids.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svl/itemiter.hxx> #include <svl/whiter.hxx> #include <editeng/formatbreakitem.hxx> diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 0d410f8df29f..6a55d6dba40f 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -22,6 +22,7 @@ #include <vcl/dialog.hxx> #include <vcl/msgbox.hxx> #include <vcl/wrkwin.hxx> +#include <vcl/settings.hxx> #include <viewopt.hxx> #include <frmtool.hxx> #include <viscrs.hxx> diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index 64d1fb389f5e..d65884bf05c3 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -52,6 +52,7 @@ #include <SwUndoPageDesc.hxx> #include <pagedeschint.hxx> #include <tgrditem.hxx> +#include <unotools/syslocale.hxx> #include <boost/scoped_ptr.hpp> diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx index 04b08824ddb2..29d59ce4f3b9 100644 --- a/sw/source/core/edit/edtox.cxx +++ b/sw/source/core/edit/edtox.cxx @@ -24,6 +24,7 @@ #include <svl/fstathelper.hxx> #include <osl/thread.h> #include <unotools/textsearch.hxx> +#include <unotools/syslocale.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 8fa85c6fa828..2874707c28d7 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -75,6 +75,7 @@ #include <svx/charthelper.hxx> #include <PostItMgr.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #define COL_NOTES_SIDEPANE RGB_COLORDATA(230,230,230) #define COL_NOTES_SIDEPANE_BORDER RGB_COLORDATA(200,200,200) diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 07a6089f596d..d27e991d00f9 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -91,6 +91,7 @@ #include <fmthdft.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> +#include <unotools/syslocale.hxx> #include <fmtflcnt.hxx> #include <editeng/brushitem.hxx> #include <editeng/unolingu.hxx> diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index e3328c81e1b9..9e56b1bdd880 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -24,6 +24,8 @@ #include <algorithm> #include <vcl/window.hxx> +#include <vcl/settings.hxx> + #include <rootfrm.hxx> #include <pagefrm.hxx> #include <viewsh.hxx> diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index b3bb4efa2f81..6873a05fc0f7 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -39,6 +39,7 @@ #include "dview.hxx" #include "flyfrm.hxx" #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <IDocumentDrawModelAccess.hxx> diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index b7ae6402234a..defb8ffe0192 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -26,6 +26,8 @@ #include <vcl/svapp.hxx> #include <vcl/salbtype.hxx> +#include <vcl/settings.hxx> + #include <svl/zformat.hxx> #include <svl/itemiter.hxx> #include <svl/whiter.hxx> diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index d6edbcd220ca..76b44d334c7a 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -43,6 +43,8 @@ #include <unotools/localedatawrapper.hxx> #include <i18nlangtag/lang.h> #include <editeng/unolingu.hxx> + +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <stdio.h> diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index 41486a6ca150..9488700eec5c 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -52,6 +52,7 @@ #include <editeng/hyphenzoneitem.hxx> #include <editeng/svxacorr.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <view.hxx> #include <prtopt.hxx> #include <fmtcol.hxx> diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index edb31713ab00..ea5147c9b77f 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -26,6 +26,7 @@ #include "globals.hrc" #include <vcl/metric.hxx> +#include <vcl/settings.hxx> #include <svl/stritem.hxx> #include <editeng/fontitem.hxx> diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 055842934236..c03f5ee71b04 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -46,6 +46,8 @@ #include <svtools/insdlg.hxx> #include "svtools/treelistentry.hxx" #include <vcl/builder.hxx> +#include <vcl/settings.hxx> + #include <comphelper/classids.hxx> #include <unotools/configmgr.hxx> #include <docsh.hxx> diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 9db3af22a64b..994a2c9b3d34 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -62,6 +62,8 @@ #include <svx/xtable.hxx> #include <svx/dlgutil.hxx> #include <svx/strarray.hxx> + +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index 4c0535f971c1..7aaaef638ac8 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -36,6 +36,8 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> + #include <sfx2/passwd.hxx> #include <dbui.hrc> diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 66ce675f8b50..56063f809f1c 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -47,6 +47,8 @@ #include <tools/urlobj.hxx> #include <svl/urihelper.hxx> #include <vcl/print.hxx> +#include <vcl/settings.hxx> + #include <unotools/tempfile.hxx> #include <osl/file.hxx> #include <mmgreetingspage.hxx> diff --git a/sw/source/ui/docvw/AnnotationMenuButton.cxx b/sw/source/ui/docvw/AnnotationMenuButton.cxx index 0bd4bf29e4bc..f54378d6d17a 100644 --- a/sw/source/ui/docvw/AnnotationMenuButton.cxx +++ b/sw/source/ui/docvw/AnnotationMenuButton.cxx @@ -29,6 +29,7 @@ #include <vcl/menu.hxx> #include <vcl/decoview.hxx> #include <vcl/gradient.hxx> +#include <vcl/settings.hxx> #include <cmdid.h> #include <SidebarWin.hxx> diff --git a/sw/source/ui/docvw/DashedLine.cxx b/sw/source/ui/docvw/DashedLine.cxx index 8e0b315e8a7a..e9e343b3dc27 100644 --- a/sw/source/ui/docvw/DashedLine.cxx +++ b/sw/source/ui/docvw/DashedLine.cxx @@ -16,6 +16,7 @@ #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> SwDashedLine::SwDashedLine( Window* pParent, Color& ( *pColorFn )() ) : FixedLine( pParent, WB_DIALOGCONTROL | WB_HORZ ), diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index d0f728db0564..9e8f55d28a29 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -47,6 +47,7 @@ #include <vcl/gradient.hxx> #include <vcl/menubtn.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #define TEXT_PADDING 5 #define BOX_DISTANCE 10 diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx index a30fb0bcecc9..1380fdfcc469 100644 --- a/sw/source/ui/docvw/PageBreakWin.cxx +++ b/sw/source/ui/docvw/PageBreakWin.cxx @@ -40,7 +40,7 @@ #include <sfx2/dispatch.hxx> #include <svl/stritem.hxx> #include <vcl/svapp.hxx> - +#include <vcl/settings.hxx> #define BUTTON_WIDTH 30 #define BUTTON_HEIGHT 19 diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx index 99a8ebe1bf0a..22f333b60a59 100644 --- a/sw/source/ui/docvw/PostItMgr.cxx +++ b/sw/source/ui/docvw/PostItMgr.cxx @@ -33,6 +33,7 @@ #include <vcl/svapp.hxx> #include <vcl/scrbar.hxx> #include <vcl/outdev.hxx> +#include <vcl/settings.hxx> #include <viewopt.hxx> diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx index 6cd7fc4b9818..0ae206f638fa 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.cxx +++ b/sw/source/ui/docvw/SidebarTxtControl.cxx @@ -40,6 +40,7 @@ #include <vcl/msgbox.hxx> #include <vcl/gradient.hxx> #include <vcl/scrbar.hxx> +#include <vcl/settings.hxx> #include <editeng/outliner.hxx> #include <editeng/editeng.hxx> diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index 0d2d1be9f01c..ea591226326c 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -55,6 +55,7 @@ #include <vcl/scrbar.hxx> #include <vcl/svapp.hxx> #include <vcl/menubtn.hxx> +#include <vcl/settings.hxx> #include <edtwin.hxx> #include <view.hxx> diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index 46f1a401c9c8..dfa45a108145 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -35,6 +35,7 @@ #include <sfx2/app.hxx> #include <svtools/htmltokn.h> #include <vcl/txtattr.hxx> +#include <vcl/settings.hxx> #include <svtools/colorcfg.hxx> #include <editeng/flstitem.hxx> #include <vcl/metric.hxx> diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 5cbd6195ffcf..ef04fa76ff74 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -21,6 +21,8 @@ #include <sfx2/app.hxx> #include <vcl/builder.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> + #include <swwait.hxx> #include <viewopt.hxx> diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index dc273f535f71..96460837d4e4 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -19,6 +19,8 @@ #include <tools/poly.hxx> #include <vcl/layout.hxx> +#include <vcl/settings.hxx> + #include <viewopt.hxx> #include "swtypes.hxx" diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 4b3e052d89f5..2e99e6d329b9 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -19,6 +19,8 @@ #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <tools/urlobj.hxx> #include <svl/urihelper.hxx> #include <unotools/pathoptions.hxx> diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx index eb5c8152318d..1714d1c8cee4 100644 --- a/sw/source/ui/frmdlg/colex.cxx +++ b/sw/source/ui/frmdlg/colex.cxx @@ -32,6 +32,7 @@ #include <vcl/bitmap.hxx> #include <vcl/builder.hxx> #include <vcl/graph.hxx> +#include <vcl/settings.hxx> #include <tgrditem.hxx> #include <viewopt.hxx> #include "colex.hxx" diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index a8ce30588ad1..239aaa6f5ed9 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -33,6 +33,8 @@ #include <svl/ctloptions.hxx> #include <sfx2/dispatch.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> + #include <swmodule.hxx> #include <sal/macros.h> diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index cd4aaf8234a0..ab59a3327d8f 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -19,6 +19,8 @@ #include "hintids.hxx" #include <vcl/graph.hxx> +#include <vcl/settings.hxx> + #include <sfx2/htmlmode.hxx> #include <sfx2/objsh.hxx> #include <svl/intitem.hxx> diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index b8bb0f9ea1d4..4c4a7e0526b9 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -21,6 +21,8 @@ #include <tools/shl.hxx> #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> +#include <vcl/settings.hxx> + #include <sfx2/tabdlg.hxx> #include <editeng/brushitem.hxx> #include <unotools/configmgr.hxx> diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx index 8f628eb6ac1a..2063af43f5b2 100644 --- a/sw/source/ui/misc/swruler.cxx +++ b/sw/source/ui/misc/swruler.cxx @@ -22,6 +22,7 @@ #include <sfx2/request.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> +#include <vcl/settings.hxx> #include "misc.hrc" #define CONTROL_BORDER_WIDTH 1 diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx index 16f8ac5e565f..1b3b85cb3cf4 100644 --- a/sw/source/ui/ribbar/inputwin.cxx +++ b/sw/source/ui/ribbar/inputwin.cxx @@ -28,6 +28,7 @@ #include <svx/ruler.hxx> #include <svl/zforlist.hxx> #include <svl/stritem.hxx> +#include <vcl/settings.hxx> #include "swtypes.hxx" #include "cmdid.h" diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index 0b449afc1380..54b34de75fe3 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -40,6 +40,7 @@ #include <wrtsh.hxx> #include <svl/imageitm.hxx> #include <vcl/lstbox.hxx> +#include <vcl/settings.hxx> #include <rtl/ustring.hxx> #include "swabstdlg.hxx" #include <misc.hrc> diff --git a/sw/source/ui/sidebar/PageColumnControl.cxx b/sw/source/ui/sidebar/PageColumnControl.cxx index d4585b7a0937..3c148c0b87ec 100644 --- a/sw/source/ui/sidebar/PageColumnControl.cxx +++ b/sw/source/ui/sidebar/PageColumnControl.cxx @@ -27,6 +27,7 @@ #include <svx/sidebar/ValueSetWithTextControl.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> +#include <vcl/settings.hxx> namespace sw { namespace sidebar { diff --git a/sw/source/ui/sidebar/PageMarginControl.cxx b/sw/source/ui/sidebar/PageMarginControl.cxx index c3d8c8081ba9..2d33467de0d8 100644 --- a/sw/source/ui/sidebar/PageMarginControl.cxx +++ b/sw/source/ui/sidebar/PageMarginControl.cxx @@ -24,6 +24,7 @@ #include <swtypes.hxx> #include <svx/sidebar/ValueSetWithTextControl.hxx> +#include <vcl/settings.hxx> #define SWPAGE_LEFT_GVALUE "Sw_Page_Left" #define SWPAGE_RIGHT_GVALUE "Sw_Page_Right" diff --git a/sw/source/ui/sidebar/PageOrientationControl.cxx b/sw/source/ui/sidebar/PageOrientationControl.cxx index 302b1697c591..27eb8a9be3af 100644 --- a/sw/source/ui/sidebar/PageOrientationControl.cxx +++ b/sw/source/ui/sidebar/PageOrientationControl.cxx @@ -24,6 +24,7 @@ #include <swtypes.hxx> #include <svx/sidebar/ValueSetWithTextControl.hxx> +#include <vcl/settings.hxx> namespace sw { namespace sidebar { diff --git a/sw/source/ui/sidebar/PageSizeControl.cxx b/sw/source/ui/sidebar/PageSizeControl.cxx index f913d8f725a0..4a21d344dd09 100644 --- a/sw/source/ui/sidebar/PageSizeControl.cxx +++ b/sw/source/ui/sidebar/PageSizeControl.cxx @@ -31,6 +31,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> +#include <vcl/settings.hxx> namespace sw { namespace sidebar { diff --git a/sw/source/ui/sidebar/WrapPropertyPanel.cxx b/sw/source/ui/sidebar/WrapPropertyPanel.cxx index cf8beb36bedd..3f303f8dfee8 100644 --- a/sw/source/ui/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/ui/sidebar/WrapPropertyPanel.cxx @@ -29,6 +29,7 @@ #include <sfx2/imagemgr.hxx> #include <svl/eitem.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include "com/sun/star/lang/IllegalArgumentException.hpp" diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index bdb1bf171cdb..92ea069d1c3b 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -21,6 +21,8 @@ #include <vcl/layout.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <svl/zforlist.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/i18n/BreakIterator.hpp> diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 71c3f903062a..c520e6570f85 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -25,6 +25,8 @@ #include <vcl/help.hxx> #include <vcl/cmdevt.hxx> #include <vcl/button.hxx> +#include <vcl/settings.hxx> + #include <svl/whiter.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index fc0a57a9e3e4..58a25d8d8ff7 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -137,6 +137,7 @@ #include <vcl/GraphicNativeTransform.hxx> #include <vcl/GraphicNativeMetadata.hxx> +#include <vcl/settings.hxx> #include <boost/scoped_ptr.hpp> diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index efd72f062a69..e428ac7173a7 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -20,7 +20,10 @@ #include <config_features.h> #include "hintids.hxx" + #include <vcl/help.hxx> +#include <vcl/settings.hxx> + #include <svx/ruler.hxx> #include <editeng/paperinf.hxx> #include <editeng/lrspitem.hxx> diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 48e2e13c6118..3a1f3b0b0f8a 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -20,6 +20,8 @@ #include <i18nutil/unicode.hxx> #include <svl/itemiter.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> + #include <editeng/itemtype.hxx> #include <svtools/grfmgr.hxx> #include <unotools/intlwrapper.hxx> diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index b8e62d7ac6f6..2dae88aa6641 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -24,6 +24,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/dispatch.hxx> #include <vcl/help.hxx> +#include <vcl/settings.hxx> #include <sot/formats.hxx> #include <uiitems.hxx> #include <fmtinfmt.hxx> diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index a931580c934a..f803de5a1248 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -29,6 +29,8 @@ #include <svl/eitem.hxx> #include <svl/urlbmk.hxx> #include <vcl/graphicfilter.hxx> +#include <vcl/settings.hxx> + #include "svtools/treelistentry.hxx" #include <sfx2/docinsert.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 09df3cd4a85a..7ab5f78a3cb2 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -30,6 +30,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/dockwin.hxx> #include <vcl/toolbox.hxx> +#include <vcl/settings.hxx> #include <swtypes.hxx> #include <swmodule.hxx> #include <view.hxx> diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index d685b564d0af..45ca783c3196 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -30,6 +30,7 @@ #include <osl/diagnose.h> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <com/sun/star/text/XTextViewCursorSupplier.hpp> #include <com/sun/star/view/XScreenCursor.hpp> #include <com/sun/star/view/DocumentZoomType.hpp> diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index 5ccee20789e6..464522c70cc5 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -36,6 +36,7 @@ #include <tools/urlobj.hxx> #include <vcl/throbber.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <limits> diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx index 91edeffecf77..1d6cab59e368 100644 --- a/toolkit/source/awt/scrollabledialog.cxx +++ b/toolkit/source/awt/scrollabledialog.cxx @@ -19,6 +19,7 @@ #include <toolkit/awt/scrollabledialog.hxx> #include <vcl/group.hxx> +#include <vcl/settings.hxx> namespace toolkit { diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index c087b14455be..4fbc9df25349 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -32,6 +32,7 @@ #include <vcl/vclevent.hxx> #include <vcl/window.hxx> #include <vcl/edit.hxx> +#include <vcl/settings.hxx> #include <tools/debug.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index a994d7f85c5c..fa29d4fb82ae 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -52,6 +52,7 @@ #include <vcl/pdfextoutdevdata.hxx> #include <vcl/tabpage.hxx> #include <vcl/button.hxx> +#include <vcl/settings.hxx> #include <comphelper/asyncnotification.hxx> #include <comphelper/flagguard.hxx> #include "stylesettings.hxx" diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 98c2fe1e7c57..9df857685c46 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -53,6 +53,7 @@ #include <vcl/svapp.hxx> #include <vcl/tabpage.hxx> #include <vcl/tabctrl.hxx> +#include <vcl/settings.hxx> #include <tools/diagnose_ex.h> #include <boost/bind.hpp> diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index 08c781d8efc8..fc53ea7c492b 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -37,6 +37,7 @@ #include <tools/diagnose_ex.h> #include <tools/debug.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> using namespace css::awt; using namespace css::awt::grid; diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index 4c10f7ce0465..feb21f27e24b 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include "svl/zforlist.hxx" #include "vcl/svapp.hxx" +#include <vcl/settings.hxx> #include "ids.hrc" #include "getcontinuations.hxx" 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; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 0912bee62bcc..4c3502eee274 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -30,6 +30,7 @@ #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> #include <vcl/wmf.hxx> +#include <vcl/settings.hxx> #include <filter/msfilter/util.hxx> #include <filter/msfilter/escherex.hxx> #include <comphelper/string.hxx> diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index d907dbac2df5..636778d2022b 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -11,6 +11,7 @@ #include <tools/resmgr.hxx> #include <svx/dialogs.hrc> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <rtl/strbuf.hxx> #include <rtftokenizer.hxx> diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index 3904b717e18d..1c2332bf8ec8 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -24,6 +24,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/button.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> namespace com { namespace sun { diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 4a5ed900c6e2..ec944f6ed45a 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -30,6 +30,8 @@ #include <svtools/stdctrl.hxx> #include <unotools/securityoptions.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> + namespace com { namespace sun { namespace star { diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 2f20b8aac9e6..212f2996a3f3 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -31,6 +31,8 @@ #include "dialogs.hrc" #include "resourcemanager.hxx" +#include <vcl/settings.hxx> + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; |