Kaydet (Commit) c6e5d551 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 from l10ntools to reportdesign

Change-Id: Ia2dc93dd848c2dc0b6a8cb6e19849c614ec55198
Reviewed-on: https://gerrit.libreoffice.org/58205
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 5ea91ed2
......@@ -18,6 +18,7 @@
*/
#include <sal/config.h>
#include <sal/log.hxx>
#include <algorithm>
#include <fstream>
......
......@@ -9,6 +9,7 @@
#include <rtl/ustring.hxx>
#include <rtl/crc.h>
#include <sal/log.hxx>
#include <cstring>
#include <ctime>
......
......@@ -33,6 +33,7 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/textenc.h>
#include <sal/log.hxx>
#include <linguistic/lngprops.hxx>
#include <linguistic/misc.hxx>
......
......@@ -21,6 +21,7 @@
#include <cppuhelper/factory.hxx>
#include <i18nlangtag/lang.h>
#include <osl/mutex.hxx>
#include <sal/log.hxx>
#include <tools/debug.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
......
......@@ -33,6 +33,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <sal/log.hxx>
#include <rtl/instance.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
......
......@@ -24,6 +24,7 @@
#include <i18nlangtag/lang.h>
#include <i18nlangtag/languagetag.hxx>
#include <osl/mutex.hxx>
#include <sal/log.hxx>
#include <tools/debug.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
......
......@@ -39,6 +39,7 @@
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <svtools/strings.hrc>
#include <unotools/resmgr.hxx>
#include <sal/log.hxx>
#include "defs.hxx"
#include "dlistimp.hxx"
......
......@@ -46,6 +46,7 @@
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <sal/config.h>
#include <sal/log.hxx>
#include <osl/conditn.hxx>
#include <osl/thread.hxx>
#include <cppuhelper/implementationentry.hxx>
......
......@@ -18,6 +18,7 @@
*/
#include <sal/config.h>
#include <sal/log.hxx>
#include <algorithm>
......
......@@ -20,6 +20,7 @@
#include <tools/debug.hxx>
#include <sal/macros.h>
#include <sal/log.hxx>
#include <com/sun/star/linguistic2/LinguServiceEvent.hpp>
#include <com/sun/star/linguistic2/LinguServiceEventFlags.hpp>
......
......@@ -18,6 +18,7 @@
*/
#include <sal/config.h>
#include <sal/log.hxx>
#include <com/sun/star/deployment/DeploymentException.hpp>
#include <com/sun/star/deployment/ExtensionManager.hpp>
......
......@@ -19,6 +19,7 @@
#include <memory>
#include <sal/macros.h>
#include <sal/log.hxx>
#include <unotools/pathoptions.hxx>
#include <svl/lngmisc.hxx>
#include <ucbhelper/content.hxx>
......
......@@ -32,6 +32,7 @@
#include <tools/debug.hxx>
#include <svl/lngmisc.hxx>
#include <osl/mutex.hxx>
#include <sal/log.hxx>
#include <vector>
......
......@@ -26,6 +26,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <comphelper/processfactory.hxx>
#include <osl/mutex.hxx>
#include <sal/log.hxx>
#include "thesdsp.hxx"
#include <linguistic/lngprops.hxx>
......
......@@ -71,6 +71,7 @@
#include <xfilter/xflist.hxx>
#include <lwpglobalmgr.hxx>
#include <xfilter/xflistitem.hxx>
#include <sal/log.hxx>
LwpBulletStyleMgr::LwpBulletStyleMgr()
: m_pFoundry(nullptr)
......
......@@ -63,6 +63,7 @@
#include <lwpfilehdr.hxx>
#include "lwpholder.hxx"
#include "lwppagehint.hxx"
#include <sal/log.hxx>
LwpDivInfo::LwpDivInfo(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
: LwpObject(objHdr, pStrm)
......
......@@ -60,6 +60,7 @@
#include <xfilter/xftextstyle.hxx>
#include <xfilter/xfdefs.hxx>
#include <xfilter/xfcolor.hxx>
#include <sal/log.hxx>
void LwpFontAttrEntry::Read(LwpObjectStream *pStrm)
{
......
......@@ -82,6 +82,7 @@
#include <string.h>
#include <osl/thread.h>
#include <sal/log.hxx>
#define EF_NONE 0x0000
#define EF_ODMA 0x0002
......
......@@ -72,6 +72,7 @@
#include "lwpdivinfo.hxx"
#include "lwpgrfobj.hxx"
#include <osl/thread.h>
#include <sal/log.hxx>
LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
: LwpDLNFPVList(objHdr, pStrm)
......
......@@ -94,6 +94,7 @@
#include <lwpdocdata.hxx>
#include "lwpnotes.hxx"
#include "lwpverdocument.hxx"
#include <sal/log.hxx>
//LwpObjectFactory* LwpObjectFactory::m_pMgr = NULL;
......
......@@ -74,6 +74,7 @@
#include <sfx2/printer.hxx>
#include <lwpchangemgr.hxx>
#include <lwpglobalmgr.hxx>
#include <sal/log.hxx>
LwpPageLayout::LwpPageLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
: LwpLayout(objHdr, pStrm)
......
......@@ -64,6 +64,7 @@
#include "lwpborderstuff.hxx"
#include "lwpshadow.hxx"
#include "lwpmargins.hxx"
#include <sal/log.hxx>
LwpParaBorderOverride::LwpParaBorderOverride()
{
......
......@@ -74,6 +74,7 @@
#include <xfilter/xfdrawlinestyle.hxx>
#include <xfilter/xfparagraph.hxx>
#include <xfilter/xfstylemanager.hxx>
#include <sal/log.hxx>
LwpSdwGroupLoaderV0102::LwpSdwGroupLoaderV0102(SvStream* pStream, LwpGraphicObject* pGraphicObj)
: m_pStream(pStream)
......
......@@ -83,6 +83,7 @@
#include <xfilter/xfparastyle.hxx>
#include <memory>
#include <set>
#include <sal/log.hxx>
LwpSuperTableLayout::LwpSuperTableLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
: LwpPlacableLayout(objHdr, pStrm)
......
......@@ -66,6 +66,7 @@
#include "lwptablelayout.hxx"
#include <osl/thread.h>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <memory>
LwpFormulaArg::~LwpFormulaArg()
......
......@@ -55,6 +55,7 @@
************************************************************************/
#include <sal/config.h>
#include <sal/log.hxx>
#include <cstring>
......
......@@ -20,6 +20,7 @@
#include <oox/core/relationshandler.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
......
......@@ -41,6 +41,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/instance.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <oox/core/fastparser.hxx>
#include <oox/core/fragmenthandler.hxx>
......
......@@ -29,6 +29,7 @@
#include <o3tl/safeint.hxx>
#include <osl/time.h>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <vector>
......
......@@ -21,6 +21,7 @@
#include <algorithm>
#include <math.h>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/graphichelper.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
......
......@@ -24,6 +24,7 @@
#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
#include <com/sun/star/xml/sax/FastToken.hpp>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <oox/helper/helper.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/propertymap.hxx>
......
......@@ -9,6 +9,7 @@
#include <config_folders.h>
#include <rtl/bootstrap.hxx>
#include <sal/log.hxx>
#include <tools/stream.hxx>
#include <comphelper/sequence.hxx>
......
......@@ -31,6 +31,7 @@
#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <comphelper/sequence.hxx>
#include <sal/log.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
......
......@@ -22,6 +22,7 @@
#include <com/sun/star/xml/dom/XDocument.hpp>
#include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <editeng/unoprnms.hxx>
#include <drawingml/textbody.hxx>
#include <drawingml/textparagraph.hxx>
......
......@@ -20,6 +20,7 @@
#include "diagramlayoutatoms.hxx"
#include <basegfx/numeric/ftools.hxx>
#include <sal/log.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/properties.hxx>
......
......@@ -21,6 +21,8 @@
#include <drawingml/customshapeproperties.hxx>
#include <sal/log.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
......
......@@ -27,6 +27,7 @@
#include "constraintlistcontext.hxx"
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <sal/log.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
......
......@@ -44,6 +44,7 @@
#include <oox/token/tokens.hxx>
#include <rtl/math.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::drawing;
......
......@@ -21,6 +21,7 @@
#include <oox/drawingml/graphicshapecontext.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <drawingml/embeddedwavaudiofile.hxx>
#include <drawingml/misccontexts.hxx>
......
......@@ -87,6 +87,7 @@
#include <vcl/graph.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/svapp.hxx>
#include <sal/log.hxx>
#include <vcl/wmf.hxx>
......
......@@ -31,6 +31,7 @@
#include <oox/helper/propertymap.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/tokens.hxx>
#include <sal/log.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::drawing;
......
......@@ -36,6 +36,7 @@
#include "hyperlinkcontext.hxx"
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <sal/log.hxx>
using namespace oox::core;
using namespace ::com::sun::star;
......
......@@ -32,6 +32,7 @@
#include <drawingml/textbodycontext.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <sal/log.hxx>
using namespace oox::core;
using namespace ::com::sun::star;
......
......@@ -30,6 +30,8 @@
#include <oox/mathml/import.hxx>
#include <sal/log.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
......
......@@ -30,6 +30,8 @@
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <sal/log.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
......
......@@ -23,6 +23,7 @@
#include <rtl/ustring.hxx>
#include <rtl/string.hxx>
#include <sal/log.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/text/XTextField.hpp>
......
......@@ -18,6 +18,7 @@
*/
#include <drawingml/textliststyle.hxx>
#include <sal/log.hxx>
namespace oox { namespace drawingml {
......
......@@ -23,6 +23,7 @@
#include <svtools/unitconv.hxx>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <oox/mathml/importutils.hxx>
#include <oox/helper/propertyset.hxx>
#include <com/sun/star/text/XText.hpp>
......
......@@ -23,6 +23,7 @@
#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <svx/unopage.hxx>
#include <sal/log.hxx>
#include <drawingml/colorchoicecontext.hxx>
#include <drawingml/textcharacterpropertiescontext.hxx>
......
......@@ -25,6 +25,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/text/XTextField.hpp>
#include <sal/log.hxx>
#include <oox/helper/helper.hxx>
#include <oox/helper/propertyset.hxx>
......
......@@ -99,6 +99,7 @@
#include <svl/zforlist.hxx>
#include <svl/numuno.hxx>
#include <tools/diagnose_ex.h>
#include <sal/log.hxx>
#include <set>
#include <unordered_set>
......
......@@ -21,6 +21,7 @@
#include <config_folders.h>
#include <rtl/bootstrap.hxx>
#include <sal/log.hxx>
#include <oox/core/xmlfilterbase.hxx>
#include <oox/export/drawingml.hxx>
#include <oox/export/utils.hxx>
......
......@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <config_global.h>
#include <sal/log.hxx>
#include <unotools/mediadescriptor.hxx>
#include <filter/msfilter/util.hxx>
#include <oox/core/xmlfilterbase.hxx>
......
......@@ -27,6 +27,7 @@
#include <rtl/strbuf.hxx>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <tools/stream.hxx>
#include <comphelper/sequenceashashmap.hxx>
......
......@@ -31,6 +31,7 @@
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <comphelper/seqstream.hxx>
#include <vcl/wmf.hxx>
#include <vcl/wmfexternal.hxx>
......
......@@ -22,6 +22,8 @@
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <oox/helper/helper.hxx>
#include <sal/log.hxx>
namespace oox {
using namespace ::com::sun::star::task;
......
......@@ -48,6 +48,7 @@ using ::com::sun::star::text::WritingMode;
#include <cppuhelper/implbase.hxx>
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
#include <sal/log.hxx>
#include <oox/token/properties.hxx>
#include <oox/token/propertynames.hxx>
using ::com::sun::star::uno::Any;
......
......@@ -23,6 +23,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <osl/diagnose.h>
#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <oox/helper/propertymap.hxx>
namespace oox {
......
......@@ -27,6 +27,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <comphelper/storagehelper.hxx>
#include <oox/helper/helper.hxx>
......
......@@ -18,6 +18,7 @@
#include <oox/token/tokens.hxx>
#include <oox/token/namespaces.hxx>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#define OPENING( token ) XML_STREAM_OPENING( token )
#define CLOSING( token ) XML_STREAM_CLOSING( token )
......
......@@ -50,6 +50,7 @@
#include <comphelper/string.hxx>
#include <rtl/tencinfo.h>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/containerhelper.hxx>
......
......@@ -29,6 +29,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <xmlscript/xmldlg_imexp.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
......
......@@ -35,6 +35,7 @@
#include <osl/diagnose.h>
#include <rtl/tencinfo.h>
#include <rtl/ustrbuf.h>
#include <sal/log.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertyset.hxx>
......
......@@ -20,6 +20,7 @@
#include <oox/ppt/animationspersist.hxx>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/text/XText.hpp>
......
......@@ -19,6 +19,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <oox/core/fragmenthandler.hxx>
#include <oox/helper/attributelist.hxx>
......
......@@ -18,6 +18,7 @@
*/
#include <sal/config.h>
#include <sal/log.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
......
......@@ -29,6 +29,7 @@
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/text/XText.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <sal/log.hxx>
#include <oox/ppt/slidepersist.hxx>
#include <oox/token/tokens.hxx>
......
......@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <sal/log.hxx>
#include <com/sun/star/xml/sax/FastToken.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
......
......@@ -21,6 +21,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <tools/multisel.hxx>
#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
......
......@@ -23,6 +23,7 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/propertyset.hxx>
......
......@@ -25,6 +25,7 @@
#include <com/sun/star/animations/XTransitionFilter.hpp>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <oox/helper/helper.hxx>
#include <oox/helper/propertymap.hxx>
......
......@@ -21,6 +21,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/math.hxx>
#include <sal/log.hxx>
#include <com/sun/star/animations/AnimationTransformType.hpp>
#include <com/sun/star/animations/AnimationCalcMode.hpp>
......
......@@ -21,6 +21,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <oox/helper/attributelist.hxx>
#include <drawingml/embeddedwavaudiofile.hxx>
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <sal/log.hxx>
#include "LockedCanvasContext.hxx"
#include <oox/drawingml/shape.hxx>
#include <oox/drawingml/shapecontext.hxx>
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <sal/log.hxx>
#include "WpgContext.hxx"
#include <drawingml/shapepropertiescontext.hxx>
#include <oox/drawingml/shapegroupcontext.hxx>
......
......@@ -24,6 +24,7 @@
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <oox/drawingml/shape.hxx>
#include <sal/log.hxx>
#include <boost/optional.hpp>
......
......@@ -9,6 +9,7 @@
#include <oox/token/relationship.hxx>
#include <sal/log.hxx>
#include <map>
namespace oox {
......
......@@ -29,6 +29,7 @@
#include <com/sun/star/text/VertOrientation.hpp>
#include <osl/diagnose.h>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <oox/core/xmlfilterbase.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/ole/axcontrol.hxx>
......
......@@ -25,6 +25,7 @@
#include <com/sun/star/table/ShadowFormat.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <oox/drawingml/color.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
......