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 /sd | |
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 'sd')
38 files changed, 67 insertions, 1 deletions
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 { |