mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS dbgmacros1 (1.18.10); FILE MERGED

Browse Source 
2003/04/09 10:40:12 kso 1.18.10.1: #108413# - debug macro unification.
This commit is contained in:
Vladimir Glazounov
2003-04-15 15:35:26 +00:00
parent c70c002967
commit 7f44a58b79
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cppuhelper/source/shlib.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: shlib.cxx,v $ * $RCSfile: shlib.cxx,v $
* *
* $Revision: 1.18 $ * $Revision: 1.19 $
* *
* last change: $Author: vg $ $Date: 2003-03-20 12:26:47 $ * last change: $Author: vg $ $Date: 2003-04-15 16:35:26 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -59,7 +59,7 @@
* *
************************************************************************/ ************************************************************************/
#ifdef DEBUG #if OSL_DEBUG_LEVEL > 1
#include <stdio.h> #include <stdio.h>
#endif #endif
#include <vector> #include <vector>
@@ -86,7 +86,7 @@ using namespace ::com::sun::star::uno;
namespace cppu namespace cppu
{ {
#ifdef DEBUG #if OSL_DEBUG_LEVEL > 1
//================================================================================================== //==================================================================================================
static inline void out( const char * p ) SAL_THROW( () ) static inline void out( const char * p ) SAL_THROW( () )
{ {
@@ -126,7 +126,7 @@ static const ::std::vector< OUString > * getAccessDPath() SAL_THROW( () )
osl_File_E_None == FileBase::getFileURLFromSystemPath(aStr, aFileUrl) ); osl_File_E_None == FileBase::getFileURLFromSystemPath(aStr, aFileUrl) );
s_v.push_back( aFileUrl ); s_v.push_back( aFileUrl );
} while( nIndex != -1 ); } while( nIndex != -1 );
#ifdef DEBUG #if OSL_DEBUG_LEVEL > 1
out( "> cpld: acknowledged following access path(s): \"" ); out( "> cpld: acknowledged following access path(s): \"" );
::std::vector< OUString >::const_iterator iPos( s_v.begin() ); ::std::vector< OUString >::const_iterator iPos( s_v.begin() );
while (iPos != s_v.end()) while (iPos != s_v.end())
@@ -143,7 +143,7 @@ static const ::std::vector< OUString > * getAccessDPath() SAL_THROW( () )
else else
{ {
// no access path env set // no access path env set
#ifdef DEBUG #if OSL_DEBUG_LEVEL > 1
out( "=> no CPLD_ACCESSPATH set.\n" ); out( "=> no CPLD_ACCESSPATH set.\n" );
#endif #endif
} }
@@ -171,7 +171,7 @@ static bool checkAccessPath( OUString * pComp ) throw ()
if ( bAbsolute ) if ( bAbsolute )
{ {
aAbs = *pComp; aAbs = *pComp;
#ifdef DEBUG #if OSL_DEBUG_LEVEL > 1
out( "> taking path: \"" ); out( "> taking path: \"" );
out( aAbs ); out( aAbs );
#endif #endif
@@ -182,7 +182,7 @@ static bool checkAccessPath( OUString * pComp ) throw ()
{ {
continue; continue;
} }
#ifdef DEBUG #if OSL_DEBUG_LEVEL > 1
out( "> found path: \"" ); out( "> found path: \"" );
out( aBaseDir ); out( aBaseDir );
out( "\" + \"" ); out( "\" + \"" );
@@ -197,14 +197,14 @@ static bool checkAccessPath( OUString * pComp ) throw ()
(aBaseDir[ aBaseDir.getLength() -1 ] == (sal_Unicode)'/' || (aBaseDir[ aBaseDir.getLength() -1 ] == (sal_Unicode)'/' ||
aAbs[ aBaseDir.getLength() ] == (sal_Unicode)'/')) // dir boundary aAbs[ aBaseDir.getLength() ] == (sal_Unicode)'/')) // dir boundary
{ {
#ifdef DEBUG #if OSL_DEBUG_LEVEL > 1
out( ": ok.\n" ); out( ": ok.\n" );
#endif #endif
// load from absolute path // load from absolute path
*pComp = aAbs; *pComp = aAbs;
return true; return true;
} }
#ifdef DEBUG #if OSL_DEBUG_LEVEL > 1
else else
{ {
out( "\" ...does not match given path \"" ); out( "\" ...does not match given path \"" );
@@ -237,7 +237,7 @@ static inline sal_Int32 endsWith( const OUString & rText, const OUString & rEnd
static OUString makeComponentPath( static OUString makeComponentPath(
const OUString & rLibName, const OUString & rPath ) const OUString & rLibName, const OUString & rPath )
{ {
#ifdef _DEBUG #if OSL_DEBUG_LEVEL > 0
// No system path allowed here ! // No system path allowed here !
{ {
OUString aComp; OUString aComp;
@@ -270,7 +270,7 @@ static OUString makeComponentPath(
} }
OUString out( buf.makeStringAndClear() ); OUString out( buf.makeStringAndClear() );
#ifdef DEBUG #if OSL_DEBUG_LEVEL > 1
OString str( OUStringToOString( out, RTL_TEXTENCODING_ASCII_US ) ); OString str( OUStringToOString( out, RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "component path=%s\n", str.getStr() ); OSL_TRACE( "component path=%s\n", str.getStr() );
#endif #endif
@@ -480,7 +480,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
if (! xRet.is()) if (! xRet.is())
{ {
osl_unloadModule( lib ); osl_unloadModule( lib );
#ifdef DEBUG #if OSL_DEBUG_LEVEL > 1
out( "### cannot activate factory: " ); out( "### cannot activate factory: " );
out( aExcMsg ); out( aExcMsg );
out( "\n" ); out( "\n" );
@@ -669,7 +669,7 @@ void SAL_CALL writeSharedLibComponentInfo(
//! ::osl_unloadModule( lib); //! ::osl_unloadModule( lib);
if (! bRet) if (! bRet)
{ {
#ifdef DEBUG #if OSL_DEBUG_LEVEL > 1
out( "### cannot write component info: " ); out( "### cannot write component info: " );
out( aExcMsg ); out( aExcMsg );
out( "\n" ); out( "\n" );