diff options
author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-07-26 23:04:10 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-07-29 12:53:11 +0000 |
commit | 15dc66c81a5a0af8db52a98e51e289f8f134d8c4 (patch) | |
tree | 0fd403e510615d887201d4c4a98d5aca1e7abc19 /xmloff | |
parent | fix windows build (diff) | |
download | core-15dc66c81a5a0af8db52a98e51e289f8f134d8c4.tar.gz core-15dc66c81a5a0af8db52a98e51e289f8f134d8c4.zip |
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
Change-Id: I377902007445b0bce91491060f05fb8a9dbe3cd0
Reviewed-on: https://gerrit.libreoffice.org/5133
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/inc/pch/precompiled_xo.hxx | 1 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLExport.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/core/xmlexp.cxx | 10 | ||||
-rw-r--r-- | xmloff/source/core/xmlimp.cxx | 9 | ||||
-rw-r--r-- | xmloff/source/core/xmluconv.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/forms/elementimport.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/forms/formattributes.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/forms/formcellbinding.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/forms/layerimport.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/forms/logging.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/forms/officeforms.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/forms/propertyimport.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/style/XMLFontStylesContext.cxx | 1 |
13 files changed, 5 insertions, 25 deletions
diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx index 6da1972583c5..605686b1bce7 100644 --- a/xmloff/inc/pch/precompiled_xo.hxx +++ b/xmloff/inc/pch/precompiled_xo.hxx @@ -515,7 +515,6 @@ #include <osl/mutex.hxx> #include <osl/thread.h> #include <rtl/instance.hxx> -#include <rtl/logfile.hxx> #include <rtl/math.hxx> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index f66f062dfe14..da7e24e25838 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -29,7 +29,6 @@ #include "SchXMLEnumConverter.hxx" #include <tools/debug.hxx> -#include <rtl/logfile.hxx> #include <comphelper/processfactory.hxx> #include <tools/globname.hxx> #include <comphelper/classids.hxx> diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 3c22c8f841e6..1dfb82ee5716 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -68,7 +68,6 @@ #include "xmloff/XMLFilterServiceNames.h" #include "xmloff/XMLEmbeddedObjectExportFilter.hxx" #include "XMLBasicExportFilter.hxx" -#include <rtl/logfile.hxx> #include <cppuhelper/implbase1.hxx> #include <comphelper/extract.hxx> #include <comphelper/servicehelper.hxx> @@ -801,9 +800,6 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen // XFilter sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) throw(uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogContext, "xmloff", "mb93740", - "SvXMLExport::filter" ); - // check for xHandler first... should have been supplied in initialize if( !mxHandler.is() ) return sal_False; @@ -843,13 +839,11 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue // print a trace message with the URL OString aUrl(OUStringToOString(GetModel()->getURL(), RTL_TEXTENCODING_ASCII_US)); - RTL_LOGFILE_CONTEXT_TRACE1( aLogContext, "%s", aUrl.getStr() ); - + SAL_INFO( "xmloff.core", aUrl.getStr() ); // we also want a trace message with the document class OString aClass(OUStringToOString(GetXMLToken(meClass), RTL_TEXTENCODING_ASCII_US)); - RTL_LOGFILE_CONTEXT_TRACE1( aLogContext, "class=\"%s\"", - aClass.getStr() ); + SAL_INFO( "xmloff.core", "class=\"" << aClass.getStr() << "\"" ); } #endif diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 1dc8f6041f4f..d7f43baed9e1 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -49,7 +49,6 @@ #include <com/sun/star/packages/zip/ZipIOException.hpp> #include <comphelper/namecontainer.hxx> #include <comphelper/servicehelper.hxx> -#include <rtl/logfile.hxx> #include <cppuhelper/implbase1.hxx> #include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> @@ -478,8 +477,7 @@ sal_Int64 SAL_CALL SvXMLImport::getSomething( const uno::Sequence< sal_Int8 >& r void SAL_CALL SvXMLImport::startDocument( void ) throw( xml::sax::SAXException, uno::RuntimeException ) { - RTL_LOGFILE_TRACE_AUTHOR( "xmloff", "unknown", "{ SvXMLImport::startDocument" ); - + SAL_INFO( "xmloff.core", "{ SvXMLImport::startDocument" ); if( !mxGraphicResolver.is() || !mxEmbeddedResolver.is() ) { Reference< lang::XMultiServiceFactory > xFactory( mxModel, UNO_QUERY ); @@ -515,8 +513,7 @@ void SAL_CALL SvXMLImport::startDocument( void ) void SAL_CALL SvXMLImport::endDocument( void ) throw( xml::sax::SAXException, uno::RuntimeException) { - RTL_LOGFILE_TRACE_AUTHOR( "xmloff", "unknown", "} SvXMLImport::startDocument" ); - + SAL_INFO( "xmloff.core", "} SvXMLImport::startDocument" ); // #i9518# All the stuff that accesses the document has to be done here, not in the dtor, // because the SvXMLImport dtor might not be called until after the document has been closed. @@ -691,7 +688,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName, // If we do profiling, we want a trace message for the first element // in order to identify the stream. OString aString(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); - RTL_LOGFILE_TRACE_AUTHOR1( "xmloff", "unknown", + SAL_INFO( "xmloff.core", "xmloff" ); "SvXMLImport::StartElement( \"%s\", ... )", aString.getStr() ); #endif diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index efa5ba6b047e..57e42654bfe8 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -27,7 +27,6 @@ #include <xmloff/xmlement.hxx> #include <xmloff/xmltoken.hxx> #include <rtl/math.hxx> -#include <rtl/logfile.hxx> #include <tools/date.hxx> #include <tools/time.hxx> diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 9f451b767dd3..492abdcc4893 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -45,7 +45,6 @@ #include <sax/tools/converter.hxx> #include <tools/urlobj.hxx> #include <tools/diagnose_ex.h> -#include <rtl/logfile.hxx> #include <rtl/strbuf.hxx> #include <comphelper/extract.hxx> #include <comphelper/types.hxx> diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index b944f5c1981e..31989bac7b7d 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -25,7 +25,6 @@ #include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <rtl/ustrbuf.hxx> -#include <rtl/logfile.hxx> //......................................................................... namespace xmloff { diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx index a874c132ea62..6ff657ec30da 100644 --- a/xmloff/source/forms/formcellbinding.cxx +++ b/xmloff/source/forms/formcellbinding.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/beans/NamedValue.hpp> #include "strings.hxx" #include <osl/diagnose.h> -#include <rtl/logfile.hxx> #include <functional> #include <algorithm> diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index bbbb8d59405a..0003e27e2920 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -50,7 +50,6 @@ #include "xmloff/xformsimport.hxx" #include <xmloff/xmltoken.hxx> #include "xmloff/xmlnmspe.hxx" -#include <rtl/logfile.hxx> #include <rtl/strbuf.hxx> #include <algorithm> diff --git a/xmloff/source/forms/logging.cxx b/xmloff/source/forms/logging.cxx index 08da2b979162..6661d671e234 100644 --- a/xmloff/source/forms/logging.cxx +++ b/xmloff/source/forms/logging.cxx @@ -18,7 +18,6 @@ */ #include "logging.hxx" -#include <rtl/logfile.hxx> //......................................................................... namespace xmloff diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index 1b1aeed8c461..e596aa43cccc 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -29,7 +29,6 @@ #include <xmloff/nmspmap.hxx> #include <comphelper/extract.hxx> #include "strings.hxx" -#include <rtl/logfile.hxx> //......................................................................... namespace xmloff diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 53f249a13dd3..0ba21d22ba99 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/DateTime.hpp> #include <unotools/datetime.hxx> -#include <rtl/logfile.hxx> #include <rtl/strbuf.hxx> #if OSL_DEBUG_LEVEL > 0 diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index 95b4a86f7f4b..b72b556d009d 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <osl/file.hxx> -#include <rtl/logfile.hxx> #include <vcl/embeddedfontshelper.hxx> #include <xmloff/nmspmap.hxx> |