include/sal/log-areas.dox | 4 ++++
unodevtools/source/unodevtools/options.cxx | 29 +++--------------------------
2 files changed, 7 insertions(+), 26 deletions(-)
New commits:
commit 26b69a9d0f6ae454ccd57019a68ef96be2568ba5
Author: Rohan Kumar <rohankanojia...@gmail.com>
Date: Mon Mar 7 19:57:40 2016 +0530
tdf#91794 Remove OSL_DEBUG_LEVEL > 1 conditionals
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 <c...@libreoffice.org>
Reviewed-by: jan iversen <j...@documentfoundation.org>
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index d2de637..3387889 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -386,6 +386,10 @@ certain functionality.
@li @c unotools.misc
@li @c unotools.ucbhelper
+@section unodevtools
+
+@li @c unodevtools
+
@section URE
@li @c rtl.string - ::rtl::OString, ::rtl::OUString, and related functionality
diff --git a/unodevtools/source/unodevtools/options.cxx
b/unodevtools/source/unodevtools/options.cxx
index 8e0e870..fbbca04 100644
--- a/unodevtools/source/unodevtools/options.cxx
+++ b/unodevtools/source/unodevtools/options.cxx
@@ -27,14 +27,6 @@
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,
sal_uInt32 * pnIndex, const OUString & aArg)
{
@@ -58,25 +50,13 @@ bool readOption( OUString * pValue, const sal_Char * pOpt,
throw CannotDumpException(
"incomplete option \"-" + aOpt + "\" given!");
} else {
-#if OSL_DEBUG_LEVEL > 1
- out( "\n> identified option -" );
- out( pOpt );
- out( " = " );
- OString tmp = OUStringToOString(*pValue,
RTL_TEXTENCODING_ASCII_US);
- out( tmp.getStr() );
-#endif
+ SAL_INFO("unodevtools", "> identified option -" << pOpt << " = "
<< *pValue);
++(*pnIndex);
return true;
}
} else if (aArg.indexOf(aOpt) == 1) {
*pValue = aArg.copy(1 + aOpt.getLength());
-#if OSL_DEBUG_LEVEL > 1
- out( "\n> identified option -" );
- out( pOpt );
- out( " = " );
- OString tmp = OUStringToOString(*pValue, RTL_TEXTENCODING_ASCII_US);
- out( tmp.getStr() );
-#endif
+ SAL_INFO("unodevtools", "> identified option -" << pOpt << " = " <<
*pValue);
++(*pnIndex);
return true;
@@ -95,10 +75,7 @@ bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
{
++(*pnIndex);
*pbOpt = sal_True;
-#if OSL_DEBUG_LEVEL > 1
- out( "\n> identified option --" );
- out( pOpt );
-#endif
+ SAL_INFO("unodevtools", "> identified option --" << pOpt);
return true;
}
return false;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
