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 /desktop/source/app | |
| parent | 9406ab47a92386d676038e467e555c3c80b46f62 (diff) | |
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 'desktop/source/app')
| -rw-r--r-- | desktop/source/app/app.cxx | 1 | ||||
| -rw-r--r-- | desktop/source/app/appinit.cxx | 1 | ||||
| -rw-r--r-- | desktop/source/app/check_ext_deps.cxx | 1 | ||||
| -rw-r--r-- | desktop/source/app/dispatchwatcher.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 1 | ||||
| -rw-r--r-- | desktop/source/app/sofficemain.cxx | 1 |
6 files changed, 7 insertions, 0 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index d0e5324e0165..f0c5d8090458 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -75,6 +75,7 @@ #include <com/sun/star/frame/thePopupMenuControllerFactory.hpp> #include <com/sun/star/office/Quickstart.hpp> +#include <sal/log.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/configuration.hxx> #include <comphelper/processfactory.hxx> diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index c0f5a2b92bc5..d51057868269 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -43,6 +43,7 @@ #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/bootstrap.hxx> +#include <sal/log.hxx> #include <tools/rcid.h> diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 8145db1de0c1..ab40ec8f2259 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -25,6 +25,7 @@ #include <rtl/bootstrap.hxx> #include <rtl/ustring.hxx> +#include <sal/log.hxx> #include <cppuhelper/compbase3.hxx> #include <vcl/wrkwin.hxx> diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index b971335a5337..fddfb428e9a9 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -17,7 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> +#include <sal/log.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 1a3cc9f77220..b3e5330af84c 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -27,6 +27,7 @@ #include <boost/scoped_ptr.hpp> #include <stdio.h> #include <osl/process.h> +#include <sal/log.hxx> #include <unotools/bootstrap.hxx> #include <vcl/svapp.hxx> #include <vcl/help.hxx> diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index dea30fd6a80a..25da9d8caafd 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -28,6 +28,7 @@ #include <osl/file.hxx> #include <rtl/bootstrap.hxx> +#include <sal/log.hxx> #include <tools/extendapplicationenvironment.hxx> #include <vcl/svmain.hxx> |