diff options
39 files changed, 32 insertions, 63 deletions
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index d3b47210d0ea..8950a98516ee 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -32,7 +32,6 @@ #include <math.h> #include <svl/zforlist.hxx> -#include <tools/debug.hxx> #include "attrib.hxx" #include "cell.hxx" diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index 802eaf8d9066..3f128973ccc7 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -86,7 +86,7 @@ void NameBuffer::operator <<( const String &rNewString ) } -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 sal_uInt16 nShrCnt; #endif @@ -102,7 +102,7 @@ ShrfmlaBuffer::ShrfmlaBuffer( RootData* pRD ) : ExcRoot( pRD ), mnCurrIdx (nBase) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 nShrCnt = 0; #endif } diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 7678c119c7b5..d968d62cddec 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -320,7 +320,7 @@ void TokenPool::GetElement( const sal_uInt16 nId ) { switch( pType[ nId ] ) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 case T_Id: OSL_FAIL( "-TokenPool::GetElement(): hier hast Du nichts zu suchen!" ); break; @@ -425,7 +425,7 @@ void TokenPool::GetElement( const sal_uInt16 nId ) void TokenPool::GetElementRek( const sal_uInt16 nId ) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 nRek++; OSL_ENSURE( nRek <= nP_Id, "*TokenPool::GetElement(): Rekursion loopt!?" ); #endif @@ -541,7 +541,7 @@ void TokenPool::GetElementRek( const sal_uInt16 nId ) } -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 nRek--; #endif } diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index a6a502d4fba9..74117e60ea2e 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -187,7 +187,7 @@ void XclExpString::AppendByte( sal_Unicode cChar, rtl_TextEncoding eTextEnc ) void XclExpString::SetFormats( const XclFormatRunVec& rFormats ) { maFormats = rFormats; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 if( IsRich() ) { XclFormatRunVec::const_iterator aCurr = maFormats.begin(); diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 8846c5e1cef3..d7ac673e2568 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2131,7 +2131,7 @@ XclExpStyle::XclExpStyle( sal_uInt32 nXFId, const String& rStyleName ) : mnLevel( EXC_STYLE_NOLEVEL ) { OSL_ENSURE( maName.Len(), "XclExpStyle::XclExpStyle - empty style name" ); -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 sal_uInt8 nStyleId, nLevel; // do not use members for debug tests OSL_ENSURE( !XclTools::GetBuiltInStyleId( nStyleId, nLevel, maName ), "XclExpStyle::XclExpStyle - this is a built-in style" ); diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index a6e3ea0d1406..7b6f24a23241 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -76,7 +76,7 @@ using namespace ::com::sun::star; // Global data ================================================================ -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 XclDebugObjCounter::~XclDebugObjCounter() { OSL_ENSURE( mnObjCnt == 0, "XclDebugObjCounter::~XclDebugObjCounter - wrong root object count" ); @@ -174,7 +174,7 @@ XclRootData::~XclRootData() XclRoot::XclRoot( XclRootData& rRootData ) : mrData( rRootData ) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 ++mrData.mnObjCnt; #endif @@ -188,14 +188,14 @@ XclRoot::XclRoot( XclRootData& rRootData ) : XclRoot::XclRoot( const XclRoot& rRoot ) : mrData( rRoot.mrData ) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 ++mrData.mnObjCnt; #endif } XclRoot::~XclRoot() { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 --mrData.mnObjCnt; #endif } diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 29799635aa2b..082a77d24f43 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -29,7 +29,6 @@ #ifndef SC_XCLEXPCHANGETRACK_HXX #define SC_XCLEXPCHANGETRACK_HXX -#include <tools/debug.hxx> #include <tools/datetime.hxx> #include <rtl/uuid.h> #include "bigrange.hxx" diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx index 5d55ff2be99f..db56e096c07a 100644 --- a/sc/source/filter/inc/filt_pch.hxx +++ b/sc/source/filter/inc/filt_pch.hxx @@ -57,7 +57,6 @@ #include <tools/errcode.hxx> #include <tools/ref.hxx> #include <tools/link.hxx> -#include <tools/debug.hxx> #include <tools/time.hxx> #include <tools/date.hxx> #include <svl/svarray.hxx> diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index cf15e543e0ee..cdd2d623503d 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -34,7 +34,6 @@ #include <limits> #include <memory> #include <tools/string.hxx> -#include <tools/debug.hxx> #include <sal/macros.h> #include <oox/helper/helper.hxx> #include <boost/noncopyable.hpp> diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index 54d4f8799e09..f63b0bbf7c88 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -29,7 +29,6 @@ #ifndef SC_NAMEBUFF_HXX #define SC_NAMEBUFF_HXX -#include <tools/debug.hxx> #include <tools/string.hxx> #include "compiler.hxx" #include "root.hxx" diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 6d8c60a88733..29a2a130f05b 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -30,7 +30,6 @@ #define SC_TOKSTACK_HXX #include <string.h> -#include <tools/debug.hxx> #include "compiler.hxx" #include "tokenarray.hxx" @@ -178,7 +177,7 @@ class TokenPool sal_uInt16 nElementAkt; static const sal_uInt16 nScTokenOff;// Offset fuer SC-Token -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 sal_uInt16 nRek; // Rekursionszaehler #endif ScTokenArray* pScToken; // Tokenbastler @@ -386,7 +385,7 @@ const inline ScTokenArray* TokenPool::operator []( const TokenId nId ) if( nId ) {//...nur wenn nId > 0! -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 nRek = 0; #endif GetElement( ( sal_uInt16 ) nId - 1 ); diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index 53d9535c87b7..20eb819cff9b 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -50,7 +50,7 @@ class XclTokenArray; // Global data ================================================================ -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 /** Counts the number of created root objects. */ struct XclDebugObjCounter { @@ -75,7 +75,7 @@ struct RootData;//! /** Stores global buffers and data needed elsewhere in the Excel filters. */ struct XclRootData -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 : public XclDebugObjCounter #endif { diff --git a/sc/source/filter/lotus/expop.cxx b/sc/source/filter/lotus/expop.cxx index 1f89745c5159..c1b0ae23a4e2 100644 --- a/sc/source/filter/lotus/expop.cxx +++ b/sc/source/filter/lotus/expop.cxx @@ -33,8 +33,6 @@ //------------------------------------------------------------------------ -#include <tools/debug.hxx> - #include "dociter.hxx" #include "cell.hxx" #include "document.hxx" diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx index 4c32b0f5e404..aa48933972c6 100644 --- a/sc/source/filter/lotus/lotimpop.cxx +++ b/sc/source/filter/lotus/lotimpop.cxx @@ -81,7 +81,7 @@ ImportLotus::~ImportLotus() delete pLotusRoot->pAttrTable; delete pLotusRoot; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 pLotusRoot = NULL; #endif diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index fbc0532ed4c2..0a4fe4fd16d7 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -195,7 +195,7 @@ FltError ImportLotus::Read() case S_END: // S_END break; // ----------------------------------------------------------- -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 default: OSL_FAIL( "*ImportLotus::Read(): State unbekannt!" ); eAkt = S_END; diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index 3563f9a9d117..919374f90241 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -1000,7 +1000,7 @@ sal_uLong Sc10Import::Import() if (!nError) { ImportNameCollection(); pPrgrsBar->Progress(); } pDoc->SetViewOptions( aSc30ViewOpt ); -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 if (nError) { OSL_FAIL( ByteString::CreateFromInt32( nError ).GetBuffer() ); @@ -1008,7 +1008,7 @@ sal_uLong Sc10Import::Import() #endif delete pPrgrsBar; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 pPrgrsBar = NULL; #endif diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index ece66ac49b7e..140bc04d9edf 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -30,7 +30,6 @@ #include "precompiled_sc.hxx" #include "XclImpChangeTrack.hxx" -#include <tools/debug.hxx> #include <sot/storage.hxx> #include <svl/zforlist.hxx> #include "chgviset.hxx" diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 7b83846e015b..89cda3e19eb9 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -46,7 +46,6 @@ #include <vcl/outdev.hxx> #include <unotools/tempfile.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <tools/debug.hxx> #include <svx/sdasitm.hxx> #include <sot/exchange.hxx> diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index b96b56bd4978..46cf04cb4ecf 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -41,7 +41,6 @@ #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include <com/sun/star/util/DateTime.hpp> -#include <tools/debug.hxx> #include <tools/datetime.hxx> #include <svl/zforlist.hxx> @@ -153,7 +152,7 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction void ScChangeTrackingExportHelper::WriteGenerated(const ScChangeAction* pGeneratedAction) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 sal_uInt32 nActionNumber(pGeneratedAction->GetActionNumber()); OSL_ENSURE(pChangeTrack->IsGenerated(nActionNumber), "a not generated action found"); #endif diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index 3c10134dc02f..1584f471ea44 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -34,7 +34,6 @@ #include "document.hxx" #include "chgviset.hxx" #include "rangeutl.hxx" -#include <tools/debug.hxx> #include <tools/datetime.hxx> #include <svl/zforlist.hxx> #include <xmloff/xmluconv.hxx> diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index 541ce346a82c..ba37d51c7b69 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -40,7 +40,6 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include <tools/debug.hxx> using namespace com::sun::star; using namespace xmloff::token; diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index 178d93294cda..a648ab273200 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -59,7 +59,6 @@ #include <com/sun/star/sheet/XDatabaseRanges.hpp> #include <com/sun/star/sheet/XDatabaseRange.hpp> #include <com/sun/star/table/TableOrientation.hpp> -#include <tools/debug.hxx> #include <comphelper/extract.hxx> #include <map> @@ -449,7 +448,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans:: if (aSortFields[0].IsCaseSensitive) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 sal_Bool bCaseSensitive(aSortFields[0].IsCaseSensitive); for (i = 1; i < nSortFields; ++i) { @@ -462,7 +461,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans:: rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_COUNTRY, aSortFields[0].CollatorLocale.Country); if (aSortFields[0].CollatorAlgorithm.getLength()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ALGORITHM, aSortFields[0].CollatorAlgorithm); -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 rtl::OUString sLanguage(aSortFields[0].CollatorLocale.Language); rtl::OUString sCountry(aSortFields[0].CollatorLocale.Country); rtl::OUString sAlgorithm(aSortFields[0].CollatorAlgorithm); diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index 4706a6f8dad9..c9c0f03f351a 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -38,7 +38,6 @@ #include <com/sun/star/sheet/CellFlags.hpp> #include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> -#include <tools/debug.hxx> #include <xmloff/xmlnmspe.hxx> #include "dociter.hxx" #include "convuno.hxx" diff --git a/sc/source/filter/xml/XMLExportSharedData.cxx b/sc/source/filter/xml/XMLExportSharedData.cxx index c8ec037cfc89..edbba6f2e00f 100644 --- a/sc/source/filter/xml/XMLExportSharedData.cxx +++ b/sc/source/filter/xml/XMLExportSharedData.cxx @@ -34,7 +34,6 @@ // INCLUDE --------------------------------------------------------------- #include "XMLExportSharedData.hxx" #include "XMLExportIterator.hxx" -#include <tools/debug.hxx> using namespace com::sun::star; diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 4ccc7227250c..d76fb8cd3206 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -42,7 +42,6 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/XMLEventExport.hxx> #include <xmloff/nmspmap.hxx> -#include <tools/debug.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sheet/XSheetCondition.hpp> diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index 15202ccf63db..dbb99ad511ce 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -34,7 +34,6 @@ // INCLUDE --------------------------------------------------------------- #include "XMLStylesImportHelper.hxx" #include "xmlimprt.hxx" -#include <tools/debug.hxx> #include <com/sun/star/util/NumberFormat.hpp> using namespace com::sun::star; diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx index 1eeb10f6d173..00ae230e499f 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" -#include <tools/debug.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <com/sun/star/text/XText.hpp> diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index e5281f43cb88..0920b0ae6d43 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx @@ -36,7 +36,6 @@ #include "XMLConverter.hxx" #include "rangeutl.hxx" #include "reftokenhelper.hxx" -#include <tools/debug.hxx> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/table/XColumnRowRange.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sc/source/filter/xml/XMLTextPContext.cxx b/sc/source/filter/xml/XMLTextPContext.cxx index 8251da5dfa0b..03d764bd5026 100644 --- a/sc/source/filter/xml/XMLTextPContext.cxx +++ b/sc/source/filter/xml/XMLTextPContext.cxx @@ -38,7 +38,6 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -#include <tools/debug.hxx> #include <com/sun/star/text/XTextCursor.hpp> using namespace com::sun::star; diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index ff487074b22d..471d6f8325d1 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.cxx @@ -35,7 +35,6 @@ #include <xmloff/xmlaustp.hxx> #include <xmloff/nmspmap.hxx> #include <tools/string.hxx> -#include <tools/debug.hxx> #include "sheetdata.hxx" diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 86bd2f60fc1e..30e0f4f50b4a 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -61,7 +61,6 @@ #include <xmloff/xmluconv.hxx> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <sal/types.h> -#include <tools/debug.hxx> #include <memory> diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 25d16d999fb0..26095fad9893 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -45,7 +45,6 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/XMLEventsImportContext.hxx> #include <com/sun/star/sheet/TableValidationVisibility.hpp> -#include <tools/debug.hxx> using namespace com::sun::star; using namespace xmloff::token; diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 60cc4f697fd6..cf906833ed4f 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -85,7 +85,6 @@ #include <rtl/ustring.hxx> -#include <tools/debug.hxx> #include "tools/color.hxx" #include <rtl/math.hxx> #include <svl/zforlist.hxx> @@ -1111,7 +1110,7 @@ void ScXMLExport::WriteRowContent() { ScMyRowFormatRange aRange; sal_Int32 nIndex(-1); -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 sal_Int32 nPrevCol(0); #endif sal_Int32 nCols(0); @@ -1120,7 +1119,7 @@ void ScXMLExport::WriteRowContent() sal_Bool bIsFirst(sal_True); while (pRowFormatRanges->GetNext(aRange)) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 OSL_ENSURE(bIsFirst || (!bIsFirst && (nPrevCol + nCols == aRange.nStartColumn)), "here are some columns missing"); #endif if (bIsFirst) @@ -1130,7 +1129,7 @@ void ScXMLExport::WriteRowContent() bIsAutoStyle = aRange.bIsAutoStyle; nCols = aRange.nRepeatColumns; bIsFirst = false; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 nPrevCol = aRange.nStartColumn; #endif } @@ -1157,7 +1156,7 @@ void ScXMLExport::WriteRowContent() bIsAutoStyle = aRange.bIsAutoStyle; nCols = aRange.nRepeatColumns; nPrevValidationIndex = aRange.nValidationIndex; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 nPrevCol = aRange.nStartColumn; #endif } diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index f2e62d6d9d51..34665341495c 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -48,7 +48,6 @@ #include <xmloff/attrlist.hxx> #include <xmloff/contextid.hxx> #include <xmloff/txtprmap.hxx> -#include <tools/debug.hxx> #include <com/sun/star/util/CellProtection.hpp> #include <com/sun/star/table/CellOrientation.hpp> #include <com/sun/star/table/CellVertJustify2.hpp> diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index d7cfdb245aeb..97eb77dd8d0a 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -45,7 +45,6 @@ #include <comphelper/extract.hxx> #include <xmloff/xmlprcon.hxx> #include <xmloff/xmluconv.hxx> -#include <tools/debug.hxx> #include "XMLTableHeaderFooterContext.hxx" #include "XMLConverter.hxx" #include "XMLTableShapeImportHelper.hxx" diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index e10b125a01a4..6c8fd7e5e9c3 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -33,7 +33,6 @@ #include <rsc/rscsfx.hxx> #include <sfx2/docfile.hxx> #include <sfx2/objsh.hxx> -#include <tools/debug.hxx> #include <osl/diagnose.h> #include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> @@ -220,7 +219,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe else { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 ByteString aError( "SAX parse exception catched while importing:\n" ); aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); OSL_FAIL( aError.GetBuffer() ); @@ -256,7 +255,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe else { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 ByteString aError( "SAX exception catched while importing:\n" ); aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); OSL_FAIL( aError.GetBuffer() ); @@ -268,7 +267,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe } catch( packages::zip::ZipIOException& r ) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 ByteString aError( "Zip exception catched while importing:\n" ); aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); OSL_FAIL( aError.GetBuffer() ); @@ -279,7 +278,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe } catch( io::IOException& r ) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 ByteString aError( "IO exception catched while importing:\n" ); aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); OSL_FAIL( aError.GetBuffer() ); @@ -290,7 +289,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe } catch( uno::Exception& r ) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 ByteString aError( "uno exception catched while importing:\n" ); aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); OSL_FAIL( aError.GetBuffer() ); diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx index 189190113cf2..d05da70d39af 100644 --- a/sc/workben/addin.cxx +++ b/sc/workben/addin.cxx @@ -35,7 +35,6 @@ #include <usr/reflserv.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#include <tools/debug.hxx> #include <tools/date.hxx> #include <svl/itemprop.hxx> #include <usr/proptypehlp.hxx> diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx index c74118ac4882..2909a227fed1 100644 --- a/sc/workben/result.cxx +++ b/sc/workben/result.cxx @@ -30,7 +30,6 @@ #pragma hdrstop #endif -#include <tools/debug.hxx> #include <usr/ustring.hxx> #include "result.hxx" diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index a289fff1b9be..68abbec64ff9 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#include <tools/debug.hxx> #include <svtools/libcall.hxx> #include <vcl/msgbox.hxx> #include <vcl/window.hxx> @@ -261,7 +260,7 @@ MyWindow::MyWindow( Window *pParent ) : XSpreadsheetDocumentRef lcl_GetDocument() { XServiceManagerRef xProv = getGlobalServiceManager(); - DBG_ASSERT( xProv.is(), "Kein ServiceManager!" ); + OSL_ENSURE( xProv.is(), "Kein ServiceManager!" ); XServiceRegistryRef xReg = (XServiceRegistry*)xProv->queryInterface(XServiceRegistry::getSmartUik()); if ( !xReg ) |