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 /cui | |
parent | DOCX export: handle wp14:sizeRelH/V relativeFrom=margin for shapes (diff) | |
download | core-a18a1a454505193b922e1d5dc3215526f01f5efd.tar.gz core-a18a1a454505193b922e1d5dc3215526f01f5efd.zip |
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>
Diffstat (limited to 'cui')
35 files changed, 40 insertions, 5 deletions
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> |