diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-07-28 17:23:50 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-31 16:45:58 +0200 |
commit | b5867945d67dba505d0629e5e41fdc52bc78bfee (patch) | |
tree | f4df18de3e656c3d3a39fd046ca5e724a560b02d /slideshow | |
parent | 1bf7bc6f9929ceae0ea059b64ae0efa12228525f (diff) |
Add missing sal/log.hxx headers
rtl/string.hxx and rtl/ustring.hxx both unnecessarily #include <sal/log.hxx> (and don't make use of it themselves), but many other files happen to depend on it.
This is a continuation of commit 6ff2d84ade299cb3d14d4110e4cf1a4b8070c030 to be able to remove those unneeded includes.
This commit adds missing headers to every file found by:
grep -FwL sal/log.hxx $(git grep -Elw 'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF|SAL_DETAIL_LOG_STREAM|SAL_WHERE|SAL_STREAM|SAL_DEBUG')
to directories from sfx2 to starmath
Change-Id: I40ee7bfae6efdadd862319b7b693ad22c648e1c4
Reviewed-on: https://gerrit.libreoffice.org/58222
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'slideshow')
38 files changed, 39 insertions, 0 deletions
diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx index ea85bbac535b..5566b5883f78 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx @@ -22,6 +22,7 @@ #include "simplecontinuousactivitybase.hxx" +#include <sal/log.hxx> namespace slideshow { diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx index 49996f8809a0..8eadd83428e8 100644 --- a/slideshow/source/engine/activitiesqueue.cxx +++ b/slideshow/source/engine/activitiesqueue.cxx @@ -21,6 +21,7 @@ #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> #include <osl/diagnose.h> +#include <sal/log.hxx> #include <slideshowexceptions.hxx> #include <activity.hxx> diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx index 1d666629302c..6ce8ee14a2ba 100644 --- a/slideshow/source/engine/animationfactory.cxx +++ b/slideshow/source/engine/animationfactory.cxx @@ -19,6 +19,7 @@ #include <tools/diagnose_ex.h> +#include <sal/log.hxx> #include <animationfactory.hxx> #include <attributemap.hxx> diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx index 6c7eebed0ad1..74bd447f7808 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.cxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx @@ -20,6 +20,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <comphelper/anytostring.hxx> +#include <sal/log.hxx> #include <com/sun/star/presentation/ParagraphTarget.hpp> #include <com/sun/star/animations/Timing.hpp> #include <com/sun/star/animations/AnimationAdditiveMode.hpp> diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx index 1d0edaa2e683..a02feb9bb085 100644 --- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx +++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/presentation/ParagraphTarget.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <basegfx/numeric/ftools.hxx> +#include <sal/log.hxx> #include <animationnodefactory.hxx> #include "paralleltimecontainer.hxx" diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index c19165f72cbf..bb3c7e3739a7 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -23,6 +23,7 @@ #include <tools.hxx> #include "nodetools.hxx" #include <delayevent.hxx> +#include <sal/log.hxx> #include <functional> #include <algorithm> diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index 16dec389d38d..bfe066e5b5a9 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -34,6 +34,8 @@ #include "nodetools.hxx" #include "generateevent.hxx" +#include <sal/log.hxx> + #include <vector> #include <algorithm> #include <iterator> diff --git a/slideshow/source/engine/attributemap.cxx b/slideshow/source/engine/attributemap.cxx index 3b5da058404e..905e5d8cba35 100644 --- a/slideshow/source/engine/attributemap.cxx +++ b/slideshow/source/engine/attributemap.cxx @@ -22,6 +22,7 @@ #include <attributemap.hxx> #include <tools.hxx> +#include <sal/log.hxx> namespace slideshow diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index 8fc545ee5b09..e1c53c4da4f6 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -19,6 +19,7 @@ #include <tools/diagnose_ex.h> +#include <sal/log.hxx> #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx index 927e0d72130d..3cb49ea23061 100644 --- a/slideshow/source/engine/opengl/TransitionImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionImpl.cxx @@ -30,6 +30,7 @@ #include <glm/gtc/type_ptr.hpp> #include <vcl/opengl/OpenGLHelper.hxx> #include <vcl/opengl/OpenGLContext.hxx> +#include <sal/log.hxx> #include <algorithm> #include <array> diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx index b0ceabef524b..663efa8a8710 100644 --- a/slideshow/source/engine/opengl/TransitionerImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx @@ -53,6 +53,7 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/factory.hxx> #include <rtl/ref.hxx> +#include <sal/log.hxx> #include <comphelper/servicedecl.hxx> diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx index 14c5bdea0b08..52c453e3eea6 100644 --- a/slideshow/source/engine/pointersymbol.cxx +++ b/slideshow/source/engine/pointersymbol.cxx @@ -22,6 +22,7 @@ #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <sal/log.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/vector/b2dvector.hxx> diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index e02d8fc8ab3c..c4c3dc4ee9ea 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -28,6 +28,7 @@ #include <cppcanvas/vclfactory.hxx> #include <cppcanvas/basegfxfactory.hxx> #include <basegfx/range/b2drange.hxx> +#include <sal/log.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index 75ff09d55f7a..12d7f8a61736 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -26,6 +26,7 @@ #include <vcl/gdimtf.hxx> #include <basegfx/numeric/ftools.hxx> +#include <sal/log.hxx> #include <cmath> #include <algorithm> diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index 2a642b1a230d..05bd61f61f27 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -27,6 +27,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <rtl/math.hxx> +#include <sal/log.hxx> #include <vcl/metric.hxx> #include <vcl/canvastools.hxx> #include <vcl/metaact.hxx> diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index 8a8ebffd0783..0aecb7d14949 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -20,6 +20,7 @@ #include <tools/diagnose_ex.h> #include <osl/diagnose.hxx> +#include <sal/log.hxx> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/FontWeight.hpp> diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index 849df8d9897c..308e0502ab7a 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -22,6 +22,7 @@ #include <rtl/math.hxx> +#include <sal/log.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index 148ed3a6de39..fc7b00ead6d1 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -20,6 +20,7 @@ // must be first #include <tools/diagnose_ex.h> +#include <sal/log.hxx> #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index 77ff57810ec9..c9b0583fad23 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -19,6 +19,7 @@ #include <tools/diagnose_ex.h> +#include <sal/log.hxx> #include "gdimtftools.hxx" #include <com/sun/star/document/XExporter.hpp> diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index eb7e739f0fbe..1b6e787009fd 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -19,6 +19,7 @@ #include <tools/diagnose_ex.h> +#include <sal/log.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index 9888976973d2..029c2a52fbc2 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -20,6 +20,7 @@ // must be first #include <tools/diagnose_ex.h> +#include <sal/log.hxx> #include "viewbackgroundshape.hxx" #include <tools.hxx> diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index dd7b2b039a95..d8dcb2bbf4d6 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -26,6 +26,7 @@ #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <sal/log.hxx> #include <vcl/canvastools.hxx> #include <vcl/syschild.hxx> #include <vcl/sysdata.hxx> diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index d34388568e4d..9fb337a2967a 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -23,6 +23,7 @@ #include <math.h> #include <rtl/math.hxx> +#include <sal/log.hxx> #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XIntegerBitmap.hpp> diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index b21266947441..cae844363cf5 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -19,6 +19,7 @@ #include <tools/diagnose_ex.h> +#include <sal/log.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index 09c80f2208c1..fd1fbfb5d87e 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -22,6 +22,7 @@ #include <basegfx/range/b1drange.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <sal/log.hxx> #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index f10f6633a464..43ac2f89e369 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -20,6 +20,7 @@ #include <tools/diagnose_ex.h> +#include <sal/log.hxx> #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index ab1214538af3..9fa0ba900ab6 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -20,6 +20,7 @@ #include <osl/diagnose.hxx> #include <tools/diagnose_ex.h> +#include <sal/log.hxx> #include <canvas/canvastools.hxx> #include <cppcanvas/basegfxfactory.hxx> diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index ebe4d43e5ff3..2f866e32ece1 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/awt/MouseEvent.hpp> +#include <sal/log.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <cppcanvas/basegfxfactory.hxx> diff --git a/slideshow/source/engine/slidebitmap.cxx b/slideshow/source/engine/slidebitmap.cxx index 2accdd74dcb2..4cf61b727678 100644 --- a/slideshow/source/engine/slidebitmap.cxx +++ b/slideshow/source/engine/slidebitmap.cxx @@ -20,6 +20,7 @@ #include <tools/diagnose_ex.h> #include <slidebitmap.hxx> +#include <sal/log.hxx> #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XBitmap.hpp> diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index fda1adf503de..1d21ec44512d 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -46,6 +46,7 @@ #include <vcl/font.hxx> #include <rtl/ref.hxx> +#include <sal/log.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XModifyListener.hpp> diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx index 3755a7cb1a16..a406590fb8ee 100644 --- a/slideshow/source/engine/smilfunctionparser.cxx +++ b/slideshow/source/engine/smilfunctionparser.cxx @@ -26,6 +26,7 @@ #include <expressionnodefactory.hxx> #include <rtl/ustring.hxx> +#include <sal/log.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx index 9dfffa60fa60..2f19fca124b9 100644 --- a/slideshow/source/engine/soundplayer.cxx +++ b/slideshow/source/engine/soundplayer.cxx @@ -22,6 +22,7 @@ #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <sal/log.hxx> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/lang/NoSupportException.hpp> diff --git a/slideshow/source/engine/transitions/fanwipe.cxx b/slideshow/source/engine/transitions/fanwipe.cxx index 2ddca66b0647..b6720d916ed5 100644 --- a/slideshow/source/engine/transitions/fanwipe.cxx +++ b/slideshow/source/engine/transitions/fanwipe.cxx @@ -20,6 +20,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <sal/log.hxx> #include "transitiontools.hxx" #include "clockwipe.hxx" #include "fanwipe.hxx" diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index aba709c87c6f..c32ca07d0e25 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -24,6 +24,7 @@ #include <basegfx/numeric/ftools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> +#include <sal/log.hxx> #include <com/sun/star/animations/TransitionType.hpp> #include <com/sun/star/animations/TransitionSubType.hpp> diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index f310f17c07df..b1ae953e4c01 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -18,6 +18,7 @@ */ #include <tools/diagnose_ex.h> +#include <sal/log.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/utils/canvastools.hxx> diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index f32eaf500564..6ae688351a48 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -19,6 +19,7 @@ #include <tools/diagnose_ex.h> +#include <sal/log.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx index d99de0052402..b232f42aa5b5 100644 --- a/slideshow/source/engine/waitsymbol.cxx +++ b/slideshow/source/engine/waitsymbol.cxx @@ -22,6 +22,7 @@ #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <sal/log.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/vector/b2dvector.hxx> diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx index cef4ab9b46b3..fe3d29363942 100644 --- a/slideshow/test/demoshow.cxx +++ b/slideshow/test/demoshow.cxx @@ -19,6 +19,7 @@ #include <rtl/ref.hxx> #include <rtl/bootstrap.hxx> +#include <sal/log.hxx> #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/servicefactory.hxx> |