diff options
-rw-r--r-- | offapi/com/sun/star/task/DocumentMSPasswordRequest.idl | 2 | ||||
-rw-r--r-- | sal/osl/w32/diagnose.c | 5 | ||||
-rw-r--r-- | stoc/source/inspect/introspection.cxx | 46 |
3 files changed, 29 insertions, 24 deletions
diff --git a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl index 6e4adec10720..717e590c12ba 100644 --- a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl +++ b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl @@ -49,7 +49,7 @@ module com { module sun { module star { module task { the mentioned service are Abort and Approve. </P> - @since OOo 3.x.x + @since OOo 3.2 */ published exception DocumentMSPasswordRequest: PasswordRequest { diff --git a/sal/osl/w32/diagnose.c b/sal/osl/w32/diagnose.c index 6a67c1aa5b0f..b2d22808dcd7 100644 --- a/sal/osl/w32/diagnose.c +++ b/sal/osl/w32/diagnose.c @@ -92,7 +92,10 @@ void SAL_CALL osl_trace(const sal_Char* lpszFormat, ...) sal_Char szMessage[512]; szMessage[sizeof(szMessage)-1] = 0; written = _vsnprintf( szMessage, sizeof(szMessage) - 2, lpszFormat, args ); - szMessage[ written == -1 ? sizeof(szMessage) - 2 : written ] = '\n'; + if ( written == -1 ) + written = sizeof(szMessage) - 2; + szMessage[ written++ ] = '\n'; + szMessage[ written ] = 0; OutputDebugString( szMessage ); } diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 011fafe9d6e9..518c6029ddd2 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -43,6 +43,7 @@ #endif #include <osl/diagnose.h> #include <osl/mutex.hxx> +#include <osl/thread.h> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/component.hxx> @@ -1421,28 +1422,29 @@ Sequence< Reference<XIdlMethod> > ImplIntrospectionAccess::getMethods(sal_Int32 if( nConcept & MethodConcepts ) pDestMethods[ iDest++ ] = pSourceMethods[ i ]; - /* - // Methode mit Concepts ausgeben - const XIdlMethodRef& rxMethod = pSourceMethods[ i ]; - OUString aMethName = rxMethod->getName(); - String aNameStr = OOUStringToString(aMethName, CHARSET_SYSTEM); - String ConceptStr; - if( nConcept & DANGEROUS ) - ConceptStr += "DANGEROUS |"; - if( nConcept & PROPERTY ) - ConceptStr += "PROPERTY |"; - if( nConcept & LISTENER ) - ConceptStr += "LISTENER |"; - if( nConcept & ENUMERATION ) - ConceptStr += "ENUMERATION |"; - if( nConcept & NAMECONTAINER ) - ConceptStr += "NAMECONTAINER |"; - if( nConcept & INDEXCONTAINER ) - ConceptStr += "INDEXCONTAINER |"; - if( nConcept & NORMAL_IMPL ) - ConceptStr += "NORMAL_IMPL |"; - printf( "Method %ld: %s, Concepts = %s\n", i, aNameStr.GetStr(), ConceptStr.GetStr() ); - */ + #if OSL_DEBUG_LEVEL > 0 + static bool debug = false; + if ( debug ) + { + // Methode mit Concepts ausgeben + const Reference< XIdlMethod >& rxMethod = pSourceMethods[ i ]; + ::rtl::OString aNameStr = ::rtl::OUStringToOString( rxMethod->getName(), osl_getThreadTextEncoding() ); + ::rtl::OString ConceptStr; + if( nConcept & MethodConcept::DANGEROUS ) + ConceptStr += "DANGEROUS |"; + if( nConcept & MethodConcept::PROPERTY ) + ConceptStr += "PROPERTY |"; + if( nConcept & MethodConcept::LISTENER ) + ConceptStr += "LISTENER |"; + if( nConcept & MethodConcept::ENUMERATION ) + ConceptStr += "ENUMERATION |"; + if( nConcept & MethodConcept::NAMECONTAINER ) + ConceptStr += "NAMECONTAINER |"; + if( nConcept & MethodConcept::INDEXCONTAINER ) + ConceptStr += "INDEXCONTAINER |"; + OSL_TRACE( "Method %ld: %s, Concepts = %s", i, aNameStr.getStr(), ConceptStr.getStr() ); + } + #endif } // Auf die richtige Laenge bringen |