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 /sfx2 | |
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 'sfx2')
-rw-r--r-- | sfx2/source/appl/linkmgr2.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/appl/shutdowniconunx.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/bastyp/sfxresid.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/control/objface.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailviewacc.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/dialoghelper.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/infobar.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/titledockwin.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/versdlg.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/doc/objcont.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/doc/printhelper.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/menu/mnuitem.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/sidebar/Theme.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/view/viewsh.cxx | 2 |
19 files changed, 19 insertions, 1 deletions
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" |