Make content of OSL_ASSERT, DBG_ASSERT, etc. visiblie in non-debug builds

...to avoid lots of loplugin:staticmethods warnings.  Also enables DBG_ASSERT
etc. also for --enable-debug builds in addition to --enable-dbgutil builds.

Change-Id: Ib89ecd9ab8ce7abb2c64790ace248b31f9d2b64d

4 files changed, 6 insertions, 30 deletions

diff --git a/shell/source/win32/ooofilereader/basereader.cxx b/shell/source/win32/ooofilereader/basereader.cxx
index 91860d81906e..503aed093539 100644
--- a/shell/source/win32/ooofilereader/basereader.cxx
+++ b/shell/source/win32/ooofilereader/basereader.cxx
@@ -79,11 +79,7 @@ void CBaseReader::Initialize( const std::string& ContentName)
             parser.parse(&m_ZipContent[0], m_ZipContent.size());
         }
     }
-    catch(std::exception&
-    #if OSL_DEBUG_LEVEL > 0
-        ex
-    #endif
-        )
+    catch(std::exception& ex)
     {
         OSL_ENSURE( false, ex.what() );
     }
diff --git a/shell/source/win32/ooofilereader/contentreader.cxx b/shell/source/win32/ooofilereader/contentreader.cxx
index 6f9a9602f6f7..0b9ef848624a 100644
--- a/shell/source/win32/ooofilereader/contentreader.cxx
+++ b/shell/source/win32/ooofilereader/contentreader.cxx
@@ -39,11 +39,7 @@ CBaseReader( DocumentName )
         m_DefaultLocale = DocumentLocale;
         Initialize( DOC_CONTENT_NAME );
     }
-    catch(xml_parser_exception&
-    #if OSL_DEBUG_LEVEL > 0
-    ex
-    #endif
-    )
+    catch(xml_parser_exception& ex)
     {
         OSL_ENSURE(false, ex.what());
     }
@@ -61,11 +57,7 @@ try
         m_DefaultLocale = DocumentLocale;
         Initialize( DOC_CONTENT_NAME );
     }
-    catch(xml_parser_exception&
-    #if OSL_DEBUG_LEVEL > 0
-    ex
-    #endif
-    )
+    catch(xml_parser_exception& ex)
     {
         OSL_ENSURE(false, ex.what());
     }
diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx b/shell/source/win32/ooofilereader/metainforeader.cxx
index b4273bdc89b6..442c12ad553e 100644
--- a/shell/source/win32/ooofilereader/metainforeader.cxx
+++ b/shell/source/win32/ooofilereader/metainforeader.cxx
@@ -58,11 +58,7 @@ CBaseReader( DocumentName )
 
         Initialize( META_CONTENT_NAME );
     }
-    catch(xml_parser_exception&
-    #if OSL_DEBUG_LEVEL > 0
-    ex
-    #endif
-    )
+    catch(xml_parser_exception& ex)
     {
         OSL_ENSURE(false, ex.what());
     }
@@ -99,11 +95,7 @@ try
 
         Initialize( META_CONTENT_NAME );
     }
-    catch(xml_parser_exception&
-    #if OSL_DEBUG_LEVEL > 0
-    ex
-    #endif
-    )
+    catch(xml_parser_exception& ex)
     {
         OSL_ENSURE(false, ex.what());
     }
diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx
index 10a0775ce6ab..ace7303060ce 100644
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -293,11 +293,7 @@ int main(int argc, char* argv[])
             ulRet = SUCCESS_SUCCESS;
 
     }
-    catch (const std::runtime_error&
-    #if OSL_DEBUG_LEVEL > 0
-    ex
-    #endif
-    )
+    catch (const std::runtime_error& ex)
     {
         OSL_FAIL(ex.what());
     }