diff options
86 files changed, 119 insertions, 423 deletions
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx index 709ea0fe207b..5c0e5a789a93 100644 --- a/UnoControls/source/controls/progressmonitor.cxx +++ b/UnoControls/source/controls/progressmonitor.cxx @@ -869,7 +869,6 @@ IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, b } // debug methods -#ifdef DBG_UTIL // addText, updateText bool ProgressMonitor::impl_debug_checkParameter ( @@ -898,8 +897,6 @@ bool ProgressMonitor::impl_debug_checkParameter ( const OUString& rTopic, bool / return true; } -#endif // #ifdef DBG_UTIL - } // namespace unocontrols /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx index e31492ad35a3..6a5feb201ba8 100644 --- a/UnoControls/source/inc/progressmonitor.hxx +++ b/UnoControls/source/inc/progressmonitor.hxx @@ -401,13 +401,9 @@ private: /**_______________________________________________________________________________________________________ */ - #ifdef DBG_UTIL - static bool impl_debug_checkParameter( const OUString& sTopic, const OUString& sText, bool bbeforeProgress ); // addText, updateText static bool impl_debug_checkParameter( const OUString& rTopic, bool bbeforeProgress ); // removeText - #endif - // private variables private: diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index d4996f971c89..c7c0500a7e40 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -540,9 +540,6 @@ namespace basic SolarMutexGuard g; Reference< XInterface > xNormalizedSource( _rSource.Source, UNO_QUERY ); - #if OSL_DEBUG_LEVEL > 0 - bool bFound = false; - #endif for ( BasicManagerStore::iterator loop = m_aStore.begin(); loop != m_aStore.end(); @@ -552,14 +549,11 @@ namespace basic if ( loop->first.get() == xNormalizedSource.get() ) { impl_removeFromRepository( loop ); - #if OSL_DEBUG_LEVEL > 0 - bFound = true; - #endif - break; + return; } } - OSL_ENSURE( bFound, "ImplRepository::_disposing: where does this come from?" ); + OSL_FAIL( "ImplRepository::_disposing: where does this come from?" ); } diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index da8681aa76e0..b4f57d19f80f 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -184,10 +184,8 @@ void BasMgrContainerListenerImpl::insertLibraryImpl( const uno::Reference< scrip if( !pMgr->GetLib( aLibName ) ) { BasicManager* pBasMgr = static_cast< BasicManager* >( pMgr ); -#ifdef DBG_UTIL StarBASIC* pLib = -#endif - pBasMgr->CreateLibForLibContainer( aLibName, xScriptCont ); + pBasMgr->CreateLibForLibContainer( aLibName, xScriptCont ); DBG_ASSERT( pLib, "XML Import: Basic library could not be created"); } @@ -308,10 +306,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::Con Event.Accessor >>= aName; // Replace not possible for library container -#ifdef DBG_UTIL - bool bLibContainer = maLibName.isEmpty(); -#endif - DBG_ASSERT( !bLibContainer, "library container fired elementReplaced()"); + DBG_ASSERT( !maLibName.isEmpty(), "library container fired elementReplaced()"); StarBASIC* pLib = mpMgr->GetLib( maLibName ); if( pLib ) @@ -2287,10 +2282,7 @@ void SAL_CALL StarBasicAccess_Impl::createLibrary throw(container::ElementExistException, uno::RuntimeException, std::exception) { (void)ExternalSourceURL; -#ifdef DBG_UTIL - StarBASIC* pLib = -#endif - mpMgr->CreateLib( LibName, Password, LinkTargetURL ); + StarBASIC* pLib = mpMgr->CreateLib( LibName, Password, LinkTargetURL ); DBG_ASSERT( pLib, "XML Import: Basic library could not be created"); } diff --git a/cli_ure/source/uno_bridge/cli_environment.cxx b/cli_ure/source/uno_bridge/cli_environment.cxx index ae673b2779ed..2c4bdcde4129 100644 --- a/cli_ure/source/uno_bridge/cli_environment.cxx +++ b/cli_ure/source/uno_bridge/cli_environment.cxx @@ -54,8 +54,10 @@ Cli_environment::~Cli_environment() ///< IDisposable Cli_environment::Dispose() Cli_environment::!Cli_environment() ///< Cli_environment::Finalize() { +#if OSL_DEBUG_LEVEL >= 2 OSL_ENSURE(_numRegisteredObjects == 0, "cli uno bridge: CLI environment contains unrevoked objects"); +#endif } System::Object^ Cli_environment::registerInterface( diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index 7f2e7f02c533..787f4348d481 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -212,10 +212,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W { // obtain the preference list Any aPreferences = xDriverManagerNode->getByName(sDriverPreferenceLocation); -#if OSL_DEBUG_LEVEL > 0 - bool bSuccess = -#endif - aPreferences >>= _rPrecedence; + bool bSuccess = aPreferences >>= _rPrecedence; OSL_ENSURE(bSuccess || !aPreferences.hasValue(), "lcl_getDriverPrecedence: invalid value for the preferences node (no string sequence but not NULL)!"); } } diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 66524fed05a6..f1da22410afa 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -408,9 +408,7 @@ static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam) { // proxy ptr not registered for another interface: // remove from ptr map -#if OSL_DEBUG_LEVEL > 0 ::std::size_t erased = -#endif that->aPtr2ObjectMap.erase( pInterface ); OSL_ASSERT( erased == 1 ); } diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 2a5c31f5c199..981ff315dcee 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -528,10 +528,7 @@ void FmSearchDialog::InitContext(sal_Int16 nContext) FmSearchContext fmscContext; fmscContext.nContext = nContext; -#ifdef DBG_UTIL - sal_uInt32 nResult = -#endif - m_lnkContextSupplier.Call(&fmscContext); + sal_uInt32 nResult = m_lnkContextSupplier.Call(&fmscContext); DBG_ASSERT(nResult > 0, "FmSearchDialog::InitContext : ContextSupplier didn't give me any controls !"); // put the field names into the respective listbox diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 2b48fde9d54c..cb9b8be5a27c 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -2904,9 +2904,7 @@ IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl) IMPL_LINK( SvxCharPositionPage, LoseFocusHdl_Impl, MetricField*, pField ) { -#ifdef DBG_UTIL bool bHigh = m_pHighPosBtn->IsChecked(); -#endif bool bLow = m_pLowPosBtn->IsChecked(); DBG_ASSERT( bHigh || bLow, "normal position is not valid" ); diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index ebdd4a81f073..26d799f04f2c 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -242,9 +242,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex) ORowSetValueVector* pTemp = k->get(); OSL_ENSURE( pTemp != reinterpret_cast<void*>(0xfeeefeee),"HALT!" ); } -#endif OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow < m_pCache->getEnd() && aCacheIter != m_pCache->m_aCacheIterators.end(),"Invalid iterator set for currentrow!"); -#if OSL_DEBUG_LEVEL > 0 ORowSetRow rRow = (*m_aCurrentRow); OSL_ENSURE(rRow.is() && static_cast<sal_uInt16>(columnIndex) < (rRow->get()).size(),"Invalid size of vector!"); #endif diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 1e4d003c271a..3e1f6790038a 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -72,7 +72,9 @@ ODsnTypeCollection::ODsnTypeCollection(const ::com::sun::star::uno::Reference< : ODsnTypeCollection::~ODsnTypeCollection() { +#if OSL_DEBUG_LEVEL > 0 OSL_ENSURE(0 == m_nLivingIterators, "ODsnTypeCollection::~ODsnTypeCollection : there are still living iterator objects!"); +#endif } OUString ODsnTypeCollection::getTypeDisplayName(const OUString& _sURL) const diff --git a/dbaccess/source/ext/macromigration/progressmixer.cxx b/dbaccess/source/ext/macromigration/progressmixer.cxx index 87c7d84579d1..d75da510282d 100644 --- a/dbaccess/source/ext/macromigration/progressmixer.cxx +++ b/dbaccess/source/ext/macromigration/progressmixer.cxx @@ -81,12 +81,11 @@ namespace dbmm namespace { -#if OSL_DEBUG_LEVEL > 0 bool lcl_isRunning( const ProgressMixer_Data& _rData ) { return _rData.pCurrentPhase != _rData.aPhases.end(); } -#endif + void lcl_ensureInitialized( ProgressMixer_Data& _rData ) { OSL_PRECOND( _rData.nWeightSum, "lcl_ensureInitialized: we have no phases, this will crash!" ); diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index e593add1f0b3..6b1220ff3531 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1006,10 +1006,7 @@ void SAL_CALL SbaTableQueryBrowser::statusChanged( const FeatureStateEvent& _rEv { // if it's the slot for the document data source, remember the state Sequence< PropertyValue > aDescriptor; - #if OSL_DEBUG_LEVEL > 0 - bool bProperFormat = - #endif - _rEvent.State >>= aDescriptor; + bool bProperFormat = _rEvent.State >>= aDescriptor; OSL_ENSURE(bProperFormat, "SbaTableQueryBrowser::statusChanged: need a data access descriptor here!"); m_aDocumentDataSource.initializeFrom(aDescriptor); @@ -1879,10 +1876,8 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue OUString sNewQueryCommand; bool bNewQueryEP; -#if OSL_DEBUG_LEVEL > 0 bool bIsQuery = -#endif - implGetQuerySignature( sNewQueryCommand, bNewQueryEP ); + implGetQuerySignature( sNewQueryCommand, bNewQueryEP ); OSL_ENSURE( bIsQuery, "SbaTableQueryBrowser::Execute: was a query before, but is not anymore?" ); bFullReinit = ( sNewQueryCommand != m_sQueryCommand ) || ( m_bQueryEscapeProcessing != bNewQueryEP ); @@ -3318,14 +3313,11 @@ bool SbaTableQueryBrowser::getExistentConnectionFor( SvTreeListEntry* _pAnyEntry return _rConnection.is(); } -#if OSL_DEBUG_LEVEL > 0 bool SbaTableQueryBrowser::impl_isDataSourceEntry( SvTreeListEntry* _pEntry ) const { return m_pTreeModel->GetRootLevelParent( _pEntry ) == _pEntry; } -#endif - bool SbaTableQueryBrowser::ensureConnection( SvTreeListEntry* _pDSEntry, void* pDSData, SharedConnection& _rConnection ) { OSL_ENSURE( impl_isDataSourceEntry( _pDSEntry ), "SbaTableQueryBrowser::ensureConnection: this entry does not denote a data source!" ); diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index ece6bea52cfd..97c6452ce663 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -883,7 +883,6 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty(const Reference< X lcl_putProperty(_rxSet, _rName,aValue); } -#if OSL_DEBUG_LEVEL > 0 OString ODbDataSourceAdministrationHelper::translatePropertyId( sal_Int32 _nId ) { OUString aString; @@ -904,8 +903,6 @@ OString ODbDataSourceAdministrationHelper::translatePropertyId( sal_Int32 _nId ) return aReturn; } -#endif - void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet, sal_Int32 _nId, const Any& _rValue ) { switch ( _rValue.getValueType().getTypeClass() ) diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 0e7803d9e9bc..5f952cfd2591 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -167,9 +167,7 @@ namespace dbaui */ static bool hasAuthentication(const SfxItemSet& _rSet); -#if OSL_DEBUG_LEVEL > 0 OString translatePropertyId( sal_Int32 _nId ); -#endif }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index fb8d26629f05..6f3eb8f49904 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -434,10 +434,8 @@ namespace dbaui void* _pTreeListUserData // in reality a DBTreeListUserData*, but we do not know this class here... ); -#if OSL_DEBUG_LEVEL > 0 // checks whether the given tree entry denotes a data source bool impl_isDataSourceEntry( SvTreeListEntry* _pEntry ) const; -#endif /// retrieves the data source URL/name for the given entry representing a data source OUString getDataSourceAcessor( SvTreeListEntry* _pDataSourceEntry ) const; diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index e88d9da0f2ed..0ad8c09ab4b4 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -1013,7 +1013,9 @@ void OHTMLImportExport::FontOn() inline void OHTMLImportExport::FontOff() { +#if OSL_DEBUG_LEVEL > 0 OSL_ENSURE(m_bCheckFont,"Kein FontOn() gerufen"); +#endif TAG_OFF( OOO_STRING_SVTOOLS_HTML_font ); #if OSL_DEBUG_LEVEL > 0 m_bCheckFont = false; diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index 7931fee33ba8..f9413ce3a338 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -82,14 +82,12 @@ void OFieldDescGenWin::DisplayData( OFieldDescription* pFieldDescr ) m_pFieldControl->DisplayData(pFieldDescr); } -#if OSL_DEBUG_LEVEL > 0 OTableEditorCtrl* OFieldDescGenWin::GetEditorCtrl() { OTableDesignView* pDesignWin = static_cast<OTableDesignView*>(GetParent()->GetParent()->GetParent()); return pDesignWin->GetEditorCtrl(); } -#endif void OFieldDescGenWin::SaveData( OFieldDescription* pFieldDescr ) { m_pFieldControl->SaveData(pFieldDescr); diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx index 04011c61c340..15eed590dbb5 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx @@ -50,9 +50,8 @@ namespace dbaui void SetControlText( sal_uInt16 nControlId, const OUString& rText ); OUString GetControlText( sal_uInt16 nControlId ); void SetReadOnly( bool bReadOnly ); -#if OSL_DEBUG_LEVEL > 0 OTableEditorCtrl* GetEditorCtrl(); -#endif + // short GetFormatCategory(OFieldDescription* pFieldDescr); // gives you one of the CAT_xxx-values (CAT_NUMBER, CAT_DATE ...) belonging to the format specified by the field diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx index 99ca9991ea13..263e8e0e8852 100644 --- a/dtrans/source/win32/clipb/MtaOleClipb.cxx +++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx @@ -709,10 +709,7 @@ void CMtaOleClipboard::createMtaOleReqWnd( ) unsigned int CMtaOleClipboard::run( ) { - #if OSL_DEBUG_LEVEL > 0 - HRESULT hr = - #endif - OleInitialize( NULL ); + HRESULT hr = OleInitialize( NULL ); OSL_ASSERT( SUCCEEDED( hr ) ); createMtaOleReqWnd( ); diff --git a/dtrans/source/win32/dtobj/APNDataObject.cxx b/dtrans/source/win32/dtobj/APNDataObject.cxx index 4de3f3e579c7..d0ecbefde3a8 100644 --- a/dtrans/source/win32/dtobj/APNDataObject.cxx +++ b/dtrans/source/win32/dtobj/APNDataObject.cxx @@ -77,9 +77,7 @@ CAPNDataObject::CAPNDataObject( IDataObjectPtr rIDataObject ) : { OSL_FAIL("marshalling failed"); - #if OSL_DEBUG_LEVEL > 0 HGLOBAL hGlobal = - #endif GlobalFree(m_hGlobal); OSL_ENSURE(NULL == hGlobal, "GlobalFree failed"); m_hGlobal = NULL; diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 060fd80c76c1..43a3877543fd 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -396,8 +396,10 @@ void TextConvWrapper::ReplaceUnit( if (pNewUnitLanguage) { +#ifdef DBG_UTIL DBG_ASSERT(!IsSimilarChinese( *pNewUnitLanguage, nOldLang ), "similar language should not be changed!"); +#endif SetLanguageAndFont( aNewSel, *pNewUnitLanguage, EE_CHAR_LANGUAGE_CJK, GetTargetFont(), EE_CHAR_FONTINFO_CJK ); } diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index b77aeec9ae0b..5ff05a1719dd 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -679,10 +679,7 @@ namespace editeng } else { -#ifdef DBG_UTIL - const bool bCompletelyDone = -#endif - ContinueConversion( false ); + const bool bCompletelyDone = ContinueConversion( false ); DBG_ASSERT( bCompletelyDone, "HangulHanjaConversion_Impl::DoDocumentConversion: ContinueConversion should have returned true here!" ); } } 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 diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index a44e8d5086b8..0fb0173a3534 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -1253,7 +1253,9 @@ void FilterCache::impl_validateAndOptimize() "filter configuration: " + sLogOut, css::uno::Reference< css::uno::XInterface >(), sLogOut); +#if OSL_DEBUG_LEVEL > 0 OSL_ENSURE(!nWarnings, OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); +#endif // <- SAFE } diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 7aee58480d35..afd728eb411a 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -168,11 +168,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::be return false; } } -#if OSL_DEBUG_LEVEL > 0 catch( const Exception& e ) -#else - catch( const Exception& ) -#endif { if (xStatusIndicator.is()) xStatusIndicator->end(); @@ -290,11 +286,7 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star::be return false; } } -#if OSL_DEBUG_LEVEL > 0 catch( const Exception& exE ) -#else - catch( const Exception& ) -#endif { OSL_FAIL( OUStringToOString( exE.Message, RTL_TEXTENCODING_ASCII_US).getStr()); if (xStatusIndicator.is()) diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 09b66fbc2d5c..82d1d7dc9d4a 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -402,11 +402,7 @@ namespace XSLT m_tcontrol->terminate(); return !m_bError; } -#if OSL_DEBUG_LEVEL > 0 catch( const Exception& exc) -#else - catch (const Exception&) -#endif { // something went wrong OSL_FAIL(OUStringToOString(exc.Message, RTL_TEXTENCODING_ASCII_US).getStr()); diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 944374e1ed2d..94c7e5f43841 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -97,9 +97,9 @@ sal_Int32 getColumnTypeByModelName(const OUString& aModelName) sal_Int32 nPrefixPos = aModelName.indexOf(aModelPrefix); #ifdef DBG_UTIL sal_Int32 nCompatiblePrefixPos = aModelName.indexOf(aCompatibleModelPrefix); -#endif DBG_ASSERT( (nPrefixPos != -1) || (nCompatiblePrefixPos != -1), "::getColumnTypeByModelName() : wrong servivce !"); +#endif OUString aColumnType = (nPrefixPos != -1) ? aModelName.copy(aModelPrefix.getLength()) diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index b770a5f0e129..aac04be88707 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -878,7 +878,9 @@ namespace frm bool FormOperations::impl_commitCurrentRecord_throw( sal_Bool* _pRecordInserted ) const { +#ifdef DBG_UTIL DBG_ASSERT( m_nMethodNestingLevel, "FormOperations::impl_commitCurrentRecord_throw: to be called within a MethodGuard'ed section only!" ); +#endif if ( !impl_hasCursor_nothrow() ) return false; @@ -911,7 +913,9 @@ namespace frm bool FormOperations::impl_commitCurrentControl_throw() const { +#ifdef DBG_UTIL DBG_ASSERT( m_nMethodNestingLevel, "FormOperations::impl_commitCurrentControl_throw: to be called within a MethodGuard'ed section only!" ); +#endif OSL_PRECOND( m_xController.is(), "FormOperations::commitCurrentControl: no controller!" ); if ( !m_xController.is() ) return false; diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx index ee443fdbaa85..04cd4ac290df 100644 --- a/forms/source/xforms/propertysetbase.cxx +++ b/forms/source/xforms/propertysetbase.cxx @@ -123,10 +123,8 @@ void PropertySetBase::initializePropertyValueCache( sal_Int32 nHandle ) Any aCurrentValue; getFastPropertyValue( aCurrentValue, nHandle ); -#if OSL_DEBUG_LEVEL > 0 ::std::pair< PropertyValueCache::iterator, bool > aInsertResult = -#endif - m_aCache.insert( PropertyValueCache::value_type( nHandle, aCurrentValue ) ); + m_aCache.insert( PropertyValueCache::value_type( nHandle, aCurrentValue ) ); OSL_ENSURE( aInsertResult.second, "PropertySetBase::initializePropertyValueCache: already cached a value for this property!" ); } diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index 170f12785ab2..804850696577 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -459,10 +459,8 @@ namespace svt continue; } -#ifdef DBG_UTIL bool bKnownSetting = -#endif - implHandleInitializationArgument( sSettingName, aSettingValue ); + implHandleInitializationArgument( sSettingName, aSettingValue ); DBG_ASSERT( bKnownSetting, ( OString( "OCommonPicker::initialize: unknown argument \"" ) += OString( sSettingName.getStr(), sSettingName.getLength(), osl_getThreadTextEncoding() ) diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 642028867d69..55c7f2789f72 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -266,9 +266,6 @@ void SvtExpFileDlg_Impl::SetStandardDir( const OUString& _rDir ) _aStdDir = "file:///"; } - -#if defined DBG_UTIL - namespace { OUString lcl_DecoratedFilter( const OUString& _rOriginalFilter ) { @@ -279,8 +276,6 @@ namespace { return aDecoratedFilter.makeStringAndClear(); } } -#endif - void SvtExpFileDlg_Impl::ClearFilterList( ) { diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx index 6f0ed999beac..0d2ebf4ee9a7 100644 --- a/fpicker/source/win32/filepicker/dibpreview.cxx +++ b/fpicker/source/win32/filepicker/dibpreview.cxx @@ -236,11 +236,7 @@ void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC) int nX = abs(nWidth - cxDib) / 2; int nY = abs(nHeight - cyDib) / 2; -#if OSL_DEBUG_LEVEL > 0 - int GDIError = GDI_ERROR; - GDIError = -#endif - StretchDIBits( + int GDIError = StretchDIBits( hDC, nX, nY, cxDib, cyDib, 0, 0, cxDib, cyDib, pBits, pbmi, DIB_RGB_COLORS, SRCCOPY); diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h index 31b036d4054d..564ebc0e9b76 100644 --- a/include/osl/diagnose.h +++ b/include/osl/diagnose.h @@ -96,16 +96,10 @@ #define OSL_TRACE(...) \ SAL_DETAIL_INFO_IF_FORMAT(OSL_DEBUG_LEVEL > 0, "legacy.osl", __VA_ARGS__) -#if OSL_DEBUG_LEVEL > 0 #define OSL_ASSERT(c) \ SAL_DETAIL_WARN_IF_FORMAT(!(c), "legacy.osl", "OSL_ASSERT: %s", #c) #define OSL_ENSURE(c, m) SAL_DETAIL_WARN_IF_FORMAT(!(c), "legacy.osl", "%s", m) #define OSL_FAIL(m) SAL_DETAIL_WARN_IF_FORMAT(sal_True, "legacy.osl", "%s", m) -#else -#define OSL_ASSERT(c) ((void) 0) -#define OSL_ENSURE(c, m) ((void) 0) -#define OSL_FAIL(m) ((void) 0) -#endif #define OSL_VERIFY(c) do { if (!(c)) OSL_ASSERT(0); } while (0) #define OSL_PRECOND(c, m) OSL_ENSURE(c, m) diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx index cec35e3e5d98..65fd18b93582 100644 --- a/include/tools/debug.hxx +++ b/include/tools/debug.hxx @@ -101,15 +101,6 @@ inline void DbgSetTestSolarMutex( DbgTestSolarMutexProc pProc ) DbgFunc( DBG_FUNC_SETTESTSOLARMUTEX, reinterpret_cast<void*>(reinterpret_cast<sal_uIntPtr>(pProc)) ); } -#define DBG_ASSERTWARNING( sCon, aWarning ) \ - SAL_DETAIL_INFO_IF_FORMAT(!(sCon), "legacy.tools", "%s", aWarning) - -#define DBG_ASSERT( sCon, aError ) \ - SAL_DETAIL_WARN_IF_FORMAT(!(sCon), "legacy.tools", "%s", aError) - -#define DBG_WARNING( aWarning ) \ - SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", "%s", aWarning) - #define DBG_TESTSOLARMUTEX() \ do \ { \ @@ -119,14 +110,19 @@ do \ #else // NO DBG_UITL -#define DBG_ASSERTWARNING( sCon, aWarning ) ((void)0) -#define DBG_ASSERT( sCon, aError ) ((void)0) -#define DBG_WARNING( aWarning ) ((void)0) - #define DBG_TESTSOLARMUTEX() ((void)0) #endif +#define DBG_ASSERTWARNING( sCon, aWarning ) \ + SAL_DETAIL_INFO_IF_FORMAT(!(sCon), "legacy.tools", "%s", aWarning) + +#define DBG_ASSERT( sCon, aError ) \ + SAL_DETAIL_WARN_IF_FORMAT(!(sCon), "legacy.tools", "%s", aError) + +#define DBG_WARNING( aWarning ) \ + SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", "%s", aWarning) + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index da9647fa54c5..9caa83916df8 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -198,9 +198,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe case TypeClass_BOOLEAN: // sal_Bool { bool bValue(false); - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif ::sax::Converter::convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("OXMLControlProperty::convertString: could not convert \""). @@ -213,9 +211,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe case TypeClass_LONG: // sal_Int32 { // it's a real int32/16 property sal_Int32 nValue(0); - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif ::sax::Converter::convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("OXMLControlProperty::convertString: could not convert \""). @@ -235,9 +231,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe case TypeClass_DOUBLE: { double nValue = 0.0; - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("OXMLControlProperty::convertString: could not convert \""). @@ -266,10 +260,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe { // first extract the double double nValue = 0; - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif - ::sax::Converter::convertDouble(nValue, _rReadCharacters); + ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("OPropertyImport::convertString: could not convert \""). append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index 5923a5aa78e1..ed0484bc90d9 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -72,19 +72,14 @@ OReportExchange::TSectionElements OReportExchange::extractCopies(const Transfera { // extract the any from the transferable datatransfer::DataFlavor aFlavor; -#if OSL_DEBUG_LEVEL > 0 bool bSuccess = -#endif - SotExchange::GetFormatDataFlavor(nKnownFormatId, aFlavor); + SotExchange::GetFormatDataFlavor(nKnownFormatId, aFlavor); OSL_ENSURE(bSuccess, "OReportExchange::extractCopies: invalid data format (no flavor)!"); uno::Any aDescriptor = _rData.GetAny(aFlavor, OUString()); TSectionElements aCopies; -#if OSL_DEBUG_LEVEL > 0 - bSuccess = -#endif - aDescriptor >>= aCopies; + bSuccess = aDescriptor >>= aCopies; OSL_ENSURE(bSuccess, "OReportExchange::extractCopies: invalid clipboard format!"); // build the real descriptor diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c index 7d19974276f8..a9058fe9b580 100644 --- a/sal/osl/w32/security.c +++ b/sal/osl/w32/security.c @@ -100,10 +100,7 @@ oslSecurityError SAL_CALL osl_loginUser( rtl_uString *strUserName, rtl_uString * sal_Unicode* strUser; sal_Unicode* strDomain = _wcsdup(rtl_uString_getStr(strUserName)); HANDLE hUserToken; - - #if OSL_DEBUG_LEVEL > 0 - LUID luid; - #endif + LUID luid; if (NULL != (strUser = wcschr(strDomain, L'/'))) *strUser++ = L'\0'; @@ -115,6 +112,7 @@ oslSecurityError SAL_CALL osl_loginUser( rtl_uString *strUserName, rtl_uString * // this process must have the right: 'act as a part of operatingsystem' OSL_ASSERT(LookupPrivilegeValue(NULL, SE_TCB_NAME, &luid)); + (void) luid; if (LogonUserW(strUser, strDomain ? strDomain : L"", rtl_uString_getStr(strPasswd), LOGON32_LOGON_INTERACTIVE, LOGON32_PROVIDER_DEFAULT, diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 8b077f11360d..835ba489a6c6 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -1956,10 +1956,7 @@ void Converter::encodeBase64(OUStringBuffer& aStrBuffer, const uno::Sequence<sal void Converter::decodeBase64(uno::Sequence<sal_Int8>& aBuffer, const OUString& sBuffer) { -#if OSL_DEBUG_LEVEL > 0 - sal_Int32 nCharsDecoded = -#endif - decodeBase64SomeChars( aBuffer, sBuffer ); + sal_Int32 nCharsDecoded = decodeBase64SomeChars( aBuffer, sBuffer ); OSL_ENSURE( nCharsDecoded == sBuffer.getLength(), "some bytes left in base64 decoding!" ); } diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index f064f65c4fbd..ce3dc9129e47 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -1951,9 +1951,7 @@ double ScInterpreter::GetHypGeomDist( double x, double n, double M, double N ) fCDenomVarLower = N - n - 2.0*(M - x) + 1.0; } -#if OSL_DEBUG_LEVEL > 0 double fCNumLower = N - n - fCNumVarUpper; -#endif double fCDenomUpper = N - n - M + x + 1.0 - fCDenomVarLower; double fDNumVarLower = n - M; diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index e274f0370a49..a186e7a47fb1 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1565,10 +1565,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, if (pMySheet) { // A stylesheet of the same name already exists -> overwrite contents -#ifdef DBG_UTIL - bool bTest = -#endif - pMySheet->SetName(pHisSheet->GetName()); + bool bTest = pMySheet->SetName(pHisSheet->GetName()); DBG_ASSERT(bTest, "Renaming StyleSheet failed."); pMySheet->GetItemSet().ClearItem(0); // Delete all diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index c2be4751a2f8..4e97ce2ca5f4 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -917,9 +917,7 @@ void SlotManager::RenameSlide() aNameDlg->GetName( aNewName ); if (aNewName != aPageName) { -#ifdef DBG_UTIL bool bResult = -#endif RenameSlideFromDrawViewShell( pSelectedPage->GetPageNum()/2, aNewName ); DBG_ASSERT( bResult, "Couldn't rename slide" ); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 83262d4999c7..00d4a19780ed 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -442,10 +442,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) aNameDlg->GetName( aNewName ); if (aNewName != aPageName) { -#ifdef DBG_UTIL - bool bResult = -#endif - RenameSlide( nPageId, aNewName ); + bool bResult = RenameSlide( nPageId, aNewName ); DBG_ASSERT( bResult, "Couldn't rename slide" ); } } diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 29e388d34ea0..79a022b9be14 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -425,10 +425,7 @@ void View::DragFinished( sal_Int8 nDropAction ) if( pObj && pObj->GetPage() ) { const size_t nOrdNum = pObj->GetOrdNumDirect(); -#ifdef DBG_UTIL - SdrObject* pChkObj = -#endif - pObj->GetPage()->RemoveObject(nOrdNum); + SdrObject* pChkObj = pObj->GetPage()->RemoveObject(nOrdNum); DBG_ASSERT(pChkObj==pObj,"pChkObj!=pObj in RemoveObject()"); } } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index cfaa651a887b..8f7c300197db 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -3223,10 +3223,8 @@ bool SfxObjectShell::SaveCompleted( const uno::Reference< embed::XStorage >& xSt bool bSendNotification = false; uno::Reference< embed::XStorage > xOldStorageHolder; -#ifdef DBG_UTIL // check for wrong creation of object container bool bHasContainer = ( pImp->mpObjectContainer != 0 ); -#endif if ( !xStorage.is() || xStorage == GetStorage() ) { @@ -3273,7 +3271,6 @@ bool SfxObjectShell::SaveCompleted( const uno::Reference< embed::XStorage >& xSt return bResult; } -#if OSL_DEBUG_LEVEL > 0 bool StoragesOfUnknownMediaTypeAreCopied_Impl( const uno::Reference< embed::XStorage >& xSource, const uno::Reference< embed::XStorage >& xTarget ) { @@ -3365,15 +3362,12 @@ bool StoragesOfUnknownMediaTypeAreCopied_Impl( const uno::Reference< embed::XSto return true; } -#endif bool SfxObjectShell::SwitchPersistance( const uno::Reference< embed::XStorage >& xStorage ) { bool bResult = false; -#ifdef DBG_UTIL // check for wrong creation of object container bool bHasContainer = ( pImp->mpObjectContainer != 0 ); -#endif if ( xStorage.is() ) { if ( pImp->mpObjectContainer ) 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()); } diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 953da657ef91..78c8d64c0056 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -615,11 +615,7 @@ BaseStorage* Storage::OpenStorage( const OUString& rName, StreamMode m, bool bDi // Open a stream BaseStorageStream* Storage::OpenStream( const OUString& rName, StreamMode m, bool, - const OString* -#ifdef DBG_UTIL - pB -#endif -) + const OString* pB ) { DBG_ASSERT(!pB, "Encryption not supported"); diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index d5bcc71cc4cf..ef6c7fe61ba3 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -218,11 +218,7 @@ SfxVoidItem::SfxVoidItem( const SfxVoidItem& rCopy): } -bool SfxVoidItem::operator==( const SfxPoolItem& -#ifdef DBG_UTIL -rCmp -#endif -) const +bool SfxVoidItem::operator==( const SfxPoolItem& rCmp ) const { DBG_ASSERT( SfxPoolItem::operator==( rCmp ), "unequal type" ); return true; diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 25ba86dd40f2..3199e420a3de 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -140,9 +140,7 @@ Result normalizePrefix( css::uno::Reference< css::ucb::XUniversalContentBroker > return GeneralFailure; } try { - #if OSL_DEBUG_LEVEL > 0 bool ok = - #endif (css::uno::Reference< css::ucb::XCommandProcessor >( content, css::uno::UNO_QUERY_THROW)->execute( css::ucb::Command("getCasePreservingURL", diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index 8a659ee6d06f..b349391b7668 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -91,11 +91,7 @@ void EditBrowseBox::implCreateActiveAccessible( ) } -Reference< XAccessible > EditBrowseBox::CreateAccessibleControl( sal_Int32 -#ifdef DBG_UTIL -_nIndex -#endif -) +Reference< XAccessible > EditBrowseBox::CreateAccessibleControl( sal_Int32 _nIndex ) { DBG_ASSERT( 0 == _nIndex, "EditBrowseBox::CreateAccessibleControl: invalid index!" ); diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index f6aa81e1a842..6ef5342828ae 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -985,10 +985,7 @@ void SvImpLBox::MakeVisible( SvTreeListEntry* pEntry, bool bMoveToTop ) { if( !pView->IsExpanded( pParent ) ) { - #ifdef DBG_UTIL - bool bRet = - #endif - pView->Expand( pParent ); + bool bRet = pView->Expand( pParent ); DBG_ASSERT(bRet,"Not expanded!"); } pParent = pView->GetParent( pParent ); diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 3d2c79852041..059c4630743f 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -1338,9 +1338,7 @@ void SvListView::Impl::ActionInserted( SvTreeListEntry* pEntry ) DBG_ASSERT(pEntry,"Insert:No Entry"); SvViewDataEntry* pData = m_rThis.CreateViewData( pEntry ); m_rThis.InitViewData( pData, pEntry ); - #ifdef DBG_UTIL std::pair<SvDataTable::iterator, bool> aSuccess = - #endif m_DataTable.insert( pEntry, pData ); DBG_ASSERT(aSuccess.second,"Entry already in View"); if (m_nVisibleCount && m_rThis.pModel->IsEntryVisible(&m_rThis, pEntry)) diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index c3d531a6550e..3ee959abae7e 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -580,21 +580,12 @@ bool SvTreeListBox::CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 nActi 3. target is a collapsed parent - entry is inserted at the end of the target childlist */ -#ifdef DBG_UTIL TriState SvTreeListBox::NotifyMoving( SvTreeListEntry* pTarget, // D&D dropping position in this->GetModel() SvTreeListEntry* pEntry, // entry that we want to move, from // GetSourceListBox()->GetModel() SvTreeListEntry*& rpNewParent, // new target parent sal_uLong& rNewChildPos) // position in childlist of target parent -#else -TriState SvTreeListBox::NotifyMoving( - SvTreeListEntry* pTarget, // D&D dropping position in this->GetModel() - SvTreeListEntry*, // entry that we want to move, from - // GetSourceListBox()->GetModel() - SvTreeListEntry*& rpNewParent, // new target parent - sal_uLong& rNewChildPos) // position in childlist of target parent -#endif { DBG_ASSERT(pEntry,"NotifyMoving:SoureEntry?"); if( !pTarget ) diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index d9d5652502ad..6c079e0fc71c 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -33,11 +33,7 @@ void AsynchronLink::CreateMutex() if( !_pMutex ) _pMutex = new osl::Mutex; } -void AsynchronLink::Call( void* pObj, bool -#ifdef DBG_UTIL -bAllowDoubles -#endif -, bool bUseTimer ) +void AsynchronLink::Call( void* pObj, bool bAllowDoubles, bool bUseTimer ) { #ifdef DBG_UTIL if ( bUseTimer || !_bInCall ) diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 88f079a38274..d6337762a731 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -400,10 +400,8 @@ void AssignmentPersistentData::ImplCommit() aNewFieldDescription[1].Value <<= _rAssignment; // just set the new value -#ifdef DBG_UTIL bool bSuccess = -#endif - SetSetProperties(sDescriptionNodePath, aNewFieldDescription); + SetSetProperties(sDescriptionNodePath, aNewFieldDescription); DBG_ASSERT(bSuccess, "AssignmentPersistentData::setFieldAssignment: could not commit the changes a field!"); } diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index 00f15e585f63..602024e34c03 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -406,10 +406,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak ) OUString sSave( aToken ); nNextCh = '\\'; - #ifdef DBG_UTIL - int nToken = - #endif - _GetNextToken(); + int nToken = _GetNextToken(); DBG_ASSERT( RTF_U == nToken, "doch kein UNI-Code Zeichen" ); // dont convert symbol chars aStrBuffer.append(static_cast< sal_Unicode >(nTokenValue)); diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index 3fae5f21d0ac..7489dfbfa315 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -179,30 +179,21 @@ namespace { { if (aVal.Name == "DataSource") { -#if OSL_DEBUG_LEVEL > 0 - bool bSuccess = -#endif - aVal.Value >>= m_xDataSource; + bool bSuccess = aVal.Value >>= m_xDataSource; OSL_ENSURE( bSuccess, "OAddressBookSourceDialogUno::implInitialize: invalid type for DataSource!" ); return; } if (aVal.Name == "DataSourceName") { -#if OSL_DEBUG_LEVEL > 0 - bool bSuccess = -#endif - aVal.Value >>= m_sDataSourceName; + bool bSuccess = aVal.Value >>= m_sDataSourceName; OSL_ENSURE( bSuccess, "OAddressBookSourceDialogUno::implInitialize: invalid type for DataSourceName!" ); return; } if (aVal.Name == "Command") { -#if OSL_DEBUG_LEVEL > 0 - bool bSuccess = -#endif - aVal.Value >>= m_sTable; + bool bSuccess = aVal.Value >>= m_sTable; OSL_ENSURE( bSuccess, "OAddressBookSourceDialogUno::implInitialize: invalid type for Command!" ); return; } diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 270e41a6a53f..cc49e5c252d5 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -267,20 +267,15 @@ namespace svx // extract the any from the transferable DataFlavor aFlavor; -#if OSL_DEBUG_LEVEL > 0 bool bSuccess = -#endif - SotExchange::GetFormatDataFlavor(getDescriptorFormatId(), aFlavor); + SotExchange::GetFormatDataFlavor(getDescriptorFormatId(), aFlavor); OSL_ENSURE(bSuccess, "OColumnTransferable::extractColumnDescriptor: invalid data format (no flavor)!"); Any aDescriptor = _rData.GetAny(aFlavor, OUString()); // extract the property value sequence Sequence< PropertyValue > aDescriptorProps; -#if OSL_DEBUG_LEVEL > 0 - bSuccess = -#endif - aDescriptor >>= aDescriptorProps; + bSuccess = aDescriptor >>= aDescriptorProps; OSL_ENSURE(bSuccess, "OColumnTransferable::extractColumnDescriptor: invalid clipboard format!"); // build the real descriptor @@ -511,20 +506,15 @@ namespace svx { // extract the any from the transferable DataFlavor aFlavor; -#if OSL_DEBUG_LEVEL > 0 bool bSuccess = -#endif - SotExchange::GetFormatDataFlavor(nKnownFormatId, aFlavor); + SotExchange::GetFormatDataFlavor(nKnownFormatId, aFlavor); OSL_ENSURE(bSuccess, "OColumnTransferable::extractColumnDescriptor: invalid data format (no flavor)!"); Any aDescriptor = _rData.GetAny(aFlavor, OUString()); // extract the property value sequence Sequence< PropertyValue > aDescriptorProps; -#if OSL_DEBUG_LEVEL > 0 - bSuccess = -#endif - aDescriptor >>= aDescriptorProps; + bSuccess = aDescriptor >>= aDescriptorProps; OSL_ENSURE(bSuccess, "OColumnTransferable::extractColumnDescriptor: invalid clipboard format!"); // build the real descriptor @@ -669,10 +659,8 @@ namespace svx { // extract the any from the transferable DataFlavor aFlavor; -#if OSL_DEBUG_LEVEL > 0 bool bSuccess = -#endif - SotExchange::GetFormatDataFlavor(getDescriptorFormatId(), aFlavor); + SotExchange::GetFormatDataFlavor(getDescriptorFormatId(), aFlavor); OSL_ENSURE(bSuccess, "OColumnTransferable::extractColumnDescriptor: invalid data format (no flavor)!"); _rData.GetAny(aFlavor, OUString()) >>= aList; diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 38d4a1e0d4c3..04e7698bb3cd 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -121,20 +121,15 @@ namespace svx // extract the any from the transferable DataFlavor aFlavor; -#if OSL_DEBUG_LEVEL > 0 bool bSuccess = -#endif - SotExchange::GetFormatDataFlavor(getDescriptorFormatId(bForm), aFlavor); + SotExchange::GetFormatDataFlavor(getDescriptorFormatId(bForm), aFlavor); OSL_ENSURE(bSuccess, "OComponentTransferable::extractColumnDescriptor: invalid data format (no flavor)!"); Any aDescriptor = _rData.GetAny(aFlavor, OUString()); // extract the property value sequence Sequence< PropertyValue > aDescriptorProps; -#if OSL_DEBUG_LEVEL > 0 - bSuccess = -#endif - aDescriptor >>= aDescriptorProps; + bSuccess = aDescriptor >>= aDescriptorProps; OSL_ENSURE(bSuccess, "OComponentTransferable::extractColumnDescriptor: invalid clipboard format!"); // build the real descriptor diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 3607211f467b..18fb327295aa 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -3550,9 +3550,7 @@ void DbGridControl::DisconnectFromFields() ColumnFieldValueListeners* pListeners = static_cast<ColumnFieldValueListeners*>(m_pFieldListeners); while (!pListeners->empty()) { -#ifdef DBG_UTIL sal_Int32 nOldSize = pListeners->size(); -#endif pListeners->begin()->second->dispose(); DBG_ASSERT(nOldSize > (sal_Int32)pListeners->size(), "DbGridControl::DisconnectFromFields : dispose on a listener should result in a removal from my list !"); } diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 1956e278d204..39868ffb1a55 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -264,17 +264,11 @@ namespace return; } - #if OSL_DEBUG_LEVEL > 0 Any aOldAssignment = - #endif _map->remove( makeAny( xControlModel ) ); - #if OSL_DEBUG_LEVEL > 0 - (void)aOldAssignment; - #endif OSL_ENSURE( !i_ignoreNonExistence || ( aOldAssignment == makeAny( Reference< XControlShape >( const_cast< FmFormObj& >( _object ).getUnoShape(), UNO_QUERY ) ) ), "lcl_removeFormObject: map was inconsistent!" ); - (void)i_ignoreNonExistence; } } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index a1f49fb34a13..dbc3b2e6dcae 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -103,10 +103,8 @@ namespace svxform Reference< XInterface > xNormalizedModel( pFormObject->GetUnoControlModel(), UNO_QUERY ); // note that this is normalized (i.e. queried for XInterface explicitly) -#ifdef DBG_UTIL ::std::pair< MapModelToShape::iterator, bool > aPos = -#endif - _rMapping.insert( ModelShapePair( xNormalizedModel, pSdrObject ) ); + _rMapping.insert( ModelShapePair( xNormalizedModel, pSdrObject ) ); DBG_ASSERT( aPos.second, "collectShapeModelMapping: model was already existent!" ); // if this asserts, this would mean we have 2 shapes pointing to the same model } @@ -947,13 +945,17 @@ namespace svxform if ( DND_ACTION_COPY == _nAction ) { // bHasHiddenControlsFormat means that only hidden controls are part of the data +#ifdef DBG_UTIL DBG_ASSERT( bHasHiddenControlsFormat, "NavigatorTree::implExecuteDataTransfer: copy allowed for hidden controls only!" ); +#endif DBG_ASSERT( _pTargetEntry && ( _pTargetEntry != m_pRootEntry ) && IsFormEntry( _pTargetEntry ), "NavigatorTree::implExecuteDataTransfer: should not be here!" ); // implAcceptDataTransfer should have caught both cases +#ifdef DBG_UTIL DBG_ASSERT(bHasHiddenControlsFormat, "NavigatorTree::implExecuteDataTransfer: only copying of hidden controls is supported !"); // should be catched by AcceptDrop +#endif // because i want to select all targets (and only them) SelectAll(false); diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 069afe450f8e..e6ed8ef90413 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -785,10 +785,7 @@ void SdrUndoInsertObj::Undo() { ImplUnmarkObject( pObj ); -#ifdef DBG_UTIL - SdrObject* pChkObj= -#endif - pObjList->RemoveObject(nOrdNum); + SdrObject* pChkObj= pObjList->RemoveObject(nOrdNum); DBG_ASSERT(pChkObj==pObj,"UndoInsertObj: RemoveObjNum!=pObj"); } } @@ -1327,10 +1324,7 @@ void SdrUndoNewLayer::Undo() { DBG_ASSERT(!bItsMine,"SdrUndoNewLayer::Undo(): Layer already belongs to UndoAction."); bItsMine=true; -#ifdef DBG_UTIL - SdrLayer* pCmpLayer= -#endif - pLayerAdmin->RemoveLayer(nNum); + SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNum); DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoNewLayer::Undo(): Removed layer is != pLayer."); } @@ -1359,10 +1353,7 @@ void SdrUndoDelLayer::Redo() { DBG_ASSERT(!bItsMine,"SdrUndoDelLayer::Undo(): Layer already belongs to UndoAction."); bItsMine=true; -#ifdef DBG_UTIL - SdrLayer* pCmpLayer= -#endif - pLayerAdmin->RemoveLayer(nNum); + SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNum); DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoDelLayer::Redo(): Removed layer is != pLayer."); } @@ -1375,20 +1366,14 @@ OUString SdrUndoDelLayer::GetComment() const void SdrUndoMoveLayer::Undo() { -#ifdef DBG_UTIL - SdrLayer* pCmpLayer= -#endif - pLayerAdmin->RemoveLayer(nNeuPos); + SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNeuPos); DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoMoveLayer::Undo(): Removed layer is != pLayer."); pLayerAdmin->InsertLayer(pLayer,nNum); } void SdrUndoMoveLayer::Redo() { -#ifdef DBG_UTIL - SdrLayer* pCmpLayer= -#endif - pLayerAdmin->RemoveLayer(nNum); + SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNum); DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoMoveLayer::Redo(): Removed layer is != pLayer."); pLayerAdmin->InsertLayer(pLayer,nNeuPos); } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 549c3e7dfb57..94ceb4350359 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -2182,9 +2182,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl SdrObjList* pObjList = mpObj->GetObjList(); if( pObjList ) { -#ifdef DBG_UTIL SdrObject* pCheck = -#endif pObjList->SetObjectOrdNum( mpObj->GetOrdNum(), static_cast<size_t>(nNewOrdNum) ); DBG_ASSERT( pCheck == mpObj.get(), "GetOrdNum() failed!" ); } diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index 15d522b8467d..81290dc4e980 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -141,10 +141,7 @@ void XTextRangeOrNodeIndexPosition::SetAsNodeIndex( // SwXTextRange -> PaM SwUnoInternalPaM aPaM(*pDoc); -#if OSL_DEBUG_LEVEL > 0 - bool bSuccess = -#endif - ::sw::XTextRangeToSwPaM(aPaM, rRange); + bool bSuccess = ::sw::XTextRangeToSwPaM(aPaM, rRange); OSL_ENSURE(bSuccess, "illegal range"); // PaM -> Index @@ -160,10 +157,7 @@ XTextRangeOrNodeIndexPosition::CopyPositionInto(SwPosition& rPos, SwDoc & rDoc) if (NULL == pIndex) { SwUnoInternalPaM aUnoPaM(rDoc); -#if OSL_DEBUG_LEVEL > 0 - bool bSuccess = -#endif - ::sw::XTextRangeToSwPaM(aUnoPaM, xRange); + bool bSuccess = ::sw::XTextRangeToSwPaM(aUnoPaM, xRange); OSL_ENSURE(bSuccess, "illegal range"); rPos = *aUnoPaM.GetPoint(); diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 069742a7efa4..f17066cc3af9 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -188,11 +188,7 @@ namespace toolkit } - void SAL_CALL OAccessibleControlContext::disposing( const EventObject& - #if OSL_DEBUG_LEVEL > 0 - _rSource - #endif - ) throw ( RuntimeException, std::exception ) + void SAL_CALL OAccessibleControlContext::disposing( const EventObject& _rSource ) throw ( RuntimeException, std::exception ) { OSL_ENSURE( Reference< XPropertySet >( _rSource.Source, UNO_QUERY ).get() == m_xControlModel.get(), "OAccessibleControlContext::disposing: where did this come from?" ); diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index eec07612f3f3..71b4d9266ce3 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -281,9 +281,11 @@ sal_uInt32 SvPersistStream::WriteDummyLen() sal_uInt32 n0 = 0; WriteUInt32( n0 ); // Because of Sun sp // Don't assert on stream error +#ifdef DBG_UTIL DBG_ASSERT( GetError() != SVSTREAM_OK || (sizeof( sal_uInt32 ) == Tell() -nPos), "No 4 byte as length parameter" ); +#endif return Tell(); } diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 8cda7c3bd8d2..c1d21dad9da1 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1623,7 +1623,9 @@ bool SvStream::SetStreamSize(sal_uInt64 const nSize) SetBufferSize( 0 ); SetSize( nSize ); SetBufferSize( nBuf ); +#ifdef DBG_UTIL DBG_ASSERT(Tell()==nFPos,"SetStreamSize failed"); +#endif return (nError == 0); } diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 2fb514da4df4..2c145b80b507 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -253,7 +253,6 @@ bool implMakeAbsoluteURL(OUString & _rsPathOrURL) return bURL && implEnsureAbsolute(_rsPathOrURL); } -#if OSL_DEBUG_LEVEL > 0 static PathStatus dbgCheckStatusOfURL(OUString const& _sURL) { @@ -264,8 +263,6 @@ PathStatus dbgCheckStatusOfURL(OUString const& _sURL) return implCheckStatusOfURL(_sURL,aDirItem); } -#endif - static PathStatus checkStatusAndNormalizeURL(OUString & _sURL) { diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx index c29dce82223c..16756c2fa3ca 100644 --- a/unotools/source/misc/sharedunocomponent.cxx +++ b/unotools/source/misc/sharedunocomponent.cxx @@ -158,11 +158,7 @@ namespace utl } } - void SAL_CALL CloseableComponentImpl::queryClosing( const EventObject& - #ifdef DBG_UTIL - Source - #endif - , sal_Bool /*GetsOwnership*/ ) throw (CloseVetoException, RuntimeException, std::exception) + void SAL_CALL CloseableComponentImpl::queryClosing( const EventObject& Source, sal_Bool /*GetsOwnership*/ ) throw (CloseVetoException, RuntimeException, std::exception) { // as long as we live, somebody wants to keep the object alive. So, veto the // closing @@ -170,11 +166,7 @@ namespace utl throw CloseVetoException(); } - void SAL_CALL CloseableComponentImpl::notifyClosing( const EventObject& - #ifdef DBG_UTIL - Source - #endif - ) throw (RuntimeException, std::exception) + void SAL_CALL CloseableComponentImpl::notifyClosing( const EventObject& Source ) throw (RuntimeException, std::exception) { DBG_ASSERT( Source.Source == m_xCloseable, "CloseableComponentImpl::notifyClosing: where did this come from?" ); @@ -184,11 +176,7 @@ namespace utl OSL_FAIL( "CloseableComponentImpl::notifyClosing: unreachable!" ); } - void SAL_CALL CloseableComponentImpl::disposing( const EventObject& - #ifdef DBG_UTIL - Source - #endif - ) throw (RuntimeException, std::exception) + void SAL_CALL CloseableComponentImpl::disposing( const EventObject& Source ) throw (RuntimeException, std::exception) { DBG_ASSERT( Source.Source == m_xCloseable, "CloseableComponentImpl::disposing: where did this come from?" ); OSL_FAIL( "CloseableComponentImpl::disposing: unreachable!" ); diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx index 0e93985a87b2..371f044633d5 100644 --- a/vcl/source/gdi/alpha.cxx +++ b/vcl/source/gdi/alpha.cxx @@ -106,11 +106,7 @@ bool AlphaMask::Replace( const Bitmap& rMask, sal_uInt8 cReplaceTransparency ) return bRet; } -bool AlphaMask::Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, sal_uLong -#ifdef DBG_UTIL -nTol -#endif -) +bool AlphaMask::Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, sal_uLong nTol ) { BitmapWriteAccess* pAcc = AcquireWriteAccess(); bool bRet = false; diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index c33ea387fcd3..87d9a3f9ae18 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -1360,8 +1360,10 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, sal_uInt32 nXAdd ) { OSL_ENSURE(mpScanline, "No Scanline allocated (!)"); OSL_ENSURE(mpScanlineAlpha, "No ScanlineAlpha allocated (!)"); +#if OSL_DEBUG_LEVEL > 0 OSL_ENSURE(mnAllocSizeScanline >= maOrigSize.Width() * 3, "Allocated Scanline too small (!)"); OSL_ENSURE(mnAllocSizeScanlineAlpha >= maOrigSize.Width(), "Allocated ScanlineAlpha too small (!)"); +#endif sal_uInt8* pScanline(mpScanline); sal_uInt8* pScanlineAlpha(mpScanlineAlpha); @@ -1495,7 +1497,9 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart, sal_uInt32 nXAdd ) if(bDoDirectScanline) { OSL_ENSURE(mpScanline, "No Scanline allocated (!)"); +#if OSL_DEBUG_LEVEL > 0 OSL_ENSURE(mnAllocSizeScanline >= maOrigSize.Width() * 3, "Allocated Scanline too small (!)"); +#endif sal_uInt8* pScanline(mpScanline); for (long nX(0); nX < maOrigSize.Width(); nX++, pTmp += 3) diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 2ea3e1c9fb51..42681731817d 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -1472,10 +1472,7 @@ static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, bool bAs HPEN hPen = NULL; HBRUSH hBrush = NULL; - #if OSL_DEBUG_LEVEL > 0 int oldCount = pSalData->mnCacheDCInUse; - (void)oldCount; - #endif // Release Cache DC if ( pThis->mpGraphics2 && diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 322d27cbe983..1e3e893d1b90 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -1097,11 +1097,7 @@ void XMLShapeImportHelper::startPage( com::sun::star::uno::Reference< com::sun:: } /** this method must be calling after the last shape is imported for the given page */ -void XMLShapeImportHelper::endPage( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& -#ifdef DBG_UTIL -rShapes -#endif -) +void XMLShapeImportHelper::endPage( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) { DBG_ASSERT( mpPageContext && (mpPageContext->mxShapes == rShapes), "wrong call to endPage(), no startPage called or wrong page" ); if( NULL == mpPageContext ) diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 374d2ba7dbe2..317afe6e1925 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -950,10 +950,12 @@ namespace xmloff #endif } + #if OSL_DEBUG_LEVEL > 0 OSL_ENSURE( 0 == nIncludeBinding, "OControlExport::exportBindingAtributes: forgot some flags!"); // in the debug version, we should have removed every bit we handled from the mask, so it should // be 0 now ... + #endif } void OControlExport::exportSpecialAttributes() @@ -1609,10 +1611,8 @@ namespace xmloff // for a list box, if the ListSourceType is VALUE_LIST, no ListSource is stored, but instead // a sequence of pairs which is build from the StringItemList and the ValueList ListSourceType eListSourceType = ListSourceType_VALUELIST; - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif - m_xProps->getPropertyValue(PROPERTY_LISTSOURCETYPE) >>= eListSourceType; + m_xProps->getPropertyValue(PROPERTY_LISTSOURCETYPE) >>= eListSourceType; OSL_ENSURE(bSuccess, "OControlExport::examineControl: could not retrieve the ListSourceType!"); if (ListSourceType_VALUELIST != eListSourceType) { diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index f69a4cf3b82f..859f1d0c9d13 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -936,10 +936,7 @@ namespace xmloff Property aProp = _rxPropInfo->getPropertyByName(_rPropValue.Name); // the untranslated string value as read in handleAttribute OUString sValue; - #if OSL_DEBUG_LEVEL > 0 - bool bSuccess = - #endif - _rPropValue.Value >>= sValue; + bool bSuccess = _rPropValue.Value >>= sValue; OSL_ENSURE(bSuccess, "OControlImport::implTranslateValueProperty: supposed to be called with non-translated string values!"); if (TypeClass_ANY == aProp.Type.getTypeClass()) diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index 634aba470eb6..9787b92e6a53 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -275,10 +275,7 @@ namespace xmloff return; } -#if OSL_DEBUG_LEVEL > 0 - bool bPageIsKnown = -#endif - implMoveIterators(_rxDrawPage, false); + bool bPageIsKnown = implMoveIterators(_rxDrawPage, false); OSL_ENSURE(bPageIsKnown, "OFormLayerXMLExport_Impl::exportForms: exporting a page which has not been examined!"); // export forms collection @@ -414,10 +411,7 @@ namespace xmloff } // move the iterator which specify the currently handled page -#if OSL_DEBUG_LEVEL > 0 - bool bPageIsKnown = -#endif - implMoveIterators(_rxDrawPage, true); + bool bPageIsKnown = implMoveIterators(_rxDrawPage, true); OSL_ENSURE(!bPageIsKnown, "OFormLayerXMLExport_Impl::examineForms: examining a page twice!"); ::std::stack< Reference< XIndexAccess > > aContainerHistory; @@ -752,10 +746,8 @@ namespace xmloff { Reference< XPropertySet > xProps( _rxControl, UNO_QUERY ); OSL_ENSURE( xProps.is(), "OFormLayerXMLExport_Impl::excludeFromExport: invalid control model!" ); -#if OSL_DEBUG_LEVEL > 0 ::std::pair< PropertySetBag::iterator, bool > aPos = -#endif - m_aIgnoreList.insert( xProps ); + m_aIgnoreList.insert( xProps ); OSL_ENSURE( aPos.second, "OFormLayerXMLExport_Impl::excludeFromExport: element already exists in the ignore list!" ); } diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 178104844698..d40003387a58 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -93,10 +93,8 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe case TypeClass_BOOLEAN: // sal_Bool { bool bValue; - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif - ::sax::Converter::convertBool(bValue, _rReadCharacters); + ::sax::Converter::convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("PropertyConversion::convertString: could not convert \""). append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). @@ -109,10 +107,8 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe if (!_pEnumMap) { // it's a real int32/16 property sal_Int32 nValue(0); - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif - ::sax::Converter::convertNumber(nValue, _rReadCharacters); + ::sax::Converter::convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("PropertyConversion::convertString: could not convert \""). append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). @@ -149,10 +145,8 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe case TypeClass_DOUBLE: { double nValue; - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif - ::sax::Converter::convertDouble(nValue, _rReadCharacters); + ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("PropertyConversion::convertString: could not convert \""). append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). @@ -177,10 +171,8 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe { // first extract the double double nValue = 0; - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif - ::sax::Converter::convertDouble(nValue, _rReadCharacters); + ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("PropertyConversion::convertString: could not convert \""). append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). @@ -315,11 +307,7 @@ bool OPropertyImport::encounteredAttribute(const OUString& _rAttributeName) cons return m_aEncounteredAttributes.end() != m_aEncounteredAttributes.find(_rAttributeName); } -void OPropertyImport::Characters(const OUString& -#if OSL_DEBUG_LEVEL > 0 -_rChars -#endif -) +void OPropertyImport::Characters(const OUString& _rChars ) { // ignore them (should be whitespaces only) OSL_ENSURE(_rChars.trim().isEmpty(), "OPropertyImport::Characters: non-whitespace characters!"); diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 94049faab795..ba6fd6bdd881 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -899,11 +899,7 @@ void XMLSectionExport::ExportBaseIndexSource( void XMLSectionExport::ExportBaseIndexBody( - SectionTypeEnum - #if OSL_DEBUG_LEVEL > 0 - eType - #endif - , + SectionTypeEnum eType, const Reference<XPropertySet> &) { // type not used; checked anyway. diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx index 24611fee23e0..9b878ef3ebd7 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx @@ -47,11 +47,7 @@ void XMLSectionFootnoteConfigExport::exportXML( SvXMLExport& rExport, bool bEndnote, const vector<XMLPropertyState> *pProperties, - sal_uInt32 - #ifdef DBG_UTIL - nIdx - #endif - , + sal_uInt32 nIdx, const rtl::Reference<XMLPropertySetMapper> & rMapper) { // store and initialize the values diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index adfcb3554e68..20c9a96a6369 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -191,11 +191,7 @@ static const SvXMLTokenMapEntry aTypes[] = }; sal_uInt16 xforms_getTypeClass( - const Reference<XDataTypeRepository>& - #ifdef DBG_UTIL - xRepository - #endif - , + const Reference<XDataTypeRepository>& xRepository, const SvXMLNamespaceMap& rNamespaceMap, const OUString& rXMLName ) { |