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 the fprintf statements and replaced them with
SAL_WARN statements.

Change-Id: Id75e310e3a95b249fdf92a4dd5a9bcf1b7fb9be6
Reviewed-on: https://gerrit.libreoffice.org/22984
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
This commit is contained in:
Rohan Kumar
2016-03-07 19:57:40 +05:30
committed by jan iversen
parent 856cf7115d
commit 26b69a9d0f
2 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/sal/log-areas.dox
View File

@@ -386,6 +386,10 @@ certain functionality.
@li @c unotools.misc @li @c unotools.misc
@li @c unotools.ucbhelper @li @c unotools.ucbhelper
@section unodevtools
@li @c unodevtools
@section URE @section URE
@li @c rtl.string - ::rtl::OString, ::rtl::OUString, and related functionality @li @c rtl.string - ::rtl::OString, ::rtl::OUString, and related functionality

29
unodevtools/source/unodevtools/options.cxx
View File

@@ -27,14 +27,6 @@
namespace unodevtools { namespace unodevtools {
#if OSL_DEBUG_LEVEL > 1
static void out( const sal_Char * pText )
{
fprintf( stderr, pText );
}
#endif
bool readOption( OUString * pValue, const sal_Char * pOpt, bool readOption( OUString * pValue, const sal_Char * pOpt,
sal_uInt32 * pnIndex, const OUString & aArg) sal_uInt32 * pnIndex, const OUString & aArg)
{ {
@@ -58,25 +50,13 @@ bool readOption( OUString * pValue, const sal_Char * pOpt,
throw CannotDumpException( throw CannotDumpException(
"incomplete option \"-" + aOpt + "\" given!"); "incomplete option \"-" + aOpt + "\" given!");
} else { } else {
#if OSL_DEBUG_LEVEL > 1 SAL_INFO("unodevtools", "> identified option -" << pOpt << " = " << *pValue);
out( "\n> identified option -" );
out( pOpt );
out( " = " );
OString tmp = OUStringToOString(*pValue, RTL_TEXTENCODING_ASCII_US);
out( tmp.getStr() );
#endif
++(*pnIndex); ++(*pnIndex);
return true; return true;
} }
} else if (aArg.indexOf(aOpt) == 1) { } else if (aArg.indexOf(aOpt) == 1) {
*pValue = aArg.copy(1 + aOpt.getLength()); *pValue = aArg.copy(1 + aOpt.getLength());
#if OSL_DEBUG_LEVEL > 1 SAL_INFO("unodevtools", "> identified option -" << pOpt << " = " << *pValue);
out( "\n> identified option -" );
out( pOpt );
out( " = " );
OString tmp = OUStringToOString(*pValue, RTL_TEXTENCODING_ASCII_US);
out( tmp.getStr() );
#endif
++(*pnIndex); ++(*pnIndex);
return true; return true;
@@ -95,10 +75,7 @@ bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
{ {
++(*pnIndex); ++(*pnIndex);
*pbOpt = sal_True; *pbOpt = sal_True;
#if OSL_DEBUG_LEVEL > 1 SAL_INFO("unodevtools", "> identified option --" << pOpt);
out( "\n> identified option --" );
out( pOpt );
#endif
return true; return true;
} }
return false; return false;