fdo#43157 : clean up OSL_DEBUG_ONLY

Change-Id: Ic92b64cfaec41bf4104cede5f26579d86543b9a8
Reviewed-on: https://gerrit.libreoffice.org/8804Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>

connectivity/source/commontools/RowFunctionParser.cxx

@@ -467,7 +467,9 @@ ExpressionNodeSharedPtr FunctionParser::parseFunction( const OUString& _sFunctio
                                     aExpressionGrammer,
                                     ::boost::spirit::space_p ) );
 
-    OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
+#if (OSL_DEBUG_LEVEL > 0)
+    ::std::cout.flush(); // needed to keep stdout and cout in sync
+#endif
 
     // input fully congested by the parser?
     if( !aParseInfo.full )

include/osl/diagnose.h

@@ -95,8 +95,6 @@
 */
 #define OSL_LOG_PREFIX SAL_DETAIL_WHERE
 
-#define OSL_DEBUG_ONLY(s)   _OSL_DEBUG_ONLY(s)
-
 #define OSL_TRACE(...) \
     SAL_DETAIL_INFO_IF_FORMAT(OSL_DEBUG_LEVEL > 0, "legacy.osl", __VA_ARGS__)
 
@@ -122,16 +120,6 @@
 #define _OSL_GLOBAL
 #endif  /* __cplusplus */
 
-#if OSL_DEBUG_LEVEL > 0
-
-#define _OSL_DEBUG_ONLY(f)  (f)
-
-#else
-
-#define _OSL_DEBUG_ONLY(f)          ((void)0)
-
-#endif /* OSL_DEBUG_LEVEL */
-
 /* the macro OSL_THIS_FUNC is intended to be an office internal macro for now */
 /* copied from boost/current_function.hpp to make it usable from C
  * sources as well

slideshow/source/engine/smilfunctionparser.cxx

@@ -564,7 +564,10 @@ namespace slideshow
                                           aEnd,
                                           aExpressionGrammer,
                                           ::boost::spirit::space_p ) );
-            OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
+
+#if OSL_DEBUG_LEVEL > 0
+            ::std::cout.flush(); // needed to keep stdout and cout in sync
+#endif
 
             // input fully congested by the parser?
             if( !aParseInfo.full )
@@ -610,8 +613,10 @@ namespace slideshow
                                           aEnd,
                                           aExpressionGrammer >> ::boost::spirit::end_p,
                                           ::boost::spirit::space_p ) );
-            OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
 
+#if OSL_DEBUG_LEVEL > 0
+            ::std::cout.flush(); // needed to keep stdout and cout in sync
+#endif
             // input fully congested by the parser?
             if( !aParseInfo.full )
                 throw ParseError( "SmilFunctionParser::parseSmilFunction(): string not fully parseable" );

svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx

@@ -1183,9 +1183,10 @@ ExpressionNodeSharedPtr FunctionParser::parseFunction( const OUString& rFunction
                                     aEnd,
                                     aExpressionGrammer >> ::boost::spirit::end_p,
                                     ::boost::spirit::space_p ) );
-    OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
-
 
+#if (OSL_DEBUG_LEVEL > 0)
+    ::std::cout.flush(); // needed to keep stdout and cout in sync
+#endif
 
     // input fully congested by the parser?
     if( !aParseInfo.full )