From 739e20ac58983925f2076a9848435b7d4fb5366a Mon Sep 17 00:00:00 2001 From: Matteo Casalin Date: Sun, 1 Jul 2012 01:06:04 +0200 Subject: Decrease header files dependencies Change-Id: I654e71e56d60bf629625df09eb93b21c9ef670e8 --- cui/source/dialogs/cuigrfflt.cxx | 1 + cui/source/inc/cuigrfflt.hxx | 2 +- extensions/source/scanner/scanwin.cxx | 2 +- filter/source/graphicfilter/icgm/bundles.cxx | 1 - filter/source/pdf/pdfexport.cxx | 1 - filter/source/svg/svgwriter.cxx | 1 + filter/source/svg/svgwriter.hxx | 1 - sc/source/ui/view/overlayobject.cxx | 1 - sd/source/ui/annotations/annotationwindow.cxx | 2 +- sd/source/ui/app/optsitem.cxx | 2 +- sd/source/ui/func/fuoaprms.cxx | 2 +- sd/source/ui/view/drviews8.cxx | 2 +- sd/source/ui/view/grviewsh.cxx | 2 +- sfx2/source/doc/graphhelp.cxx | 2 +- sfx2/source/view/ipclient.cxx | 1 - .../source/engine/shapes/drawinglayeranimation.cxx | 2 +- slideshow/source/engine/shapes/viewmediashape.cxx | 1 - svtools/source/filter/wmf/emfwr.cxx | 2 +- svtools/source/filter/wmf/wmfwr.cxx | 2 +- svtools/source/graphic/grfmgr.cxx | 2 +- svtools/source/graphic/provider.cxx | 1 - svx/source/dialog/_contdlg.cxx | 2 +- svx/source/gallery2/galobj.cxx | 2 +- svx/source/sdr/overlay/overlayanimatedbitmapex.cxx | 1 - svx/source/sdr/overlay/overlaybitmapex.cxx | 1 - svx/source/sdr/overlay/overlaycrosshair.cxx | 1 - svx/source/sdr/overlay/overlayhelpline.cxx | 1 - svx/source/sdr/overlay/overlayline.cxx | 1 - svx/source/sdr/overlay/overlaymanager.cxx | 1 - svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 1 - svx/source/sdr/overlay/overlayobject.cxx | 1 - svx/source/sdr/overlay/overlaypolypolygon.cxx | 1 - svx/source/sdr/overlay/overlayrollingrectangle.cxx | 1 - svx/source/sdr/overlay/overlaytriangle.cxx | 1 - svx/source/svdraw/gradtrns.cxx | 2 +- svx/source/svdraw/sdrpagewindow.cxx | 2 +- svx/source/svdraw/svdfmtf.cxx | 2 +- svx/source/svdraw/svdoashp.cxx | 2 +- svx/source/svdraw/svdobj.cxx | 2 +- svx/source/svdraw/svdocapt.cxx | 2 +- svx/source/svdraw/svdograf.cxx | 2 +- svx/source/svdraw/svdopath.cxx | 2 +- svx/source/svdraw/svdotext.cxx | 2 +- svx/source/svdraw/svdotextdecomposition.cxx | 2 +- svx/source/svdraw/svdotextpathdecomposition.cxx | 1 - svx/source/svdraw/svdpage.cxx | 2 +- svx/source/svdraw/svdpoev.cxx | 2 +- svx/source/table/tablehandles.cxx | 1 - svx/source/xoutdev/_xpoly.cxx | 2 +- sw/source/core/graphic/ndgrf.cxx | 2 +- sw/source/core/layout/fly.cxx | 2 +- sw/source/filter/rtf/swparrtf.cxx | 2 +- tools/Package_inc.mk | 1 + tools/inc/tools/gen.hxx | 30 -------------------- tools/inc/tools/helpers.hxx | 33 ++++++++++++++++++++++ tools/source/generic/line.cxx | 1 + tools/source/generic/poly.cxx | 1 + vcl/generic/glyphs/glyphcache.cxx | 1 - vcl/inc/vcl/salbtype.hxx | 2 +- vcl/source/app/sound.cxx | 5 ---- vcl/source/gdi/cvtsvm.cxx | 2 +- vcl/source/gdi/impanmvw.cxx | 2 +- vcl/source/gdi/impgraph.cxx | 2 +- vcl/source/gdi/metaact.cxx | 2 +- vcl/source/gdi/print2.cxx | 1 - vcl/source/gdi/regband.cxx | 3 +- vcl/source/gdi/region.cxx | 1 + vcl/unx/generic/app/saldisp.cxx | 1 - vcl/unx/generic/app/soicon.cxx | 1 - xmloff/source/draw/shapeexport2.cxx | 2 +- xmloff/source/draw/shapeexport3.cxx | 2 +- xmloff/source/draw/xexptran.cxx | 2 +- 72 files changed, 79 insertions(+), 98 deletions(-) create mode 100644 tools/inc/tools/helpers.hxx diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 310c54ad5e3e..2dbe2004dc7f 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include +#include #include #include #include diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index f9cb62419647..3c67e0dec405 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 2eaf89dcd6b7..1b5a595ae54a 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -42,12 +42,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include "scanner.hxx" #if defined MSC diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx index 3282ce4d5466..68811592009d 100644 --- a/filter/source/graphicfilter/icgm/bundles.cxx +++ b/filter/source/graphicfilter/icgm/bundles.cxx @@ -29,7 +29,6 @@ #include "bundles.hxx" -#include #include Bundle& Bundle::operator=( Bundle& rSource ) diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 30727c6773f1..e85afdedb4b2 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -39,7 +39,6 @@ #include "vcl/metaact.hxx" #include "vcl/gdimtf.hxx" #include "vcl/jobset.hxx" -#include "vcl/salbtype.hxx" #include "vcl/bmpacc.hxx" #include "vcl/svapp.hxx" #include "toolkit/awt/vclxdevice.hxx" diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 1e2a2c0197e6..1b64ff588521 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -32,6 +32,7 @@ #include "svgwriter.hxx" #include +#include #include diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index b2821b649a34..43dffe54d68c 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/sc/source/ui/view/overlayobject.cxx b/sc/source/ui/view/overlayobject.cxx index 90c3eff82ca1..ed0ff36fc952 100644 --- a/sc/source/ui/view/overlayobject.cxx +++ b/sc/source/ui/view/overlayobject.cxx @@ -30,7 +30,6 @@ #include "overlayobject.hxx" #include "vcl/outdev.hxx" #include "vcl/lineinfo.hxx" -#include "vcl/salbtype.hxx" #include "vcl/window.hxx" #include "tools/fract.hxx" #include "basegfx/range/b2drange.hxx" diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 6d8a311edc71..7604ca4348ec 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -75,8 +75,8 @@ #include #include #include -#include // FRound #include +#include #include #include diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 9fb13528ba7f..9251fdae6164 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include "app.hxx" diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index f596d2b2815b..c65bb8e37996 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -51,7 +51,7 @@ #include "View.hxx" #include "sdabstdlg.hxx" #include "sdresid.hxx" -#include // FRound +#include #include using namespace ::com::sun::star; diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index ea01389da407..c7ba98e00395 100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -75,7 +75,7 @@ #include "drawview.hxx" #include "zoomlist.hxx" #include -#include // FRound +#include #include namespace sd { diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx index b87fbfb864ca..f41a21fbcc9a 100644 --- a/sd/source/ui/view/grviewsh.cxx +++ b/sd/source/ui/view/grviewsh.cxx @@ -24,7 +24,7 @@ #include #include #include -#include // FRound +#include namespace sd { diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 69583c711ca7..cd6225c674d6 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -60,9 +60,9 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index a2586dbc6297..1310df3b2add 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -48,7 +48,6 @@ #include "workwin.hxx" #include "guisaveas.hxx" #include -#include #include #include diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index 097576dd5866..77fb5148a29a 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -37,7 +38,6 @@ #include #include -#include #include #include #include diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index cb74d66534cd..5c8c51f08d0b 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -39,7 +39,6 @@ #include #include -#include #include #include diff --git a/svtools/source/filter/wmf/emfwr.cxx b/svtools/source/filter/wmf/emfwr.cxx index 0c998e1320d9..cb31e2f97980 100644 --- a/svtools/source/filter/wmf/emfwr.cxx +++ b/svtools/source/filter/wmf/emfwr.cxx @@ -29,7 +29,7 @@ #include "emfwr.hxx" #include -#include +#include #include #include #include diff --git a/svtools/source/filter/wmf/wmfwr.cxx b/svtools/source/filter/wmf/wmfwr.cxx index c4fb19336955..e6aaa013810c 100644 --- a/svtools/source/filter/wmf/wmfwr.cxx +++ b/svtools/source/filter/wmf/wmfwr.cxx @@ -27,7 +27,6 @@ ************************************************************************/ -#include #include #include "wmfwr.hxx" #include @@ -35,6 +34,7 @@ #include #include #include +#include #include #include #include //unicode::getUnicodeScriptType diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index de70efbe4201..e3370d902aa0 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -39,7 +40,6 @@ #include #include #include -#include #include #include diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 9b8c7757f550..7798b57fc8db 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 5bbd61dd4530..5827495b22dd 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -29,7 +29,7 @@ #include #include #include -#include // FRound +#include #include #include #include diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 945c23f121de..f0a7b5541419 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -37,6 +37,7 @@ #include #include +#include #include #include #include @@ -45,7 +46,6 @@ #include "gallery.hrc" #include "svx/galmisc.hxx" #include "galobj.hxx" -#include // FRound #include #include "gallerydrawmodel.hxx" diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx index 51dc1a3fb543..db3295506e7d 100644 --- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx +++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx @@ -27,7 +27,6 @@ ************************************************************************/ #include -#include #include #include #include diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx index 953a405f9bc3..61ad48c8fb1f 100644 --- a/svx/source/sdr/overlay/overlaybitmapex.cxx +++ b/svx/source/sdr/overlay/overlaybitmapex.cxx @@ -28,7 +28,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx index 343d8b8b9c74..3dedad397f98 100644 --- a/svx/source/sdr/overlay/overlaycrosshair.cxx +++ b/svx/source/sdr/overlay/overlaycrosshair.cxx @@ -19,7 +19,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx index 16bd4f5697c7..6e0c8cac0c48 100644 --- a/svx/source/sdr/overlay/overlayhelpline.cxx +++ b/svx/source/sdr/overlay/overlayhelpline.cxx @@ -19,7 +19,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx index 064c4fc7e77b..110b732cc6ab 100644 --- a/svx/source/sdr/overlay/overlayline.cxx +++ b/svx/source/sdr/overlay/overlayline.cxx @@ -28,7 +28,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 2bd3e51a0fcf..6182b4458703 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index 933e5e97ca70..b13a1c6cdd59 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index e2ad9f13d9d0..b5399d6939cd 100644 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx index 5dd6c92de229..a3aa39a54cbf 100644 --- a/svx/source/sdr/overlay/overlaypolypolygon.cxx +++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx @@ -27,7 +27,6 @@ ************************************************************************/ #include -#include #include #include #include diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx index 7c94256aa7bd..24a6f13f9acd 100644 --- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx @@ -28,7 +28,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx index e245f560b752..e2facf0154ef 100644 --- a/svx/source/sdr/overlay/overlaytriangle.cxx +++ b/svx/source/sdr/overlay/overlaytriangle.cxx @@ -28,7 +28,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx index 56fd48c6ad2b..99405082abca 100644 --- a/svx/source/svdraw/gradtrns.cxx +++ b/svx/source/svdraw/gradtrns.cxx @@ -23,7 +23,7 @@ #include #include #include -#include // FRound +#include ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 48d2de4e69bb..62df73829e6c 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -195,7 +195,7 @@ void SdrPageWindow::PrepareRedraw(const Region& rReg) #ifdef CLIPPER_TEST #include #include -#include // FRound +#include #include #include #include diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index d62255cadac9..fd2533e16fe8 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -65,7 +65,7 @@ #include #include #include -#include // FRound +#include #include #include #include diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 1e66287d8b83..74338ff25c7d 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -43,7 +43,7 @@ #include #include #include -#include // FRound +#include #include #include #include diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index a71db0bf0fa2..8af35f0badbe 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -87,7 +88,6 @@ #include #include #include -#include // FRound #include #include diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index eca1f620b228..4b11406aec30 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include +#include #include #include #include @@ -49,7 +50,6 @@ #include #include #include -#include // FRound #include #include #include diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 75f71f6302ff..e03a8d0aefbb 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 25b7fa5a4d72..3ef20c8e17ed 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -28,6 +28,7 @@ #include +#include #include #include #include @@ -54,7 +55,6 @@ #include #include #include -#include // FRound #include #include #include "svdconv.hxx" diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 05fdbedeab54..d214f548e097 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -51,7 +51,7 @@ #include #include #include -#include // FRound +#include #include #include #include diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index c5046b8d4ab4..34b017dea17b 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 3470421ed6bd..f0935bb0ae0c 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index cd8ba23e4176..db88eb3b6b56 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -40,6 +40,7 @@ #include #include +#include #include #include @@ -59,7 +60,6 @@ #include #include -#include // FRound #include #include #include diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index db899bde6f52..862795296d5d 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -38,7 +38,7 @@ #include #include #include -#include // FRound +#include #include diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 7b1db08662ac..b77f65730c6f 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -31,7 +31,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx index 451b132fc232..ed5689739d0a 100644 --- a/svx/source/xoutdev/_xpoly.cxx +++ b/svx/source/xoutdev/_xpoly.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #include #include "xpolyimp.hxx" @@ -37,7 +38,6 @@ #include #include #include -#include // FRound #include #include diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index f5986c725216..c3f3aef1b91d 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -27,7 +27,7 @@ ************************************************************************/ #include -#include // FRound +#include #include #include #include diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index cc7c170ccc8c..628f9c5194dc 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -85,7 +86,6 @@ #include "ndindex.hxx" // GetGrfArea #include "sectfrm.hxx" #include -#include // FRound #include "switerator.hxx" using namespace ::com::sun::star; diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 031a63e30583..a7ca88635a33 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -111,7 +112,6 @@ #include #include #include -#include // FRound #include #include diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk index f216f057be2c..b0ac9ed4cc2b 100644 --- a/tools/Package_inc.mk +++ b/tools/Package_inc.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/fsys.hxx,tools/fsys.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/gen.hxx,tools/gen.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/getprocessworkingdir.hxx,tools/getprocessworkingdir.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/globname.hxx,tools/globname.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/helpers.hxx,tools/helpers.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmime.hxx,tools/inetmime.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmsg.hxx,tools/inetmsg.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetstrm.hxx,tools/inetstrm.hxx)) diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx index 6c07542b3294..5252bdd22ac7 100644 --- a/tools/inc/tools/gen.hxx +++ b/tools/inc/tools/gen.hxx @@ -35,36 +35,6 @@ class SvStream; -// -------------------- -// - Helper functions - -// -------------------- - -inline long MinMax( long nVal, long nMin, long nMax ); -inline long AlignedWidth4Bytes( long nWidthBits ); -inline long FRound( double fVal ); - -// --------------- -// - Inlines - -// --------------- - -inline long MinMax( long nVal, long nMin, long nMax ) -{ - return( nVal >= nMin ? ( nVal <= nMax ? nVal : nMax ) : nMin ); -} - -// ------------------------------------------------------------------ - -inline long AlignedWidth4Bytes( long nWidthBits ) -{ - return( ( ( nWidthBits + 31 ) >> 5 ) << 2 ); -} - -// ------------------------------------------------------------------ - -inline long FRound( double fVal ) -{ - return( fVal > 0.0 ? (long) ( fVal + 0.5 ) : -(long) ( -fVal + 0.5 ) ); -} // -------- // - Pair - diff --git a/tools/inc/tools/helpers.hxx b/tools/inc/tools/helpers.hxx new file mode 100644 index 000000000000..f34a7c20893c --- /dev/null +++ b/tools/inc/tools/helpers.hxx @@ -0,0 +1,33 @@ +/* -*- 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/. + */ + + +#ifndef _TOOLS_HELPERS_HXX +#define _TOOLS_HELPERS_HXX + +inline long MinMax( long nVal, long nMin, long nMax ) +{ + return nVal >= nMin ? ( nVal <= nMax ? nVal : nMax ) : nMin; +} + + +inline long AlignedWidth4Bytes( long nWidthBits ) +{ + return ( ( nWidthBits + 31 ) >> 5 ) << 2; +} + + +inline long FRound( double fVal ) +{ + return fVal > 0.0 ? static_cast( fVal + 0.5 ) : -static_cast( -fVal + 0.5 ); +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/generic/line.cxx b/tools/source/generic/line.cxx index 5b9073efaeae..d9984efcc731 100644 --- a/tools/source/generic/line.cxx +++ b/tools/source/generic/line.cxx @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index 7f2afcac7661..b712e6449f46 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index 66dc23760ed7..bf2159ede80d 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx index 89da4a6af377..31f9f02a6be4 100644 --- a/vcl/inc/vcl/salbtype.hxx +++ b/vcl/inc/vcl/salbtype.hxx @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx index 0a56b2c433f7..2ffc190cf399 100644 --- a/vcl/source/app/sound.cxx +++ b/vcl/source/app/sound.cxx @@ -18,13 +18,8 @@ */ -#include - -#include -#include #include #include -#include #include #include diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index c8ad028d8e1c..f4a0152b4b88 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -31,10 +31,10 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx index df4deadfdf32..7be51d2ab264 100644 --- a/vcl/source/gdi/impanmvw.cxx +++ b/vcl/source/gdi/impanmvw.cxx @@ -21,7 +21,7 @@ #include "impanmvw.hxx" #include #include -#include +#include // ---------------- // - ImplAnimView - diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 6762543ad23c..5d28efa9fce9 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -40,7 +41,6 @@ #include #include #include -#include #include #include diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 1a25a12156ba..7cfa2bc9f0c1 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -31,8 +31,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index 7280360b95e2..8e66e514157f 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index 146c38a77488..154574af54dc 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -27,8 +27,9 @@ ************************************************************************/ #include -#include +#include #include +#include #include diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 11eed095468b..795fc48afcd5 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 90bdf839fcb0..e9b4ba099e6e 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -77,7 +77,6 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*); #include #include #include -#include #include #include #include diff --git a/vcl/unx/generic/app/soicon.cxx b/vcl/unx/generic/app/soicon.cxx index 79d9e6019035..5b062f9304e7 100644 --- a/vcl/unx/generic/app/soicon.cxx +++ b/vcl/unx/generic/app/soicon.cxx @@ -32,7 +32,6 @@ #include #include -#include #include #include #include diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 00856c83572a..963b3fa0732a 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -50,12 +50,12 @@ #include #include "sdpropls.hxx" #include +#include #include #include #include #include "XMLImageMapExport.hxx" #include "xexptran.hxx" -#include // FRound #include #include diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx index 888f4b603c3c..6ca18819b3a4 100644 --- a/xmloff/source/draw/shapeexport3.cxx +++ b/xmloff/source/draw/shapeexport3.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 545e0a42ae87..d78614382c5d 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include -- cgit