OSL_TRACE->SAL in unotools..uui

Change-Id: I7f391604401b8a10f5d451673ed6223c031c56ab

8 files changed, 14 insertions, 12 deletions

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index a27e77e566a4..a1b3418ee373 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -393,6 +393,7 @@ certain functionality.
 
 @section unotools
 
+@li @c unotools
 @li @c unotools.config
 @li @c unotools.i18n
 @li @c unotools.misc
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index 68868f63e5d9..5c5308040bb7 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -372,7 +372,7 @@ OUString getExecutableBaseName()
            sExecutable  = sExecutable.copy(0,nExtIndex);
     }
     else
-        OSL_TRACE("Cannot get executable name: osl_getExecutableFile failed");
+        SAL_WARN("unotools", "Cannot get executable name: osl_getExecutableFile failed");
 
     return sExecutable;
 }
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index f9e846ea2bf6..c331edefd150 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -161,7 +161,7 @@ void GlobalEventConfig_Impl::Notify( const Sequence< OUString >& )
 void GlobalEventConfig_Impl::ImplCommit()
 {
     //DF need to check it this is correct??
-    OSL_TRACE("In GlobalEventConfig_Impl::ImplCommit");
+    SAL_INFO("unotools", "In GlobalEventConfig_Impl::ImplCommit");
     EventBindingHash::const_iterator it = m_eventBindingHash.begin();
     EventBindingHash::const_iterator it_end = m_eventBindingHash.end();
     // clear the existing nodes
@@ -177,7 +177,7 @@ void GlobalEventConfig_Impl::ImplCommit()
         sNode = SETNODE_BINDINGS PATHDELIMITER "BindingType['" +
                 it->first +
                 "']" PATHDELIMITER PROPERTYNAME_BINDINGURL;
-        OSL_TRACE("writing binding for: %s",OUStringToOString(sNode , RTL_TEXTENCODING_ASCII_US ).pData->buffer);
+        SAL_INFO("unotools", "writing binding for: " << sNode);
         seqValues[ 0 ].Name = sNode;
         seqValues[ 0 ].Value <<= it->second;
         //write the data to the registry
@@ -207,7 +207,7 @@ void GlobalEventConfig_Impl::initBindingInfo()
         aBuffer.append( lEventNames[i] );
         aBuffer.append( aCommandKey );
         lMacros[0] = aBuffer.makeStringAndClear();
-        OSL_TRACE("reading binding for: %s",OUStringToOString(lMacros[0] , RTL_TEXTENCODING_ASCII_US ).pData->buffer);
+        SAL_INFO("unotools", "reading binding for: " << lMacros[0]);
         Sequence< Any > lValues = GetProperties( lMacros );
         OUString sMacroURL;
         if( lValues.getLength() > 0 )
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index a467685f38ea..bb68778e4da4 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -1795,7 +1795,7 @@ void LocaleDataWrapper::outputCheckMessage( const char* pStr )
 {
     fprintf( stderr, "\n%s\n", pStr);
     fflush( stderr);
-    OSL_TRACE("%s", pStr);
+    SAL_WARN("unotools", pStr);
 }
 
 // static
diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx
index a01e59eb95b1..f6b940ba65bf 100644
--- a/unoxml/qa/unit/domtest.cxx
+++ b/unoxml/qa/unit/domtest.cxx
@@ -173,7 +173,7 @@ struct TokenHandler
 {
     virtual ::sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence< ::sal_Int8 >& Identifier ) throw (uno::RuntimeException) override
     {
-        OSL_TRACE("getTokenFromUTF8() %s", reinterpret_cast<const char*>(Identifier.getConstArray()));
+        SAL_INFO("unoxml", "getTokenFromUTF8() " << reinterpret_cast<const char*>(Identifier.getConstArray()));
         return Identifier.getLength() ? Identifier[0] : 0;
     }
 
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx
index 5d53151f2ba4..ed2a87ccbdd6 100644
--- a/unoxml/source/dom/attr.cxx
+++ b/unoxml/source/dom/attr.cxx
@@ -63,7 +63,9 @@ namespace DOM
         }
         pNs = xmlSearchNsByHref(pNode->doc, pNode, pUri);
         // if (!pNs) hmm... now what? throw?
-        if (!pNs) { OSL_TRACE("CAtttr: cannot create namespace"); }
+        if (!pNs) {
+            SAL_WARN("unoxml", "CAtttr: cannot create namespace");
+        }
         return pNs;
     }
 
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index 77288d7365ff..f95582778bc9 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -82,8 +82,8 @@ namespace DOM
                 strlen(reinterpret_cast<const char*>(pHref)),
                 RTL_TEXTENCODING_UTF8);
 
-            OSL_TRACE("Trying to add namespace %s (prefix %s)",
-                      reinterpret_cast<const char*>(pHref), reinterpret_cast<const char*>(pPrefix));
+            SAL_INFO("unoxml", "Trying to add namespace " << reinterpret_cast<const char*>(pHref) <<
+                               "(prefix " << reinterpret_cast<const char*>(pPrefix) << ")" );
 
             Context::NamespaceMapType::iterator aIter=
                 io_rContext.maNamespaceMap.find(val);
@@ -113,8 +113,7 @@ namespace DOM
         OString prefix(pPrefix,
                        strlen(reinterpret_cast<const char*>(pPrefix)));
 
-        OSL_TRACE("getTokenWithPrefix(): prefix %s, name %s",
-                  pPrefix, pName);
+        SAL_INFO("unoxml", "getTokenWithPrefix(): prefix " << pPrefix << ", name " << pName);
 
         Context::NamespaceVectorType::value_type::const_iterator aIter;
         if( (aIter=std::find_if(rContext.maNamespaces.back().begin(),
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 93a1ddca9dca..9e07550ee5db 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -160,7 +160,7 @@ void getRememberModes(
                 bHasRememberModePersistent = true;
                 break;
             default:
-                OSL_TRACE( "Unsupported RememberAuthentication value" );
+                SAL_WARN( "uui", "Unsupported RememberAuthentication value" << rRememberModes[i] );
                 break;
             }
         }