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

tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals

Browse Source 
I removed OSL_DEBUG_LEVEL > 1 conditionals to SAL_INFO
statements

Change-Id: I6f74f5146473464758f35629877a76bb2bc39b4e
Reviewed-on: https://gerrit.libreoffice.org/23071
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
This commit is contained in:
Rohan Kumar
2016-03-09 17:53:50 +05:30
committed by Björn Michaelsen
parent e1193272cd
commit d6411207bd
3 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cppuhelper/source/factory.cxx
View File

@@ -699,9 +699,7 @@ Reference<XInterface > SAL_CALL ORegistryFactoryHelper::createInstanceWithArgume
} }
else if( xModuleFactory.is() ) else if( xModuleFactory.is() )
{ {
#if OSL_DEBUG_LEVEL > 1 SAL_INFO("cppuhelper", "no context ORegistryFactoryHelper::createInstanceWithArgumentsAndContext()!");
OSL_TRACE( "### no context ORegistryFactoryHelper::createInstanceWithArgumentsAndContext()!" );
#endif
return xModuleFactory->createInstanceWithArgumentsAndContext( Arguments, Reference< XComponentContext >() ); return xModuleFactory->createInstanceWithArgumentsAndContext( Arguments, Reference< XComponentContext >() );
} }
@@ -732,12 +730,7 @@ Reference< XInterface > ORegistryFactoryHelper::createInstanceWithArgumentsAndCo
} }
else if( xModuleFactoryDepr.is() ) else if( xModuleFactoryDepr.is() )
{ {
#if OSL_DEBUG_LEVEL > 1 SAL_INFO_IF(xContext.is(), "cppuhelper", "ignoring context calling ORegistryFactoryHelper::createInstaceWithArgumentsAndContext()!");
if (xContext.is())
{
OSL_TRACE( "### ignoring context calling ORegistryFactoryHelper::createInstanceWithArgumentsAndContext()!" );
}
#endif
return xModuleFactoryDepr->createInstanceWithArguments( rArguments ); return xModuleFactoryDepr->createInstanceWithArguments( rArguments );
} }

9
cppuhelper/test/testdefaultbootstrapping.cxx
View File

@@ -50,10 +50,7 @@ SAL_IMPLEMENT_MAIN()
if (!arg.isEmpty()) if (!arg.isEmpty())
{ {
Reference<XInterface> xInterface = smgr->createInstance(arg); Reference<XInterface> xInterface = smgr->createInstance(arg);
OString tmp = OUStringToOString(arg, RTL_TEXTENCODING_ASCII_US); SAL_INFO("cppuhelper", "got the " << arg << " service " << xInterface.get());
#if OSL_DEBUG_LEVEL > 1
fprintf(stderr, "got the %s service %p\n", tmp.getStr(), xInterface.get());
#endif
result = result && (xInterface.get() != 0); result = result && (xInterface.get() != 0);
} }
@@ -65,9 +62,7 @@ SAL_IMPLEMENT_MAIN()
fprintf(stderr, "an exception occurred: %s\n", message.getStr()); fprintf(stderr, "an exception occurred: %s\n", message.getStr());
} }
#if OSL_DEBUG_LEVEL > 1 SAL_INFO("extensions", "---------------------------------- " << result);
OSL_TRACE("---------------------------------- %i", result);
#endif
return result; return result;
} }

13
cppuhelper/test/testlib/defbootstrap_lib.cxx
View File

@@ -43,10 +43,7 @@ static sal_Bool tryService(const char * serviceName)
OUString iniName = libraryFileUrl.copy(0, libraryFileUrl.lastIndexOf((sal_Unicode)'.')); // cut the library extension OUString iniName = libraryFileUrl.copy(0, libraryFileUrl.lastIndexOf((sal_Unicode)'.')); // cut the library extension
iniName += SAL_CONFIGFILE(""); // add the rc file extension iniName += SAL_CONFIGFILE(""); // add the rc file extension
#if OSL_DEBUG_LEVEL > 1 SAL_INFO("cppuhelper", "using ini: " << iniName);
OString sIniName = OUStringToOString(iniName, RTL_TEXTENCODING_ASCII_US);
fprintf(stderr, "defbootstrap.cxx:tryService: using ini: %s\n", sIniName.getStr());
#endif
sal_Bool result = sal_True; sal_Bool result = sal_True;
@@ -57,9 +54,7 @@ static sal_Bool tryService(const char * serviceName)
OUString arg = OUString::createFromAscii(serviceName); OUString arg = OUString::createFromAscii(serviceName);
Reference<XInterface> xInterface = smgr->createInstance(arg); Reference<XInterface> xInterface = smgr->createInstance(arg);
#if OSL_DEBUG_LEVEL > 1 SAL_INFO("cppuhelper", "got the " << serviceName << " service " << xInterface.get());
fprintf(stderr, "got the %s service %p\n", serviceName, xInterface.get());
#endif
result = result && (xInterface.get() != 0); result = result && (xInterface.get() != 0);
} }
catch(Exception & exception) { catch(Exception & exception) {
@@ -68,9 +63,7 @@ static sal_Bool tryService(const char * serviceName)
fprintf(stderr, "an exception occurred: %s\n", message.getStr()); fprintf(stderr, "an exception occurred: %s\n", message.getStr());
} }
#if OSL_DEBUG_LEVEL > 1 SAL_INFO("cppuhelper", "---------------------------------- " << result);
OSL_TRACE("---------------------------------- %i", result);
#endif
return result; return result;
} }