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

3 files changed, 6 insertions, 19 deletions

diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 6c99566b86fc..5c5be725ffba 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -91,10 +91,8 @@ namespace abp
                     Reference< XPropertySet > xDialogProps( xDialog, UNO_QUERY );
 
                     Sequence< AliasProgrammaticPair > aMapping;
-#ifdef DBG_UTIL
                     bool bSuccess =
-#endif
-                    xDialogProps->getPropertyValue("FieldMapping") >>= aMapping;
+                        xDialogProps->getPropertyValue("FieldMapping") >>= aMapping;
                     DBG_ASSERT( bSuccess, "fieldmapping::invokeDialog: invalid property type for FieldMapping!" );
 
                     // and copy it into the map
@@ -235,10 +233,10 @@ namespace abp
 #ifdef DBG_UTIL
                 OUString sRedundantProgrammaticName;
                 aFields.openNode( *pExistentFields ).getNodeValue( sProgrammaticNodeName ) >>= sRedundantProgrammaticName;
-#endif
                 DBG_ASSERT( sRedundantProgrammaticName == *pExistentFields,
                     "fieldmapping::writeTemplateAddressFieldMapping: inconsistent config data!" );
                     // there should be a redundancy in the config data .... if this asserts, there isn't anymore!
+#endif
 
                 // do we have a new alias for the programmatic?
                 MapString2String::iterator aPos = aFieldAssignment.find( *pExistentFields );
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index 9f9135832f0e..7bf9611323b9 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -209,10 +209,8 @@ namespace logging
 
         sal_uInt64 nBytesToWrite( _rEntry.getLength() );
         sal_uInt64 nBytesWritten( 0 );
-    #if OSL_DEBUG_LEVEL > 0
         ::osl::FileBase::RC res =
-    #endif
-        m_pFile->write( _rEntry.getStr(), nBytesToWrite, nBytesWritten );
+              m_pFile->write( _rEntry.getStr(), nBytesToWrite, nBytesWritten );
         OSL_ENSURE( ( res == ::osl::FileBase::E_None ) && ( nBytesWritten == nBytesToWrite ),
             "FileHandler::impl_writeString_nothrow: could not write the log entry!" );
     }
@@ -310,10 +308,7 @@ namespace logging
             OSL_PRECOND(false, "FileHandler::flush: no file!");
             return;
         }
-        #if OSL_DEBUG_LEVEL > 0
-            ::osl::FileBase::RC res =
-        #endif
-                m_pFile->sync();
+        ::osl::FileBase::RC res = m_pFile->sync();
         OSL_ENSURE(res == ::osl::FileBase::E_None, "FileHandler::flush: Could not sync logfile to filesystem.");
     }
 
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index e994186ca79d..19d09d179d2c 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -407,10 +407,7 @@ namespace pcr
             case PROPERTY_ID_BOUND_CELL:
             {
                 Reference< XValueBinding > xBinding;
-#if OSL_DEBUG_LEVEL > 0
-                bool bSuccess =
-#endif
-                _rPropertyValue >>= xBinding;
+                bool bSuccess = _rPropertyValue >>= xBinding;
                 OSL_ENSURE( bSuccess, "CellBindingPropertyHandler::convertToControlValue: invalid value (1)!" );
 
                 // the only value binding we support so far is linking to spreadsheet cells
@@ -421,10 +418,7 @@ namespace pcr
             case PROPERTY_ID_LIST_CELL_RANGE:
             {
                 Reference< XListEntrySource > xSource;
-#if OSL_DEBUG_LEVEL > 0
-                bool bSuccess =
-#endif
-                _rPropertyValue >>= xSource;
+                bool bSuccess = _rPropertyValue >>= xSource;
                 OSL_ENSURE( bSuccess, "CellBindingPropertyHandler::convertToControlValue: invalid value (2)!" );
 
                 // the only value binding we support so far is linking to spreadsheet cells