diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-22 09:42:28 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-22 09:57:47 +0200 |
commit | 6ff2d84ade299cb3d14d4110e4cf1a4b8070c030 (patch) | |
tree | 783dc367eacbe3eef9f226d0735d0137e7245648 /extensions/source | |
parent | DocxAttributeOutput::m_postponedDMLDrawing: use std::unique_ptr<> (diff) | |
download | core-6ff2d84ade299cb3d14d4110e4cf1a4b8070c030.tar.gz core-6ff2d84ade299cb3d14d4110e4cf1a4b8070c030.zip |
Various #include <sal/log.hxx> fixups
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. Cleaned up some, but something like
grep -FwL sal/log.hxx $(git grep -Elw \
'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF') -- \*.cxx)
shows lots more files that potentially need fixing before the include can be
removed from rtl/string.hxx and rtl/ustring.hxx.
Change-Id: Ibf033363e83d37851776f392dc0b077381cd8b90
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/bibliography/datman.cxx | 1 | ||||
-rw-r--r-- | extensions/source/dbpilots/gridwizard.cxx | 1 | ||||
-rw-r--r-- | extensions/source/ole/olethread.cxx | 1 | ||||
-rw-r--r-- | extensions/source/plugin/base/xplugin.cxx | 1 | ||||
-rw-r--r-- | extensions/source/plugin/unx/npnapi.cxx | 1 | ||||
-rw-r--r-- | extensions/source/plugin/unx/nppapi.cxx | 1 | ||||
-rw-r--r-- | extensions/source/plugin/unx/npwrap.cxx | 1 | ||||
-rw-r--r-- | extensions/source/plugin/unx/plugcon.cxx | 2 | ||||
-rw-r--r-- | extensions/source/plugin/unx/sysplug.cxx | 1 | ||||
-rw-r--r-- | extensions/source/plugin/win/sysplug.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/formlinkdialog.cxx | 1 | ||||
-rw-r--r-- | extensions/source/scanner/sane.cxx | 1 | ||||
-rw-r--r-- | extensions/source/update/feed/updatefeed.cxx | 1 |
13 files changed, 15 insertions, 0 deletions
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 74715bc31404..257d08d189e0 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -18,6 +18,7 @@ */ #include <osl/mutex.hxx> +#include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <comphelper/processfactory.hxx> #include <com/sun/star/io/XPersistObject.hpp> diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 0c68df814ee3..882847b0f99f 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/form/XGridColumnFactory.hpp> #include <com/sun/star/awt/MouseWheelBehavior.hpp> #include <com/sun/star/container/XNameContainer.hpp> +#include <sal/log.hxx> #include <tools/debug.hxx> #include "dbptools.hxx" #include "dbpilots.hrc" diff --git a/extensions/source/ole/olethread.cxx b/extensions/source/ole/olethread.cxx index 4fa8f582ad0f..99d3a331df31 100644 --- a/extensions/source/ole/olethread.cxx +++ b/extensions/source/ole/olethread.cxx @@ -20,6 +20,7 @@ #include "ole2uno.hxx" #include <osl/thread.hxx> +#include <sal/log.hxx> using namespace std; diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 834b52ec766b..9933739cddca 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -45,6 +45,7 @@ #include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> #include <plugin/impl.hxx> +#include <sal/log.hxx> #include <ucbhelper/content.hxx> #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx index 16329c9059c7..c56f37b5c3f5 100644 --- a/extensions/source/plugin/unx/npnapi.cxx +++ b/extensions/source/plugin/unx/npnapi.cxx @@ -39,6 +39,7 @@ #include <dlfcn.h> #include <osl/module.h> +#include <sal/log.hxx> #include <config_vclplug.h> diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx index 6197fcf2f62e..d755df17ab1b 100644 --- a/extensions/source/plugin/unx/nppapi.cxx +++ b/extensions/source/plugin/unx/nppapi.cxx @@ -35,6 +35,7 @@ #include <cstdarg> +#include <sal/log.hxx> #include <vcl/svapp.hxx> #include <plugin/unx/plugcon.hxx> diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx index 6f4b58b63ae4..cec4fe7d1a05 100644 --- a/extensions/source/plugin/unx/npwrap.cxx +++ b/extensions/source/plugin/unx/npwrap.cxx @@ -42,6 +42,7 @@ #include <osl/file.h> #include <osl/module.h> +#include <sal/log.hxx> #include <config_vclplug.h> diff --git a/extensions/source/plugin/unx/plugcon.cxx b/extensions/source/plugin/unx/plugcon.cxx index c54f7f2368d2..fe0bd5d12511 100644 --- a/extensions/source/plugin/unx/plugcon.cxx +++ b/extensions/source/plugin/unx/plugcon.cxx @@ -33,6 +33,8 @@ #undef _LINUX_SOURCE_COMPAT #endif +#include <sal/log.hxx> + #include <plugin/unx/plugcon.hxx> #include <cstdarg> diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx index b19c01778719..e8a1af9b5539 100644 --- a/extensions/source/plugin/unx/sysplug.cxx +++ b/extensions/source/plugin/unx/sysplug.cxx @@ -40,6 +40,7 @@ #include <osl/file.hxx> #include <osl/thread.h> #include <rtl/bootstrap.hxx> +#include <sal/log.hxx> #include <plugin/impl.hxx> diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx index 7d94acf3b218..d34c80012295 100644 --- a/extensions/source/plugin/win/sysplug.cxx +++ b/extensions/source/plugin/win/sysplug.cxx @@ -30,6 +30,8 @@ #include <prewin.h> #include <postwin.h> +#include <sal/log.hxx> + #include <plugin/impl.hxx> #if defined _MSC_VER diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index c7fda6ba8361..81716b251d5d 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -23,6 +23,7 @@ #include "modulepcr.hxx" #include "formresid.hrc" #include "formstrings.hxx" +#include <sal/log.hxx> #include <vcl/combobox.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index fe150b925b81..023aa854344c 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -20,6 +20,7 @@ #include <cstdarg> #include <math.h> #include <osl/file.h> +#include <sal/log.hxx> #include <tools/stream.hxx> #include <unotools/tempfile.hxx> #include <sane.hxx> diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 61f076172302..c04ed464eada 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -51,6 +51,7 @@ #include <rtl/ref.hxx> #include <rtl/bootstrap.hxx> #include <rtl/ustrbuf.hxx> +#include <sal/log.hxx> #include <osl/diagnose.h> #include <osl/process.h> #include <osl/conditn.hxx> |