[Libreoffice-commits] .: 4 commits - accessibility/source automation/source basctl/source cui/source extensions/source forms/source lingucomponent/source xmlsecurity/source xmlsecurity/workben
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Mar 2 06:01:37 PST 2011
accessibility/source/extended/AccessibleBrowseBoxTable.cxx | 2
accessibility/source/extended/AccessibleGridControlTable.cxx | 2
automation/source/communi/communi.cxx | 2
automation/source/server/XMLParser.cxx | 2
automation/source/server/cmdbasestream.cxx | 9 +-
automation/source/server/recorder.cxx | 6 -
automation/source/server/server.cxx | 4 -
automation/source/server/statemnt.cxx | 14 ++--
automation/source/simplecm/packethandler.cxx | 5 -
automation/source/simplecm/simplecm.cxx | 5 -
automation/source/testtool/objtest.cxx | 33 +++-------
basctl/source/basicide/baside2.cxx | 4 -
basctl/source/basicide/bastype3.cxx | 8 +-
basctl/source/basicide/localizationmgr.cxx | 4 -
basctl/source/basicide/moduldl2.cxx | 2
basctl/source/basicide/moduldlg.cxx | 2
basctl/source/dlged/dlged.cxx | 2
basctl/source/dlged/propbrw.cxx | 4 -
cui/source/customize/cfgutil.cxx | 2
cui/source/customize/selector.cxx | 2
cui/source/dialogs/cuigaldlg.cxx | 4 -
cui/source/dialogs/cuigrfflt.cxx | 2
cui/source/dialogs/dlgname.cxx | 2
cui/source/dialogs/hangulhanjadlg.cxx | 4 -
cui/source/dialogs/hltpbase.cxx | 2
cui/source/dialogs/insdlg.cxx | 8 +-
cui/source/dialogs/showcols.cxx | 4 -
cui/source/dialogs/zoom.cxx | 8 +-
cui/source/options/optasian.cxx | 6 -
cui/source/options/optgdlg.cxx | 2
cui/source/options/optlingu.cxx | 10 +--
cui/source/options/optsave.cxx | 2
cui/source/options/treeopt.cxx | 2
cui/source/tabpages/autocdlg.cxx | 2
cui/source/tabpages/macroass.cxx | 2
cui/source/tabpages/paragrph.cxx | 2
cui/source/tabpages/swpossizetabpage.cxx | 4 -
cui/source/tabpages/textattr.cxx | 2
extensions/source/abpilot/abspilot.cxx | 6 -
extensions/source/abpilot/admininvokationimpl.cxx | 2
extensions/source/abpilot/datasourcehandling.cxx | 16 ++--
extensions/source/abpilot/fieldmappingimpl.cxx | 8 +-
extensions/source/bibliography/datman.cxx | 26 +++----
extensions/source/bibliography/formcontrolcontainer.cxx | 2
extensions/source/bibliography/framectr.cxx | 10 +--
extensions/source/bibliography/general.cxx | 4 -
extensions/source/dbpilots/commonpagesdbp.cxx | 12 +--
extensions/source/dbpilots/controlwizard.cxx | 20 +++---
extensions/source/dbpilots/dbptools.cxx | 2
extensions/source/dbpilots/groupboxwiz.cxx | 2
extensions/source/dbpilots/listcombowizard.cxx | 4 -
extensions/source/dbpilots/optiongrouplayouter.cxx | 6 -
extensions/source/plugin/aqua/sysplug.cxx | 2
extensions/source/plugin/base/plctrl.cxx | 4 -
extensions/source/plugin/win/sysplug.cxx | 2
extensions/source/plugin/win/winmgr.cxx | 2
extensions/source/propctrlr/browserlistbox.cxx | 2
extensions/source/propctrlr/buttonnavigationhandler.cxx | 4 -
extensions/source/propctrlr/cellbindinghandler.cxx | 10 +--
extensions/source/propctrlr/editpropertyhandler.cxx | 2
extensions/source/propctrlr/eformspropertyhandler.cxx | 8 +-
extensions/source/propctrlr/eventhandler.cxx | 6 -
extensions/source/propctrlr/fontdialog.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 12 +--
extensions/source/propctrlr/formmetadata.cxx | 4 -
extensions/source/propctrlr/genericpropertyhandler.cxx | 8 +-
extensions/source/propctrlr/handlerhelper.cxx | 2
extensions/source/propctrlr/propcontroller.cxx | 6 -
extensions/source/propctrlr/propertyhandler.cxx | 4 -
extensions/source/propctrlr/submissionhandler.cxx | 2
extensions/source/propctrlr/taborder.cxx | 6 -
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 12 +--
extensions/source/scanner/scanwin.cxx | 18 ++---
extensions/source/svg/svgaction.cxx | 2
forms/source/component/Button.cxx | 4 -
forms/source/component/CheckBox.cxx | 6 -
forms/source/component/ComboBox.cxx | 4 -
forms/source/component/Currency.cxx | 2
forms/source/component/DatabaseForm.cxx | 10 +--
forms/source/component/File.cxx | 2
forms/source/component/Filter.cxx | 2
forms/source/component/FormComponent.cxx | 6 -
forms/source/component/FormattedField.cxx | 6 -
forms/source/component/FormattedFieldWrapper.cxx | 2
forms/source/component/Grid.cxx | 4 -
forms/source/component/GroupBox.cxx | 2
forms/source/component/GroupManager.cxx | 4 -
forms/source/component/Hidden.cxx | 2
forms/source/component/ImageButton.cxx | 2
forms/source/component/ImageControl.cxx | 4 -
forms/source/component/ListBox.cxx | 2
forms/source/component/RadioButton.cxx | 4 -
forms/source/component/formcontrolfont.cxx | 6 -
forms/source/component/imgprod.cxx | 2
forms/source/helper/controlfeatureinterception.cxx | 4 -
forms/source/helper/formnavigation.cxx | 2
forms/source/misc/InterfaceContainer.cxx | 4 -
forms/source/xforms/propertysetbase.cxx | 2
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 2
lingucomponent/source/lingutil/lingutil.cxx | 6 -
lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx | 2
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 2
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 2
xmlsecurity/source/component/registerservices.cxx | 2
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 6 -
xmlsecurity/source/dialogs/macrosecurity.cxx | 2
xmlsecurity/workben/signaturetest.cxx | 8 +-
107 files changed, 267 insertions(+), 275 deletions(-)
New commits:
commit 461a425d646526699ad2a56e67bd1446e18a517c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Mar 2 09:51:56 2011 +0100
Add osl/diagnose.d includes
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index 0084f85..d71dcf1 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -37,6 +37,7 @@
*
************************************************************************/
#include <osl/endian.h>
+#include <osl/diagnose.h>
#include "cmdbasestream.hxx"
#include "rcontrol.hxx"
diff --git a/automation/source/simplecm/packethandler.cxx b/automation/source/simplecm/packethandler.cxx
index b03673a..b4cdae4 100644
--- a/automation/source/simplecm/packethandler.cxx
+++ b/automation/source/simplecm/packethandler.cxx
@@ -41,6 +41,7 @@
#include <automation/commtypes.hxx>
#include <automation/commdefines.hxx>
#include "communiio.hxx"
+#include <osl/diagnose.h>
/**
Forces switch to multichannel headers even for old communication Method
diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx
index 8cf2b03..33c9e85 100644
--- a/automation/source/simplecm/simplecm.cxx
+++ b/automation/source/simplecm/simplecm.cxx
@@ -33,6 +33,7 @@
#define ENABLE_BYTESTRING_STREAM_OPERATORS
#include <tools/solar.h>
#include <automation/simplecm.hxx>
+#include <osl/diagnose.h>
#include <automation/commdefines.hxx>
#include "packethandler.hxx"
commit d0a313b279ec4e9be3bd859d8a420fff9ddd8bc7
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 1 18:57:17 2011 +0100
Replace one DBG_UTIL with OSL_DEBUG_LEVEL
And remove the other one, as OSL_FAIL is executed only on
OSL_DEBUG_LEVEL > 0 (in diagnose.h).
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 657ee5d..bab52a2 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1626,7 +1626,7 @@ void ModulWindowLayout::DockaWindow( DockingWindow* pDockingWindow )
// evtl. Sonderbehandlung...
ArrangeWindows();
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
else
OSL_FAIL( "Wer will sich denn hier andocken ?" );
#endif
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index e1c410d..9f40dcb 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -1057,9 +1057,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG )
}
catch(IllegalArgumentException)
{
-#ifdef DBG_UTIL
OSL_FAIL( "Folder picker failed with illegal arguments" );
-#endif
}
}
commit ab7005a89db017b36a66c4509edaee88cf9fbda1
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 1 18:14:41 2011 +0100
Remove DBG_UTILx
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 383edae..7d1d67b 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -1106,15 +1106,6 @@ void TestToolObj::WaitForAnswer ()
{
if ( bUseIPC )
{
- #ifdef DBG_UTILx
- USHORT nSysWinModeMemo = GetpApp()->GetSystemWindowMode();
- GetpApp()->SetSystemWindowMode( 0 );
- ModelessDialog aDlg(NULL);
- aDlg.SetOutputSizePixel(Size(200,0));
- aDlg.SetText(CUniString("Waiting for Answer"));
- aDlg.Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
- GetpApp()->SetSystemWindowMode( nSysWinModeMemo );
- #endif
BOOL bWasRealWait = !bReturnOK;
BasicRuntime aRun( NULL );
if ( BasicRuntimeAccess::HasRuntime() )
commit fcfd8b64c4e427d4599dd9da4148860f732b6ec6
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 1 17:55:09 2011 +0100
Move DBG_ERROR to OSL_FAIL
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index f94c7fe..3557cfa 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -264,7 +264,7 @@ Reference< XAccessibleTable > AccessibleBrowseBoxTable::implGetHeaderBar(
}
catch( lang::IndexOutOfBoundsException& )
{
- DBG_ERROR( "implGetHeaderBar - wrong child index" );
+ OSL_FAIL( "implGetHeaderBar - wrong child index" );
}
// RuntimeException goes to caller
}
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index b6ab201..d76dd78 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -364,7 +364,7 @@ Reference< XAccessibleTable > AccessibleGridControlTable::implGetHeaderBar(
}
catch( lang::IndexOutOfBoundsException& )
{
- DBG_ERROR( "implGetHeaderBar - wrong child index" );
+ OSL_FAIL( "implGetHeaderBar - wrong child index" );
}
// RuntimeException goes to caller
}
diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx
index ede17dd..a7f551d 100644
--- a/automation/source/communi/communi.cxx
+++ b/automation/source/communi/communi.cxx
@@ -56,7 +56,7 @@ _SV_IMPL_SORTAR_ALG( nm,AE )\
if( nL ) {\
DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );\
for( USHORT n=nP; n < nP + nL; n++ ) \
- DBG_ERROR("Das Element der Liste wurde nicht gelöscht"); \
+ OSL_FAIL("Das Element der Liste wurde nicht gelöscht"); \
SvPtrarr::Remove( nP, nL ); \
} \
} \
diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index 992cfa0..cd4f6a0 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@ -178,7 +178,7 @@ ElementNode::ElementNode( const String& aName, Reference < XAttributeList > xAtt
xAttributeList = Reference < XAttributeList > ( xAttributeCloner->createClone() , UNO_QUERY );
else
{
- DBG_ERROR("Unable to clone AttributeList");
+ OSL_FAIL("Unable to clone AttributeList");
}
}
};
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index a4e62f4..0084f85 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -281,23 +281,23 @@ void CmdBaseStream::Write( comm_BOOL bBool )
void CmdBaseStream::Read ( comm_String* &pString )
{
(void) pString; /* avoid warning about unused parameter */
- DBG_ERROR("Read ( comm_String* &pString ) Not Implemented");
+ OSL_FAIL("Read ( comm_String* &pString ) Not Implemented");
}
void CmdBaseStream::Read ( SmartId* &pId )
{
(void) pId; /* avoid warning about unused parameter */
- DBG_ERROR("Read ( SmartId* &pId ) Not Implemented");
+ OSL_FAIL("Read ( SmartId* &pId ) Not Implemented");
}
void CmdBaseStream::Write( comm_String *pString )
{
(void) pString; /* avoid warning about unused parameter */
- DBG_ERROR("Write( comm_String *pString ) Not Implemented");
+ OSL_FAIL("Write( comm_String *pString ) Not Implemented");
}
void CmdBaseStream::Write( SmartId* pId )
{
(void) pId; /* avoid warning about unused parameter */
- DBG_ERROR("Write( SmartId* pId ) Not Implemented");
+ OSL_FAIL("Write( SmartId* pId ) Not Implemented");
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index 712c3fd..408c15c 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -236,7 +236,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case STATE_NOCHECK: nMethod = M_UnCheck; aMethod = CUniString("UnCheck"); break;
case STATE_DONTKNOW: nMethod = M_TriState; aMethod = CUniString("TriState"); break;
default: nMethod = M_Check;
- DBG_ERROR( "Unknown state in TriStateBox::GetState()" );
+ OSL_FAIL( "Unknown state in TriStateBox::GetState()" );
}
if ( m_bRecord )
{
@@ -395,7 +395,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case WINDOW_CANCELBUTTON: nMethod = M_Cancel; aMethod = CUniString("Cancel"); break;
case WINDOW_HELPBUTTON: nMethod = M_Help; aMethod = CUniString("Help"); break;
default: nMethod = M_Default;aMethod = CUniString("Unknown Button");
- DBG_ERROR( "Unknown Button" );
+ OSL_FAIL( "Unknown Button" );
}
if ( m_bRecord )
{
@@ -452,7 +452,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_SPINFIELD_FIRST: nMethod = M_ToMin; aMethod = CUniString("ToMin"); break;
case VCLEVENT_SPINFIELD_LAST: nMethod = M_ToMax; aMethod = CUniString("ToMax"); break;
default: nMethod = M_ToMin; aMethod = CUniString("Unknown");
- DBG_ERROR( "Unknown EventID in Spinfield" );
+ OSL_FAIL( "Unknown EventID in Spinfield" );
}
if ( m_bRecord )
{
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index 95b83e5..4d22660 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -637,7 +637,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG )
pDlg->SetOutputSizePixel(Size(150,0));
pDlg->SetText( String ( TTProperties::GetSvtResId( TT_GPF ) ) );
pDlg->Show();
- DBG_ERROR("GPF");
+ OSL_FAIL("GPF");
pC->ReportError( GEN_RES_STR0( S_GPF_ABORT ) );
StatementList::bDying = TRUE;
while ( StatementList::pFirst ) // Kommandos werden übersprungen
@@ -744,7 +744,7 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn )
if( !pIn->IsEof() )
pCmdStream->Read( nId );
else {
- DBG_ERROR( "truncated input stream" );
+ OSL_FAIL( "truncated input stream" );
}
}
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 502de94..58b1afc 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -187,7 +187,7 @@ void StatementFlow::SendViaSocket()
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "SendViaSocket called recursively. Aborted!!!\n" );
#endif
- DBG_ERROR("SendViaSocket called recursively. Aborted!!!");
+ OSL_FAIL("SendViaSocket called recursively. Aborted!!!");
return;
}
bSending = TRUE;
@@ -199,7 +199,7 @@ void StatementFlow::SendViaSocket()
else
{
// Macht nix. Wenn das Basic nicht mehr da ist, ist sowiso alles egal
- DBG_ERROR("Cannot send results to TestTool");
+ OSL_FAIL("Cannot send results to TestTool");
}
pRet->Reset();
@@ -263,7 +263,7 @@ BOOL StatementFlow::Execute()
break;
default:
- DBG_ERROR( "Unknown Flowcontrol" );
+ OSL_FAIL( "Unknown Flowcontrol" );
break;
}
@@ -2417,7 +2417,7 @@ BOOL StatementCommand::Execute()
break;
}
default:
- DBG_ERROR( "Unknown Windowtype" );
+ OSL_FAIL( "Unknown Windowtype" );
REPORT_WIN_CLOSEDc(pControl, "Unknown Windowtype");
ReportError( GEN_RES_STR0( S_RESETAPPLICATION_FAILED_UNKNOWN ), pControl->GetType() );
#if OSL_DEBUG_LEVEL > 1
@@ -3448,7 +3448,7 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType )
}
else
{
- DBG_ERROR( "Wrong ControlType" );
+ OSL_FAIL( "Wrong ControlType" );
}
pCmdIn->Read( nMethodId );
@@ -6029,7 +6029,7 @@ BOOL StatementControl::Execute()
pFloat = pControl->GET_REAL_PARENT();
else
{
- DBG_ERROR("FloatingMode set but Parent is no FloatingWindow");
+ OSL_FAIL("FloatingMode set but Parent is no FloatingWindow");
}
}
if ( pFloat && pFloat->GetType() == WINDOW_FLOATINGWINDOW )
@@ -6375,7 +6375,7 @@ BOOL StatementControl::Execute()
break;
}
default:
- DBG_ERROR( "Unknown Objekttype from UId or Method not suported" );
+ OSL_FAIL( "Unknown Objekttype from UId or Method not suported" );
ReportError( aUId, GEN_RES_STR2( S_UNKNOWN_TYPE, UniString::CreateFromInt32( nRT ), MethodString(nMethodId) ) );
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( " Unknown Objekttype from UId or Method not suported" );
diff --git a/automation/source/simplecm/packethandler.cxx b/automation/source/simplecm/packethandler.cxx
index 3f0e412..b03673a 100644
--- a/automation/source/simplecm/packethandler.cxx
+++ b/automation/source/simplecm/packethandler.cxx
@@ -143,7 +143,7 @@ comm_BOOL PacketHandler::ReceiveData( void* &pData, comm_UINT32 &nLen )
break;
default:
{
- DBG_ERROR("Unbekannter Headertyp in der Kommunikation");
+ OSL_FAIL("Unbekannter Headertyp in der Kommunikation");
bWasError = TRUE;
}
@@ -285,7 +285,7 @@ comm_BOOL PacketHandler::SendHandshake( HandshakeType aHandshakeType, const void
nBuffer += 0 ; // one word extradata for options
break;
default:
- DBG_ERROR("Unknown HandshakeType");
+ OSL_FAIL("Unknown HandshakeType");
}
if ( pData )
diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx
index 80b388d..8cf2b03 100644
--- a/automation/source/simplecm/simplecm.cxx
+++ b/automation/source/simplecm/simplecm.cxx
@@ -336,7 +336,7 @@ BOOL SimpleCommunicationLinkViaSocket::SendHandshake( HandshakeType aHandshakeTy
case CH_SetApplication:
break;
default:
- DBG_ERROR("Unknown HandshakeType");
+ OSL_FAIL("Unknown HandshakeType");
}
}
return !bWasError;
@@ -484,7 +484,7 @@ void CommunicationManager::CallDataReceived( CommunicationLink* pCL )
// should be impossible but happens for mysterious reasons
if ( !pCL->pServiceData )
{
- DBG_ERROR( "Datastream is NULL" );
+ OSL_FAIL( "Datastream is NULL" );
pCL->FinishCallback();
return;
}
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 4048a1f..383edae 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -202,7 +202,7 @@ ControlDef::ControlDef(const String &aOldName, const String &aNewName, ControlDe
pNewDef = new ControlDef( aOldName, aNewName, pOriginal->SonGetObject(i) ,TRUE );
if (! SonInsert(pNewDef))
{
- DBG_ERROR("Name Doppelt im CopyConstructor. Neuer Name = Controlname!!");
+ OSL_FAIL("Name Doppelt im CopyConstructor. Neuer Name = Controlname!!");
delete pNewDef;
}
}
@@ -233,7 +233,7 @@ void CRevNames::Insert( String aName, SmartId aUId, ULONG nSeq )
if ( !CNames::C40_PTR_INSERT( ControlItem, pRN) )
{
- DBG_ERROR("Interner Fehler beim Speichern der Lokalen KurzNamen");
+ OSL_FAIL("Interner Fehler beim Speichern der Lokalen KurzNamen");
delete pRN;
}
@@ -541,7 +541,7 @@ void TestToolObj::InitTestToolObj()
}
else
{
- DBG_ERROR("Testtool: Could not replace Wait method");
+ OSL_FAIL("Testtool: Could not replace Wait method");
}
MAKE_TT_KEYWORD( "Kontext", SbxCLASS_METHOD, SbxNULL, ID_Kontext );
@@ -927,7 +927,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
aUId = SmartId( aLongname );
else
{
- DBG_ERROR("Unknown URL schema");
+ OSL_FAIL("Unknown URL schema");
}
}
@@ -948,7 +948,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
if (!pNewDef->SonInsert( pNewDef2 )) // Dialog in eigenen Namespace eintragen
{
delete pNewDef2;
- DBG_ERROR(" !!!! ACHTUNG !!!! Fehler beim einf�gen in leere Liste!");
+ OSL_FAIL(" !!!! ACHTUNG !!!! Fehler beim einf�gen in leere Liste!");
}
}
@@ -1215,7 +1215,7 @@ void TestToolObj::SendViaSocket()
{
if ( !pCommunicationManager )
{
- DBG_ERROR("Kein CommunicationManager vorhanden!!");
+ OSL_FAIL("Kein CommunicationManager vorhanden!!");
return;
}
@@ -1300,7 +1300,7 @@ void TestToolObj::EndBlock()
}
else
{
- DBG_ERROR("EndBlock au�erhalb eines Blockes");
+ OSL_FAIL("EndBlock au�erhalb eines Blockes");
}
}
@@ -1415,14 +1415,14 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
if (!pNewDef->SonInsert(pNewDef2)) // Dialog in eigenen Namespace eintragen
{
delete pNewDef2;
- DBG_ERROR(" !!!! ACHTUNG !!!! Fehler beim einf�gen in leere Liste!");
+ OSL_FAIL(" !!!! ACHTUNG !!!! Fehler beim einf�gen in leere Liste!");
}
}
const ControlItem *pItem = pNewDef;
if (! pNames->Insert(pItem))
{
- DBG_ERROR(" !!!! ACHTUNG !!!! Fehler beim einf�gen eines namens!");
+ OSL_FAIL(" !!!! ACHTUNG !!!! Fehler beim einf�gen eines namens!");
delete pNewDef;
pFatherDef = NULL;
}
@@ -1435,7 +1435,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
{
if (!pFatherDef)
{
- DBG_ERROR( "Internal Error: Erster Kurzname mu� mit * beginnen. �berspringe." );
+ OSL_FAIL( "Internal Error: Erster Kurzname mu� mit * beginnen. �berspringe." );
}
else
{
@@ -1443,7 +1443,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
if (! pFatherDef->SonInsert(pNewDef))
{
delete pNewDef;
- DBG_ERROR(" !!!! ACHTUNG !!!! Fehler beim einf�gen eines namens!");
+ OSL_FAIL(" !!!! ACHTUNG !!!! Fehler beim einf�gen eines namens!");
}
}
}
@@ -3759,7 +3759,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
pRetStream->Read( nId );
else
{
- DBG_ERROR( "truncated input stream" );
+ OSL_FAIL( "truncated input stream" );
}
}
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index b48bff2..657ee5d 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1628,7 +1628,7 @@ void ModulWindowLayout::DockaWindow( DockingWindow* pDockingWindow )
}
#ifdef DBG_UTIL
else
- DBG_ERROR( "Wer will sich denn hier andocken ?" );
+ OSL_FAIL( "Wer will sich denn hier andocken ?" );
#endif
}
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 5d4bdc1..6b23810 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -127,7 +127,7 @@ void BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
}
else
{
- DBG_ERROR( "BasicTreeListBox::RequestingChilds: Error loading library!" );
+ OSL_FAIL( "BasicTreeListBox::RequestingChilds: Error loading library!" );
}
}
}
@@ -140,7 +140,7 @@ void BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
ImpCreateLibSubSubEntriesInVBAMode( pEntry, aDocument, aLibName );
}
else {
- DBG_ERROR( "BasicTreeListBox::RequestingChilds: Unknown Type!" );
+ OSL_FAIL( "BasicTreeListBox::RequestingChilds: Unknown Type!" );
}
}
@@ -263,7 +263,7 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry )
}
default:
{
- DBG_ERROR( "FindVariable: Unbekannter Typ!" );
+ OSL_FAIL( "FindVariable: Unbekannter Typ!" );
pVar = 0;
}
break;
@@ -365,7 +365,7 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
break;
default:
{
- DBG_ERROR( "GetEntryDescriptor: Unbekannter Typ!" );
+ OSL_FAIL( "GetEntryDescriptor: Unbekannter Typ!" );
eType = OBJ_TYPE_UNKNOWN;
}
break;
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index c5eeaa9..afc47d5 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -762,7 +762,7 @@ void LocalizationMgr::handleSetDefaultLocale( Locale aLocale )
}
catch(IllegalArgumentException&)
{
- DBG_ERROR( "LocalizationMgr::handleSetDefaultLocale: Invalid locale" );
+ OSL_FAIL( "LocalizationMgr::handleSetDefaultLocale: Invalid locale" );
}
// update locale toolbar
@@ -782,7 +782,7 @@ void LocalizationMgr::handleSetCurrentLocale( ::com::sun::star::lang::Locale aLo
}
catch(IllegalArgumentException&)
{
- DBG_ERROR( "LocalizationMgr::handleSetCurrentLocale: Invalid locale" );
+ OSL_FAIL( "LocalizationMgr::handleSetCurrentLocale: Invalid locale" );
}
// update locale toolbar
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 223e56b..2751448 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1266,7 +1266,7 @@ void LibPage::ExportAsPackage( const String& aLibName )
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" ) ) ), UNO_QUERY );
if( !xSFA.is() )
{
- DBG_ERROR( "No simpleFileAccess" );
+ OSL_FAIL( "No simpleFileAccess" );
return;
}
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index b8337d2..2fe2310 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -553,7 +553,7 @@ IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl )
((LibPage*)pNewTabPage)->SetTabDlg( this );
}
break;
- default: DBG_ERROR( "PageHdl: Unbekannte ID!" );
+ default: OSL_FAIL( "PageHdl: Unbekannte ID!" );
}
DBG_ASSERT( pNewTabPage, "Keine Page!" );
pTabCtrl->SetTabPage( nId, pNewTabPage );
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 805a435..3fcc35b 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -130,7 +130,7 @@ void DlgEditor::ShowDialog()
}
catch( UnknownPropertyException& )
{
- DBG_ERROR( "DlgEditor::ShowDialog(): No ResourceResolver property" );
+ OSL_FAIL( "DlgEditor::ShowDialog(): No ResourceResolver property" );
}
}
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 6309e00..a43a252 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -161,7 +161,7 @@ PropBrw::PropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBindings* _
}
catch (Exception&)
{
- DBG_ERROR("PropBrw::PropBrw: could not create/initialize my frame!");
+ OSL_FAIL("PropBrw::PropBrw: could not create/initialize my frame!");
m_xMeAsFrame.clear();
}
@@ -236,7 +236,7 @@ void PropBrw::ImplReCreateController()
}
catch (Exception&)
{
- DBG_ERROR("PropBrw::PropBrw: could not create/initialize the browser controller!");
+ OSL_FAIL("PropBrw::PropBrw: could not create/initialize the browser controller!");
try
{
::comphelper::disposeComponent(m_xBrowserController);
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 137ade8..d26b695 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -1510,7 +1510,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
}
default:
- DBG_ERROR( "Falscher Gruppentyp!" );
+ OSL_FAIL( "Falscher Gruppentyp!" );
break;
}
}
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index d124dd4..5b486a0 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -953,7 +953,7 @@ void SvxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
}
default:
- DBG_ERROR( "Falscher Gruppentyp!" );
+ OSL_FAIL( "Falscher Gruppentyp!" );
break;
}
}
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index e8ed58d..e1c410d 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -1058,7 +1058,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG )
catch(IllegalArgumentException)
{
#ifdef DBG_UTIL
- DBG_ERROR( "Folder picker failed with illegal arguments" );
+ OSL_FAIL( "Folder picker failed with illegal arguments" );
#endif
}
}
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 889fff6..6e4d90d 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -447,7 +447,7 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic,
switch( maCtlLight.GetActualRP() )
{
- default: DBG_ERROR("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" );
+ default: OSL_FAIL("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" );
case( RP_LT ): nAzim = 4500, nElev = 4500; break;
case( RP_MT ): nAzim = 9000, nElev = 4500; break;
case( RP_RT ): nAzim = 13500, nElev = 4500; break;
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index d4cb6fd..18cdc9e 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -223,7 +223,7 @@ void SvxMessDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt )
break;
default:
- DBG_ERROR( "Falsche Button-Nummer!!!" );
+ OSL_FAIL( "Falsche Button-Nummer!!!" );
}
}
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 88c0c02..3d0a29e 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -906,7 +906,7 @@ namespace svx
case HHC::eRubyHangulAbove: m_pHangulAbove->Check(); break;
case HHC::eRubyHangulBelow: m_pHangulBelow->Check(); break;
default:
- DBG_ERROR( "HangulHanjaConversionDialog::SetConversionFormat: unknown type!" );
+ OSL_FAIL( "HangulHanjaConversionDialog::SetConversionFormat: unknown type!" );
}
}
@@ -928,7 +928,7 @@ namespace svx
if ( m_pHangulBelow->IsChecked() )
return HHC::eRubyHangulBelow;
- DBG_ERROR( "HangulHanjaConversionDialog::GetConversionFormat: no radio checked?" );
+ OSL_FAIL( "HangulHanjaConversionDialog::GetConversionFormat: no radio checked?" );
return HHC::eSimpleConversion;
}
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 9421836..1046afc 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -532,7 +532,7 @@ BOOL SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL )
}
catch( ... )
{
- DBG_ERROR( "FileExists: ucb error" );
+ OSL_FAIL( "FileExists: ucb error" );
}
}
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index e12ad0d..041ef64 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -676,7 +676,7 @@ short SvInsertAppletDialog::Execute()
}
catch ( uno::Exception& )
{
- DBG_ERROR( "No Applet!" );
+ OSL_FAIL( "No Applet!" );
}
}
else
@@ -726,7 +726,7 @@ short SvInsertAppletDialog::Execute()
}
catch ( uno::Exception& )
{
- DBG_ERROR( "No Applet!" );
+ OSL_FAIL( "No Applet!" );
}
}
}
@@ -909,7 +909,7 @@ short SfxInsertFloatingFrameDialog::Execute()
}
catch ( uno::Exception& )
{
- DBG_ERROR( "No IFrame!" );
+ OSL_FAIL( "No IFrame!" );
}
}
else
@@ -996,7 +996,7 @@ short SfxInsertFloatingFrameDialog::Execute()
}
catch ( uno::Exception& )
{
- DBG_ERROR( "No IFrame!" );
+ OSL_FAIL( "No IFrame!" );
}
}
}
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 743e1f9..83938ff 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -83,7 +83,7 @@ IMPL_LINK( FmShowColsDialog, OnClickedOk, Button*, EMPTYARG )
}
catch(...)
{
- DBG_ERROR("FmShowColsDialog::OnClickedOk Exception occurred!");
+ OSL_FAIL("FmShowColsDialog::OnClickedOk Exception occurred!");
}
}
}
@@ -121,7 +121,7 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com:
}
catch(...)
{
- DBG_ERROR("FmShowColsDialog::SetColumns Exception occurred!");
+ OSL_FAIL("FmShowColsDialog::SetColumns Exception occurred!");
}
// if the col is hidden, put it into the list
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 651bd76..12cbb9c 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -139,7 +139,7 @@ void SvxZoomDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt )
break;
default:
- DBG_ERROR( "wrong button number" );
+ OSL_FAIL( "wrong button number" );
}
}
@@ -162,7 +162,7 @@ void SvxZoomDialog::HideButton( USHORT nBtnId )
break;
default:
- DBG_ERROR( "Falsche Button-Nummer!!!" );
+ OSL_FAIL( "Falsche Button-Nummer!!!" );
}
}
@@ -424,7 +424,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn )
}
else
{
- DBG_ERROR( "Wrong Button" );
+ OSL_FAIL( "Wrong Button" );
return 0;
}
@@ -506,7 +506,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn )
}
else
{
- DBG_ERROR( "Wrong Button" );
+ OSL_FAIL( "Wrong Button" );
return 0;
}
pOutSet = new SfxItemSet( rSet );
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 4ddaf34..bf735d2 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -225,7 +225,7 @@ BOOL SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
}
catch(Exception&)
{
- DBG_ERROR("exception in XForbiddenCharacters");
+ OSL_FAIL("exception in XForbiddenCharacters");
}
}
eLastUsedLanguageTypeForForbiddenCharacters = aLanguageLB.GetSelectLanguage();
@@ -359,7 +359,7 @@ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG )
}
catch(Exception&)
{
- DBG_ERROR("exception in XForbiddenCharacters");
+ OSL_FAIL("exception in XForbiddenCharacters");
}
}
}
@@ -422,7 +422,7 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
}
catch(Exception&)
{
- DBG_ERROR("exception in XForbiddenCharacters");
+ OSL_FAIL("exception in XForbiddenCharacters");
}
}
pImpl->aConfig.SetStartEndChars( aLocale, bEnable ? &sStart : 0, bEnable ? &sEnd : 0);
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index ffe2829..3bd0eef 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -940,7 +940,7 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
case 1: eSet = SFX_SYMBOLS_SIZE_SMALL; break;
case 2: eSet = SFX_SYMBOLS_SIZE_LARGE; break;
default:
- DBG_ERROR( "OfaViewTabPage::FillItemSet(): This state of aIconSizeLB should not be possible!" );
+ OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of aIconSizeLB should not be possible!" );
}
aMiscOptions.SetSymbolsSize( eSet );
}
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 5012914..4f2fcbc 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1845,7 +1845,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
case EID_NUM_POST_BREAK : nRID = STR_NUM_POST_BREAK_DLG; break;
case EID_NUM_MIN_WORDLEN: nRID = STR_NUM_MIN_WORDLEN_DLG; break;
default:
- DBG_ERROR( "unexpected case" );
+ OSL_FAIL( "unexpected case" );
}
OptionsBreakSet aDlg( this, nRID );
@@ -1865,7 +1865,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
}
else
{
- DBG_ERROR( "pBtn unexpected value" );
+ OSL_FAIL( "pBtn unexpected value" );
}
return 0;
@@ -1901,7 +1901,7 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox )
}
else
{
- DBG_ERROR( "pBox unexpected value" );
+ OSL_FAIL( "pBox unexpected value" );
}
return 0;
@@ -2122,7 +2122,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox )
}
else
{
- DBG_ERROR( "pBox unexpected value" );
+ OSL_FAIL( "pBox unexpected value" );
}
return 0;
@@ -2467,7 +2467,7 @@ IMPL_LINK( SvxEditModulesDlg, ClickHdl_Impl, PushButton *, pBtn )
}
else
{
- DBG_ERROR( "pBtn unexpected value" );
+ OSL_FAIL( "pBtn unexpected value" );
}
return 0;
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 86ef52f..6d8f597 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -495,7 +495,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
case APP_IMPRESS : sReplace = C2U("com.sun.star.presentation.PresentationDocument");break;
case APP_DRAW : sReplace = C2U("com.sun.star.drawing.DrawingDocument");break;
case APP_MATH : sReplace = C2U("com.sun.star.formula.FormulaProperties");break;
- default: DBG_ERROR("illegal user data");
+ default: OSL_FAIL("illegal user data");
}
String sTmp(sCommand);
sTmp.SearchAndReplaceAscii("%1", sReplace);
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 8469d04..f7f22d3 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1692,7 +1692,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
default:
{
- DBG_ERROR( "Unhandled option in ApplyItemSet" );
+ OSL_FAIL( "Unhandled option in ApplyItemSet" );
}
break;
}
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 4e51bd5..288cc83 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2151,7 +2151,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn )
cDlg = pAutoCorrect->GetQuote('\"',FALSE,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50
break;
default:
- DBG_ERROR("svx::OfaQuoteTabPage::QuoteHdl(), how to initialize cDlg?" );
+ OSL_FAIL("svx::OfaQuoteTabPage::QuoteHdl(), how to initialize cDlg?" );
cDlg = 0;
break;
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index ddfe7f7..b9c560d 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -175,7 +175,7 @@ void _SfxMacroTabPage::EnableButtons( const String& rLangName )
sEventMacro = ((SvLBoxString*)pE->GetItem( LB_MACROS_ITEMPOS ))->GetText();
if ( rLangName.EqualsAscii("JavaScript") )
{
- DBG_ERROR( "_SfxMacroTabPage::EnableButtons(): this is not an up to date usage!" );
+ OSL_FAIL( "_SfxMacroTabPage::EnableButtons(): this is not an up to date usage!" );
}
else
{
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index c1d0df3..76c206c 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -268,7 +268,7 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
break;
default:
- DBG_ERROR( "unbekannter Type fuer Zeilenabstand." );
+ OSL_FAIL( "unbekannter Type fuer Zeilenabstand." );
break;
}
eState = GetItemSet().GetItemState( nWhich );
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 802440a..7a53da9 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1787,7 +1787,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView )
m_pSdrView = pSdrView;
if(!m_pSdrView)
{
- DBG_ERROR("No SdrView* set");
+ OSL_FAIL("No SdrView* set");
return;
}
@@ -1858,7 +1858,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView )
( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT || eKind==OBJ_OUTLINETEXT) &&
( (SdrTextObj*) pObj )->HasText() )
{
- DBG_ERROR("AutoWidth/AutoHeight should be enabled");
+ OSL_FAIL("AutoWidth/AutoHeight should be enabled");
}
}
#endif
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 2000dd4..c69a625 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -418,7 +418,7 @@ BOOL SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
switch( eState )
{
default: ; //prevent warning
- DBG_ERROR( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" );
+ OSL_FAIL( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" );
case STATE_NOCHECK: eFTS = SDRTEXTFIT_NONE; break;
case STATE_CHECK: eFTS = SDRTEXTFIT_AUTOFIT; break;
}
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index d8de0a7..8f57715 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -319,7 +319,7 @@ namespace abp
case AST_EVOLUTION_GROUPWISE:
case AST_EVOLUTION_LDAP : pGuess = "Personal"; break;
default:
- DBG_ERROR( "OAddessBookSourcePilot::implDefaultTableName: unhandled case!" );
+ OSL_FAIL( "OAddessBookSourcePilot::implDefaultTableName: unhandled case!" );
return;
}
const ::rtl::OUString sGuess = ::rtl::OUString::createFromAscii( pGuess );
@@ -398,7 +398,7 @@ namespace abp
break;
case AST_INVALID:
- DBG_ERROR( "OAddessBookSourcePilot::implCreateDataSource: illegal data source type!" );
+ OSL_FAIL( "OAddessBookSourcePilot::implCreateDataSource: illegal data source type!" );
break;
}
m_eNewDataSourceType = m_aSettings.eType;
@@ -437,7 +437,7 @@ namespace abp
return new FinalPage( this );
default:
- DBG_ERROR("OAddessBookSourcePilot::createPage: invalid state!");
+ OSL_FAIL("OAddessBookSourcePilot::createPage: invalid state!");
return NULL;
}
}
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 909bf52..61ef82d 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -123,7 +123,7 @@ namespace abp
}
catch(const Exception&)
{
- DBG_ERROR("OAdminDialogInvokation::invokeAdministration: caught an exception while executing the dialog!");
+ OSL_FAIL("OAdminDialogInvokation::invokeAdministration: caught an exception while executing the dialog!");
}
return sal_False;
}
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 18108bf..b65635b 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -145,7 +145,7 @@ namespace abp
}
catch(const Exception&)
{
- DBG_ERROR( "lcl_implCreateAndSetURL: caught an exception while creating the data source!" );
+ OSL_FAIL( "lcl_implCreateAndSetURL: caught an exception while creating the data source!" );
}
return aReturn;
@@ -217,7 +217,7 @@ namespace abp
}
catch( const Exception& )
{
- DBG_ERROR( "ODataSourceContext::ODataSourceContext: caught an exception!" );
+ OSL_FAIL( "ODataSourceContext::ODataSourceContext: caught an exception!" );
}
}
@@ -395,7 +395,7 @@ namespace abp
}
catch(const Exception&)
{
- DBG_ERROR( "ODataSource::registerDataSource: caught an exception while creating the data source!" );
+ OSL_FAIL( "ODataSource::registerDataSource: caught an exception while creating the data source!" );
}
}
//---------------------------------------------------------------------
@@ -412,7 +412,7 @@ namespace abp
}
catch(const Exception&)
{
- DBG_ERROR( "ODataSource::registerDataSource: caught an exception while creating the data source!" );
+ OSL_FAIL( "ODataSource::registerDataSource: caught an exception while creating the data source!" );
}
}
@@ -444,7 +444,7 @@ namespace abp
}
catch(const Exception&)
{
- DBG_ERROR( "ODataSource::remove: caught an exception while creating the data source!" );
+ OSL_FAIL( "ODataSource::remove: caught an exception while creating the data source!" );
}
}
@@ -483,7 +483,7 @@ namespace abp
m_pImpl->aTables.clear();
if ( !isConnected() )
{
- DBG_ERROR( "ODataSource::getTableNames: not connected!" );
+ OSL_FAIL( "ODataSource::getTableNames: not connected!" );
}
else
{
@@ -564,7 +564,7 @@ namespace abp
catch( const SQLException& e ) { aError <<= e; }
catch( const Exception& )
{
- DBG_ERROR( "ODataSource::connect: caught a generic exception!" );
+ OSL_FAIL( "ODataSource::connect: caught a generic exception!" );
}
// ................................................................
@@ -593,7 +593,7 @@ namespace abp
}
catch( const Exception& )
{
- DBG_ERROR( "ODataSource::connect: caught an exception while trying to display the error!" );
+ OSL_FAIL( "ODataSource::connect: caught an exception while trying to display the error!" );
}
}
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 2e17fb5..f5c6432 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -148,7 +148,7 @@ namespace abp
}
catch(const Exception&)
{
- DBG_ERROR("fieldmapping::invokeDialog: caught an exception while executing the dialog!");
+ OSL_FAIL("fieldmapping::invokeDialog: caught an exception while executing the dialog!");
}
return sal_False;
}
@@ -228,20 +228,20 @@ namespace abp
aDriverFieldAliasing.getNodeValue( sDriverProgrammatic ) >>= sDriverUI;
if ( 0 == sDriverUI.getLength() )
{
- DBG_ERROR( "fieldmapping::defaultMapping: invalid driver UI column name!");
+ OSL_FAIL( "fieldmapping::defaultMapping: invalid driver UI column name!");
}
else
_rFieldAssignment[ sAddressProgrammatic ] = sDriverUI;
}
else
{
- DBG_ERROR( "fieldmapping::defaultMapping: invalid driver programmatic name!" );
+ OSL_FAIL( "fieldmapping::defaultMapping: invalid driver programmatic name!" );
}
}
}
catch( const Exception& )
{
- DBG_ERROR("fieldmapping::defaultMapping: code is assumed to throw no exceptions!");
+ OSL_FAIL("fieldmapping::defaultMapping: code is assumed to throw no exceptions!");
// the config nodes we're using herein should not do this ....
}
}
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 1b3ef90..d85cbe1 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -121,7 +121,7 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
catch(Exception eEx)
{
(void) eEx; // make compiler happy
- DBG_ERROR("Exception caught in ODatabaseContext::getRegisteredObject()");
+ OSL_FAIL("Exception caught in ODatabaseContext::getRegisteredObject()");
}
}
// build the connection from the data source
@@ -170,7 +170,7 @@ Reference< XConnection > getConnection(const Reference< XInterface > & xRowSet)
catch(Exception& e )
{
(void) e; // make compiler happy
- DBG_ERROR("exception in getConnection");
+ OSL_FAIL("exception in getConnection");
}
return xConn;
@@ -629,7 +629,7 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan )
catch(Exception& e )
{
(void) e; // make compiler happy
- DBG_ERROR("Exception in BibDataManager::DBChangeDialog_Impl::DBChangeDialog_Impl");
+ OSL_FAIL("Exception in BibDataManager::DBChangeDialog_Impl::DBChangeDialog_Impl");
}
@@ -861,7 +861,7 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid)
catch(Exception& e )
{
(void) e; // make compiler happy
- DBG_ERROR("Exception in BibDataManager::InsertFields");
+ OSL_FAIL("Exception in BibDataManager::InsertFields");
}
}
/* --------------------------------------------------
@@ -897,7 +897,7 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference<
catch(Exception& e )
{
(void) e; // make compiler happy
- DBG_ERROR("::updateGridModel: something went wrong !");
+ OSL_FAIL("::updateGridModel: something went wrong !");
}
@@ -983,7 +983,7 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
catch(Exception& e )
{
(void) e; // make compiler happy
- DBG_ERROR("::createDatabaseForm: something went wrong !");
+ OSL_FAIL("::createDatabaseForm: something went wrong !");
}
@@ -1006,7 +1006,7 @@ Sequence< ::rtl::OUString > BibDataManager::getDataSources()
catch(Exception& e )
{
(void) e; // make compiler happy
- DBG_ERROR("::getDataSources: something went wrong !");
+ OSL_FAIL("::getDataSources: something went wrong !");
}
@@ -1248,7 +1248,7 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable)
catch(Exception& e )
{
(void) e; // make compiler happy
- DBG_ERROR("::setActiveDataTable: something went wrong !");
+ OSL_FAIL("::setActiveDataTable: something went wrong !");
}
}
@@ -1381,7 +1381,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS
catch(Exception& e )
{
(void) e; // make compiler happy
- DBG_ERROR("::createGridModel: something went wrong !");
+ OSL_FAIL("::createGridModel: something went wrong !");
}
@@ -1503,7 +1503,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel(
catch(Exception& e )
{
(void) e; // make compiler happy
- DBG_ERROR("::loadControlModel: something went wrong !");
+ OSL_FAIL("::loadControlModel: something went wrong !");
}
return xModel;
}
@@ -1543,7 +1543,7 @@ void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw
catch(Exception& e )
{
(void) e; // make compiler happy
- DBG_ERROR("::propertyChange: something went wrong !");
+ OSL_FAIL("::propertyChange: something went wrong !");
}
@@ -1588,7 +1588,7 @@ try
catch(Exception& e )
{
(void) e; // make compiler happy
- DBG_ERROR("Exception in BibDataManager::SetMeAsUidListener");
+ OSL_FAIL("Exception in BibDataManager::SetMeAsUidListener");
}
@@ -1634,7 +1634,7 @@ try
catch(Exception& e )
{
(void) e; // make compiler happy
- DBG_ERROR("Exception in BibDataManager::RemoveMeAsUidListener");
+ OSL_FAIL("Exception in BibDataManager::RemoveMeAsUidListener");
}
diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx
index 8794a5b..c410071 100644
--- a/extensions/source/bibliography/formcontrolcontainer.cxx
+++ b/extensions/source/bibliography/formcontrolcontainer.cxx
@@ -120,7 +120,7 @@ namespace bib
catch( const Exception& e)
{
(void) e; // make compiler happy
- DBG_ERROR( "FormControlContainer::implSetDesignMode: caught an exception!" );
+ OSL_FAIL( "FormControlContainer::implSetDesignMode: caught an exception!" );
}
}
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index b509479..4008c49 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -410,7 +410,7 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X
}
catch(Exception&)
{
- DBG_ERROR("SaveModified: Exception occurred!");
+ OSL_FAIL("SaveModified: Exception occurred!");
}
}
return bResult;
@@ -464,7 +464,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
}
catch(const Exception&)
{
- DBG_ERROR("Exception catched while changing the data source");
+ OSL_FAIL("Exception catched while changing the data source");
}
}
}
@@ -554,7 +554,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
}
catch( const uno::Exception& )
{
- DBG_ERROR( "BibFrameController_Impl::dispatch: caught an exception!" );
+ OSL_FAIL( "BibFrameController_Impl::dispatch: caught an exception!" );
}
sal_uInt16 nCount = aStatusListeners.Count();
@@ -598,7 +598,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
}
catch(Exception&)
{
- DBG_ERROR("Exception in last() or moveToInsertRow()");
+ OSL_FAIL("Exception in last() or moveToInsertRow()");
}
}
}
@@ -658,7 +658,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
}
catch(Exception&)
{
- DBG_ERROR("DeleteRecord : exception caught !");
+ OSL_FAIL("DeleteRecord : exception caught !");
}
}
}
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index ed3cca3..6edb64c 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -183,7 +183,7 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno
catch(Exception& rEx)
{
(void) rEx; // make compiler happy
- DBG_ERROR("BibPosListener::positioned: something went wrong !");
+ OSL_FAIL("BibPosListener::positioned: something went wrong !");
}
}
@@ -569,7 +569,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
catch(Exception& rEx)
{
(void) rEx; // make compiler happy
- DBG_ERROR("BibGeneralPage::AddXControl: something went wrong !");
+ OSL_FAIL("BibGeneralPage::AddXControl: something went wrong !");
}
return xCtrModel;
}
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 2c1155e..7724d69 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -156,7 +156,7 @@ namespace dbp
}
catch(Exception&)
{
- DBG_ERROR("OTableSelectionPage::initializePage: caught an exception!");
+ OSL_FAIL("OTableSelectionPage::initializePage: caught an exception!");
}
}
@@ -191,7 +191,7 @@ namespace dbp
}
catch(Exception&)
{
- DBG_ERROR("OTableSelectionPage::commitPage: caught an exception!");
+ OSL_FAIL("OTableSelectionPage::commitPage: caught an exception!");
}
return sal_True;
@@ -306,7 +306,7 @@ namespace dbp
}
else
{
- DBG_ERROR("OTableSelectionPage::implFillTables: invalid data source object returned by the context");
+ OSL_FAIL("OTableSelectionPage::implFillTables: invalid data source object returned by the context");
}
}
}
@@ -315,7 +315,7 @@ namespace dbp
catch(SQLException& e) { aSQLException <<= e; }
catch (Exception&)
{
- DBG_ERROR("OTableSelectionPage::implFillTables: could not fill the table list!");
+ OSL_FAIL("OTableSelectionPage::implFillTables: could not fill the table list!");
}
}
@@ -347,7 +347,7 @@ namespace dbp
catch(SQLException& e) { aSQLException <<= e; }
catch (Exception&)
{
- DBG_ERROR("OTableSelectionPage::implFillTables: could not fill the table list!");
+ OSL_FAIL("OTableSelectionPage::implFillTables: could not fill the table list!");
}
}
@@ -388,7 +388,7 @@ namespace dbp
}
catch (Exception&)
{
- DBG_ERROR("OTableSelectionPage::implCollectDatasource: could not collect the data source names!");
+ OSL_FAIL("OTableSelectionPage::implCollectDatasource: could not collect the data source names!");
}
}
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index eee8e58..0e8eead 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -246,7 +246,7 @@ namespace dbp
}
catch(const Exception&)
{
- DBG_ERROR("OControlWizardPage::initializePage: caught an exception!");
+ OSL_FAIL("OControlWizardPage::initializePage: caught an exception!");
}
INetURLObject aURL( sDataSource );
@@ -310,7 +310,7 @@ namespace dbp
}
catch(Exception&)
{
- DBG_ERROR("OControlWizard::activate: could not obtain the class id!");
+ OSL_FAIL("OControlWizard::activate: could not obtain the class id!");
}
if (!approveControl(nClassId))
{
@@ -434,7 +434,7 @@ namespace dbp
}
catch(Exception&)
{
- DBG_ERROR("OControlWizard::implDeterminePage: caught an exception!");
+ OSL_FAIL("OControlWizard::implDeterminePage: caught an exception!");
}
}
@@ -456,7 +456,7 @@ namespace dbp
}
catch(Exception&)
{
- DBG_ERROR("OControlWizard::implGetDSContext: invalid database context!");
+ OSL_FAIL("OControlWizard::implGetDSContext: invalid database context!");
}
}
@@ -476,7 +476,7 @@ namespace dbp
}
catch(const Exception&)
{
- DBG_ERROR("OControlWizard::getFormConnection: caught an exception!");
+ OSL_FAIL("OControlWizard::getFormConnection: caught an exception!");
}
return xConn;
}
@@ -507,7 +507,7 @@ namespace dbp
}
catch(const Exception&)
{
- DBG_ERROR("OControlWizard::setFormConnection: caught an exception!");
+ OSL_FAIL("OControlWizard::setFormConnection: caught an exception!");
}
}
@@ -646,7 +646,7 @@ namespace dbp
}
catch(Exception&)
{
- DBG_ERROR("OControlWizard::initContext: unexpected exception while gathering column information!");
+ OSL_FAIL("OControlWizard::initContext: unexpected exception while gathering column information!");
}
m_aContext.aTypes.insert(OControlWizardContext::TNameTypeMap::value_type(*pBegin,nFieldType));
}
@@ -657,7 +657,7 @@ namespace dbp
catch(SQLException& e) { aSQLException <<= e; }
catch(Exception&)
{
- DBG_ERROR("OControlWizard::initContext: could not retrieve the control context (caught an exception)!");
+ OSL_FAIL("OControlWizard::initContext: could not retrieve the control context (caught an exception)!");
}
::comphelper::disposeComponent(xStatement);
@@ -710,7 +710,7 @@ namespace dbp
}
catch(Exception&)
{
- DBG_ERROR("OControlWizard::commitControlSettings: could not commit the basic control settings!");
+ OSL_FAIL("OControlWizard::commitControlSettings: could not commit the basic control settings!");
}
}
@@ -735,7 +735,7 @@ namespace dbp
}
catch(Exception&)
{
- DBG_ERROR("OControlWizard::initControlSettings: could not retrieve the basic control settings!");
+ OSL_FAIL("OControlWizard::initControlSettings: could not retrieve the basic control settings!");
}
}
diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx
index 05d85f5..9bd7dd6 100644
--- a/extensions/source/dbpilots/dbptools.cxx
+++ b/extensions/source/dbpilots/dbptools.cxx
@@ -61,7 +61,7 @@ namespace dbp
}
catch(Exception&)
{
- DBG_ERROR("::dbp::disambiguateName: something went (strangely) wrong!");
+ OSL_FAIL("::dbp::disambiguateName: something went (strangely) wrong!");
}
}
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 6387c62..03fd6de 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -177,7 +177,7 @@ namespace dbp
}
catch(Exception&)
{
- DBG_ERROR("OGroupBoxWizard::createRadios: caught an exception while creating the radio shapes!");
+ OSL_FAIL("OGroupBoxWizard::createRadios: caught an exception while creating the radio shapes!");
}
}
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index fa254c6..7d27faf 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -222,7 +222,7 @@ namespace dbp
}
catch(Exception&)
{
- DBG_ERROR("OListComboWizard::implApplySettings: could not set the property values for the listbox!");
+ OSL_FAIL("OListComboWizard::implApplySettings: could not set the property values for the listbox!");
}
}
@@ -353,7 +353,7 @@ namespace dbp
}
catch(Exception&)
{
- DBG_ERROR("OContentTableSelection::initializePage: could not retrieve the table names!");
+ OSL_FAIL("OContentTableSelection::initializePage: could not retrieve the table names!");
}
m_aSelectTable.SelectEntry(getSettings().sListContentTable);
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index 17200bb..16caae4 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -78,14 +78,14 @@ namespace dbp
Reference< XShapes > xPageShapes(_rContext.xDrawPage, UNO_QUERY);
if (!xPageShapes.is())
{
- DBG_ERROR("OOptionGroupLayouter::OOptionGroupLayouter: missing the XShapes interface for the page!");
+ OSL_FAIL("OOptionGroupLayouter::OOptionGroupLayouter: missing the XShapes interface for the page!");
return;
}
Reference< XMultiServiceFactory > xDocFactory(_rContext.xDocumentModel, UNO_QUERY);
if (!xDocFactory.is())
{
- DBG_ERROR("OOptionGroupLayouter::OOptionGroupLayouter: no document service factory!");
+ OSL_FAIL("OOptionGroupLayouter::OOptionGroupLayouter: no document service factory!");
return;
}
@@ -196,7 +196,7 @@ namespace dbp
}
catch(Exception&)
{
- DBG_ERROR("OOptionGroupLayouter::doLayout: caught an exception while grouping the shapes!");
+ OSL_FAIL("OOptionGroupLayouter::doLayout: caught an exception while grouping the shapes!");
}
}
diff --git a/extensions/source/plugin/aqua/sysplug.cxx b/extensions/source/plugin/aqua/sysplug.cxx
index 96ef2cf..98ca841 100644
--- a/extensions/source/plugin/aqua/sysplug.cxx
+++ b/extensions/source/plugin/aqua/sysplug.cxx
@@ -684,7 +684,7 @@ NPError MacPluginComm::NPP_SetValue( NPP instance, NPNVariable variable, void *s
//--------------------------------------------------------------------------------------------------
void * MacPluginComm::NPP_GetJavaClass()
{
- DBG_ERROR( "no java class available!" );
+ OSL_FAIL( "no java class available!" );
return 0;
}
diff --git a/extensions/source/plugin/base/plctrl.cxx b/extensions/source/plugin/base/plctrl.cxx
index cf86074..44a473a 100644
--- a/extensions/source/plugin/base/plctrl.cxx
+++ b/extensions/source/plugin/base/plctrl.cxx
@@ -162,7 +162,7 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo
{
if (_xPeer.is())
{
- DBG_ERROR( "### Peer is already set!" );
+ OSL_FAIL( "### Peer is already set!" );
return;
}
@@ -190,7 +190,7 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo
}
else
{
- DBG_ERROR( "### cannot get implementation of parent peer!" );
+ OSL_FAIL( "### cannot get implementation of parent peer!" );
}
getMultiplexer()->setPeer( _xPeerWindow );
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx
index f527645..d5b4934 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -423,7 +423,7 @@ NPError PluginComm_Impl::NPP_SetValue( NPP instance, NPNVariable variable, void
//--------------------------------------------------------------------------------------------------
void * PluginComm_Impl::NPP_GetJavaClass()
{
- DBG_ERROR( "no java class available!" );
+ OSL_FAIL( "no java class available!" );
return 0;
}
diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index e9312e8..108df5b 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -435,7 +435,7 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo
}
#if OSL_DEBUG_LEVEL > 1
else
- DBG_ERROR( "### cannot get MIME type or extensions!" );
+ OSL_FAIL( "### cannot get MIME type or extensions!" );
#endif
}
if (pVersionData)
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 164990e..3673ac0 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -974,7 +974,7 @@ namespace pcr
)
if ( (*search)->second.pLine->getControl().get() == _rxControl.get() )
return sal_uInt16( search - m_aOrderedLines.begin() );
- DBG_ERROR( "OBrowserListBox::impl_getControlPos: invalid control - not part of any of our lines!" );
+ OSL_FAIL( "OBrowserListBox::impl_getControlPos: invalid control - not part of any of our lines!" );
return (sal_uInt16)-1;
}
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx
index 5f9f8e9..65c7686 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.cxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx
@@ -121,7 +121,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "ButtonNavigationHandler::getPropertyState: cannot handle this property!" );
+ OSL_FAIL( "ButtonNavigationHandler::getPropertyState: cannot handle this property!" );
break;
}
@@ -152,7 +152,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "ButtonNavigationHandler::getPropertyValue: cannot handle this property!" );
+ OSL_FAIL( "ButtonNavigationHandler::getPropertyValue: cannot handle this property!" );
break;
}
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index 8b758ca..f120cf4 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -202,7 +202,7 @@ namespace pcr
break; // case PROPERTY_ID_CONTROLSOURCE
default:
- DBG_ERROR( "CellBindingPropertyHandler::actuatingPropertyChanged: did not register for this property!" );
+ OSL_FAIL( "CellBindingPropertyHandler::actuatingPropertyChanged: did not register for this property!" );
}
for ( ::std::vector< PropertyId >::const_iterator loopAffected = aDependentProperties.begin();
@@ -282,7 +282,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "CellBindingPropertyHandler::getPropertyValue: cannot handle this!" );
+ OSL_FAIL( "CellBindingPropertyHandler::getPropertyValue: cannot handle this!" );
break;
}
return aReturn;
@@ -342,7 +342,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "CellBindingPropertyHandler::setPropertyValue: cannot handle this!" );
+ OSL_FAIL( "CellBindingPropertyHandler::setPropertyValue: cannot handle this!" );
break;
}
@@ -401,7 +401,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "CellBindingPropertyHandler::convertToPropertyValue: cannot handle this!" );
+ OSL_FAIL( "CellBindingPropertyHandler::convertToPropertyValue: cannot handle this!" );
break;
}
@@ -456,7 +456,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "CellBindingPropertyHandler::convertToControlValue: cannot handle this!" );
+ OSL_FAIL( "CellBindingPropertyHandler::convertToControlValue: cannot handle this!" );
break;
}
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index f57b620..9d589a0 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -134,7 +134,7 @@ namespace pcr
default:
- DBG_ERROR( "EditPropertyHandler::getPropertyValue: cannot handle this property!" );
+ OSL_FAIL( "EditPropertyHandler::getPropertyValue: cannot handle this property!" );
break;
}
}
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 5002606..e86477a 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -153,7 +153,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "EFormsPropertyHandler::getPropertyValue: cannot handle this property!" );
+ OSL_FAIL( "EFormsPropertyHandler::getPropertyValue: cannot handle this property!" );
break;
}
}
@@ -269,7 +269,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "EFormsPropertyHandler::setPropertyValue: cannot handle this property!" );
+ OSL_FAIL( "EFormsPropertyHandler::setPropertyValue: cannot handle this property!" );
break;
}
@@ -463,7 +463,7 @@ namespace pcr
case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_CALCULATION; break;
default:
- DBG_ERROR( "EFormsPropertyHandler::describePropertyLine: cannot handle this property!" );
+ OSL_FAIL( "EFormsPropertyHandler::describePropertyLine: cannot handle this property!" );
break;
}
@@ -606,7 +606,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "EFormsPropertyHandler::actuatingPropertyChanged: cannot handle this property!" );
+ OSL_FAIL( "EFormsPropertyHandler::actuatingPropertyChanged: cannot handle this property!" );
break;
}
}
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 37f5c87..bc79a54 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -266,7 +266,7 @@ namespace pcr
|| ( pAssignedEvent->ScriptType.getLength() == 0 )
)
{
- DBG_ERROR( "lcl_getAssignedScriptEvent: me thinks this should not happen!" );
+ OSL_FAIL( "lcl_getAssignedScriptEvent: me thinks this should not happen!" );
continue;
}
@@ -305,7 +305,7 @@ namespace pcr
EventDescription aKnownEvent;
if ( lcl_getEventDescriptionForMethod( _rFormComponentEventDescriptor.EventMethod, aKnownEvent ) )
return aKnownEvent.sListenerClassName;
- DBG_ERROR( "lcl_getQualifiedKnownListenerName: unknown method name!" );
+ OSL_FAIL( "lcl_getQualifiedKnownListenerName: unknown method name!" );
// somebody assigned an script to a form component event which we don't know
// Speaking strictly, this is not really an error - it is possible to do
// this programmatically -, but it should rarely happen, since it's not possible
@@ -972,7 +972,7 @@ namespace pcr
//--------------------------------------------------------------------
void SAL_CALL EventHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException)
{
- DBG_ERROR( "EventHandler::actuatingPropertyChanged: no actuating properties -> no callback (well, this is how it *should* be!)" );
+ OSL_FAIL( "EventHandler::actuatingPropertyChanged: no actuating properties -> no callback (well, this is how it *should* be!)" );
}
//--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 86ce62e..6b34590 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -281,7 +281,7 @@ namespace pcr
}
catch (Exception&)
{
- DBG_ERROR("ControlCharacterDialog::translatePropertiesToItems: caught an exception!");
+ OSL_FAIL("ControlCharacterDialog::translatePropertiesToItems: caught an exception!");
}
_pSet->DisableItem(SID_ATTR_CHAR_CJK_FONT);
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 276e192..b0abab6 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1000,7 +1000,7 @@ namespace pcr
String sDisplayName = m_pInfoService->getPropertyTranslation( nPropId );
if ( !sDisplayName.Len() )
{
- DBG_ERROR( "FormComponentPropertyHandler::describePropertyLine: did getSupportedProperties not work properly?" );
+ OSL_FAIL( "FormComponentPropertyHandler::describePropertyLine: did getSupportedProperties not work properly?" );
throw UnknownPropertyException();
}
@@ -1513,7 +1513,7 @@ namespace pcr
eResult = InteractiveSelectionResult_Pending;
break;
default:
- DBG_ERROR( "FormComponentPropertyHandler::onInteractivePropertySelection: request for a property which does not have dedicated UI!" );
+ OSL_FAIL( "FormComponentPropertyHandler::onInteractivePropertySelection: request for a property which does not have dedicated UI!" );
break;
}
return eResult;
@@ -1801,7 +1801,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "FormComponentPropertyHandler::actuatingPropertyChanged: did not register for this property!" );
+ OSL_FAIL( "FormComponentPropertyHandler::actuatingPropertyChanged: did not register for this property!" );
break;
} // switch ( nActuatingPropId )
@@ -2389,7 +2389,7 @@ namespace pcr
}
catch (Exception&)
{
- DBG_ERROR( "FormComponentPropertyHandler::impl_initFieldList_nothrow: caught an exception!" );
+ OSL_FAIL( "FormComponentPropertyHandler::impl_initFieldList_nothrow: caught an exception!" );
}
}
@@ -2443,7 +2443,7 @@ namespace pcr
}
catch( const Exception& )
{
- DBG_ERROR( "FormComponentPropertyHandler::impl_ensureRowsetConnection_nothrow: caught an exception during error handling!" );
+ OSL_FAIL( "FormComponentPropertyHandler::impl_ensureRowsetConnection_nothrow: caught an exception during error handling!" );
}
// additional info about what happended
String sInfo( PcrRes( RID_STR_UNABLETOCONNECT ) );
@@ -2503,7 +2503,7 @@ namespace pcr
}
catch (Exception&)
{
- DBG_ERROR("FormComponentPropertyHandler::impl_describeCursorSource_nothrow: caught an exception !");
+ OSL_FAIL("FormComponentPropertyHandler::impl_describeCursorSource_nothrow: caught an exception !");
}
}
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index 38ad0a5..b8dcb78 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -651,7 +651,7 @@ namespace pcr
}
else
{
- DBG_ERROR( "DefaultEnumRepresentation::getValueFromDescription: could not translate the enum string!" );
+ OSL_FAIL( "DefaultEnumRepresentation::getValueFromDescription: could not translate the enum string!" );
_out_rValue.clear();
}
}
@@ -675,7 +675,7 @@ namespace pcr
}
else
{
- DBG_ERROR( "DefaultEnumRepresentation::getDescriptionForValue: could not translate an enum value" );
+ OSL_FAIL( "DefaultEnumRepresentation::getDescriptionForValue: could not translate an enum value" );
}
return sReturn;
}
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 409635d..e40df77 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -172,7 +172,7 @@ namespace pcr
_out_rValue = ::cppu::int2enum( aValues[ index ], m_aEnumType );
else
{
- DBG_ERROR( "EnumRepresentation::getValueFromDescription: cannot convert!" );
+ OSL_FAIL( "EnumRepresentation::getValueFromDescription: cannot convert!" );
_out_rValue.clear();
}
}
@@ -196,7 +196,7 @@ namespace pcr
sDescription = aDescriptions[ index ];
else
{
- DBG_ERROR( "EnumRepresentation::getDescriptionForValue: cannot convert!" );
+ OSL_FAIL( "EnumRepresentation::getDescriptionForValue: cannot convert!" );
}
return sDescription;
}
@@ -695,14 +695,14 @@ namespace pcr
//--------------------------------------------------------------------
InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException)
{
- DBG_ERROR( "GenericPropertyHandler::onInteractivePropertySelection: I'm too dumb to know anything about property browse buttons!" );
+ OSL_FAIL( "GenericPropertyHandler::onInteractivePropertySelection: I'm too dumb to know anything about property browse buttons!" );
return InteractiveSelectionResult_Cancelled;
}
//--------------------------------------------------------------------
void SAL_CALL GenericPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException)
{
- DBG_ERROR( "GenericPropertyHandler::actuatingPropertyChanged: no no no, I did not register for any actuating properties!" );
+ OSL_FAIL( "GenericPropertyHandler::actuatingPropertyChanged: no no no, I did not register for any actuating properties!" );
}
//--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index 9dcee32..25cde3a 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -113,7 +113,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "PropertyHandlerHelper::describePropertyLine: don't know how to represent this at the UI!" );
+ OSL_FAIL( "PropertyHandlerHelper::describePropertyLine: don't know how to represent this at the UI!" );
// NO break!
case TypeClass_STRING:
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 06a2ff4..f8b2d02 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -990,7 +990,7 @@ namespace pcr
catch(Exception&)
{
- DBG_ERROR("OPropertyBrowserController::impl_rebindToInspectee_nothrow: caught an exception !");
+ OSL_FAIL("OPropertyBrowserController::impl_rebindToInspectee_nothrow: caught an exception !");
}
}
@@ -1121,7 +1121,7 @@ namespace pcr
}
catch(Exception&)
{
- DBG_ERROR("OPropertyBrowserController::doInspection : caught an exception !");
+ OSL_FAIL("OPropertyBrowserController::doInspection : caught an exception !");
}
}
@@ -1441,7 +1441,7 @@ namespace pcr
}
catch(Exception&)
{
- DBG_ERROR("OPropertyBrowserController::Commit : caught an exception !");
+ OSL_FAIL("OPropertyBrowserController::Commit : caught an exception !");
}
m_sCommittingProperty = ::rtl::OUString();
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index 2b4ee77..0571311 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -248,14 +248,14 @@ namespace pcr
//--------------------------------------------------------------------
InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException)
{
- DBG_ERROR( "PropertyHandler::onInteractivePropertySelection: not implemented!" );
+ OSL_FAIL( "PropertyHandler::onInteractivePropertySelection: not implemented!" );
return InteractiveSelectionResult_Cancelled;
}
//--------------------------------------------------------------------
void SAL_CALL PropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException)
{
- DBG_ERROR( "PropertyHandler::actuatingPropertyChanged: not implemented!" );
+ OSL_FAIL( "PropertyHandler::actuatingPropertyChanged: not implemented!" );
}
//--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index fee3f2a..2826d9f 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -167,7 +167,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "SubmissionPropertyHandler::getPropertyValue: cannot handle this property!" );
+ OSL_FAIL( "SubmissionPropertyHandler::getPropertyValue: cannot handle this property!" );
break;
}
}
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 0485b04..33f256d 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -171,7 +171,7 @@ namespace pcr
case FormComponentType::SPINBUTTON: nImageId = RID_SVXIMG_SPINBUTTON; break;
case FormComponentType::NAVIGATIONBAR: nImageId = RID_SVXIMG_NAVIGATIONBAR; break;
default:
- DBG_ERROR( "TabOrderDialog::GetImage: unknown control type" );
+ OSL_FAIL( "TabOrderDialog::GetImage: unknown control type" );
}
}
@@ -215,7 +215,7 @@ namespace pcr
else
{
// no property set -> no tab order
- DBG_ERROR( "TabOrderDialog::FillList: invalid control encountered!" );
+ OSL_FAIL( "TabOrderDialog::FillList: invalid control encountered!" );
aLB_Controls.Clear();
break;
}
@@ -223,7 +223,7 @@ namespace pcr
}
catch( const Exception& )
{
- DBG_ERROR( "TabOrderDialog::FillList: caught an exception!" );
+ OSL_FAIL( "TabOrderDialog::FillList: caught an exception!" );
}
// select first entry
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 7555ecb..604e7ae 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -163,7 +163,7 @@ namespace pcr
::rtl::Reference< XSDDataType > pType = m_pHelper->getValidatingDataType();
if ( !pType.is() )
{
- DBG_ERROR( "XSDValidationPropertyHandler::setPropertyValue: you're trying to set a type facet, without a current type!" );
+ OSL_FAIL( "XSDValidationPropertyHandler::setPropertyValue: you're trying to set a type facet, without a current type!" );
return;
}
@@ -415,7 +415,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "XSDValidationPropertyHandler::describePropertyLine: cannot handle this property!" );
+ OSL_FAIL( "XSDValidationPropertyHandler::describePropertyLine: cannot handle this property!" );
break;
}
@@ -471,7 +471,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "XSDValidationPropertyHandler::onInteractivePropertySelection: unexpected property to build a dedicated UI!" );
+ OSL_FAIL( "XSDValidationPropertyHandler::onInteractivePropertySelection: unexpected property to build a dedicated UI!" );
break;
}
return InteractiveSelectionResult_Cancelled;
@@ -503,7 +503,7 @@ namespace pcr
::rtl::Reference< XSDDataType > pType = m_pHelper->getValidatingDataType();
if ( !pType.is() )
{
- DBG_ERROR( "XSDValidationPropertyHandler::implPrepareCloneDataCurrentType: invalid current data type!" );
+ OSL_FAIL( "XSDValidationPropertyHandler::implPrepareCloneDataCurrentType: invalid current data type!" );
return false;
}
@@ -542,7 +542,7 @@ namespace pcr
::rtl::Reference< XSDDataType > pType = m_pHelper->getValidatingDataType();
if ( !pType.is() )
{
- DBG_ERROR( "XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType: invalid current data type!" );
+ OSL_FAIL( "XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType: invalid current data type!" );
return false;
}
@@ -656,7 +656,7 @@ namespace pcr
break;
default:
- DBG_ERROR( "XSDValidationPropertyHandler::actuatingPropertyChanged: cannot handle this property!" );
+ OSL_FAIL( "XSDValidationPropertyHandler::actuatingPropertyChanged: cannot handle this property!" );
return;
}
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 919ed9f..b8518eb 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -598,7 +598,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame()
catch( const beans::UnknownPropertyException& )
{
// property unknown.
- DBG_ERROR("ImpTwain::ImplGetActiveFrame: ActiveFrame property unknown, cannot determine active frame!");
+ OSL_FAIL("ImpTwain::ImplGetActiveFrame: ActiveFrame property unknown, cannot determine active frame!");
return uno::Reference< frame::XFrame >();
}
@@ -617,7 +617,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame()
{
}
- DBG_ERROR("ImpTwain::ImplGetActiveFrame: Could not determine active frame!");
+ OSL_FAIL("ImpTwain::ImplGetActiveFrame: Could not determine active frame!");
return uno::Reference< frame::XFrame >();
}
@@ -633,7 +633,7 @@ uno::Reference< util::XCloseBroadcaster > ImpTwain::ImplGetActiveFrameCloseBroad
{
}
- DBG_ERROR("ImpTwain::ImplGetActiveFrameCloseBroadcaster: Could determine close broadcaster on active frame!");
+ OSL_FAIL("ImpTwain::ImplGetActiveFrameCloseBroadcaster: Could determine close broadcaster on active frame!");
return uno::Reference< util::XCloseBroadcaster >();
}
@@ -653,7 +653,7 @@ void ImpTwain::ImplRegisterCloseListener()
else
{
// interface unknown. don't register, then
- DBG_ERROR("ImpTwain::ImplRegisterCloseListener: XFrame has no XCloseBroadcaster!");
+ OSL_FAIL("ImpTwain::ImplRegisterCloseListener: XFrame has no XCloseBroadcaster!");
return;
}
}
@@ -661,7 +661,7 @@ void ImpTwain::ImplRegisterCloseListener()
{
}
- DBG_ERROR("ImpTwain::ImplRegisterCloseListener: Could not register as close listener!");
+ OSL_FAIL("ImpTwain::ImplRegisterCloseListener: Could not register as close listener!");
}
// -----------------------------------------------------------------------------
@@ -681,7 +681,7 @@ void ImpTwain::ImplDeregisterCloseListener()
else
{
// interface unknown. don't deregister, then
- DBG_ERROR("ImpTwain::ImplDeregisterCloseListener: XFrame has no XCloseBroadcaster!");
+ OSL_FAIL("ImpTwain::ImplDeregisterCloseListener: XFrame has no XCloseBroadcaster!");
return;
}
}
@@ -689,7 +689,7 @@ void ImpTwain::ImplDeregisterCloseListener()
{
}
- DBG_ERROR("ImpTwain::ImplDeregisterCloseListener: Could not deregister as close listener!");
+ OSL_FAIL("ImpTwain::ImplDeregisterCloseListener: Could not deregister as close listener!");
}
// -----------------------------------------------------------------------------
@@ -708,7 +708,7 @@ void SAL_CALL ImpTwain::queryClosing( const lang::EventObject& /*Source*/, sal_B
void SAL_CALL ImpTwain::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
{
// should not happen
- DBG_ERROR("ImpTwain::notifyClosing called, but we vetoed the closing before!");
+ OSL_FAIL("ImpTwain::notifyClosing called, but we vetoed the closing before!");
}
// -----------------------------------------------------------------------------
@@ -733,7 +733,7 @@ void ImpTwain::ImplSendCloseEvent()
{
}
- DBG_ERROR("ImpTwain::ImplSendCloseEvent: Could not send required close broadcast!");
+ OSL_FAIL("ImpTwain::ImplSendCloseEvent: Could not send required close broadcast!");
}
diff --git a/extensions/source/svg/svgaction.cxx b/extensions/source/svg/svgaction.cxx
index b9f65c2..43967a0 100644
--- a/extensions/source/svg/svgaction.cxx
+++ b/extensions/source/svg/svgaction.cxx
@@ -519,7 +519,7 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2, const
if( pLineColor )
{
// !!! mrExport.AddAttribute( XML_NAMESPACE_NONE, ... )
- DBG_ERROR( "SVGActionWriter::ImplWriteLine: Line color not implemented" );
+ OSL_FAIL( "SVGActionWriter::ImplWriteLine: Line color not implemented" );
}
{
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 7343d80..6b8ce9e 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -224,7 +224,7 @@ void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw
break;
default:
- DBG_ERROR("OButtonModel::read : unknown version !");
+ OSL_FAIL("OButtonModel::read : unknown version !");
m_eButtonType = FormButtonType_PUSH;
m_sTargetURL = ::rtl::OUString();
m_sTargetFrame = ::rtl::OUString();
@@ -492,7 +492,7 @@ IMPL_LINK( OButtonControl, OnClick, void*, EMPTYARG )
#endif
catch( const Exception& )
{
- DBG_ERROR( "OButtonControl::OnClick: caught a exception other than RuntimeException!" );
+ OSL_FAIL( "OButtonControl::OnClick: caught a exception other than RuntimeException!" );
}
}
}
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index bc69702..45964f2 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -200,7 +200,7 @@ void SAL_CALL OCheckBoxModel::read(const Reference<stario::XObjectInputStream>&
readCommonProperties(_rxInStream);
break;
default:
- DBG_ERROR("OCheckBoxModel::read : unknown version !");
+ OSL_FAIL("OCheckBoxModel::read : unknown version !");
defaultCommonProperties();
break;
}
@@ -257,12 +257,12 @@ sal_Bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
m_xColumnUpdate->updateBoolean( sal_False );
break;
default:
- DBG_ERROR("OCheckBoxModel::commitControlValueToDbColumn: invalid value !");
+ OSL_FAIL("OCheckBoxModel::commitControlValueToDbColumn: invalid value !");
}
}
catch(Exception&)
{
- DBG_ERROR("OCheckBoxModel::commitControlValueToDbColumn: could not commit !");
+ OSL_FAIL("OCheckBoxModel::commitControlValueToDbColumn: could not commit !");
}
}
return sal_True;
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 02d1550..8fa821b 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -403,7 +403,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>&
if (nVersion > 0x0006)
{
- DBG_ERROR("OComboBoxModel::read : invalid (means unknown) version !");
+ OSL_FAIL("OComboBoxModel::read : invalid (means unknown) version !");
m_aListSource = ::rtl::OUString();
m_aBoundColumn <<= (sal_Int16)0;
m_aDefaultText = ::rtl::OUString();
@@ -498,7 +498,7 @@ void OComboBoxModel::loadData( bool _bForce )
Reference<XServiceInfo> xServiceInfo(xConnection, UNO_QUERY);
if (!xServiceInfo.is() || !xServiceInfo->supportsService(SRV_SDB_CONNECTION))
{
- DBG_ERROR("OComboBoxModel::loadData : invalid connection !");
+ OSL_FAIL("OComboBoxModel::loadData : invalid connection !");
return;
}
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index b604400..5f7d1db 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -137,7 +137,7 @@ void OCurrencyModel::implConstruct()
}
catch(Exception&)
{
- DBG_ERROR( "OCurrencyModel::implConstruct: caught an exception while initializing the aggregate!" );
+ OSL_FAIL( "OCurrencyModel::implConstruct: caught an exception while initializing the aggregate!" );
}
}
}
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 2426e1c..7ad2e30 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1157,7 +1157,7 @@ bool ODatabaseForm::hasValidParent() const
Reference<XResultSet> xResultSet(m_xParent, UNO_QUERY);
if (!xResultSet.is())
{
- DBG_ERROR("ODatabaseForm::hasValidParent() : no parent resultset !");
+ OSL_FAIL("ODatabaseForm::hasValidParent() : no parent resultset !");
return false;
}
try
@@ -2339,7 +2339,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
lcl_dispatch(xFrame,xTransformer,aURLStr,aReferer,aTargetName,aData,osl_getThreadTextEncoding());
}
else {
- DBG_ERROR("ODatabaseForm::submit_Impl : wrong encoding !");
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list