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 /xmlscript | |
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 'xmlscript')
-rw-r--r-- | xmlscript/source/xml_helper/xml_impctx.cxx | 2 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 1 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 1 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 1 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 1 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 1 | ||||
-rw-r--r-- | xmlscript/source/xmllib_imexp/xmllib_import.cxx | 4 | ||||
-rw-r--r-- | xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 4 |
8 files changed, 15 insertions, 0 deletions
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index 886b076d1952..06f279b7c9bf 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -31,6 +31,8 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <sal/log.hxx> + #include <memory> #include <unordered_map> #include <vector> diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx index 5763d710f770..129d87b34b45 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx @@ -20,6 +20,7 @@ #include "exp_share.hxx" #include <rtl/ustrbuf.hxx> +#include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/awt/CharSet.hpp> diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index 7a317e815e21..315c08f288ad 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/script/vba/XVBACompatibility.hpp> #include <osl/diagnose.h> +#include <sal/log.hxx> #include <comphelper/processfactory.hxx> #include <i18nlangtag/languagetag.hxx> diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index df0b15507fe4..4619050c910c 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/style/VerticalAlignment.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Time.hpp> +#include <sal/log.hxx> #include <tools/date.hxx> #include <tools/time.hxx> #include <osl/diagnose.h> diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx index dd77b3333c6b..79d4255c0917 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx @@ -21,6 +21,7 @@ #include "unoservices.hxx" #include "xmlbas_export.hxx" +#include <sal/log.hxx> #include <xmlscript/xmlns.h> #include <xmlscript/xml_helper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx index 5359bde79941..9926fbe4d767 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx @@ -21,6 +21,7 @@ #include "unoservices.hxx" #include "xmlbas_import.hxx" +#include <sal/log.hxx> #include <xmlscript/xmlns.h> #include <xmlscript/xml_helper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx index 4aaec1fdb65d..f65ac55ab7d2 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <sal/log.hxx> + #include "imp_share.hxx" #include "xml_import.hxx" diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx index 797af996eab1..a14e7a237d9e 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <sal/log.hxx> + #include "imp_share.hxx" #include "xml_import.hxx" |