[Libreoffice-commits] .: 4 commits - cppcanvas/source sot/source svl/inc svl/source svtools/source toolkit/source toolkit/workben tools/source tools/workben ucbhelper/workben unotools/source vcl/aqua vcl/os2 vcl/source vcl/unx vcl/win
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Mar 2 05:47:31 PST 2011
cppcanvas/source/inc/implrenderer.hxx | 2 -
sot/source/base/factory.cxx | 2 -
sot/source/base/object.cxx | 2 -
sot/source/sdstor/stg.cxx | 2 -
sot/source/sdstor/stgio.cxx | 2 -
sot/source/sdstor/storage.cxx | 8 ++--
sot/source/sdstor/ucbstorage.cxx | 26 +++++++--------
svl/inc/svl/filerec.hxx | 2 -
svl/source/config/asiancfg.cxx | 2 -
svl/source/config/ctloptions.cxx | 2 -
svl/source/filepicker/pickerhelper.cxx | 4 +-
svl/source/items/cenumitm.cxx | 4 +-
svl/source/items/cintitem.cxx | 8 ++--
svl/source/items/cntwall.cxx | 4 +-
svl/source/items/ctypeitm.cxx | 2 -
svl/source/items/custritm.cxx | 4 +-
svl/source/items/dateitem.cxx | 2 -
svl/source/items/globalnameitem.cxx | 2 -
svl/source/items/intitem.cxx | 2 -
svl/source/items/itempool.cxx | 6 +--
svl/source/items/itemset.cxx | 6 +--
svl/source/items/lckbitem.cxx | 2 -
svl/source/items/nranges.cxx | 2 -
svl/source/items/poolio.cxx | 2 -
svl/source/items/poolitem.cxx | 4 +-
svl/source/items/ptitem.cxx | 4 +-
svl/source/items/rectitem.cxx | 4 +-
svl/source/items/slstitm.cxx | 2 -
svl/source/items/srchitem.cxx | 2 -
svl/source/items/style.cxx | 6 +--
svl/source/items/szitem.cxx | 2 -
svl/source/items/visitem.cxx | 2 -
svl/source/misc/inettype.cxx | 2 -
svl/source/notify/brdcst.cxx | 3 +
svl/source/numbers/numfmuno.cxx | 16 ++++-----
svl/source/numbers/numhead.cxx | 8 ++--
svl/source/numbers/supservs.cxx | 2 -
svl/source/numbers/zforfind.cxx | 2 -
svl/source/numbers/zforlist.cxx | 22 ++++++-------
svl/source/numbers/zformat.cxx | 7 ++--
svl/source/undo/undo.cxx | 8 ++--
svtools/source/brwbox/brwbox2.cxx | 6 +--
svtools/source/config/accessibilityoptions.cxx | 4 +-
svtools/source/contnr/imivctl1.cxx | 4 +-
svtools/source/contnr/svimpicn.cxx | 2 -
svtools/source/contnr/svlbox.cxx | 2 -
svtools/source/contnr/treelist.cxx | 8 ++--
svtools/source/control/filectrl2.cxx | 2 -
svtools/source/control/fmtfield.cxx | 2 -
svtools/source/dialogs/addresstemplate.cxx | 12 +++----
svtools/source/dialogs/propctrl.cxx | 6 +--
svtools/source/dialogs/wizardmachine.cxx | 6 +--
svtools/source/dialogs/wizdlg.cxx | 4 +-
svtools/source/edit/textdata.cxx | 2 -
svtools/source/edit/textdoc.cxx | 8 ++--
svtools/source/edit/texteng.cxx | 2 -
svtools/source/filter.vcl/filter/FilterConfigItem.cxx | 16 ++++-----
svtools/source/filter.vcl/wmf/enhwmf.cxx | 2 -
svtools/source/filter.vcl/wmf/winmtf.cxx | 2 -
svtools/source/filter.vcl/wmf/winmtf.hxx | 2 -
svtools/source/filter.vcl/wmf/wmfwr.cxx | 6 +--
svtools/source/graphic/grfcache.cxx | 2 -
svtools/source/graphic/grfmgr2.cxx | 6 +--
svtools/source/misc/chartprettypainter.cxx | 2 -
svtools/source/misc/embedhlp.cxx | 2 -
svtools/source/misc/templatefoldercache.cxx | 6 +--
svtools/source/misc/transfer.cxx | 4 +-
svtools/source/productregistration/registrationdlg.cxx | 2 -
svtools/source/table/tablecontrol_impl.cxx | 6 +--
svtools/source/uno/unocontroltablemodel.cxx | 6 +--
svtools/source/uno/unoevent.cxx | 2 -
svtools/source/uno/unoiface.cxx | 4 +-
svtools/source/uno/unoimap.cxx | 4 +-
toolkit/source/awt/vclxmenu.cxx | 2 -
toolkit/source/awt/vclxprinter.cxx | 6 +--
toolkit/source/awt/vclxwindow.cxx | 4 +-
toolkit/source/awt/vclxwindows.cxx | 2 -
toolkit/source/controls/dialogcontrol.cxx | 10 +++---
toolkit/source/controls/geometrycontrolmodel.cxx | 6 +--
toolkit/source/controls/tkscrollbar.cxx | 2 -
toolkit/source/controls/tkspinbutton.cxx | 2 -
toolkit/source/controls/unocontrol.cxx | 4 +-
toolkit/source/controls/unocontrolmodel.cxx | 24 +++++++-------
toolkit/source/controls/unocontrols.cxx | 2 -
toolkit/source/helper/unowrapper.cxx | 2 -
toolkit/source/helper/vclunohelper.cxx | 8 ++--
toolkit/source/layout/core/box-base.cxx | 4 +-
toolkit/source/layout/core/container.cxx | 2 -
toolkit/source/layout/core/dialogbuttonhbox.cxx | 2 -
toolkit/source/layout/core/import.cxx | 2 -
toolkit/source/layout/core/proplist.cxx | 2 -
toolkit/workben/layout/zoom.cxx | 8 ++--
tools/source/fsys/dirent.cxx | 2 -
tools/source/fsys/urlobj.cxx | 4 +-
tools/source/generic/b3dtrans.cxx | 6 +--
tools/source/generic/bigint.cxx | 6 +--
tools/source/generic/fract.cxx | 2 -
tools/source/generic/poly.cxx | 4 +-
tools/source/inet/inetmime.cxx | 2 -
tools/source/ref/errinf.cxx | 4 +-
tools/source/ref/pstm.cxx | 8 ++--
tools/source/stream/stream.cxx | 14 ++++----
tools/source/string/strascii.cxx | 4 +-
tools/source/string/strimp.cxx | 6 +--
tools/source/testtoolloader/testtoolloader.cxx | 2 -
tools/workben/hashtbl.cxx | 4 +-
ucbhelper/workben/ucbexplorer/ucbexplorer.cxx | 8 ++--
unotools/source/config/cmdoptions.cxx | 2 -
unotools/source/config/configmgr.cxx | 14 ++++----
unotools/source/config/dynamicmenuoptions.cxx | 2 -
unotools/source/config/extendedsecurityoptions.cxx | 2 -
unotools/source/config/fltrcfg.cxx | 2 -
unotools/source/config/fontcfg.cxx | 2 -
unotools/source/config/pathoptions.cxx | 4 +-
unotools/source/config/saveopt.cxx | 6 +--
unotools/source/config/searchopt.cxx | 6 +--
unotools/source/config/undoopt.cxx | 4 +-
unotools/source/misc/sharedunocomponent.cxx | 4 +-
unotools/source/property/propertysethelper.cxx | 6 +--
unotools/source/property/propertysetinfo.cxx | 4 +-
unotools/source/ucbhelper/ucblockbytes.cxx | 6 +--
vcl/aqua/source/app/saldata.cxx | 4 +-
vcl/aqua/source/app/salinst.cxx | 4 +-
vcl/aqua/source/gdi/salbmp.cxx | 4 +-
vcl/aqua/source/gdi/salgdi.cxx | 10 +++---
vcl/aqua/source/gdi/salprn.cxx | 4 +-
vcl/aqua/source/window/salframe.cxx | 2 -
vcl/aqua/source/window/salmenu.cxx | 6 +--
vcl/os2/source/app/salinst.cxx | 4 +-
vcl/source/app/svapp.cxx | 2 -
vcl/source/app/timer.cxx | 2 -
vcl/source/control/button.cxx | 2 -
vcl/source/control/field.cxx | 6 +--
vcl/source/control/field2.cxx | 8 ++--
vcl/source/fontsubset/fontsubset.cxx | 2 -
vcl/source/gdi/bitmap.cxx | 2 -
vcl/source/gdi/bitmap3.cxx | 4 +-
vcl/source/gdi/bitmap4.cxx | 2 -
vcl/source/gdi/bmpacc.cxx | 2 -
vcl/source/gdi/cvtsvm.cxx | 2 -
vcl/source/gdi/gdimtf.cxx | 4 +-
vcl/source/gdi/graphictools.cxx | 16 ++++-----
vcl/source/gdi/outmap.cxx | 2 -
vcl/source/gdi/pdfwriter_impl.cxx | 24 +++++++-------
vcl/source/gdi/print2.cxx | 6 +--
vcl/source/gdi/region.cxx | 18 +++++-----
vcl/source/gdi/salmisc.cxx | 4 +-
vcl/source/helper/canvasbitmap.cxx | 2 -
vcl/source/window/accel.cxx | 2 -
vcl/source/window/dialog.cxx | 4 +-
vcl/source/window/printdlg.cxx | 4 +-
vcl/source/window/toolbox.cxx | 2 -
vcl/unx/gtk/app/gtkdata.cxx | 4 +-
vcl/unx/gtk/window/gtkframe.cxx | 2 -
vcl/unx/headless/svpelement.cxx | 3 +
vcl/unx/headless/svppspgraphics.cxx | 14 ++++----
vcl/unx/headless/svptext.cxx | 2 -
vcl/unx/source/app/saldisp.cxx | 4 +-
vcl/unx/source/gdi/pspgraphics.cxx | 28 ++++++++---------
vcl/unx/source/gdi/salgdi2.cxx | 2 -
vcl/unx/source/printergfx/common_gfx.cxx | 10 +++---
vcl/unx/source/printergfx/psputil.cxx | 2 -
vcl/win/source/app/salinst.cxx | 4 +-
163 files changed, 406 insertions(+), 403 deletions(-)
New commits:
commit b722614de75c6f9f675aa85605752627288b9bbf
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Mar 2 14:04:11 2011 +0100
Add missing osl/diagnose.h include
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 0004cad..48a6dcf 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -34,6 +34,7 @@
#include <errno.h>
#include <stdlib.h>
#include <tools/debug.hxx>
+#include <osl/diagnose.h>
#include <i18npool/mslangid.hxx>
#include <rtl/math.hxx>
#include <rtl/instance.hxx>
commit 8c5f102512ef736735ce58ebd8d04ab9c24ecbed
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Mar 2 14:03:15 2011 +0100
Move some DBG_UTIL to OSL_DEBUG_LEVEL
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index e42b1de..085050c 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -154,7 +154,7 @@ Reference< XMultiServiceFactory > ConfigManager::GetConfigurationProvider()
UNISTRING("com.sun.star.configuration.ConfigurationProvider")),
UNO_QUERY);
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
catch(Exception& rEx)
{
static sal_Bool bMessage = sal_True;
@@ -216,7 +216,7 @@ Reference< XHierarchicalNameAccess > ConfigManager::AddConfigItem(utl::ConfigIte
void ConfigManager::RegisterConfigItem(utl::ConfigItem& rCfgItem)
{
ConfigItemList::iterator aListIter = pMgrImpl->aItemList.begin();
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
for(aListIter = pMgrImpl->aItemList.begin(); aListIter != pMgrImpl->aItemList.end(); ++aListIter)
{
ConfigItemListEntry_Impl& rEntry = *aListIter;
@@ -229,7 +229,7 @@ void ConfigManager::RegisterConfigItem(utl::ConfigItem& rCfgItem)
Reference< XHierarchicalNameAccess> ConfigManager::AcquireTree(utl::ConfigItem& rCfgItem)
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
sal_Bool bFound = sal_False;
ConfigItemList::iterator aListIter = pMgrImpl->aItemList.begin();
for(aListIter = pMgrImpl->aItemList.begin(); aListIter != pMgrImpl->aItemList.end(); ++aListIter)
@@ -290,7 +290,7 @@ Reference< XHierarchicalNameAccess> ConfigManager::AcquireTree(utl::ConfigItem&
throw;
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
if(0 == (CONFIG_MODE_IGNORE_ERRORS & rCfgItem.GetMode()))
{
OString sMsg("CreateInstance exception: ");
@@ -629,7 +629,7 @@ Reference< XHierarchicalNameAccess> ConfigManager::GetHierarchyAccess(const OUSt
OUString::createFromAscii(pAccessSrvc),
aArgs);
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
catch(Exception& rEx)
{
OString sMsg("CreateInstance exception: ");
@@ -660,7 +660,7 @@ Any ConfigManager::GetLocalProperty(const OUString& rProperty)
if(xAccess.is())
aRet = xAccess->getByName(sProperty);
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
catch(Exception& rEx)
{
OString sMsg("GetLocalProperty: ");
@@ -690,7 +690,7 @@ void ConfigManager::PutLocalProperty(const OUString& rProperty, const Any& rValu
{
xNodeReplace->replaceByName(sProperty, rValue);
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
catch(Exception& rEx)
{
OString sMsg("PutLocalProperty: ");
commit eb207167d0fa43719b4771aa9d11f690cc05c5f9
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Mar 2 12:18:35 2011 +0100
Add osl/diagnose.h include
diff --git a/svl/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx
index eb6364f..188466e 100644
--- a/svl/source/notify/brdcst.cxx
+++ b/svl/source/notify/brdcst.cxx
@@ -30,6 +30,7 @@
#include "precompiled_svl.hxx"
#include <tools/debug.hxx>
+#include <osl/diagnose.h>
#include <svl/hint.hxx>
#include <svl/smplhint.hxx>
diff --git a/vcl/unx/headless/svpelement.cxx b/vcl/unx/headless/svpelement.cxx
index 054b4cb..f6f895a 100644
--- a/vcl/unx/headless/svpelement.cxx
+++ b/vcl/unx/headless/svpelement.cxx
@@ -30,6 +30,7 @@
#include <basebmp/scanlineformats.hxx>
#include <tools/debug.hxx>
+#include <osl/diagnose.h>
#if defined WITH_SVP_LISTENING
#include <osl/thread.h>
commit aa4b849ed4a79252fe24c801600a9c6ff2e8888e
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 1 19:08:19 2011 +0100
Move DBG_ERROR to OSL_FAIL
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 18ae010..7869d93 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -147,7 +147,7 @@ static float GetSwapFloat( SvStream& rSt )
{
if ( sizeof( float ) != 4 )
{
- DBG_ERROR( "EnhWMFReader::sizeof( float ) != 4" );
+ OSL_FAIL( "EnhWMFReader::sizeof( float ) != 4" );
rXForm = XForm();
}
else
diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index d327bf0..b510a06 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.cxx
@@ -136,7 +136,7 @@ SotFactory::SotFactory( const SvGlobalName & rName,
DBG_ASSERT( aEmptyName != *this, "create factory without SvGlobalName" );
if( Find( *this ) )
{
- DBG_ERROR( "create factories with the same unique name" );
+ OSL_FAIL( "create factories with the same unique name" );
}
}
#endif
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index 44acd69..d1eb8bf 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -459,7 +459,7 @@ void SotObject::RemoveOwnerLock()
ReleaseRef();
}
else {
- DBG_ERROR("OwnerLockCount underflow!");
+ OSL_FAIL("OwnerLockCount underflow!");
}
}
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 4c31b74..6c59260 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -560,7 +560,7 @@ void Storage::FillInfoList( SvStorageInfoList* pList ) const
BaseStorage* Storage::OpenUCBStorage( const String& rName, StreamMode m, BOOL bDirect )
{
- DBG_ERROR("Not supported!");
+ OSL_FAIL("Not supported!");
/*
BaseStorage* pStorage = new Storage( pIo, NULL, m );
SetError( ERRCODE_IO_NOTSUPPORTED );
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index 93a3422..70c85b4 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -383,7 +383,7 @@ ULONG StgIo::ValidateFATs()
// DBG_ASSERT( nErr == FAT_OK ,"Storage kaputt");
return nErr;
}
-// DBG_ERROR("Validiere nicht (kein FileStorage)");
+// OSL_FAIL("Validiere nicht (kein FileStorage)");
return FAT_OK;
}
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 2a67680..cb0cd4f 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -390,7 +390,7 @@ BOOL SotStorageStream::SetProperty( const String& rName, const ::com::sun::star:
}
else
{
- DBG_ERROR("Not implemented!");
+ OSL_FAIL("Not implemented!");
return FALSE;
}
}
@@ -404,7 +404,7 @@ BOOL SotStorageStream::GetProperty( const String& rName, ::com::sun::star::uno::
}
else
{
- DBG_ERROR("Not implemented!");
+ OSL_FAIL("Not implemented!");
return FALSE;
}
}
@@ -418,7 +418,7 @@ BOOL SotStorageStream::GetProperty( const String& rName, ::com::sun::star::uno::
}
else
{
- DBG_ERROR("Not implemented!");
+ OSL_FAIL("Not implemented!");
return ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >();
}
}
@@ -739,7 +739,7 @@ void SotStorage::RemoveUNOStorageHolder( UNOStorageHolder* pHolder )
}
else
{
- DBG_ERROR("Not implemented!");
+ OSL_FAIL("Not implemented!");
}
}
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 9dd4af0..0d0163f 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -359,7 +359,7 @@ sal_Int32 GetFormatId_Impl( SvGlobalName aName )
return 0;
else
{
- DBG_ERROR( "Unknown UCB storage format!" );
+ OSL_FAIL( "Unknown UCB storage format!" );
return 0;
}
}
@@ -612,7 +612,7 @@ String UCBStorageElement_Impl::GetContentType()
return m_xStorage->m_aContentType;
else
{
- DBG_ERROR("Element not loaded!");
+ OSL_FAIL("Element not loaded!");
return String();
}
}
@@ -626,7 +626,7 @@ void UCBStorageElement_Impl::SetContentType( const String& rType )
m_xStorage->m_aContentType = m_xStorage->m_aOriginalContentType = rType;
}
else {
- DBG_ERROR("Element not loaded!");
+ OSL_FAIL("Element not loaded!");
}
}
@@ -738,7 +738,7 @@ Reference<XInputStream> UCBStorageStream_Impl::GetXInputStream()
if( m_pAntiImpl && m_nRepresentMode != nonset )
{
- DBG_ERROR( "Misuse of the XInputstream!" );
+ OSL_FAIL( "Misuse of the XInputstream!" );
SetError( ERRCODE_IO_ACCESSDENIED );
}
else
@@ -792,7 +792,7 @@ BOOL UCBStorageStream_Impl::Init()
{
if( m_nRepresentMode == xinputstream )
{
- DBG_ERROR( "XInputStream misuse!" );
+ OSL_FAIL( "XInputStream misuse!" );
SetError( ERRCODE_IO_ACCESSDENIED );
return FALSE;
}
@@ -814,7 +814,7 @@ BOOL UCBStorageStream_Impl::Init()
if( !m_pStream )
{
- DBG_ERROR( "Suspicious temporary stream creation!" );
+ OSL_FAIL( "Suspicious temporary stream creation!" );
SetError( SVSTREAM_CANNOT_MAKE );
return FALSE;
}
@@ -853,7 +853,7 @@ BOOL UCBStorageStream_Impl::Init()
{
// something is really wrong
m_bSourceRead = FALSE;
- DBG_ERROR( "Can not operate original stream!" );
+ OSL_FAIL( "Can not operate original stream!" );
SetError( SVSTREAM_CANNOT_MAKE );
}
@@ -1244,7 +1244,7 @@ BOOL UCBStorageStream_Impl::Revert()
// if an OLEStorage is created on this stream, no "revert" is neccessary because OLEStorages do nothing on "Revert" !
if ( m_bCommited )
{
- DBG_ERROR("Revert while commit is in progress!" );
+ OSL_FAIL("Revert while commit is in progress!" );
return FALSE; // ???
}
@@ -1392,7 +1392,7 @@ ULONG UCBStorageStream::Write( const void* pData, ULONG nSize )
// mba: does occur in writer !
if ( pImp->m_bCommited )
{
- DBG_ERROR("Writing while commit is in progress!" );
+ OSL_FAIL("Writing while commit is in progress!" );
return 0;
}
*/
@@ -1425,7 +1425,7 @@ BOOL UCBStorageStream::SetSize( ULONG nNewSize )
/*
if ( pImp->m_bCommited )
{
- DBG_ERROR("Changing stream size while commit is in progress!" );
+ OSL_FAIL("Changing stream size while commit is in progress!" );
return FALSE;
}
*/
@@ -2665,7 +2665,7 @@ ULONG UCBStorage::GetFormat()
String UCBStorage::GetUserName()
{
- DBG_ERROR("UserName is not implemented in UCB storages!" );
+ OSL_FAIL("UserName is not implemented in UCB storages!" );
return pImp->m_aUserTypeName;
}
@@ -2888,7 +2888,7 @@ BaseStorageStream* UCBStorage::OpenStream( const String& rEleName, StreamMode nM
// stream has already been created; if it has no external reference, it may be opened another time
if ( pElement->m_xStream->m_pAntiImpl )
{
- DBG_ERROR("Stream is already open!" );
+ OSL_FAIL("Stream is already open!" );
SetError( SVSTREAM_ACCESS_DENIED ); // ???
return NULL;
}
@@ -3011,7 +3011,7 @@ BaseStorage* UCBStorage::OpenStorage_Impl( const String& rEleName, StreamMode nM
// storage has already been opened; if it has no external reference, it may be opened another time
if ( pElement->m_xStorage->m_pAntiImpl )
{
- DBG_ERROR("Storage is already open!" );
+ OSL_FAIL("Storage is already open!" );
SetError( SVSTREAM_ACCESS_DENIED ); // ???
}
else
diff --git a/svl/inc/svl/filerec.hxx b/svl/inc/svl/filerec.hxx
index b2fdb8a..3e88d04 100644
--- a/svl/inc/svl/filerec.hxx
+++ b/svl/inc/svl/filerec.hxx
@@ -621,7 +621,7 @@ public:
// private: geht nicht, da einige Compiler dann auch vorherige privat machen
void NewContent()
- { DBG_ERROR( "NewContent() only allowed with args" ); }
+ { OSL_FAIL( "NewContent() only allowed with args" ); }
};
//------------------------------------------------------------------------
diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx
index 11c1f54..a83f493 100644
--- a/svl/source/config/asiancfg.cxx
+++ b/svl/source/config/asiancfg.cxx
@@ -260,7 +260,7 @@ void SvxAsianConfig::SetStartEndChars( const Locale& rLocale,
}
#ifdef DBG_UTIL
else if(!bFound)
- DBG_ERROR("attempt to clear unavailable data");
+ OSL_FAIL("attempt to clear unavailable data");
#endif
SetModified();
}
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index 69b4cd8..2a771f5 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -119,7 +119,7 @@ sal_Bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const
case SvtCTLOptions::E_CTLTEXTNUMERALS : bReadOnly = m_bROCTLTextNumerals ; break;
case SvtCTLOptions::E_CTLSEQUENCECHECKINGRESTRICTED: bReadOnly = m_bROCTLRestricted ; break;
case SvtCTLOptions::E_CTLSEQUENCECHECKINGTYPEANDREPLACE: bReadOnly = m_bROCTLTypeAndReplace; break;
- default: DBG_ERROR( "SvtCTLOptions_Impl::IsReadOnly() - invalid option" );
+ default: OSL_FAIL( "SvtCTLOptions_Impl::IsReadOnly() - invalid option" );
}
return bReadOnly;
}
diff --git a/svl/source/filepicker/pickerhelper.cxx b/svl/source/filepicker/pickerhelper.cxx
index e217c29..0749731 100644
--- a/svl/source/filepicker/pickerhelper.cxx
+++ b/svl/source/filepicker/pickerhelper.cxx
@@ -67,7 +67,7 @@ namespace svt
}
catch( const css::uno::Exception& )
{
- DBG_ERROR( "svt::SetDialogHelpId(): caught an exception while setting the help id!" );
+ OSL_FAIL( "svt::SetDialogHelpId(): caught an exception while setting the help id!" );
}
}
@@ -93,7 +93,7 @@ namespace svt
}
catch( const css::uno::Exception& )
{
- DBG_ERROR( "svt::SetDialogHelpId(): caught an exception while setting the help id!" );
+ OSL_FAIL( "svt::SetDialogHelpId(): caught an exception while setting the help id!" );
}
}
}
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index ffba305..cff9244 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -88,7 +88,7 @@ bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal,
SetEnumValue(USHORT(nTheValue));
return true;
}
- DBG_ERROR("SfxEnumItemInterface::PutValue(): Wrong type");
+ OSL_FAIL("SfxEnumItemInterface::PutValue(): Wrong type");
return false;
}
@@ -248,7 +248,7 @@ bool CntBoolItem::PutValue(const com::sun::star::uno::Any& rVal, BYTE)
m_bValue = bTheValue;
return true;
}
- DBG_ERROR("CntBoolItem::PutValue(): Wrong type");
+ OSL_FAIL("CntBoolItem::PutValue(): Wrong type");
return false;
}
diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index 7491dd9..9d600e7 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -106,7 +106,7 @@ bool CntByteItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
return true;
}
- DBG_ERROR( "CntByteItem::PutValue - Wrong type!" );
+ OSL_FAIL( "CntByteItem::PutValue - Wrong type!" );
return false;
}
@@ -242,7 +242,7 @@ bool CntUInt16Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
return true;
}
- DBG_ERROR( "CntUInt16Item::PutValue - Wrong type!" );
+ OSL_FAIL( "CntUInt16Item::PutValue - Wrong type!" );
return false;
}
@@ -373,7 +373,7 @@ bool CntInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
return true;
}
- DBG_ERROR( "CntInt32Item::PutValue - Wrong type!" );
+ OSL_FAIL( "CntInt32Item::PutValue - Wrong type!" );
return false;
}
@@ -508,7 +508,7 @@ bool CntUInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
return true;
}
- DBG_ERROR( "CntUInt32Item::PutValue - Wrong type!" );
+ OSL_FAIL( "CntUInt32Item::PutValue - Wrong type!" );
return false;
}
diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx
index 8b9abfa..d89228a 100644
--- a/svl/source/items/cntwall.cxx
+++ b/svl/source/items/cntwall.cxx
@@ -153,7 +153,7 @@ SfxPoolItem* CntWallpaperItem::Clone( SfxItemPool* ) const
// virtual
bool CntWallpaperItem::QueryValue( com::sun::star::uno::Any&,BYTE ) const
{
- DBG_ERROR("Not implemented!");
+ OSL_FAIL("Not implemented!");
return false;
}
@@ -161,7 +161,7 @@ bool CntWallpaperItem::QueryValue( com::sun::star::uno::Any&,BYTE ) const
// virtual
bool CntWallpaperItem::PutValue( const com::sun::star::uno::Any&,BYTE )
{
- DBG_ERROR("Not implemented!");
+ OSL_FAIL("Not implemented!");
return false;
}
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index edcc27c..2986436 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -247,7 +247,7 @@ bool CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
return true;
}
- DBG_ERROR( "CntContentTypeItem::PutValue - Wrong type!" );
+ OSL_FAIL( "CntContentTypeItem::PutValue - Wrong type!" );
return false;
}
diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx
index 1cde801..6ca506c 100644
--- a/svl/source/items/custritm.cxx
+++ b/svl/source/items/custritm.cxx
@@ -61,7 +61,7 @@ int CntUnencodedStringItem::operator ==(const SfxPoolItem & rItem) const
// virtual
int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith) const
{
- DBG_ERROR("CntUnencodedStringItem::Compare(): No international");
+ OSL_FAIL("CntUnencodedStringItem::Compare(): No international");
DBG_CHKTHIS(CntUnencodedStringItem, 0);
DBG_ASSERT(rWith.ISA(CntUnencodedStringItem),
"CntUnencodedStringItem::Compare(): Bad type");
@@ -125,7 +125,7 @@ bool CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal,
m_aValue = UniString(aTheValue);
return true;
}
- DBG_ERROR("CntUnencodedStringItem::PutValue(): Wrong type");
+ OSL_FAIL("CntUnencodedStringItem::PutValue(): Wrong type");
return false;
}
diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx
index 054e117..c56cf62 100644
--- a/svl/source/items/dateitem.cxx
+++ b/svl/source/items/dateitem.cxx
@@ -192,7 +192,7 @@ bool SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal,
return true;
}
- DBG_ERROR( "SfxDateTimeItem::PutValue - Wrong type!" );
+ OSL_FAIL( "SfxDateTimeItem::PutValue - Wrong type!" );
return false;
}
diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx
index 137725f..e0de408 100644
--- a/svl/source/items/globalnameitem.cxx
+++ b/svl/source/items/globalnameitem.cxx
@@ -98,7 +98,7 @@ bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
return true;
}
- DBG_ERROR( "SfxGlobalNameItem::PutValue - Wrong type!" );
+ OSL_FAIL( "SfxGlobalNameItem::PutValue - Wrong type!" );
return true;
}
diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index 01eb466..9a29315 100644
--- a/svl/source/items/intitem.cxx
+++ b/svl/source/items/intitem.cxx
@@ -130,7 +130,7 @@ bool SfxInt16Item::PutValue(const com::sun::star::uno::Any& rVal, BYTE )
return true;
}
- DBG_ERROR( "SfxInt16Item::PutValue - Wrong type!" );
+ OSL_FAIL( "SfxInt16Item::PutValue - Wrong type!" );
return false;
}
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 3aacbf9..0d0eaff 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -458,7 +458,7 @@ void SfxItemPool::SetSecondaryPool( SfxItemPool *pPool )
for( USHORT i = (*ppItemArr)->Count(); i; ++ppHtArr, --i )
if ( !(*ppHtArr) )
{
- DBG_ERROR( "old secondary pool must be empty" );
+ OSL_FAIL( "old secondary pool must be empty" );
bOK = FALSE;
break;
}
@@ -757,7 +757,7 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, USHORT nWhich )
{
if ( pSecondary )
return pSecondary->Put( rItem, nWhich );
- DBG_ERROR( "unknown Which-Id - cannot put item" );
+ OSL_FAIL( "unknown Which-Id - cannot put item" );
}
// SID oder nicht poolable (neue Definition)?
@@ -886,7 +886,7 @@ void SfxItemPool::Remove( const SfxPoolItem& rItem )
pSecondary->Remove( rItem );
return;
}
- DBG_ERROR( "unknown Which-Id - cannot remove item" );
+ OSL_FAIL( "unknown Which-Id - cannot remove item" );
}
// SID oder nicht poolable (neue Definition)?
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index d8823eb..9e8f8b8 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -725,7 +725,7 @@ void SfxItemSet::PutExtended
break;
default:
- DBG_ERROR( "invalid Argument for eDontCareAs" );
+ OSL_FAIL( "invalid Argument for eDontCareAs" );
}
}
else
@@ -750,7 +750,7 @@ void SfxItemSet::PutExtended
break;
default:
- DBG_ERROR( "invalid Argument for eDefaultAs" );
+ OSL_FAIL( "invalid Argument for eDefaultAs" );
}
}
pPtr += 2;
@@ -972,7 +972,7 @@ const SfxPoolItem* SfxItemSet::GetItem
return pItem;
// sonst Fehler melden
- DBG_ERROR( "invalid argument type" );
+ OSL_FAIL( "invalid argument type" );
}
// kein Item gefunden oder falschen Typ gefunden
diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index 6a36a48..88b60a0 100644
--- a/svl/source/items/lckbitem.cxx
+++ b/svl/source/items/lckbitem.cxx
@@ -157,7 +157,7 @@ bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
return true;
}
- DBG_ERROR( "SfxLockBytesItem::PutValue - Wrong type!" );
+ OSL_FAIL( "SfxLockBytesItem::PutValue - Wrong type!" );
return true;
}
diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx
index c3f19a0..31e8dd5 100644
--- a/svl/source/items/nranges.cxx
+++ b/svl/source/items/nranges.cxx
@@ -576,7 +576,7 @@ SfxNumRanges& SfxNumRanges::operator -=
}
// we should never be here
- DBG_ERROR( "SfxNumRanges::operator-=: internal error" );
+ OSL_FAIL( "SfxNumRanges::operator-=: internal error" );
} // while
pTarget[ nTargetPos ] = 0;
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index bf5cc85..5b6a58f 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -1125,7 +1125,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
: 0;
if ( !pItem )
{
- DBG_ERROR( "can't resolve surrogate" );
+ OSL_FAIL( "can't resolve surrogate" );
rWhich = 0; // nur zur Sicherheit fuer richtige Stream-Pos
return 0;
}
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index a3e3b92..e4e0c3f 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -424,7 +424,7 @@ bool SfxPoolItem::HasMetrics() const
bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const
{
- DBG_ERROR("There is no implementation for QueryValue for this item!");
+ OSL_FAIL("There is no implementation for QueryValue for this item!");
return false;
}
@@ -432,7 +432,7 @@ bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const
bool SfxPoolItem::PutValue( const com::sun::star::uno::Any&, BYTE )
{
- DBG_ERROR("There is no implementation for PutValue for this item!");
+ OSL_FAIL("There is no implementation for PutValue for this item!");
return false;
}
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index d8e9765..e4621c8 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -156,7 +156,7 @@ bool SfxPointItem::QueryValue( uno::Any& rVal,
case 0: rVal <<= aTmp; break;
case MID_X: rVal <<= aTmp.X; break;
case MID_Y: rVal <<= aTmp.Y; break;
- default: DBG_ERROR("Wrong MemberId!"); return true;
+ default: OSL_FAIL("Wrong MemberId!"); return true;
}
return true;
@@ -195,7 +195,7 @@ bool SfxPointItem::PutValue( const uno::Any& rVal,
case 0: aVal.setX( aValue.X ); aVal.setY( aValue.Y ); break;
case MID_X: aVal.setX( nVal ); break;
case MID_Y: aVal.setY( nVal ); break;
- default: DBG_ERROR("Wrong MemberId!"); return FALSE;
+ default: OSL_FAIL("Wrong MemberId!"); return FALSE;
}
}
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index c30dc8b..ed184de 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -158,7 +158,7 @@ bool SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal,
case MID_RECT_RIGHT: rVal <<= aVal.getY(); break;
case MID_WIDTH: rVal <<= aVal.getWidth(); break;
case MID_HEIGHT: rVal <<= aVal.getHeight(); break;
- default: DBG_ERROR("Wrong MemberID!"); return false;
+ default: OSL_FAIL("Wrong MemberID!"); return false;
}
return true;
@@ -191,7 +191,7 @@ bool SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal,
case MID_RECT_RIGHT: aVal.setY( nVal ); break;
case MID_WIDTH: aVal.setWidth( nVal ); break;
case MID_HEIGHT: aVal.setHeight( nVal ); break;
- default: DBG_ERROR("Wrong MemberID!"); return false;
+ default: OSL_FAIL("Wrong MemberID!"); return false;
}
}
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index b16e0c9..77d19d0 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -403,7 +403,7 @@ bool SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
return true;
}
- DBG_ERROR( "SfxStringListItem::PutValue - Wrong type!" );
+ OSL_FAIL( "SfxStringListItem::PutValue - Wrong type!" );
return false;
}
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 0ee9925..aebdffa 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -661,7 +661,7 @@ bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMember
break;
}
default:
- DBG_ERROR( "Unknown MemberId" );
+ OSL_FAIL( "Unknown MemberId" );
}
return bRet;
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 670b98e..d6142d8 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -279,7 +279,7 @@ BOOL SfxStyleSheetBase::SetParent( const XubString& rName )
SfxStyleSheetBase* pIter = rPool.Find(rName, nFamily);
if( rName.Len() && !pIter )
{
- DBG_ERROR( "StyleSheet-Parent nicht gefunden" );
+ OSL_FAIL( "StyleSheet-Parent nicht gefunden" );
return FALSE;
}
// rekursive Verknuepfungen verhindern
@@ -309,7 +309,7 @@ BOOL SfxStyleSheetBase::SetFollow( const XubString& rName )
{
if( !rPool.Find( rName, nFamily ) )
{
- DBG_ERROR( "StyleSheet-Follow nicht gefunden" );
+ OSL_FAIL( "StyleSheet-Follow nicht gefunden" );
return FALSE;
}
aFollow = rName;
@@ -484,7 +484,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::operator[](USHORT nIdx)
++z;
}
}
- DBG_ERROR("falscher Index");
+ OSL_FAIL("falscher Index");
return 0;
}
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index e7d9261..9838a69 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -160,7 +160,7 @@ bool SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal,
rVal <<= aTmp.getWidth(); break;
case MID_HEIGHT:
rVal <<= aTmp.getHeight(); break;
- default: DBG_ERROR("Wrong MemberId!"); return false;
+ default: OSL_FAIL("Wrong MemberId!"); return false;
}
return true;
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index 343146c..e480c65 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -99,7 +99,7 @@ bool SfxVisibilityItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
if (rVal >>= m_nValue)
return true;
- DBG_ERROR( "SfxInt16Item::PutValue - Wrong type!" );
+ OSL_FAIL( "SfxInt16Item::PutValue - Wrong type!" );
return false;
}
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 3e81be3..8e3ed91 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -936,7 +936,7 @@ UniString INetContentTypes::GetContentType(INetContentType eTypeID)
Registration::GetContentType(eTypeID);
if (aTypeName.Len() == 0)
{
- DBG_ERROR("INetContentTypes::GetContentType(): Bad ID");
+ OSL_FAIL("INetContentTypes::GetContentType(): Bad ID");
return
UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(
CONTENT_TYPE_STR_APP_OCTSTREAM));
diff --git a/svl/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx
index 7eb1658..eb6364f 100644
--- a/svl/source/notify/brdcst.cxx
+++ b/svl/source/notify/brdcst.cxx
@@ -147,7 +147,7 @@ BOOL SfxBroadcaster::AddListener( SfxListener& rListener )
aListeners.Insert( pListener, aListeners.Count() );
else
{
- DBG_ERROR( "array overflow" );
+ OSL_FAIL( "array overflow" );
return FALSE;
}
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index ba7799b..d3d7f0e 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -849,7 +849,7 @@ void SAL_CALL SvNumberFormatObj::addPropertyChangeListener( const rtl::OUString&
throw(beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
{
- DBG_ERROR("not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL SvNumberFormatObj::removePropertyChangeListener( const rtl::OUString&,
@@ -857,7 +857,7 @@ void SAL_CALL SvNumberFormatObj::removePropertyChangeListener( const rtl::OUStri
throw(beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
{
- DBG_ERROR("not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL SvNumberFormatObj::addVetoableChangeListener( const rtl::OUString&,
@@ -865,7 +865,7 @@ void SAL_CALL SvNumberFormatObj::addVetoableChangeListener( const rtl::OUString&
throw(beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
{
- DBG_ERROR("not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL SvNumberFormatObj::removeVetoableChangeListener( const rtl::OUString&,
@@ -873,7 +873,7 @@ void SAL_CALL SvNumberFormatObj::removeVetoableChangeListener( const rtl::OUStri
throw(beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
{
- DBG_ERROR("not implemented");
+ OSL_FAIL("not implemented");
}
// XPropertyAccess
@@ -1086,7 +1086,7 @@ void SAL_CALL SvNumberFormatSettingsObj::addPropertyChangeListener( const rtl::O
throw(beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
{
- DBG_ERROR("not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL SvNumberFormatSettingsObj::removePropertyChangeListener( const rtl::OUString&,
@@ -1094,7 +1094,7 @@ void SAL_CALL SvNumberFormatSettingsObj::removePropertyChangeListener( const rtl
throw(beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
{
- DBG_ERROR("not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL SvNumberFormatSettingsObj::addVetoableChangeListener( const rtl::OUString&,
@@ -1102,7 +1102,7 @@ void SAL_CALL SvNumberFormatSettingsObj::addVetoableChangeListener( const rtl::O
throw(beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
{
- DBG_ERROR("not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const rtl::OUString&,
@@ -1110,7 +1110,7 @@ void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const rtl
throw(beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
{
- DBG_ERROR("not implemented");
+ OSL_FAIL("not implemented");
}
// XServiceInfo
diff --git a/svl/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx
index cfc7656..310fe03 100644
--- a/svl/source/numbers/numhead.cxx
+++ b/svl/source/numbers/numhead.cxx
@@ -69,7 +69,7 @@ ULONG SvNumReadHeader::BytesLeft() const
if (nReadEnd <= nDataEnd)
return nDataEnd-nReadEnd;
- DBG_ERROR("Fehler bei SvNumReadHeader::BytesLeft");
+ OSL_FAIL("Fehler bei SvNumReadHeader::BytesLeft");
return 0;
}
@@ -119,7 +119,7 @@ ImpSvNumMultipleReadHeader::ImpSvNumMultipleReadHeader(SvStream& rNewStream) :
rStream >> nID;
if (nID != SV_NUMID_SIZES)
{
- DBG_ERROR("SV_NUMID_SIZES nicht gefunden");
+ OSL_FAIL("SV_NUMID_SIZES nicht gefunden");
}
sal_uInt32 nSizeTableLen;
rStream >> nSizeTableLen;
@@ -154,7 +154,7 @@ void ImpSvNumMultipleReadHeader::Skip( SvStream& rStream )
rStream >> nID;
if ( nID != SV_NUMID_SIZES )
{
- DBG_ERROR("SV_NUMID_SIZES nicht gefunden");
+ OSL_FAIL("SV_NUMID_SIZES nicht gefunden");
}
sal_uInt32 nSizeTableLen;
rStream >> nSizeTableLen;
@@ -190,7 +190,7 @@ ULONG ImpSvNumMultipleReadHeader::BytesLeft() const
if (nReadEnd <= nEntryEnd)
return nEntryEnd-nReadEnd;
- DBG_ERROR("Fehler bei ImpSvNumMultipleReadHeader::BytesLeft");
+ OSL_FAIL("Fehler bei ImpSvNumMultipleReadHeader::BytesLeft");
return 0;
}
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 1f745cc..3aede57 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -117,7 +117,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence<
#ifdef DBG_UTIL
else
{
- DBG_ERROR("SvNumberFormatsSupplierServiceObject::initialize : unknown argument !");
+ OSL_FAIL("SvNumberFormatsSupplierServiceObject::initialize : unknown argument !");
}
#endif
}
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index ccc752f..44903c6 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -1022,7 +1022,7 @@ BOOL ImpSvNumberInputScan::GetDateRef( double& fDays, USHORT& nCounter,
}
break;
default:
- DBG_ERROR( "ImpSvNumberInputScan::GetDateRef: unknown NfEvalDateFormat" );
+ OSL_FAIL( "ImpSvNumberInputScan::GetDateRef: unknown NfEvalDateFormat" );
DateFmt = YMD;
bFormatTurn = FALSE;
}
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 584e4e8..5e2031d 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -526,7 +526,7 @@ BOOL SvNumberFormatter::PutEntry(String& rString,
sal_uInt32 nPos = CLOffset + pStdFormat->GetLastInsertKey();
if (nPos - CLOffset >= SV_COUNTRY_LANGUAGE_OFFSET)
{
- DBG_ERROR("SvNumberFormatter:: Zu viele Formate pro CL");
+ OSL_FAIL("SvNumberFormatter:: Zu viele Formate pro CL");
delete p_Entry;
}
else if (!aFTable.Insert(nPos+1,p_Entry))
@@ -966,7 +966,7 @@ String SvNumberFormatter::GetKeyword( LanguageType eLnge, USHORT nIndex )
if ( pTable && nIndex < NF_KEYWORD_ENTRIES_COUNT )
return pTable[nIndex];
- DBG_ERROR("GetKeyword: invalid index");
+ OSL_FAIL("GetKeyword: invalid index");
return String();
}
@@ -1050,7 +1050,7 @@ SvNumberFormatTable& SvNumberFormatter::GetFirstEntryTable(
SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(FIndex);
if (!pFormat)
{
-// DBG_ERROR("SvNumberFormatter:: Unbekanntes altes Zahlformat (1)");
+// OSL_FAIL("SvNumberFormatter:: Unbekanntes altes Zahlformat (1)");
rLnge = IniLnge;
eType = NUMBERFORMAT_ALL;
eTypetmp = eType;
@@ -1207,7 +1207,7 @@ BOOL SvNumberFormatter::IsNumberFormat(const String& sString,
const SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(F_Index);
if (!pFormat)
{
-// DBG_ERROR("SvNumberFormatter:: Unbekanntes altes Zahlformat (2)");
+// OSL_FAIL("SvNumberFormatter:: Unbekanntes altes Zahlformat (2)");
ChangeIntl(IniLnge);
FType = NUMBERFORMAT_NUMBER;
}
@@ -2964,7 +2964,7 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter
nNewKey = nPos+1;
if (nPos - nCLOffset >= SV_COUNTRY_LANGUAGE_OFFSET)
{
- DBG_ERROR(
+ OSL_FAIL(
"SvNumberFormatter:: Zu viele Formate pro CL");
delete pNewEntry;
}
@@ -4017,7 +4017,7 @@ void NfCurrencyEntry::CompletePositiveFormatString( String& rStr,
}
break;
default:
- DBG_ERROR("NfCurrencyEntry::CompletePositiveFormatString: unknown option");
+ OSL_FAIL("NfCurrencyEntry::CompletePositiveFormatString: unknown option");
break;
}
}
@@ -4139,7 +4139,7 @@ void NfCurrencyEntry::CompleteNegativeFormatString( String& rStr,
}
break;
default:
- DBG_ERROR("NfCurrencyEntry::CompleteNegativeFormatString: unknown option");
+ OSL_FAIL("NfCurrencyEntry::CompleteNegativeFormatString: unknown option");
break;
}
}
@@ -4170,7 +4170,7 @@ USHORT NfCurrencyEntry::GetEffectivePositiveFormat( USHORT
case 3: // 1 $
break;
default:
- DBG_ERROR("NfCurrencyEntry::GetEffectivePositiveFormat: unknown option");
+ OSL_FAIL("NfCurrencyEntry::GetEffectivePositiveFormat: unknown option");
break;
}
return nIntlFormat;
@@ -4211,7 +4211,7 @@ USHORT lcl_MergeNegativeParenthesisFormat( USHORT nIntlFormat, USHORT nCurrForma
nSign = 2;
break;
default:
- DBG_ERROR("lcl_MergeNegativeParenthesisFormat: unknown option");
+ OSL_FAIL("lcl_MergeNegativeParenthesisFormat: unknown option");
break;
}
@@ -4324,7 +4324,7 @@ USHORT NfCurrencyEntry::GetEffectiveNegativeFormat( USHORT nIntlFormat,
nIntlFormat = 8; // -1 $
break;
default:
- DBG_ERROR("NfCurrencyEntry::GetEffectiveNegativeFormat: unknown option");
+ OSL_FAIL("NfCurrencyEntry::GetEffectiveNegativeFormat: unknown option");
break;
}
#endif
@@ -4386,7 +4386,7 @@ USHORT NfCurrencyEntry::GetEffectiveNegativeFormat( USHORT nIntlFormat,
nIntlFormat, nCurrFormat );
break;
default:
- DBG_ERROR("NfCurrencyEntry::GetEffectiveNegativeFormat: unknown option");
+ OSL_FAIL("NfCurrencyEntry::GetEffectiveNegativeFormat: unknown option");
break;
}
}
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index e44af29..0004cad 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2299,7 +2299,7 @@ BOOL SvNumberformat::GetOutputString(double fNumber,
}
if (rInfo.nCntExp == 0)
{
- DBG_ERROR("SvNumberformat:: Bruch, nCntExp == 0");
+ OSL_FAIL("SvNumberformat:: Bruch, nCntExp == 0");
return FALSE;
}
ULONG nBasis = ((ULONG)floor( // 9, 99, 999 ,...
@@ -4144,7 +4144,7 @@ DateFormat SvNumberformat::GetDateOrder() const
}
else
{
- DBG_ERROR( "SvNumberformat::GetDateOrder: no date" );
+ OSL_FAIL( "SvNumberformat::GetDateOrder: no date" );
}
return rLoc().getDateFormat();
}
@@ -4154,7 +4154,7 @@ sal_uInt32 SvNumberformat::GetExactDateOrder() const
sal_uInt32 nRet = 0;
if ( (eType & NUMBERFORMAT_DATE) != NUMBERFORMAT_DATE )
{
- DBG_ERROR( "SvNumberformat::GetExactDateOrder: no date" );
+ OSL_FAIL( "SvNumberformat::GetExactDateOrder: no date" );
return nRet;
}
short const * const pType = NumFor[0].Info().nTypeArray;
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 046f9e9..de4242e 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -122,7 +122,7 @@ XubString SfxUndoAction::GetRepeatComment(SfxRepeatTarget&) const
void SfxUndoAction::Undo()
{
// die sind nur konzeptuell pure virtual
- DBG_ERROR( "pure virtual function called: SfxUndoAction::Undo()" );
+ OSL_FAIL( "pure virtual function called: SfxUndoAction::Undo()" );
}
//------------------------------------------------------------------------
@@ -130,7 +130,7 @@ void SfxUndoAction::Undo()
void SfxUndoAction::Redo()
{
// die sind nur konzeptuell pure virtual
- DBG_ERROR( "pure virtual function called: SfxUndoAction::Redo()" );
+ OSL_FAIL( "pure virtual function called: SfxUndoAction::Redo()" );
}
//------------------------------------------------------------------------
@@ -138,7 +138,7 @@ void SfxUndoAction::Redo()
void SfxUndoAction::Repeat(SfxRepeatTarget&)
{
// die sind nur konzeptuell pure virtual
- DBG_ERROR( "pure virtual function called: SfxUndoAction::Repeat()" );
+ OSL_FAIL( "pure virtual function called: SfxUndoAction::Repeat()" );
}
//------------------------------------------------------------------------
@@ -585,7 +585,7 @@ void SfxUndoManager::LeaveListAction()
if( pActUndoArray == pUndoArray )
{
- DBG_ERROR( "svl::SfxUndoManager::LeaveListAction(), called without calling EnterListAction()!" );
+ OSL_FAIL( "svl::SfxUndoManager::LeaveListAction(), called without calling EnterListAction()!" );
return;
}
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index d05e35e..0e3205b 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -952,7 +952,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL
// prepare row
ULONG nRow = nTopRow+nRelRow;
if ( !SeekRow( nRow) ) {
- DBG_ERROR("BrowseBox::ImplPaintData: SeekRow gescheitert");
+ OSL_FAIL("BrowseBox::ImplPaintData: SeekRow gescheitert");
}
_rOut.SetClipRegion();
aPos.X() = aOverallAreaPos.X();
@@ -994,7 +994,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL
if (!pCol)
{ // FS - 21.05.99 - 66325
// ist zwar eigentlich woanders (an der richtigen Stelle) gefixt, aber sicher ist sicher ...
- DBG_ERROR("BrowseBox::PaintData : nFirstCol is probably invalid !");
+ OSL_FAIL("BrowseBox::PaintData : nFirstCol is probably invalid !");
break;
}
}
@@ -1267,7 +1267,7 @@ void BrowseBox::UpdateScrollbars()
if ( nTopRow > nRowCount )
{
nTopRow = nRowCount - 1;
- DBG_ERROR("BrowseBox: nTopRow > nRowCount");
+ OSL_FAIL("BrowseBox: nTopRow > nRowCount");
}
if ( pVScroll->GetThumbPos() != nTopRow )
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 3858649..b1c95dd 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -550,12 +550,12 @@ void SvtAccessibilityOptions::Commit()
sal_Bool SvtAccessibilityOptions::GetIsForDrawings() const
{
- DBG_ERROR( "SvtAccessibilityOptions::GetIsForDrawings: is obsolete!" );
+ OSL_FAIL( "SvtAccessibilityOptions::GetIsForDrawings: is obsolete!" );
return sal_False;
}
sal_Bool SvtAccessibilityOptions::GetIsForBorders() const
{
- DBG_ERROR( "SvtAccessibilityOptions::GetIsForBorders: is obsolete!" );
+ OSL_FAIL( "SvtAccessibilityOptions::GetIsForBorders: is obsolete!" );
return sal_False;
}
sal_Bool SvtAccessibilityOptions::GetAutoDetectSystemHC() const
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 7a444b3..46c47bc 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2221,7 +2221,7 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcBmpRect( SvxIconChoiceCtrlEntry* pEntry, c
return Rectangle( aPos, aImageSize );
default:
- DBG_ERROR("IconView: Viewmode not set");
+ OSL_FAIL("IconView: Viewmode not set");
return aBound;
}
}
@@ -3784,7 +3784,7 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry( ULONG& rP
pEntry = pEntry->pflink;
if( nCount && pEntry == pHead )
{
- DBG_ERROR("SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry > Endlosschleife!");
+ OSL_FAIL("SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry > Endlosschleife!");
return 0;
}
}
diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx
index 5bba7af..c35367f 100644
--- a/svtools/source/contnr/svimpicn.cxx
+++ b/svtools/source/contnr/svimpicn.cxx
@@ -1310,7 +1310,7 @@ void SvImpIconView::PaintResizeRect( const Rectangle& rRect )
void SvImpIconView::RepaintSelectionItems()
{
- DBG_ERROR("RepaintSelectionItems");
+ OSL_FAIL("RepaintSelectionItems");
pView->Invalidate(); // vorlaeufig
}
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index 989a5b7..222e421 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -1172,7 +1172,7 @@ SvLBox* SvLBox::GetTargetView() const
void SvLBox::RequestingChilds( SvLBoxEntry* )
{
DBG_CHKTHIS(SvLBox,0);
- DBG_ERROR("Child-Request-Hdl not implemented!");
+ OSL_FAIL("Child-Request-Hdl not implemented!");
}
void SvLBox::RecalcViewData()
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 9cfca3d..c8c16c8 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -810,7 +810,7 @@ ULONG SvTreeList::GetVisibleCount( const SvListView* pView ) const
#ifdef DBG_UTIL
if( nPos > 10000000 )
{
- DBG_ERROR("nVisibleCount bad");
+ OSL_FAIL("nVisibleCount bad");
}
#endif
((SvListView*)pView)->nVisibleCount = nPos;
@@ -1310,7 +1310,7 @@ BOOL SvTreeList::Remove( SvListEntry* pEntry )
if( !pEntry->pParent )
{
- DBG_ERROR("Removing entry not in model!");
+ OSL_FAIL("Removing entry not in model!");
// unter gewissen Umstaenden (welche?) loescht der
// Explorer aus der View Eintraege, die er nicht in die View
// eingefuegt hat. Da sich der Kunde fuer ein platzendes
@@ -1800,7 +1800,7 @@ void SvListView::ActionRemoving( SvListEntry* pEntry )
#ifdef DBG_UTIL
if( nVisibleCount < nVisibleRemoved )
{
- DBG_ERROR("nVisibleRemoved bad");
+ OSL_FAIL("nVisibleRemoved bad");
}
#endif
nVisibleCount -= nVisibleRemoved;
@@ -1878,7 +1878,7 @@ void SvListView::ModelNotification( USHORT nActionId, SvListEntry* pEntry1,
case LISTACTION_RESORTING:
break;
default:
- DBG_ERROR("unknown ActionId");
+ OSL_FAIL("unknown ActionId");
}
}
diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx
index 2232d70..0846f26 100644
--- a/svtools/source/control/filectrl2.cxx
+++ b/svtools/source/control/filectrl2.cxx
@@ -89,7 +89,7 @@ void FileControl::ImplBrowseFile( )
}
catch( const Exception& )
{
- DBG_ERROR( "FileControl::ImplBrowseFile: caught an exception while executing the file picker!" );
+ OSL_FAIL( "FileControl::ImplBrowseFile: caught an exception while executing the file picker!" );
}
}
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 079721d..8cadc52 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -1293,7 +1293,7 @@ void DoubleCurrencyField::FormatChanged(FORMAT_CHANGE_TYPE nWhat)
UpdateCurrencyFormat();
break;
case FCT_KEYONLY:
- DBG_ERROR("DoubleCurrencyField::FormatChanged : somebody modified my key !");
+ OSL_FAIL("DoubleCurrencyField::FormatChanged : somebody modified my key !");
// We always build our own format from the settings we get via special methods (setCurrencySymbol etc.).
// Nobody but ourself should modifiy the format key directly !
break;
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index d2ff68f..706b343 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -264,13 +264,13 @@ public:
// -------------------------------------------------------------------
void AssigmentTransientData::setDatasourceName(const ::rtl::OUString&)
{
- DBG_ERROR( "AssigmentTransientData::setDatasourceName: cannot be implemented for transient data!" );
+ OSL_FAIL( "AssigmentTransientData::setDatasourceName: cannot be implemented for transient data!" );
}
// -------------------------------------------------------------------
void AssigmentTransientData::setCommand(const ::rtl::OUString&)
{
- DBG_ERROR( "AssigmentTransientData::setCommand: cannot be implemented for transient data!" );
+ OSL_FAIL( "AssigmentTransientData::setCommand: cannot be implemented for transient data!" );
}
// ===================================================================
@@ -818,7 +818,7 @@ void AssignmentPersistentData::Commit()
}
catch(Exception&)
{
- DBG_ERROR("AddressBookSourceDialog::initializeDatasources: caught an exception while asking for the data source names!");
+ OSL_FAIL("AddressBookSourceDialog::initializeDatasources: caught an exception while asking for the data source names!");
}
const ::rtl::OUString* pDatasourceNames = aDatasourceNames.getConstArray();
const ::rtl::OUString* pEnd = pDatasourceNames + aDatasourceNames.getLength();
@@ -904,7 +904,7 @@ void AssignmentPersistentData::Commit()
catch(SQLException& e) { aException <<= e; }
catch(Exception&)
{
- DBG_ERROR("AddressBookSourceDialog::resetTables: could not retrieve the table!");
+ OSL_FAIL("AddressBookSourceDialog::resetTables: could not retrieve the table!");
}
if (aException.hasValue())
@@ -964,7 +964,7 @@ void AssignmentPersistentData::Commit()
}
catch(Exception&)
{
- DBG_ERROR("AddressBookSourceDialog::resetFields: could not retrieve the table columns!");
+ OSL_FAIL("AddressBookSourceDialog::resetFields: could not retrieve the table columns!");
}
@@ -1263,7 +1263,7 @@ void AssignmentPersistentData::Commit()
}
catch(Exception&)
{
- DBG_ERROR("AddressBookSourceDialog::OnAdministrateDatasources: an error occurred while executing the administration dialog!");
+ OSL_FAIL("AddressBookSourceDialog::OnAdministrateDatasources: an error occurred while executing the administration dialog!");
}
// re-fill the data source list
diff --git a/svtools/source/dialogs/propctrl.cxx b/svtools/source/dialogs/propctrl.cxx
index c69a2dc..8a29513 100644
--- a/svtools/source/dialogs/propctrl.cxx
+++ b/svtools/source/dialogs/propctrl.cxx
@@ -196,7 +196,7 @@ void PropertyEditorControler_Impl::setObject( XPropertyEditorRef xEditor_, const
XIdlClassRef xPropClass = rProp.Type;
if( !xPropClass.is() )
{
- DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" )
+ OSL_FAIL( "PropertyEditorControler_Impl::Commit(), Property without type" )
return;
}
TypeClass eType = xPropClass->getTypeClass();
@@ -293,7 +293,7 @@ void PropertyEditorControler_Impl::Clicked
XIdlClassRef xPropClass = rProp.Type;
if( !xPropClass.is() )
{
- DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" )
+ OSL_FAIL( "PropertyEditorControler_Impl::Commit(), Property without type" )
return;
}
TypeClass eType = xPropClass->getTypeClass();
@@ -315,7 +315,7 @@ void PropertyEditorControler_Impl::Commit
XIdlClassRef xPropClass = rProp.Type;
if( !xPropClass.is() )
{
- DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" )
+ OSL_FAIL( "PropertyEditorControler_Impl::Commit(), Property without type" )
return;
}
TypeClass eType = xPropClass->getTypeClass();
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index b669311..a4caf85 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -522,7 +522,7 @@ namespace svt
WizardState nNextState = determineNextState( nCurrentState );
if ( WZS_INVALID_STATE == nNextState )
{
- DBG_ERROR( "OWizardMachine::skipUntil: the given target state does not exist!" );
+ OSL_FAIL( "OWizardMachine::skipUntil: the given target state does not exist!" );
return sal_False;
}
@@ -538,7 +538,7 @@ namespace svt
{
// argh! prepareLeaveCurrentPage succeeded, determineNextState succeeded,
// but ShowPage doesn't? Somebody behaves very strange here ....
- DBG_ERROR( "OWizardMachine::skipUntil: very unpolite ...." );
+ OSL_FAIL( "OWizardMachine::skipUntil: very unpolite ...." );
m_pImpl->aStateHistory = aOldStateHistory;
return sal_False;
}
@@ -574,7 +574,7 @@ namespace svt
{
// TODO: this leaves us in a state where we have no current page and an inconsistent state history.
// Perhaps we should rollback the skipping here ....
- DBG_ERROR("OWizardMachine::skip: very unpolite ....");
+ OSL_FAIL("OWizardMachine::skip: very unpolite ....");
// if somebody does a skip and then does not allow to leave ...
// (can't be a commit error, as we've already committed the current page. So if ShowPage fails here,
// somebody behaves really strange ...)
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index e8d3c78..056b739 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -590,7 +590,7 @@ void WizardDialog::RemovePage( TabPage* pPage )
pPageData = pPageData->mpNext;
}
- DBG_ERROR( "WizardDialog::RemovePage() - Page not in list" );
+ OSL_FAIL( "WizardDialog::RemovePage() - Page not in list" );
}
// -----------------------------------------------------------------------
@@ -676,7 +676,7 @@ void WizardDialog::RemoveButton( Button* pButton )
pBtnData = pBtnData->mpNext;
}
- DBG_ERROR( "WizardDialog::RemoveButton() - Button not in list" );
+ OSL_FAIL( "WizardDialog::RemoveButton() - Button not in list" );
}
// -----------------------------------------------------------------------
diff --git a/svtools/source/edit/textdata.cxx b/svtools/source/edit/textdata.cxx
index 7ea3550..3b99aad 100644
--- a/svtools/source/edit/textdata.cxx
+++ b/svtools/source/edit/textdata.cxx
@@ -112,7 +112,7 @@ USHORT TETextPortionList::FindPortion( USHORT nCharPos, USHORT& nPortionStart, B
}
}
}
- DBG_ERROR( "FindPortion: Nicht gefunden!" );
+ OSL_FAIL( "FindPortion: Nicht gefunden!" );
return ( Count() - 1 );
}
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx
index 257d3b0..d30b439 100644
--- a/svtools/source/edit/textdoc.cxx
+++ b/svtools/source/edit/textdoc.cxx
@@ -241,7 +241,7 @@ BOOL TextCharAttribList::DbgCheckAttribs()
if ( pAttr->GetStart() > pAttr->GetEnd() )
{
bOK = FALSE;
- DBG_ERROR( "Attr verdreht" );
+ OSL_FAIL( "Attr verdreht" );
}
}
return bOK;
@@ -553,7 +553,7 @@ String TextDoc::GetText( const sal_Unicode* pSep ) const
if ( nLen > STRING_MAXLEN )
{
- DBG_ERROR( "Text zu gross fuer String" );
+ OSL_FAIL( "Text zu gross fuer String" );
return String();
}
@@ -679,13 +679,13 @@ BOOL TextDoc::IsValidPaM( const TextPaM& rPaM )
{
if ( rPaM.GetPara() >= maTextNodes.Count() )
{
- DBG_ERROR( "PaM: Para out of range" );
+ OSL_FAIL( "PaM: Para out of range" );
return FALSE;
}
TextNode * pNode = maTextNodes.GetObject( rPaM.GetPara() );
if ( rPaM.GetIndex() > pNode->GetText().Len() )
{
- DBG_ERROR( "PaM: Index out of range" );
+ OSL_FAIL( "PaM: Index out of range" );
return FALSE;
}
return TRUE;
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index e14ba7e..4c7f64a 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -2251,7 +2251,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
#endif
}
break;
- default: DBG_ERROR( "ImpPaint: Unknown Portion-Type !" );
+ default: OSL_FAIL( "ImpPaint: Unknown Portion-Type !" );
}
}
diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
index d6b2377..eabc997 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
@@ -161,7 +161,7 @@ void FilterConfigItem::ImpInitTree( const String& rSubTree )
}
catch ( ::com::sun::star::uno::Exception& )
{
- DBG_ERROR( "FilterConfigItem::FilterConfigItem - Could not access configuration Key" );
+ OSL_FAIL( "FilterConfigItem::FilterConfigItem - Could not access configuration Key" );
}
}
}
@@ -202,7 +202,7 @@ FilterConfigItem::~FilterConfigItem()
}
catch ( ::com::sun::star::uno::Exception& )
{
- DBG_ERROR( "FilterConfigItem::FilterConfigItem - Could not update configuration data" );
+ OSL_FAIL( "FilterConfigItem::FilterConfigItem - Could not update configuration data" );
}
}
}
@@ -365,7 +365,7 @@ Size FilterConfigItem::ReadSize( const OUString& rKey, const Size& rDefault )
}
catch ( ::com::sun::star::uno::Exception& )
{
- DBG_ERROR( "FilterConfigItem::ReadSize - could not read PropertyValue" );
+ OSL_FAIL( "FilterConfigItem::ReadSize - could not read PropertyValue" );
}
PropertyValue aWidth;
aWidth.Name = sWidth;
@@ -442,7 +442,7 @@ void FilterConfigItem::WriteBool( const OUString& rKey, sal_Bool bNewValue )
}
catch ( ::com::sun::star::uno::Exception& )
{
- DBG_ERROR( "FilterConfigItem::WriteBool - could not set PropertyValue" );
+ OSL_FAIL( "FilterConfigItem::WriteBool - could not set PropertyValue" );
}
}
}
@@ -476,7 +476,7 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue )
}
catch ( ::com::sun::star::uno::Exception& )
{
- DBG_ERROR( "FilterConfigItem::WriteInt32 - could not set PropertyValue" );
+ OSL_FAIL( "FilterConfigItem::WriteInt32 - could not set PropertyValue" );
}
}
}
@@ -528,7 +528,7 @@ void FilterConfigItem::WriteSize( const OUString& rKey, const Size& rNewValue )
}
catch ( ::com::sun::star::uno::Exception& )
{
- DBG_ERROR( "FilterConfigItem::WriteSize - could not read PropertyValue" );
+ OSL_FAIL( "FilterConfigItem::WriteSize - could not read PropertyValue" );
}
}
}
@@ -560,7 +560,7 @@ void FilterConfigItem::WriteString( const OUString& rKey, const OUString& rNewVa
}
catch ( ::com::sun::star::uno::Exception& )
{
- DBG_ERROR( "FilterConfigItem::WriteInt32 - could not set PropertyValue" );
+ OSL_FAIL( "FilterConfigItem::WriteInt32 - could not set PropertyValue" );
}
}
}
@@ -588,7 +588,7 @@ void FilterConfigItem::WriteAny( const OUString& rKey, const Any& rNewAny )
}
catch ( com::sun::star::uno::Exception& )
{
- DBG_ERROR( "FilterConfigItem::WriteAny - could not set PropertyValue" );
+ OSL_FAIL( "FilterConfigItem::WriteAny - could not set PropertyValue" );
}
}
diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter.vcl/wmf/enhwmf.cxx
index 1dd5c64..c729f4c 100644
--- a/svtools/source/filter.vcl/wmf/enhwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/enhwmf.cxx
@@ -179,7 +179,7 @@ SvStream& operator>>( SvStream& rIn, XForm& rXForm )
{
if ( sizeof( float ) != 4 )
{
- DBG_ERROR( "EnhWMFReader::sizeof( float ) != 4" );
+ OSL_FAIL( "EnhWMFReader::sizeof( float ) != 4" );
rXForm = XForm();
}
else
diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx
index b17c7c1..2db70ee 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.cxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.cxx
@@ -816,7 +816,7 @@ void WinMtfOutput::CreateObject( INT32 nIndex, GDIObjectType eType, void* pStyle
break;
default:
- DBG_ERROR( "unsupported style not deleted" );
+ OSL_FAIL( "unsupported style not deleted" );
break;
}
}
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx
index 0cbe7b9..880500d 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -527,7 +527,7 @@ struct GDIObj
break;
default:
- DBG_ERROR( "unsupported style deleted" );
+ OSL_FAIL( "unsupported style deleted" );
break;
}
pStyle = NULL;
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter.vcl/wmf/wmfwr.cxx
index abf8b8c..8038f48 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.cxx
+++ b/svtools/source/filter.vcl/wmf/wmfwr.cxx
@@ -1743,7 +1743,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
case META_MASKSCALE_ACTION:
case META_MASKSCALEPART_ACTION:
{
- DBG_ERROR( "Unsupported action: MetaMask...Action!" );
+ OSL_FAIL( "Unsupported action: MetaMask...Action!" );
}
break;
@@ -1752,13 +1752,13 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
case META_ISECTREGIONCLIPREGION_ACTION:
{
- DBG_ERROR( "Unsupported action: MetaISectRegionClipRegionAction!" );
+ OSL_FAIL( "Unsupported action: MetaISectRegionClipRegionAction!" );
}
break;
case META_MOVECLIPREGION_ACTION:
{
- DBG_ERROR( "Unsupported action: MetaMoveClipRegionAction!" );
+ OSL_FAIL( "Unsupported action: MetaMoveClipRegionAction!" );
}
break;
}
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index b9b7588..90cda50 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -512,7 +512,7 @@ ULONG GraphicDisplayCacheEntry::GetNeededSize( OutputDevice* pOut, const Point&
}
else
{
- DBG_ERROR( "GraphicDisplayCacheEntry::GetNeededSize(): pOut->GetBitCount() == 0" );
+ OSL_FAIL( "GraphicDisplayCacheEntry::GetNeededSize(): pOut->GetBitCount() == 0" );
nNeededSize = 256000;
}
}
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 7a2dbfa..9f86e69 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -1806,7 +1806,7 @@ void GraphicManager::ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, UL
if( ( nAdjustmentFlags & ADJUSTMENT_TRANSPARENCY ) && aAttr.IsTransparent() )
{
- DBG_ERROR( "Missing implementation: Mtf-Transparency" );
+ OSL_FAIL( "Missing implementation: Mtf-Transparency" );
}
}
@@ -1854,12 +1854,12 @@ void GraphicManager::ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr
if( ( nAdjustmentFlags & ADJUSTMENT_ROTATE ) && aAttr.IsRotated() )
{
- DBG_ERROR( "Missing implementation: Animation-Rotation" );
+ OSL_FAIL( "Missing implementation: Animation-Rotation" );
}
if( ( nAdjustmentFlags & ADJUSTMENT_TRANSPARENCY ) && aAttr.IsTransparent() )
{
- DBG_ERROR( "Missing implementation: Animation-Transparency" );
+ OSL_FAIL( "Missing implementation: Animation-Transparency" );
}
}
diff --git a/svtools/source/misc/chartprettypainter.cxx b/svtools/source/misc/chartprettypainter.cxx
index 85d51e9..26a251a 100644
--- a/svtools/source/misc/chartprettypainter.cxx
+++ b/svtools/source/misc/chartprettypainter.cxx
@@ -134,7 +134,7 @@ bool ChartPrettyPainter::DoPrettyPaintChart( uno::Reference< frame::XModel > xCh
catch( uno::Exception& e )
{
(void)e;
- DBG_ERROR( "Chart cannot be painted pretty!" );
+ OSL_FAIL( "Chart cannot be painted pretty!" );
}
return false;
}
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 5a6959c..1b40635 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -428,7 +428,7 @@ void EmbeddedObjectRef::GetReplacement( BOOL bUpdate )
}
else
{
- DBG_ERROR("No update, but replacement exists already!");
+ OSL_FAIL("No update, but replacement exists already!");
return;
}
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 4e83f7f..1a523c9 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -263,7 +263,7 @@ namespace svt
{
if ( !_rLHS.is() || !_rRHS.is() )
{
- DBG_ERROR( "TemplateContentEqual::operator(): invalid contents!" );
+ OSL_FAIL( "TemplateContentEqual::operator(): invalid contents!" );
return true;
// this is not strictly true, in case only one is invalid - but this is a heavy error anyway
}
@@ -691,7 +691,7 @@ namespace svt
}
catch( const Exception& )
{
- DBG_ERROR( "TemplateFolderCacheImpl::implReadFolder: caught an exception!" );
+ OSL_FAIL( "TemplateFolderCacheImpl::implReadFolder: caught an exception!" );
return sal_False;
}
return sal_True;
@@ -788,7 +788,7 @@ namespace svt
INetURLObject aStorageURL( sStorageURL );
if ( INET_PROT_NOT_VALID == aStorageURL.GetProtocol() )
{
- DBG_ERROR( "TemplateFolderCacheImpl::openCacheStream: invalid storage path!" );
+ OSL_FAIL( "TemplateFolderCacheImpl::openCacheStream: invalid storage path!" );
return sal_False;
}
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 011f0e8..2637db2 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -634,7 +634,7 @@ void TransferableHelper::ImplFlush()
}
catch( const ::com::sun::star::uno::Exception& )
{
- DBG_ERROR( "Could not flush clipboard" );
+ OSL_FAIL( "Could not flush clipboard" );
}
Application::AcquireSolarMutex( nRef );
@@ -1038,7 +1038,7 @@ sal_Bool TransferableHelper::SetInterface( const ::com::sun::star::uno::Referenc
sal_Bool TransferableHelper::WriteObject( SotStorageStreamRef&, void*, sal_uInt32, const DataFlavor& )
{
- DBG_ERROR( "TransferableHelper::WriteObject( ... ) not implemented" );
+ OSL_FAIL( "TransferableHelper::WriteObject( ... ) not implemented" );
return sal_False;
}
diff --git a/svtools/source/productregistration/registrationdlg.cxx b/svtools/source/productregistration/registrationdlg.cxx
index f441582..f24585e 100644
--- a/svtools/source/productregistration/registrationdlg.cxx
+++ b/svtools/source/productregistration/registrationdlg.cxx
@@ -133,7 +133,7 @@ namespace svt
#ifdef DBG_UTIL
else
{
- DBG_ERROR( "RegistrationDialog::Execute: invalid dialog state!" );
+ OSL_FAIL( "RegistrationDialog::Execute: invalid dialog state!" );
}
#endif
}
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 469261f..13ba4d3 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -137,13 +137,13 @@ namespace svt { namespace table
}
virtual PColumnModel getColumnModel( ColPos column )
{
- DBG_ERROR( "EmptyTableModel::getColumnModel: invalid call!" );
+ OSL_FAIL( "EmptyTableModel::getColumnModel: invalid call!" );
(void)column;
return PColumnModel();
}
virtual PColumnModel getColumnModelByID( ColumnID id )
{
- DBG_ERROR( "EmptyTableModel::getColumnModel: invalid call!" );
+ OSL_FAIL( "EmptyTableModel::getColumnModel: invalid call!" );
(void)id;
return PColumnModel();
}
@@ -1517,7 +1517,7 @@ namespace svt { namespace table
}
break;
default:
- DBG_ERROR( "TableControl_Impl::dispatchAction: unsupported action!" );
+ OSL_FAIL( "TableControl_Impl::dispatchAction: unsupported action!" );
}
return bSuccess;
}
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index 8275d56..d7bcac8 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -290,7 +290,7 @@ using namespace ::com::sun::star::uno;
{
(void) listener;
// TODO
- DBG_ERROR( "DefaultTableModel::addTableModelListener: not yet implemented!" );
+ OSL_FAIL( "DefaultTableModel::addTableModelListener: not yet implemented!" );
}
//--------------------------------------------------------------------
@@ -298,7 +298,7 @@ using namespace ::com::sun::star::uno;
{
(void)listener;
// TODO
- DBG_ERROR( "DefaultTableModel::removeTableModelListener: not yet implemented!" );
+ OSL_FAIL( "DefaultTableModel::removeTableModelListener: not yet implemented!" );
}
//--------------------------------------------------------------------
@@ -319,7 +319,7 @@ using namespace ::com::sun::star::uno;
{
(void)id;
// TODO
- DBG_ERROR( "DefaultTableModel::getColumnModelByID: not yet implemented!" );
+ OSL_FAIL( "DefaultTableModel::getColumnModelByID: not yet implemented!" );
return PColumnModel();
}
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index ffd5793..faec1cb 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -282,7 +282,7 @@ void SvBaseEventDescriptor::getAnyFromMacro(Any& rAny,
}
case JAVASCRIPT:
default:
- DBG_ERROR("not implemented");
+ OSL_FAIL("not implemented");
}
}
// else: bRetValueOK not set
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 30932c7..0be9aef 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -440,7 +440,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const
case ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN: meLineEndType = LINEEND_CR; break;
case ::com::sun::star::awt::LineEndFormat::LINE_FEED: meLineEndType = LINEEND_LF; break;
case ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN_LINE_FEED: meLineEndType = LINEEND_CRLF; break;
- default: DBG_ERROR( "VCLXMultiLineEdit::setProperty: invalid line end value!" ); break;
+ default: OSL_FAIL( "VCLXMultiLineEdit::setProperty: invalid line end value!" ); break;
}
}
break;
@@ -496,7 +496,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const
case LINEEND_CR: nLineEndType = ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN; break;
case LINEEND_LF: nLineEndType = ::com::sun::star::awt::LineEndFormat::LINE_FEED; break;
case LINEEND_CRLF: nLineEndType = ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN_LINE_FEED; break;
- default: DBG_ERROR( "VCLXMultiLineEdit::getProperty: invalid line end value!" ); break;
+ default: OSL_FAIL( "VCLXMultiLineEdit::getProperty: invalid line end value!" ); break;
}
aProp <<= nLineEndType;
}
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 236da55..d3a3616 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -492,7 +492,7 @@ void SvUnoImageMapObject::_setPropertyValues( const PropertyMapEntry** ppEntries
bOk = *pValues >>= maPolygon;
break;
default:
- DBG_ERROR( "SvUnoImageMapObject::_setPropertyValues: unexpected property handle" );
+ OSL_FAIL( "SvUnoImageMapObject::_setPropertyValues: unexpected property handle" );
break;
}
@@ -542,7 +542,7 @@ void SvUnoImageMapObject::_getPropertyValues( const PropertyMapEntry** ppEntries
*pValues <<= maPolygon;
break;
default:
- DBG_ERROR( "SvUnoImageMapObject::_getPropertyValues: unexpected property handle" );
+ OSL_FAIL( "SvUnoImageMapObject::_getPropertyValues: unexpected property handle" );
break;
}
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 554872f..ec8413d 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -203,7 +203,7 @@ IMPL_LINK( VCLXMenu, MenuEventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_MENU_HIDE:
break;
- default: DBG_ERROR( "MenuEventListener - Unknown event!" );
+ default: OSL_FAIL( "MenuEventListener - Unknown event!" );
}
}
}
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index f9b83bf..64569f0 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -178,7 +178,7 @@ sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( ::com::sun::star::uno
break;
default:
{
- DBG_ERROR( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" );
+ OSL_FAIL( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" );
}
}
return bDifferent;
@@ -202,7 +202,7 @@ void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle
break;
default:
{
- DBG_ERROR( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" );
+ OSL_FAIL( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" );
}
}
}
@@ -221,7 +221,7 @@ void VCLXPrinterPropertySet::getFastPropertyValue( ::com::sun::star::uno::Any& r
break;
default:
{
- DBG_ERROR( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" );
+ OSL_FAIL( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" );
}
}
}
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 525637f..fa64c6d 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1005,7 +1005,7 @@ void VCLXWindow::dispose( ) throw(::com::sun::star::uno::RuntimeException)
}
catch ( const ::com::sun::star::uno::Exception& )
{
- DBG_ERROR( "VCLXWindow::dispose: could not dispose the accessible context!" );
+ OSL_FAIL( "VCLXWindow::dispose: could not dispose the accessible context!" );
}
mpImpl->mxAccessibleContext.clear();
@@ -1327,7 +1327,7 @@ void VCLXWindow::getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescript
BackgroundColor = rStyleSettings.GetDialogColor().GetColor();
}
break;
- default: DBG_ERROR( "VCLWindow::getStyles() - unknown Type" );
+ default: OSL_FAIL( "VCLWindow::getStyles() - unknown Type" );
}
}
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index b911705..0a75b54 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -900,7 +900,7 @@ short VCLXCheckBox::getState() throw(::com::sun::star::uno::RuntimeException)
case STATE_NOCHECK: nState = 0; break;
case STATE_CHECK: nState = 1; break;
case STATE_DONTKNOW: nState = 2; break;
- default: DBG_ERROR( "VCLXCheckBox::getState(): unknown TriState!" );
+ default: OSL_FAIL( "VCLXCheckBox::getState(): unknown TriState!" );
}
}
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 9a604f4..9dca486 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -150,7 +150,7 @@ struct DisposeControlModel : public ::std::unary_function< Reference< XControlMo
}
catch( const Exception& )
{
- DBG_ERROR( "DisposeControlModel::(): caught an exception while disposing a component!" );
+ OSL_FAIL( "DisposeControlModel::(): caught an exception while disposing a component!" );
}
}
};
@@ -909,7 +909,7 @@ sal_Bool SAL_CALL UnoControlDialogModel::getGroupControl( ) throw (RuntimeExcep
// ----------------------------------------------------------------------------
void SAL_CALL UnoControlDialogModel::setGroupControl( sal_Bool ) throw (RuntimeException)
{
- DBG_ERROR( "UnoControlDialogModel::setGroupControl: explicit grouping not supported" );
+ OSL_FAIL( "UnoControlDialogModel::setGroupControl: explicit grouping not supported" );
}
// ----------------------------------------------------------------------------
@@ -1004,7 +1004,7 @@ void SAL_CALL UnoControlDialogModel::setGroup( const Sequence< Reference< XContr
// We only have a sequence of control models, and we _know_ (yes, that's a HACK relying on
// implementation details) that VCL does grouping according to the order of controls automatically
// At least VCL does this for all we're interested in: Radio buttons.
- DBG_ERROR( "UnoControlDialogModel::setGroup: grouping not supported" );
+ OSL_FAIL( "UnoControlDialogModel::setGroup: grouping not supported" );
}
// ----------------------------------------------------------------------------
@@ -1027,7 +1027,7 @@ namespace
}
catch( const Exception& )
{
- DBG_ERROR( "lcl_getDialogStep: caught an exception while determining the dialog page!" );
+ OSL_FAIL( "lcl_getDialogStep: caught an exception while determining the dialog page!" );
}
return nStep;
}
@@ -1052,7 +1052,7 @@ void SAL_CALL UnoControlDialogModel::getGroup( sal_Int32 _nGroup, Sequence< Refe
if ( ( _nGroup < 0 ) || ( _nGroup >= (sal_Int32)maGroups.size() ) )
{
- DBG_ERROR( "UnoControlDialogModel::getGroup: invalid argument and I am not allowed to throw an exception!" );
+ OSL_FAIL( "UnoControlDialogModel::getGroup: invalid argument and I am not allowed to throw an exception!" );
_rGroup.realloc( 0 );
_rName = ::rtl::OUString();
}
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index baea429..4fe7753 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -210,7 +210,7 @@
case GCM_PROPERTY_ID_STEP: aDefault <<= (sal_Int32) 0; break;
case GCM_PROPERTY_ID_TAG: aDefault <<= ::rtl::OUString(); break;
case GCM_PROPERTY_ID_RESOURCERESOLVER: aDefault <<= Reference< resource::XStringResourceResolver >(); break;
- default: DBG_ERROR( "ImplGetDefaultValueByHandle - unknown Property" );
+ default: OSL_FAIL( "ImplGetDefaultValueByHandle - unknown Property" );
}
return aDefault;
@@ -232,7 +232,7 @@
case GCM_PROPERTY_ID_STEP: aValue <<= m_nStep; break;
case GCM_PROPERTY_ID_TAG: aValue <<= m_aTag; break;
case GCM_PROPERTY_ID_RESOURCERESOLVER: aValue <<= m_xStrResolver; break;
- default: DBG_ERROR( "ImplGetPropertyValueByHandle - unknown Property" );
+ default: OSL_FAIL( "ImplGetPropertyValueByHandle - unknown Property" );
}
return aValue;
@@ -252,7 +252,7 @@
case GCM_PROPERTY_ID_STEP: aValue >>= m_nStep; break;
case GCM_PROPERTY_ID_TAG: aValue >>= m_aTag; break;
case GCM_PROPERTY_ID_RESOURCERESOLVER: aValue >>= m_xStrResolver; break;
- default: DBG_ERROR( "ImplSetPropertyValueByHandle - unknown Property" );
+ default: OSL_FAIL( "ImplSetPropertyValueByHandle - unknown Property" );
}
}
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index 4148084..9a1ee3f 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -160,7 +160,7 @@ namespace toolkit
break;
default:
{
- DBG_ERROR( "UnoScrollBarControl::adjustmentValueChanged - unknown Type" );
+ OSL_FAIL( "UnoScrollBarControl::adjustmentValueChanged - unknown Type" );
}
}
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index d526f4f..1a24f45 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -217,7 +217,7 @@ namespace toolkit
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( rEvent.Value ), sal_False );
break;
default:
- DBG_ERROR( "UnoSpinButtonControl::adjustmentValueChanged - unknown Type" );
+ OSL_FAIL( "UnoSpinButtonControl::adjustmentValueChanged - unknown Type" );
}
if ( maAdjustmentListeners.getLength() )
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 37188c9..483d00f 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -374,7 +374,7 @@ void UnoControl::disposeAccessibleContext()
}
catch( const Exception& )
{
- DBG_ERROR( "UnoControl::disposeAccessibleContext: could not dispose my AccessibleContext!" );
+ OSL_FAIL( "UnoControl::disposeAccessibleContext: could not dispose my AccessibleContext!" );
}
}
}
@@ -1452,7 +1452,7 @@ sal_Bool UnoControl::isTransparent( ) throw(RuntimeException)
// XServiceInfo
::rtl::OUString UnoControl::getImplementationName( ) throw(RuntimeException)
{
- DBG_ERROR( "This method should be overloaded!" );
+ OSL_FAIL( "This method should be overloaded!" );
return ::rtl::OUString();
}
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index b6617db..6d64763 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -147,7 +147,7 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId,
break;
case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: rValue >>= rFD.Type;
break;
- default: DBG_ERROR( "FontProperty?!" );
+ default: OSL_FAIL( "FontProperty?!" );
}
}
@@ -195,7 +195,7 @@ UnoControlModel::~UnoControlModel()
UnoControlModel* UnoControlModel::Clone() const
{
- DBG_ERROR( "UnoControlModel::Clone() ?!" );
+ OSL_FAIL( "UnoControlModel::Clone() ?!" );
return NULL;
}
@@ -249,7 +249,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const
case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: aDefault <<= aFD.Kerning; break;
case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: aDefault <<= aFD.WordLineMode; break;
case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: aDefault <<= aFD.Type; break;
- default: DBG_ERROR( "FontProperty?!" );
+ default: OSL_FAIL( "FontProperty?!" );
}
}
else
@@ -445,7 +445,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const
}
break;
- default: DBG_ERROR( "ImplGetDefaultValue - unknown Property" );
+ default: OSL_FAIL( "ImplGetDefaultValue - unknown Property" );
}
}
@@ -607,7 +607,7 @@ void UnoControlModel::setPropertyToDefault( const ::rtl::OUString& PropertyName
{
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
- DBG_ERROR( "ServiceName von UnoControlModel ?!" );
+ OSL_FAIL( "ServiceName von UnoControlModel ?!" );
return ::rtl::OUString();
}
@@ -819,7 +819,7 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun:
}
else
{
- DBG_ERROR( "Property?!" );
+ OSL_FAIL( "Property?!" );
}
sal_Int32 nPropDataLen = xMark->offsetToMark( nPropDataBeginMark );
@@ -1027,7 +1027,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
}
else
{
- DBG_ERROR( "read: unknown Property!" );
+ OSL_FAIL( "read: unknown Property!" );
}
}
}
@@ -1090,7 +1090,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
// ::com::sun::star::lang::XServiceInfo
::rtl::OUString UnoControlModel::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException)
{
- DBG_ERROR( "This method should be overloaded!" );
+ OSL_FAIL( "This method should be overloaded!" );
return ::rtl::OUString();
}
@@ -1116,7 +1116,7 @@ sal_Bool UnoControlModel::supportsService( const ::rtl::OUString& rServiceName )
// ::cppu::OPropertySetHelper
::cppu::IPropertyArrayHelper& UnoControlModel::getInfoHelper()
{
- DBG_ERROR( "UnoControlModel::getInfoHelper() not possible!" );
+ OSL_FAIL( "UnoControlModel::getInfoHelper() not possible!" );
return *(::cppu::IPropertyArrayHelper*) NULL;
}
@@ -1317,12 +1317,12 @@ void UnoControlModel::getFastPropertyValue( ::com::sun::star::uno::Any& rValue,
break;
case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: rValue <<= aFD.Type;
break;
- default: DBG_ERROR( "FontProperty?!" );
+ default: OSL_FAIL( "FontProperty?!" );
}
}
else
{
- DBG_ERROR( "getFastPropertyValue - invalid Property!" );
+ OSL_FAIL( "getFastPropertyValue - invalid Property!" );
}
}
@@ -1379,7 +1379,7 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun:
// ::com::sun::star::beans::XMultiPropertySet
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > UnoControlModel::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException)
{
- DBG_ERROR( "UnoControlModel::getPropertySetInfo() not possible!" );
+ OSL_FAIL( "UnoControlModel::getPropertySetInfo() not possible!" );
return ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >();
}
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 9e82976..3a4fdfa 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -720,7 +720,7 @@ UnoButtonControl::UnoButtonControl()
break;
default:
{
- DBG_ERROR( "Unknown Button Type!" );
+ OSL_FAIL( "Unknown Button Type!" );
}
}
}
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 9b590e2..6076684 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -187,7 +187,7 @@ void UnoWrapper::SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Ref
{
int i = 0;
i++;
- // DBG_ERROR( "UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window!" );
+ // OSL_FAIL( "UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window!" );
}
pVCLXWindow->SetWindow( pWindow );
pWindow->SetWindowPeer( xIFace, pVCLXWindow );
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 634565e..35400d2 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -246,7 +246,7 @@ float VCLUnoHelper::ConvertFontWidth( FontWidth eWidth )
else if( eWidth == WIDTH_ULTRA_EXPANDED )
return ::com::sun::star::awt::FontWidth::ULTRAEXPANDED;
- DBG_ERROR( "Unknown FontWidth" );
+ OSL_FAIL( "Unknown FontWidth" );
return ::com::sun::star::awt::FontWidth::DONTKNOW;
}
@@ -273,7 +273,7 @@ FontWidth VCLUnoHelper::ConvertFontWidth( float f )
else if( f <= ::com::sun::star::awt::FontWidth::ULTRAEXPANDED )
return WIDTH_ULTRA_EXPANDED;
- DBG_ERROR( "Unknown FontWidth" );
+ OSL_FAIL( "Unknown FontWidth" );
return WIDTH_DONTKNOW;
}
@@ -300,7 +300,7 @@ float VCLUnoHelper::ConvertFontWeight( FontWeight eWeight )
else if( eWeight == WEIGHT_BLACK )
return ::com::sun::star::awt::FontWeight::BLACK;
- DBG_ERROR( "Unknown FontWeigth" );
+ OSL_FAIL( "Unknown FontWeigth" );
return ::com::sun::star::awt::FontWeight::DONTKNOW;
}
@@ -327,7 +327,7 @@ FontWeight VCLUnoHelper::ConvertFontWeight( float f )
else if( f <= ::com::sun::star::awt::FontWeight::BLACK )
return WEIGHT_BLACK;
- DBG_ERROR( "Unknown FontWeigth" );
+ OSL_FAIL( "Unknown FontWeigth" );
return WEIGHT_DONTKNOW;
}
diff --git a/toolkit/source/layout/core/box-base.cxx b/toolkit/source/layout/core/box-base.cxx
index 015dada..7bb1360 100644
--- a/toolkit/source/layout/core/box-base.cxx
+++ b/toolkit/source/layout/core/box-base.cxx
@@ -52,7 +52,7 @@ static bool isVisible( uno::Reference< awt::XLayoutConstrains > xWidget )
{
if ( !xWidget.is() )
{
- DBG_ERROR( "FIXME: invalid child !" );
+ OSL_FAIL( "FIXME: invalid child !" );
return true;
}
@@ -132,7 +132,7 @@ Box_Base::removeChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
}
else
{
- DBG_ERROR( "Box_Base: removeChild: no such child" );
+ OSL_FAIL( "Box_Base: removeChild: no such child" );
}
}
diff --git a/toolkit/source/layout/core/container.cxx b/toolkit/source/layout/core/container.cxx
index 80f8dfc..9e844e1 100644
--- a/toolkit/source/layout/core/container.cxx
+++ b/toolkit/source/layout/core/container.cxx
@@ -76,7 +76,7 @@ Container::allocateChildAt( const uno::Reference< awt::XLayoutConstrains > &xChi
awt::PosSize::POSSIZE );
else
{
- DBG_ERROR( "Error: non-sizeable child" );
+ OSL_FAIL( "Error: non-sizeable child" );
}
}
}
diff --git a/toolkit/source/layout/core/dialogbuttonhbox.cxx b/toolkit/source/layout/core/dialogbuttonhbox.cxx
index a727007..2fc0d8d 100644
--- a/toolkit/source/layout/core/dialogbuttonhbox.cxx
+++ b/toolkit/source/layout/core/dialogbuttonhbox.cxx
@@ -185,7 +185,7 @@ DialogButtonHBox::removeChild( uno::Reference< awt::XLayoutConstrains > const& x
}
else
{
- DBG_ERROR( "DialogButtonHBox: removeChild: no such child" );
+ OSL_FAIL( "DialogButtonHBox: removeChild: no such child" );
}
}
diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx
index e0ab1ff..1d3b588 100644
--- a/toolkit/source/layout/core/import.cxx
+++ b/toolkit/source/layout/core/import.cxx
@@ -107,7 +107,7 @@ SAL_THROW (())
} // DEBUG:
else if ( pParent == NULL )
{
- DBG_ERROR( "Fatal error: top node isn't a dialog" );
+ OSL_FAIL( "Fatal error: top node isn't a dialog" );
}
OUString aOrdering;
diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx
index f5c85a9..ad1936e 100644
--- a/toolkit/source/layout/core/proplist.cxx
+++ b/toolkit/source/layout/core/proplist.cxx
@@ -246,7 +246,7 @@ setProperties( uno::Reference< uno::XInterface > const& xPeer,
{
if ( !prophlp::canHandleProps( xPeer ) )
{
- DBG_ERROR( "Error: setProperties - bad handle ignoring props:\n" );
+ OSL_FAIL( "Error: setProperties - bad handle ignoring props:\n" );
for ( PropList::const_iterator it = rProps.begin(); it != rProps.end();
++it )
{
diff --git a/toolkit/workben/layout/zoom.cxx b/toolkit/workben/layout/zoom.cxx
index 9ab3cce..ac11481 100644
--- a/toolkit/workben/layout/zoom.cxx
+++ b/toolkit/workben/layout/zoom.cxx
@@ -197,7 +197,7 @@ void SvxZoomDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt )
break;
default:
- DBG_ERROR( "wrong button number" );
+ OSL_FAIL( "wrong button number" );
}
}
@@ -220,7 +220,7 @@ void SvxZoomDialog::HideButton( USHORT nBtnId )
break;
default:
- DBG_ERROR( "Falsche Button-Nummer!!!" );
+ OSL_FAIL( "Falsche Button-Nummer!!!" );
}
}
@@ -498,7 +498,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn )
}
else
{
- DBG_ERROR( "Wrong Button" );
+ OSL_FAIL( "Wrong Button" );
return 0;
}
@@ -585,7 +585,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn )
}
else
{
- DBG_ERROR( "Wrong Button" );
+ OSL_FAIL( "Wrong Button" );
return 0;
}
#if !TEST_LAYOUT
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 2d4bc99..dcd2032 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -1386,7 +1386,7 @@ DirEntry& DirEntry::operator=( const DirEntry& rEntry )
if ( this == &rEntry )
return *this;
if ( rEntry.nError != FSYS_ERR_OK ) {
- DBG_ERROR("Zuweisung mit invalidem DirEntry");
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list