summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
Diffstat (limited to 'stoc')
-rw-r--r--stoc/source/inspect/introspection.cxx4
-rw-r--r--stoc/source/javaloader/javaloader.cxx2
-rw-r--r--stoc/source/security/access_controller.cxx10
-rw-r--r--stoc/source/security/lru_cache.h24
-rw-r--r--stoc/source/security/permissions.cxx9
-rw-r--r--stoc/test/javavm/testjavavm.cxx7
-rw-r--r--stoc/test/testconv.cxx5
-rw-r--r--stoc/test/testcorefl.cxx6
-rw-r--r--stoc/test/testiadapter.cxx2
-rw-r--r--stoc/test/testintrosp.cxx5
-rw-r--r--stoc/test/testproxyfac.cxx4
11 files changed, 26 insertions, 52 deletions
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 9043ded5416c..4a4ac6bcc170 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -2070,7 +2070,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
if (aIt != rPropNameMap.end())
{
/* TODO
- OSL_TRACE(
+ SAL_INFO("stoc",(
String( "Introspection: Property \"" ) +
OOUStringToString( aPropName, CHARSET_SYSTEM ) +
String( "\" found more than once" ) );
@@ -2259,7 +2259,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
if (aIt != rPropNameMap.end())
{
/* TODO:
- OSL_TRACE(
+ SAL_INFO("stoc",(
String( "Introspection: Property \"" ) +
OOUStringToString( aPropName, CHARSET_SYSTEM ) +
String( "\" found more than once" ) );
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index f625f610b7ef..f7ecaadf4588 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -284,7 +284,7 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL
reinterpret_cast<typelib_TypeDescription *>(pType_XImplementationLoader));
throw;
}
- OSL_TRACE("javaloader.cxx: mapped javaloader - 0x%p", m_javaLoader.get());
+ SAL_INFO("stoc", "javaloader.cxx: mapped javaloader - 0x" << m_javaLoader.get());
return m_javaLoader;
}
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 246ea6fb3573..1bc162ab703a 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -488,16 +488,14 @@ static void dumpPermissions(
{
buf.append( "> dumping default permissions:" );
}
- OString str( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "%s", str.getStr() );
+ SAL_INFO("stoc", buf.makeStringAndClear() );
Sequence< OUString > permissions( collection.toStrings() );
OUString const * p = permissions.getConstArray();
for ( sal_Int32 nPos = 0; nPos < permissions.getLength(); ++nPos )
{
- OString str( OUStringToOString( p[ nPos ], RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "%s", str.getStr() );
+ SAL_INFO("stoc", p[ nPos ] );
}
- OSL_TRACE( "> permission dump done" );
+ SAL_INFO("stoc", "> permission dump done" );
}
#endif
@@ -632,7 +630,7 @@ PermissionCollection AccessController::getEffectivePermissions(
buf.append( "\"" );
OString str(
OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "%s", str.getStr() );
+ SAL_INFO("stoc",( "%s", str.getStr() );
#endif
return PermissionCollection( new AllPermission() );
}
diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h
index d61877314eb6..5af0718c38e0 100644
--- a/stoc/source/security/lru_cache.h
+++ b/stoc/source/security/lru_cache.h
@@ -157,12 +157,10 @@ inline t_val const * lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lookup(
toFront( entry );
#ifdef __CACHE_DIAGNOSE
OUStringBuffer buf( 48 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> retrieved element \"") );
+ buf.appendAscii( "> retrieved element \"" );
buf.append( entry->m_key );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" from cache") );
- OString str( OUStringToOString(
- buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "%s", str.getStr() );
+ buf.appendAscii( "\" from cache" );
+ SAL_INFO("stoc", buf.makeStringAndClear() );
#endif
return &entry->m_val;
}
@@ -186,12 +184,10 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set(
if (entry->m_key.getLength())
{
OUStringBuffer buf( 48 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> kicking element \"") );
+ buf.appendAscii( "> kicking element \"" );
buf.append( entry->m_key );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" from cache") );
- OString str( OUStringToOString(
- buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "%s", str.getStr() );
+ buf.appendAscii( "\" from cache" );
+ SAL_INFO("stoc", buf.makeStringAndClear() );
}
#endif
m_key2element.erase( entry->m_key );
@@ -208,12 +204,10 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set(
entry = iFind->second;
#ifdef __CACHE_DIAGNOSE
OUStringBuffer buf( 48 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> replacing element \"") );
+ buf.appendAscii( "> replacing element \"" );
buf.append( entry->m_key );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" in cache") );
- OString str( OUStringToOString(
- buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "%s", str.getStr() );
+ buf.appendAscii( "\" in cache" );
+ SAL_INFO("stoc", buf.makeStringAndClear() );
#endif
}
entry->m_val = val;
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index d5f033c95ab3..a865d475042d 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -70,12 +70,7 @@ static inline sal_Int32 makeMask(
#if OSL_DEBUG_LEVEL > 0
if (! strings[ nPos ])
{
- OUStringBuffer buf( 48 );
- buf.append( "### ignoring unknown socket action: " );
- buf.append( item );
- OString str( OUStringToOString(
- buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "%s", str.getStr() );
+ SAL_WARN("stoc", "ignoring unknown socket action: " << item );
}
#endif
}
@@ -542,7 +537,7 @@ static void demanded_diag(
buf.append( " => ok." );
OString str(
OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "%s", str.getStr() );
+ SAL_INFO("stoc",( "%s", str.getStr() );
}
#endif
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index 827a93cfb63e..f856f76dc2a8 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -89,7 +89,7 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
jclass cls = p_env->FindClass( "TestJavaVM");
if (cls == 0) {
- OSL_TRACE( "Can't find Prog class");
+ SAL_WARN("stoc", "Can't find Prog class");
exit(1);
}
@@ -139,10 +139,7 @@ SAL_IMPLEMENT_MAIN()
catch (const Exception & rExc)
{
OSL_FAIL( "### exception occurred!" );
- OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "### exception occurred: " );
- OSL_TRACE( "%s", aMsg.getStr() );
- OSL_TRACE( "\n" );
+ SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
}
Reference< XComponent > xCompContext( context, UNO_QUERY );
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index afe682fb8631..2eebdef67d4c 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -672,10 +672,7 @@ SAL_IMPLEMENT_MAIN()
catch (const Exception & rExc)
{
OSL_FAIL( "### exception occurred!" );
- OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "### exception occurred: " );
- OSL_TRACE( "%s", aMsg.getStr() );
- OSL_TRACE( "\n" );
+ SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
}
Reference< XComponent >( xMgr, UNO_QUERY )->dispose();
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 05df96424a28..7aa06a9ca82d 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -368,11 +368,7 @@ SAL_IMPLEMENT_MAIN()
catch (const Exception & rExc)
{
OSL_FAIL( "### exception occurred!" );
- OString aMsg(
- OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "### exception occurred: " );
- OSL_TRACE( "%s", aMsg.getStr() );
- OSL_TRACE( "\n" );
+ SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
}
printf( "testcorefl %s !\n", (bSucc ? "succeeded" : "failed") );
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index 54c260e4fef4..a335939b9659 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -159,7 +159,7 @@ class Test_Impl : public WeakImplHelper< XLanguageBindingTest >
public:
virtual ~Test_Impl()
- { OSL_TRACE( "> scalar Test_Impl dtor <\n" ); }
+ { SAL_INFO("stoc", "> scalar Test_Impl dtor <" ); }
// XLBTestBase
virtual void SAL_CALL setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 22df49ebc509..caff1337a91c 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -1196,10 +1196,7 @@ SAL_IMPLEMENT_MAIN()
catch (const Exception & rExc)
{
OSL_FAIL( "### exception occurred!" );
- OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "### exception occurred: " );
- OSL_TRACE( "%s", aMsg.getStr() );
- OSL_TRACE( "\n" );
+ SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
}
Reference< XComponent >( xMgr, UNO_QUERY )->dispose();
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index 83bda7ff321f..ebc878696316 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -55,7 +55,7 @@ public:
virtual ~TargetObject() {
--s_obj;
- OSL_TRACE( "~TargetObject()" );
+ SAL_INFO("stoc", "~TargetObject()" );
}
TargetObject()
{ ++s_obj; }
@@ -113,7 +113,7 @@ public:
virtual ~TestMaster() {
--s_obj;
- OSL_TRACE( "~TestMaster()" );
+ SAL_INFO("stoc", "~TestMaster()" );
}
virtual Any SAL_CALL queryInterface( const Type & rType )
generated by cgit (git 2.34.1) at 2024-12-26 09:43:39 +0000