Kaydet (Commit) 0132f27d authored tarafından Gabor Kelemen's avatar Gabor Kelemen Kaydeden (comit) Miklos Vajna

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 6ff2d84a 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 w* x*

Change-Id: I27bff44da3d34d24262031c7489e755311599bc5
Reviewed-on: https://gerrit.libreoffice.org/57307
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 7d710ee0
......@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <sal/log.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <com/sun/star/bridge/XUnoUrlResolver.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
......
......@@ -18,6 +18,7 @@
*/
#include <rtl/ref.hxx>
#include <sal/log.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
......
......@@ -22,6 +22,7 @@
#include <ooxml/resourceids.hxx>
#include <comphelper/propertysequence.hxx>
#include <comphelper/sequence.hxx>
#include <sal/log.hxx>
namespace writerfilter {
namespace dmapper {
......
......@@ -78,6 +78,7 @@
#include "GraphicHelpers.hxx"
#include <dmapper/GraphicZOrderHelper.hxx>
#include <tools/diagnose_ex.h>
#include <sal/log.hxx>
using namespace ::com::sun::star;
using namespace oox;
......
......@@ -36,6 +36,7 @@
#include "ConversionHelper.hxx"
#include "util.hxx"
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <comphelper/sequence.hxx>
#ifdef DEBUG_WRITERFILTER
......
......@@ -33,6 +33,7 @@
#include <ooxml/resourceids.hxx>
#include "DomainMapper.hxx"
#include <rtl/math.hxx>
#include <sal/log.hxx>
namespace writerfilter {
namespace dmapper {
......
......@@ -93,6 +93,7 @@
#include <unotools/configmgr.hxx>
#include <unotools/mediadescriptor.hxx>
#include <tools/diagnose_ex.h>
#include <sal/log.hxx>
using namespace ::com::sun::star;
......
......@@ -20,6 +20,7 @@
#include "FontTable.hxx"
#include <ooxml/resourceids.hxx>
#include <vector>
#include <sal/log.hxx>
#include <osl/file.hxx>
#include <rtl/tencinfo.h>
#include <vcl/embeddedfontshelper.hxx>
......
......@@ -28,6 +28,7 @@
#include <com/sun/star/text/RelOrientation.hpp>
#include <oox/drawingml/drawingmltypes.hxx>
#include <sal/log.hxx>
#include <unotools/resmgr.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
......
......@@ -47,6 +47,7 @@
#include <svx/unoapi.hxx>
#include <cppuhelper/implbase.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <rtl/math.hxx>
#include <comphelper/string.hxx>
#include <comphelper/sequenceashashmap.hxx>
......
......@@ -38,6 +38,7 @@
#include <osl/diagnose.h>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/propertyvalue.hxx>
......
......@@ -25,6 +25,7 @@
#include <oox/ole/oleobjecthelper.hxx>
#include <ooxml/resourceids.hxx>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <unotools/mediadescriptor.hxx>
#include <officecfg/Office/Common.hxx>
......
......@@ -24,6 +24,7 @@
#include <i18nutil/paper.hxx>
#include <osl/diagnose.h>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
......
......@@ -12,6 +12,7 @@
#include <com/sun/star/drawing/XControlShape.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
#include <sal/log.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <editeng/unoprnms.hxx>
#include <vcl/svapp.hxx>
......
......@@ -15,6 +15,8 @@
#include <ooxml/resourceids.hxx>
#include <sal/log.hxx>
namespace
{
OUString lcl_getTypePath(OUString& rType)
......
......@@ -40,6 +40,7 @@
#include <set>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <comphelper/string.hxx>
#include <comphelper/sequence.hxx>
#include <tools/diagnose_ex.h>
......
......@@ -22,6 +22,8 @@
#include "DomainMapper_Impl.hxx"
#include "util.hxx"
#include <sal/log.hxx>
namespace writerfilter
{
namespace dmapper
......
......@@ -26,6 +26,8 @@
#include "WrapPolygonHandler.hxx"
#include "util.hxx"
#include <sal/log.hxx>
namespace writerfilter {
using namespace com::sun::star;
......
......@@ -30,6 +30,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/file.hxx>
#include <sal/log.hxx>
#include <unotools/mediadescriptor.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/ucbstreamhelper.hxx>
......
......@@ -41,6 +41,8 @@
#include <oox/ole/vbaproject.hxx>
#include <ooxml/OOXMLDocument.hxx>
#include <unotools/mediadescriptor.hxx>
#include <rtl/ref.hxx>
#include <sal/log.hxx>
using namespace ::com::sun::star;
......
......@@ -20,6 +20,8 @@
#include <ooxml/resourceids.hxx>
#include "Handler.hxx"
#include <sal/log.hxx>
namespace writerfilter {
namespace ooxml
{
......
......@@ -33,6 +33,7 @@
#include "OOXMLFastDocumentHandler.hxx"
#include "OOXMLPropertySet.hxx"
#include <sal/log.hxx>
#include <unotools/resmgr.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
......
......@@ -22,6 +22,7 @@
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <ooxml/resourceids.hxx>
#include <oox/token/namespaces.hxx>
#include <sal/log.hxx>
#include <comphelper/embeddedobjectcontainer.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <tools/globname.hxx>
......
......@@ -22,6 +22,8 @@
#include "OOXMLParserState.hxx"
#include "Handler.hxx"
#include <sal/log.hxx>
namespace writerfilter {
namespace ooxml
{
......
......@@ -17,6 +17,7 @@
#include <filter/msfilter/escherex.hxx>
#include <rtl/character.hxx>
#include <tools/stream.hxx>
#include <sal/log.hxx>
#include <dmapper/DomainMapperFactory.hxx>
#include <ooxml/resourceids.hxx>
......
......@@ -19,6 +19,8 @@
#include <ooxml/resourceids.hxx>
#include <sal/log.hxx>
#include "rtfsdrimport.hxx"
#include "rtfskipdestination.hxx"
......
......@@ -14,6 +14,8 @@
#include <ooxml/resourceids.hxx>
#include <sal/log.hxx>
#include "rtfreferenceproperties.hxx"
#include "rtfskipdestination.hxx"
......
......@@ -15,6 +15,7 @@
#include <comphelper/sequence.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <osl/thread.h>
#include <sal/log.hxx>
#include <rtl/tencinfo.h>
#include <tools/mapunit.hxx>
......
......@@ -32,6 +32,7 @@
#include <oox/drawingml/drawingmltypes.hxx>
#include <rtl/uri.hxx>
#include <rtl/tencinfo.h>
#include <sal/log.hxx>
#include <oox/helper/graphichelper.hxx>
#include <vcl/wmfexternal.hxx>
#include <vcl/graph.hxx>
......
......@@ -32,6 +32,7 @@
#include <filter/msfilter/escherex.hxx>
#include <filter/msfilter/util.hxx>
#include <filter/msfilter/rtfutil.hxx>
#include <sal/log.hxx>
#include <svx/svdtrans.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/propertyvalue.hxx>
......
......@@ -14,6 +14,7 @@
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/character.hxx>
#include <sal/log.hxx>
#include "rtfskipdestination.hxx"
#include <com/sun/star/io/BufferSizeExceededException.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
......
......@@ -14,6 +14,7 @@
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/ucb/XContent.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <sal/log.hxx>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <sfx2/passwd.hxx>
......
......@@ -15,6 +15,7 @@
#include <comphelper/seekableinput.hxx>
#include <rtl/string.hxx>
#include <sal/log.hxx>
#include <sot/storage.hxx>
......
......@@ -10,6 +10,7 @@
*/
#include <cppuhelper/supportsservice.hxx>
#include <sal/log.hxx>
#include <libe-book/libe-book.h>
......
......@@ -16,6 +16,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
#include <sal/log.hxx>
#include <comphelper/storagehelper.hxx>
#include <unotools/mediadescriptor.hxx>
#include <xmloff/attrlist.hxx>
......
......@@ -10,6 +10,7 @@
*/
#include <cppuhelper/supportsservice.hxx>
#include <sal/log.hxx>
#include <libwps/libwps.h>
......
......@@ -12,6 +12,8 @@
#include "xmlimp.hxx"
#include "xmltext.hxx"
#include <sal/log.hxx>
using namespace com::sun::star;
namespace writerperfect
......
......@@ -14,6 +14,8 @@
#include "xmlimp.hxx"
#include "xmltext.hxx"
#include <sal/log.hxx>
using namespace com::sun::star;
namespace writerperfect
......
......@@ -13,6 +13,8 @@
#include "XMLTextFrameContext.hxx"
#include "xmlimp.hxx"
#include <sal/log.hxx>
using namespace com::sun::star;
namespace
......
......@@ -13,6 +13,8 @@
#include "txtstyli.hxx"
#include "xmlimp.hxx"
#include <sal/log.hxx>
using namespace com::sun::star;
namespace writerperfect
......
......@@ -13,6 +13,8 @@
#include "xmlimp.hxx"
#include "xmltext.hxx"
#include <sal/log.hxx>
using namespace com::sun::star;
namespace writerperfect
......
......@@ -36,6 +36,7 @@
#endif
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <algorithm>
#include <set>
......
......@@ -20,6 +20,7 @@
#include <string.h>
#include <rtl/character.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <tvread.hxx>
#include <expat.h>
......
......@@ -30,6 +30,7 @@
#include <xmloff/xmluconv.hxx>
#include <tools/color.hxx>
#include <sal/log.hxx>
#include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
#include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
......
......@@ -26,6 +26,7 @@
#include "SchXMLSeries2Context.hxx"
#include "SchXMLTools.hxx"
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <unotools/mediadescriptor.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmlement.hxx>
......
......@@ -19,6 +19,7 @@
#include <memory>
#include <sal/config.h>
#include <sal/log.hxx>
#include <sax/tools/converter.hxx>
......
......@@ -26,6 +26,7 @@
#include <o3tl/make_unique.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <comphelper/processfactory.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/prstylei.hxx>
......
......@@ -26,6 +26,8 @@
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmluconv.hxx>
#include <sal/log.hxx>
#include <com/sun/star/chart/ChartLegendPosition.hpp>
#include <com/sun/star/chart/ChartLegendExpansion.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
......
......@@ -27,6 +27,7 @@
#include "SchXMLTools.hxx"
#include <comphelper/processfactory.hxx>
#include <sal/log.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmlement.hxx>
#include <xmloff/nmspmap.hxx>
......
......@@ -45,6 +45,7 @@
#include <comphelper/processfactory.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmlimp.hxx>
#include <xmloff/nmspmap.hxx>
......
......@@ -26,6 +26,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <rtl/ustring.h>
#include <sal/log.hxx>
#include <tools/diagnose_ex.h>
#include <typeinfo>
......
......@@ -27,6 +27,7 @@
#include "transporttypes.hxx"
#include <XMLStringBufferImportContext.hxx>
#include <rtl/math.hxx>
#include <sal/log.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltoken.hxx>
#include <xmloff/nmspmap.hxx>
......
......@@ -48,6 +48,7 @@
#include <comphelper/processfactory.hxx>
#include <tools/diagnose_ex.h>
#include <sal/log.hxx>
#include <algorithm>
#include <map>
......
......@@ -24,6 +24,8 @@
#include <xmloff/families.hxx>
#include <xmloff/xmltypes.hxx>
#include <sal/log.hxx>
#include "XMLChartPropertyContext.hxx"
using namespace com::sun::star;
......
......@@ -27,6 +27,8 @@
#include "contexts.hxx"
#include "SchXMLChartContext.hxx"
#include <sal/log.hxx>
using namespace com::sun::star;
using namespace ::xmloff::token;
......
......@@ -43,6 +43,7 @@
#include <com/sun/star/document/IndexedPropertyValues.hpp>
#include <com/sun/star/document/NamedPropertyValues.hpp>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <unotools/configmgr.hxx>
#include "xmlenums.hxx"
......
......@@ -33,6 +33,7 @@
#include <com/sun/star/xml/dom/NodeType.hpp>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <comphelper/processfactory.hxx>
......
......@@ -37,6 +37,7 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <vector>
......
......@@ -29,6 +29,7 @@
#include <com/sun/star/rdf/XDocumentRepository.hpp>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <map>
#include <iterator>
......
......@@ -23,6 +23,7 @@
#include <xmloff/SettingsExportHelper.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltoken.hxx>
#include <sal/log.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <comphelper/base64.hxx>
......
......@@ -10,6 +10,7 @@
#include "SvXMLAttrCollection.hxx"
#include <limits.h>
#include <osl/diagnose.h>
#include <sal/log.hxx>
bool SvXMLAttrCollection::operator ==( const SvXMLAttrCollection& rCmp ) const
{
......
......@@ -18,6 +18,7 @@
*/
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <xmloff/i18nmap.hxx>
void SvI18NMap::Add( sal_uInt16 nKind, const OUString& rName,
......
......@@ -21,6 +21,7 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <xmloff/xmltoken.hxx>
#include <xmloff/nmspmap.hxx>
......
......@@ -20,6 +20,7 @@
#include <xmloff/xmlerror.hxx>
#include <rtl/ustring.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <com/sun/star/xml/sax/XLocator.hpp>
#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <com/sun/star/uno/Any.hxx>
......
......@@ -19,6 +19,7 @@
#include <memory>
#include <sal/config.h>
#include <sal/log.hxx>
#include <stack>
#include <string.h>
......
......@@ -21,6 +21,7 @@
#include <string.h>
#include <tools/diagnose_ex.h>
#include <sal/log.hxx>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <tools/urlobj.hxx>
#include <vcl/graph.hxx>
......
......@@ -24,6 +24,7 @@
#include <com/sun/star/util/Date.hpp>
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <xmloff/xmlement.hxx>
#include <xmloff/xmltoken.hxx>
#include <rtl/math.hxx>
......
......@@ -17,6 +17,7 @@
#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <sal/log.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
#include <xmloff/xmltoken.hxx>
......
......@@ -24,6 +24,8 @@
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmltoken.hxx>
#include <sal/log.hxx>
#include "sdxmlexp_impl.hxx"
#include "sdxmlimp_impl.hxx"
......
......@@ -18,6 +18,7 @@
*/
#include <tools/debug.hxx>
#include <sal/log.hxx>
#include <xmloff/XMLShapeStyleContext.hxx>
#include <XMLShapePropertySetContext.hxx>
#include <xmloff/contextid.hxx>
......
......@@ -53,6 +53,7 @@
#include <com/sun/star/drawing/XShape.hpp>
#include <o3tl/any.hxx>
#include <sax/tools/converter.hxx>
#include <sal/log.hxx>
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
#include "sdxmlexp_impl.hxx"
......
......@@ -23,6 +23,7 @@
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
#include <sax/tools/converter.hxx>
#include <sal/log.hxx>
#include <list>
#include <comphelper/extract.hxx>
......
......@@ -25,6 +25,7 @@
#include <com/sun/star/presentation/ClickAction.hpp>
#include <tools/urlobj.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <sax/tools/converter.hxx>
......
......@@ -19,6 +19,7 @@
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <com/sun/star/drawing/XLayerManager.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
......