[Libreoffice-commits] .: starmath/source sw/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Mar 2 06:06:42 PST 2011
starmath/source/accessibility.cxx | 2 -
starmath/source/cfgitem.cxx | 2 -
starmath/source/document.cxx | 2 -
starmath/source/format.cxx | 2 -
starmath/source/mathmlexport.cxx | 2 -
starmath/source/mathmlimport.cxx | 2 -
starmath/source/node.cxx | 4 +-
starmath/source/rect.cxx | 2 -
starmath/source/symbol.cxx | 2 -
starmath/source/toolbox.cxx | 4 +-
starmath/source/view.cxx | 6 +--
starmath/source/visitors.cxx | 2 -
sw/source/core/attr/format.cxx | 2 -
sw/source/core/bastyp/calc.cxx | 2 -
sw/source/core/doc/docdraw.cxx | 2 -
sw/source/core/doc/docfld.cxx | 2 -
sw/source/core/doc/docnew.cxx | 2 -
sw/source/core/doc/doctxm.cxx | 4 +-
sw/source/core/doc/tblrwcl.cxx | 2 -
sw/source/core/edit/edlingu.cxx | 2 -
sw/source/core/fields/authfld.cxx | 4 +-
sw/source/core/fields/chpfld.cxx | 4 +-
sw/source/core/fields/dbfld.cxx | 12 +++---
sw/source/core/fields/ddefld.cxx | 4 +-
sw/source/core/fields/docufld.cxx | 54 +++++++++++++++----------------
sw/source/core/fields/expfld.cxx | 10 ++---
sw/source/core/fields/fldbas.cxx | 4 +-
sw/source/core/fields/flddropdown.cxx | 4 +-
sw/source/core/fields/macrofld.cxx | 4 +-
sw/source/core/fields/reffld.cxx | 8 ++--
sw/source/core/fields/scrptfld.cxx | 4 +-
sw/source/core/fields/usrfld.cxx | 4 +-
sw/source/core/graphic/grfatr.cxx | 2 -
sw/source/core/layout/atrfrm.cxx | 10 ++---
sw/source/core/ole/ndole.cxx | 6 +--
sw/source/core/para/paratr.cxx | 2 -
sw/source/core/swg/SwXMLTextBlocks.cxx | 2 -
sw/source/core/text/inftxt.cxx | 2 -
sw/source/core/txtnode/fmtatr2.cxx | 2 -
sw/source/core/unocore/unochart.cxx | 26 +++++++-------
sw/source/core/unocore/unocrsrhelper.cxx | 6 +--
sw/source/core/unocore/unodraw.cxx | 2 -
sw/source/core/unocore/unofield.cxx | 10 ++---
sw/source/core/unocore/unoframe.cxx | 2 -
sw/source/core/unocore/unoidx.cxx | 2 -
sw/source/core/unocore/unomap.cxx | 2 -
sw/source/core/unocore/unoparagraph.cxx | 4 +-
sw/source/core/unocore/unoport.cxx | 4 +-
sw/source/core/unocore/unoportenum.cxx | 4 +-
sw/source/core/unocore/unoredline.cxx | 10 ++---
sw/source/core/unocore/unoredlines.cxx | 4 +-
sw/source/core/unocore/unotbl.cxx | 22 ++++++------
sw/source/filter/html/htmlplug.cxx | 2 -
sw/source/filter/ww8/writerhelper.cxx | 2 -
sw/source/filter/xml/xmlexpit.cxx | 12 +++---
sw/source/filter/xml/xmlimp.cxx | 2 -
sw/source/filter/xml/xmlimpit.cxx | 12 +++---
sw/source/filter/xml/xmlmeta.cxx | 2 -
sw/source/filter/xml/xmltble.cxx | 4 +-
sw/source/filter/xml/xmltexte.cxx | 2 -
60 files changed, 164 insertions(+), 164 deletions(-)
New commits:
commit 49f6447d8e01ae651e09f665a61cdbeef8eb44f8
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 1 19:09:12 2011 +0100
Move DBG_ERROR to OSL_FAIL
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 7ce1031..44383de 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1033,7 +1033,7 @@ SfxItemSet SmTextForwarder::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAt
nFlags = GETATTRIBS_CHARATTRIBS;
break;
default:
- DBG_ERROR("unknown flags for SmTextForwarder::GetAttribs");
+ OSL_FAIL("unknown flags for SmTextForwarder::GetAttribs");
}
return pEditEngine->GetAttribs( rSel.nStartPara, rSel.nStartPos, rSel.nEndPos, nFlags );
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 444cd12..99dcf51 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -544,7 +544,7 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol,
}
else
{
- DBG_ERROR( "symbol read error" );
+ OSL_FAIL( "symbol read error" );
}
}
}
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index eddbe9b..61ee8a9 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -273,7 +273,7 @@ void SmDocShell::ArrangeFormula()
if (!pOutDev)
{
#if OSL_DEBUG_LEVEL > 1
- DBG_ERROR("!! SmDocShell::ArrangeFormula: reference device missing !!");
+ OSL_FAIL("!! SmDocShell::ArrangeFormula: reference device missing !!");
#endif
}
diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx
index 3b42395..4d50334 100644
--- a/starmath/source/format.cxx
+++ b/starmath/source/format.cxx
@@ -97,7 +97,7 @@ String GetDefaultFontName( LanguageType nLang, USHORT nIdent )
case SCRIPTTYPE_COMPLEX : pTable = aCTLDefFnts; break;
default :
pTable = aLatinDefFnts;
- DBG_ERROR( "unknown script-type" );
+ OSL_FAIL( "unknown script-type" );
}
return Application::GetDefaultDevice()->GetDefaultFont(
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 73558c3..db08bfe 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -344,7 +344,7 @@ sal_Bool SmXMLExportWrapper::WriteThroughComponent(
}
catch ( uno::Exception& )
{
- DBG_ERROR( "Can't create output stream in package!" );
+ OSL_FAIL( "Can't create output stream in package!" );
return sal_False;
}
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index cd88d71..4e425d9 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -3007,7 +3007,7 @@ void SmXMLImport::SetConfigurationSettings(const Sequence<PropertyValue>& aConfP
}
catch( Exception& )
{
- DBG_ERROR( "SmXMLImport::SetConfigurationSettings: Exception!" );
+ OSL_FAIL( "SmXMLImport::SetConfigurationSettings: Exception!" );
}
}
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 217ea1b..00e3e3e 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -93,7 +93,7 @@ SmTmpDevice::SmTmpDevice(OutputDevice &rTheDev, bool bUseMap100th_mm) :
PUSH_LINECOLOR | PUSH_FILLCOLOR | PUSH_TEXTCOLOR );
if (bUseMap100th_mm && MAP_100TH_MM != rOutDev.GetMapMode().GetMapUnit())
{
- DBG_ERROR( "incorrect MapMode?" );
+ OSL_FAIL( "incorrect MapMode?" );
rOutDev.SetMapMode( MAP_100TH_MM ); //Immer fuer 100% fomatieren
}
}
@@ -512,7 +512,7 @@ const SmNode * SmNode::FindRectClosestTo(const Point &rPoint) const
void SmNode::GetAccessibleText( String &/*rText*/ ) const
{
- DBG_ERROR( "SmNode: GetAccessibleText not overloaded" );
+ OSL_FAIL( "SmNode: GetAccessibleText not overloaded" );
}
const SmNode * SmNode::FindNodeWithAccessibleIndex(xub_StrLen nAccIdx) const
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index 3007a58..52e3100 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -193,7 +193,7 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat,
#if OSL_DEBUG_LEVEL > 1
if (!bSuccess)
{
- DBG_ERROR( "Sm : Ooops... (fehlt evtl. der Font?)");
+ OSL_FAIL( "Sm : Ooops... (fehlt evtl. der Font?)");
}
#endif
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index 0701b79..cd3147b 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -276,7 +276,7 @@ void SmSymbolManager::Load()
if (0 == nSymbolCount)
{
- DBG_ERROR( "no symbol set found" );
+ OSL_FAIL( "no symbol set found" );
m_bModified = false;
}
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index 204f77a..a4159c6 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -61,7 +61,7 @@ static USHORT GetImageListRID( USHORT nCategoryRID )
case RID_FORMAT_CAT : nRes = RID_IL_FORMAT; break;
case RID_MISC_CAT : nRes = RID_IL_MISC; break;
default :
- DBG_ERROR( "unkown category" );
+ OSL_FAIL( "unkown category" );
}
return nRes;
}
@@ -106,7 +106,7 @@ static USHORT GetCategoryRID( USHORT nResId )
if (nResId != RID_IL_CATALOG)
{
#if OSL_DEBUG_LEVEL > 1
- DBG_ERROR( "unkown category" );
+ OSL_FAIL( "unkown category" );
#endif
}
}
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 53d3eb0..897cdd2 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1478,7 +1478,7 @@ bool SmViewShell::Insert( SfxMedium& rMedium )
pEditWin->InsertText( aText );
else
{
- DBG_ERROR( "EditWindow missing" );
+ OSL_FAIL( "EditWindow missing" );
aTemp += aText;
aText = aTemp;
}
@@ -1523,7 +1523,7 @@ bool SmViewShell::InsertFrom(SfxMedium &rMedium)
pEditWin->InsertText( aText );
else
{
- DBG_ERROR( "EditWindow missing" );
+ OSL_FAIL( "EditWindow missing" );
aTemp += aText;
aText = aTemp;
}
@@ -1644,7 +1644,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
}
catch (uno::Exception &)
{
- DBG_ERROR( "SmViewShell::Execute (SID_PASTEOBJECT): failed to get storage from input stream" );
+ OSL_FAIL( "SmViewShell::Execute (SID_PASTEOBJECT): failed to get storage from input stream" );
}
}
}
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index 3015765..d89abb8 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -496,7 +496,7 @@ SmTmpDevice2::SmTmpDevice2( OutputDevice &rTheDev, bool bUseMap100th_mm ) :
PUSH_LINECOLOR | PUSH_FILLCOLOR | PUSH_TEXTCOLOR );
if ( bUseMap100th_mm && MAP_100TH_MM != rOutDev.GetMapMode( ).GetMapUnit( ) )
{
- DBG_ERROR( "incorrect MapMode?" );
+ OSL_FAIL( "incorrect MapMode?" );
rOutDev.SetMapMode( MAP_100TH_MM ); //format for 100% always
}
}
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 2e42228..99f5235 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -254,7 +254,7 @@ SwFmt::~SwFmt()
SwFmt *pParentFmt = DerivedFrom();
if (!pParentFmt)
{
- DBG_ERROR( "~SwFmt: parent format missing" );
+ OSL_FAIL( "~SwFmt: parent format missing" );
}
else
{
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 8d498e5..3614899 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -1333,7 +1333,7 @@ SwSbxValue SwCalc::Prim()
nErg.PutLong( nErg.GetDouble() == 0.0 ? 1 : 0 );
else
{
- DBG_ERROR( "unexpected case. computing binary NOT" );
+ OSL_FAIL( "unexpected case. computing binary NOT" );
//!! computes a binary NOT
nErg.Compute( SbxNOT, nErg );
}
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 9bc5925..f2c903e 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -898,7 +898,7 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo)
}
else
{
- DBG_ERROR("unbekannter Feldbefehl");
+ OSL_FAIL("unbekannter Feldbefehl");
pInfo->SetRepresentation( String( '?' ) );
}
}
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index c5d55a1..6517cea 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1557,7 +1557,7 @@ void SwDoc::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc )
}
else
{
- DBG_ERROR("TODO: what should happen with unnamed DBFields?");
+ OSL_FAIL("TODO: what should happen with unnamed DBFields?");
}
}
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 7c435cb..fc360fa 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -148,7 +148,7 @@ SV_IMPL_PTRARR( SwGrfFmtColls, SwGrfFmtCollPtr)
}
catch (uno::Exception &)
{
- DBG_ERROR( "No GCIterator" );
+ OSL_FAIL( "No GCIterator" );
}
}
}
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 495257b..7697d7a 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1475,7 +1475,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
}
else
{
- DBG_ERROR("OLE-object nicht geladen?");
+ OSL_FAIL("OLE-object nicht geladen?");
bInclude = FALSE;
}
}
@@ -2258,7 +2258,7 @@ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
}
#if OSL_DEBUG_LEVEL > 1
else
- DBG_ERROR("Bibliography entries cannot be found here");
+ OSL_FAIL("Bibliography entries cannot be found here");
#endif
}
if(*pNew < *pOld)
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 2e38d33..f11c3d2 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -3482,7 +3482,7 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
if( Abs( nAktSize - nSize ) > ( COLFUZZY * rBoxes.Count() ) )
{
- DBG_ERROR( "Boxen der Line zu klein/gross" );
+ OSL_FAIL( "Boxen der Line zu klein/gross" );
}
}
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 24bf13c..d277876 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -1366,7 +1366,7 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
{
//add the 'ignore' markup to the TextNode's grammar ignore markup list
IgnoreGrammarErrorAt( *pCrsr );
- DBG_ERROR("TODO: add ignore mark to text node");
+ OSL_FAIL("TODO: add ignore mark to text node");
}
if(aCurrentNewPortion == rNewPortions.begin())
break;
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 15fb13a..f41ab01 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -455,7 +455,7 @@ bool SwAuthorityFieldType::QueryValue( Any& rVal, USHORT nWhichId ) const
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -528,7 +528,7 @@ bool SwAuthorityFieldType::PutValue( const Any& rAny, USHORT nWhichId )
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return bRet;
}
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index 7c5e6f6..36a4d43 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -229,7 +229,7 @@ bool SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -271,7 +271,7 @@ bool SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId )
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
bRet = false;
}
return bRet;
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index ef960f5..681d7f2 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -142,7 +142,7 @@ bool SwDBFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
rAny <<= aDBData.nCommandType;
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -185,7 +185,7 @@ bool SwDBFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
rAny >>= aDBData.nCommandType;
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -423,7 +423,7 @@ bool SwDBField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
rAny <<= OUString(sFieldCode);
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
@@ -483,7 +483,7 @@ bool SwDBField::PutValue( const uno::Any& rAny, USHORT nWhichId )
::GetString( rAny, sFieldCode );
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -555,7 +555,7 @@ bool SwDBNameInfField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -587,7 +587,7 @@ bool SwDBNameInfField::PutValue( const uno::Any& rAny, USHORT nWhichId )
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 2b56522..edfa9c4 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -345,7 +345,7 @@ bool SwDDEFieldType::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
rVal <<= ::rtl::OUString(aExpansion);
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
if( nPart )
rVal <<= OUString(GetCmd().GetToken(nPart-1, sfx2::cTokenSeperator));
@@ -373,7 +373,7 @@ bool SwDDEFieldType::PutValue( const uno::Any& rVal, USHORT nWhichId )
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
if( nPart )
{
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 10ed3c0..a4ff8b2 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -275,7 +275,7 @@ bool SwPageNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -320,7 +320,7 @@ bool SwPageNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId )
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return bRet;
}
@@ -396,7 +396,7 @@ bool SwAuthorField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -421,7 +421,7 @@ bool SwAuthorField::PutValue( const uno::Any& rAny, USHORT nWhichId )
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -552,7 +552,7 @@ bool SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
rAny <<= OUString(GetContent());
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -600,7 +600,7 @@ bool SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -709,7 +709,7 @@ bool SwTemplNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -747,7 +747,7 @@ bool SwTemplNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -846,7 +846,7 @@ bool SwDocStatField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
rAny <<= (sal_Int16)GetFormat();
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -871,7 +871,7 @@ bool SwDocStatField::PutValue( const uno::Any& rAny, USHORT nWhichId )
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return bRet;
}
@@ -1608,7 +1608,7 @@ bool SwHiddenTxtField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
if( pOut )
rAny <<= OUString( *pOut );
@@ -1641,7 +1641,7 @@ bool SwHiddenTxtField::PutValue( const uno::Any& rAny, USHORT nWhichId )
bValid = TRUE;
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -1737,7 +1737,7 @@ bool SwHiddenParaField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -1754,7 +1754,7 @@ bool SwHiddenParaField::PutValue( const uno::Any& rAny, USHORT nWhichId )
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -1937,7 +1937,7 @@ bool SwPostItField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -1959,7 +1959,7 @@ bool SwPostItField::PutValue( const uno::Any& rAny, USHORT nWhichId )
}
break;
case FIELD_PROP_TEXT:
- DBG_ERROR("Not implemented!");
+ OSL_FAIL("Not implemented!");
break;
case FIELD_PROP_DATE:
if( rAny.getValueType() == ::getCppuType((util::Date*)0) )
@@ -1983,7 +1983,7 @@ bool SwPostItField::PutValue( const uno::Any& rAny, USHORT nWhichId )
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -2103,7 +2103,7 @@ bool SwExtUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -2130,7 +2130,7 @@ bool SwExtUserField::PutValue( const uno::Any& rAny, USHORT nWhichId )
SetFormat(GetFormat() & ~AF_FIXED);
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -2208,7 +2208,7 @@ bool SwRefPageSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
rAny <<= (sal_Int16)nOffset;
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -2224,7 +2224,7 @@ bool SwRefPageSetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
rAny >>=nOffset;
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -2475,7 +2475,7 @@ bool SwRefPageGetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
rAny <<= OUString(sTxt);
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -2502,7 +2502,7 @@ bool SwRefPageGetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -2619,7 +2619,7 @@ bool SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
rAny <<= OUString(sTxt);
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -2652,7 +2652,7 @@ bool SwJumpEditField::PutValue( const uno::Any& rAny, USHORT nWhichId )
::GetString( rAny, sTxt);
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -2711,7 +2711,7 @@ bool SwCombinedCharField::QueryValue( uno::Any& rAny,
rAny <<= rtl::OUString( sCharacters );
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -2725,7 +2725,7 @@ bool SwCombinedCharField::PutValue( const uno::Any& rAny,
::GetString( rAny, sCharacters ).Erase( MAX_COMBINED_CHARACTERS );
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 65d8917..bc14b82 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -97,7 +97,7 @@ sal_Int32 lcl_APIToSubType(const uno::Any& rAny)
case SetVariableType::FORMULA: nSet = nsSwGetSetExpType::GSE_FORMULA; break;
case SetVariableType::STRING: nSet = nsSwGetSetExpType::GSE_STRING; break;
default:
- DBG_ERROR("wrong value");
+ OSL_FAIL("wrong value");
nSet = -1;
}
return nSet;
@@ -668,7 +668,7 @@ bool SwSetExpFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -705,7 +705,7 @@ bool SwSetExpFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -1076,7 +1076,7 @@ bool SwInputField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
rAny <<= OUString( aToolTip );
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -1098,7 +1098,7 @@ bool SwInputField::PutValue( const uno::Any& rAny, USHORT nWhichId )
::GetString( rAny, aToolTip );
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index f7eb561..f2af5d4 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -325,7 +325,7 @@ bool SwField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -341,7 +341,7 @@ bool SwField::PutValue( const uno::Any& rVal, USHORT nWhichId )
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index c9f13f9..eab65e4 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -222,7 +222,7 @@ bool SwDropDownField::QueryValue(::uno::Any &rVal, USHORT nWhich) const
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -277,7 +277,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal,
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index 73a61ae..4922a0a 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -193,7 +193,7 @@ bool SwMacroField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
rAny <<= bIsScriptURL ? OUString(GetMacroName()): OUString();
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -217,7 +217,7 @@ bool SwMacroField::PutValue( const uno::Any& rAny, USHORT nWhichId )
bIsScriptURL = isScriptURL(aMacro);
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 23b0eec..6cc1f38 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -470,7 +470,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
break;
// <--
default:
- DBG_ERROR("<SwGetRefField::UpdateField(..)> - unknown format type");
+ OSL_FAIL("<SwGetRefField::UpdateField(..)> - unknown format type");
}
}
@@ -615,7 +615,7 @@ bool SwGetRefField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
case REF_SETREFATTR : nSource = ReferenceFieldSource::REFERENCE_MARK; break;
case REF_SEQUENCEFLD: nSource = ReferenceFieldSource::SEQUENCE_FIELD; break;
case REF_BOOKMARK : nSource = ReferenceFieldSource::BOOKMARK; break;
- case REF_OUTLINE : DBG_ERROR("not implemented"); break;
+ case REF_OUTLINE : OSL_FAIL("not implemented"); break;
case REF_FOOTNOTE : nSource = ReferenceFieldSource::FOOTNOTE; break;
case REF_ENDNOTE : nSource = ReferenceFieldSource::ENDNOTE; break;
}
@@ -648,7 +648,7 @@ bool SwGetRefField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
rAny <<= (sal_Int16)nSeqNo;
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -723,7 +723,7 @@ bool SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId )
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx
index 170ef82..8d23b7e 100644
--- a/sw/source/core/fields/scrptfld.cxx
+++ b/sw/source/core/fields/scrptfld.cxx
@@ -120,7 +120,7 @@ bool SwScriptField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
rAny.setValue(&bCodeURL, ::getBooleanCppuType());
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -139,7 +139,7 @@ bool SwScriptField::PutValue( const uno::Any& rAny, USHORT nWhichId )
bCodeURL = *(sal_Bool*)rAny.getValue();
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index f761ef3..7fca454 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -320,7 +320,7 @@ bool SwUserFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
@@ -358,7 +358,7 @@ bool SwUserFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
}
break;
default:
- DBG_ERROR("illegal property");
+ OSL_FAIL("illegal property");
}
return true;
}
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index a0a3e3b..813a5a0 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -215,7 +215,7 @@ bool SwRotationGrf::PutValue( const uno::Any& rVal, BYTE )
return true;
}
- DBG_ERROR( "SwRotationGrf::PutValue - Wrong type!" );
+ OSL_FAIL( "SwRotationGrf::PutValue - Wrong type!" );
return false;
}
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 018a09b..c0867ff 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1008,7 +1008,7 @@ bool SwFmtCol::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
nMemberId &= ~CONVERT_TWIPS;
if(MID_COLUMN_SEPARATOR_LINE == nMemberId)
{
- DBG_ERROR("not implemented");
+ OSL_FAIL("not implemented");
}
else
{
@@ -1025,7 +1025,7 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId )
bool bRet = false;
if(MID_COLUMN_SEPARATOR_LINE == nMemberId)
{
- DBG_ERROR("not implemented");
+ OSL_FAIL("not implemented");
}
else
{
@@ -2233,7 +2233,7 @@ bool SwTextGridItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
rVal <<= text::TextGridMode::LINES_AND_CHARS;
break;
default:
- DBG_ERROR("unknown SwTextGrid value");
+ OSL_FAIL("unknown SwTextGrid value");
bRet = false;
break;
}
@@ -2248,7 +2248,7 @@ bool SwTextGridItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
}
break;
default:
- DBG_ERROR("Unknown SwTextGridItem member");
+ OSL_FAIL("Unknown SwTextGridItem member");
bRet = false;
break;
}
@@ -2342,7 +2342,7 @@ bool SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
break;
}
default:
- DBG_ERROR("Unknown SwTextGridItem member");
+ OSL_FAIL("Unknown SwTextGridItem member");
bRet = false;
}
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 25bbbe2..e860185 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -312,7 +312,7 @@ BOOL SwOLENode::RestorePersistentData()
{
if ( xChild.is() )
xChild->setParent( 0 );
- DBG_ERROR( "InsertObject failed" );
+ OSL_FAIL( "InsertObject failed" );
}
else
{
@@ -747,7 +747,7 @@ void SwOLEObj::SetNode( SwOLENode* pNode )
xChild->setParent( p->GetModel() );
if (!p->GetEmbeddedObjectContainer().InsertEmbeddedObject( xOLERef.GetObject(), aObjName ) )
{
- DBG_ERROR( "InsertObject failed" );
+ OSL_FAIL( "InsertObject failed" );
if ( xChild.is() )
xChild->setParent( 0 );
}
@@ -863,7 +863,7 @@ BOOL SwOLEObj::UnloadObject( uno::Reference< embed::XEmbeddedObject > xObj, cons
if ( xPers.is() )
xPers->storeOwn();
else {
- DBG_ERROR("Modified object without persistance in cache!");
+ OSL_FAIL("Modified object without persistance in cache!");
}
}
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index 5642b77..d029bbf 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -234,7 +234,7 @@ bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
bWholeWord = *(sal_Bool*)rVal.getValue();
break;
case MID_DROPCAP_CHAR_STYLE_NAME :
- DBG_ERROR("char format cannot be set in PutValue()!");
+ OSL_FAIL("char format cannot be set in PutValue()!");
break;
}
return true;
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index e7c5cb6..13800a7 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -101,7 +101,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const String& rFile )
}
catch( const uno::Exception& )
{
- DBG_ERROR("exception while creating AutoText storage");
+ OSL_FAIL("exception while creating AutoText storage");
}
}
InitBlockMode ( refStg );
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index ab668cf..18fd618 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1333,7 +1333,7 @@ static void lcl_InitHyphValues( PropertyValues &rVals,
pVal[1].Value <<= nMinTrailing;
}
else {
- DBG_ERROR( "unxpected size of sequence" );
+ OSL_FAIL( "unxpected size of sequence" );
}
}
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index 1ee547b..9966579 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -135,7 +135,7 @@ bool SwFmtCharFmt::QueryValue( uno::Any& rVal, BYTE ) const
}
bool SwFmtCharFmt::PutValue( const uno::Any& , BYTE )
{
- DBG_ERROR("Zeichenvorlage kann mit PutValue nicht gesetzt werden!");
+ OSL_FAIL("Zeichenvorlage kann mit PutValue nicht gesetzt werden!");
return false;
}
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 305bc34..d64c09d 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -1108,7 +1108,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
uno::Reference< chart2::data::XLabeledDataSequence > xLabeledDataSequence( pDS_LDS[nDS1] );
if( !xLabeledDataSequence.is() )
{
- DBG_ERROR("got NULL for XLabeledDataSequence from Data source");
+ OSL_FAIL("got NULL for XLabeledDataSequence from Data source");
continue;
}
const uno::Reference< chart2::data::XDataSequence > xCurLabel( xLabeledDataSequence->getLabel(), uno::UNO_QUERY );
@@ -1182,7 +1182,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
nDirection = 0;
else
{
- DBG_ERROR( "trying to determine 'DataRowSource': unexpected case found" );
+ OSL_FAIL( "trying to determine 'DataRowSource': unexpected case found" );
nDirection = -2;
}
}
@@ -1956,7 +1956,7 @@ SwChartDataSequence::SwChartDataSequence(
pDataProvider->addEventListener( dynamic_cast< lang::XEventListener * >(this) );
}
else {
- DBG_ERROR( "table missing" );
+ OSL_FAIL( "table missing" );
}
}
catch (uno::RuntimeException &)
@@ -2006,7 +2006,7 @@ SwChartDataSequence::SwChartDataSequence( const SwChartDataSequence &rObj ) :
pDataProvider->addEventListener( dynamic_cast< lang::XEventListener * >(this) );
}
else {
- DBG_ERROR( "table missing" );
+ OSL_FAIL( "table missing" );
}
}
catch (uno::RuntimeException &)
@@ -2154,7 +2154,7 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel(
bReturnEmptyTxt = nColSpan == nRowSpan;
}
else {
- DBG_ERROR( "unexpected case" );
+ OSL_FAIL( "unexpected case" );
}
// build label sequence
@@ -2340,7 +2340,7 @@ void SAL_CALL SwChartDataSequence::addPropertyChangeListener(
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- DBG_ERROR( "not implemented" );
+ OSL_FAIL( "not implemented" );
}
void SAL_CALL SwChartDataSequence::removePropertyChangeListener(
@@ -2348,7 +2348,7 @@ void SAL_CALL SwChartDataSequence::removePropertyChangeListener(
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- DBG_ERROR( "not implemented" );
+ OSL_FAIL( "not implemented" );
}
void SAL_CALL SwChartDataSequence::addVetoableChangeListener(
@@ -2356,7 +2356,7 @@ void SAL_CALL SwChartDataSequence::addVetoableChangeListener(
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- DBG_ERROR( "not implemented" );
+ OSL_FAIL( "not implemented" );
}
void SAL_CALL SwChartDataSequence::removeVetoableChangeListener(
@@ -2364,7 +2364,7 @@ void SAL_CALL SwChartDataSequence::removeVetoableChangeListener(
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- DBG_ERROR( "not implemented" );
+ OSL_FAIL( "not implemented" );
}
OUString SAL_CALL SwChartDataSequence::getImplementationName( )
@@ -2479,7 +2479,7 @@ void SAL_CALL SwChartDataSequence::dispose( )
pDataProvider->RemoveDataSequence( *pTable, xRef );
}
else {
- DBG_ERROR( "table missing" );
+ OSL_FAIL( "table missing" );
}
}
@@ -2566,7 +2566,7 @@ sal_Bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
bMoveLeft = nMarkCol > nPointCol;
}
else {
- DBG_ERROR( "neither vertical nor horizontal movement" );
+ OSL_FAIL( "neither vertical nor horizontal movement" );
}
// get new box (position) to use...
@@ -2605,11 +2605,11 @@ sal_Bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
pPos->nContent = aNewPos.nContent;
}
else {
- DBG_ERROR( "neither point nor mark available for change" );
+ OSL_FAIL( "neither point nor mark available for change" );
}
}
else {
- DBG_ERROR( "failed to get position" );
+ OSL_FAIL( "failed to get position" );
}
}
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index cbdadc1..5d9c41c 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1002,12 +1002,12 @@ sal_Bool DocInsertStringSplitCR(
if (aTxt.getLength() &&
!rDoc.InsertString( rNewCursor, aTxt, nInsertFlags ))
{
- DBG_ERROR( "Doc->Insert(Str) failed." );
+ OSL_FAIL( "Doc->Insert(Str) failed." );
bOK = sal_False;
}
if (!rDoc.SplitNode( *rNewCursor.GetPoint(), false ) )
{
- DBG_ERROR( "SplitNode failed" );
+ OSL_FAIL( "SplitNode failed" );
bOK = sal_False;
}
nStartIdx = nIdx + 1;
@@ -1017,7 +1017,7 @@ sal_Bool DocInsertStringSplitCR(
if (aTxt.getLength() &&
!rDoc.InsertString( rNewCursor, aTxt, nInsertFlags ))
{
- DBG_ERROR( "Doc->Insert(Str) failed." );
+ OSL_FAIL( "Doc->Insert(Str) failed." );
bOK = sal_False;
}
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index c6fe1e9..9bbe817 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1101,7 +1101,7 @@ uno::Sequence< sal_Int8 > SwXShape::getImplementationId( ) throw(uno::RuntimeEx
}
if( NULL == pImplementationId )
{
- DBG_ERROR( "Could not create an implementation id for a SwXShape!" );
+ OSL_FAIL( "Could not create an implementation id for a SwXShape!" );
return uno::Sequence< sal_Int8 > ();
}
else
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 9e67219..c244fe9 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -196,7 +196,7 @@ sal_uInt16 lcl_ServiceIdToResId(sal_uInt16 nServiceId)
++pMap;
#if OSL_DEBUG_LEVEL > 1
if( USHRT_MAX == pMap->nServiceId )
- DBG_ERROR("service id not found");
+ OSL_FAIL("service id not found");
#endif
return pMap->nResId;
}
@@ -276,7 +276,7 @@ sal_uInt16 lcl_GetServiceForField( const SwField& rFld )
}
#if OSL_DEBUG_LEVEL > 1
if( USHRT_MAX == nSrvId )
- DBG_ERROR("resid not found");
+ OSL_FAIL("resid not found");
#endif
return nSrvId;
}
@@ -384,7 +384,7 @@ USHORT lcl_GetPropertyMapOfService( USHORT nServiceId )
case SW_SERVICE_FIELDMASTER_DUMMY5: nRet = PROPERTY_MAP_FLDMSTR_DUMMY0; break;
case SW_SERVICE_FIELDTYPE_HIDDEN_TEXT: nRet = PROPERTY_MAP_FLDTYP_HIDDEN_TEXT; break;
default:
- DBG_ERROR( "wrong service id" );
+ OSL_FAIL( "wrong service id" );
nRet = USHRT_MAX;
}
return nRet;
@@ -1579,7 +1579,7 @@ void SwXTextField::attachToRange(
//case text::SetVariableType::SEQUENCE: nSubType = nsSwGetSetExpType::GSE_SEQ; break;
case text::SetVariableType::FORMULA: nSubType = nsSwGetSetExpType::GSE_FORMULA; break;
default:
- DBG_ERROR("wrong value");
+ OSL_FAIL("wrong value");
nSubType = nsSwGetSetExpType::GSE_EXPR;
}
//make sure the SubType matches the field type
@@ -1715,7 +1715,7 @@ void SwXTextField::attachToRange(
((SwTblField*)pFld)->ChgExpStr(m_pProps->sPar1);
}
break;
- default: DBG_ERROR("was ist das fuer ein Typ?");
+ default: OSL_FAIL("was ist das fuer ein Typ?");
}
if(pFld)
{
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 90fdc0f..033771f 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3131,7 +3131,7 @@ void SwXOLEListener::disposing( const lang::EventObject& rEvent )
}
catch(uno::Exception const &)
{
- DBG_ERROR("OLE Listener couldn't be removed");
+ OSL_FAIL("OLE Listener couldn't be removed");
}
}
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 090357e..572cd5e 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -682,7 +682,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
case WID_CREATE_FROM_OUTLINE:
lcl_AnyToBitMask(rValue, nCreate, nsSwTOXElement::TOX_OUTLINELEVEL);
break;
-// case WID_PARAGRAPH_STYLE_NAMES :DBG_ERROR("not implemented")
+// case WID_PARAGRAPH_STYLE_NAMES :OSL_FAIL("not implemented")
// break;
case WID_CREATE_FROM_CHAPTER:
rTOXBase.SetFromChapter(lcl_AnyToBool(rValue));
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 5fbf9b1..8e5b76d 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -2485,7 +2485,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
break;
default:
- DBG_ERROR( "unexpected property map ID" );
+ OSL_FAIL( "unexpected property map ID" );
}
//fill the character pointers and types into the arrays
SfxItemPropertyMapEntry* p = aMapEntriesArr[nPropertyId];
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 122d372..19bbd04 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -606,7 +606,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
catch (beans::UnknownPropertyException &)
{
// should not occur because property was searched for before
- DBG_ERROR( "unexpected exception catched" );
+ OSL_FAIL( "unexpected exception catched" );
pFailed[ nFailed++ ].Result =
beans::TolerantPropertySetResultType::UNKNOWN_PROPERTY;
}
@@ -759,7 +759,7 @@ throw (uno::RuntimeException)
catch (beans::UnknownPropertyException &)
{
// should not occur because property was searched for before
- DBG_ERROR( "unexpected exception caught" );
+ OSL_FAIL( "unexpected exception caught" );
rResult.Result = beans::TolerantPropertySetResultType::UNKNOWN_PROPERTY;
}
catch (lang::IllegalArgumentException &)
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index e05d452..0936225 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -570,7 +570,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPr
catch (beans::UnknownPropertyException &)
{
// should not occur because property was searched for before
- DBG_ERROR( "unexpected exception catched" );
+ OSL_FAIL( "unexpected exception catched" );
pFailed[ nFailed++ ].Result = beans::TolerantPropertySetResultType::UNKNOWN_PROPERTY;
}
catch (lang::IllegalArgumentException &)
@@ -682,7 +682,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion:
catch (beans::UnknownPropertyException &)
{
// should not occur because property was searched for before
- DBG_ERROR( "unexpected exception catched" );
+ OSL_FAIL( "unexpected exception catched" );
aResult.Result = beans::TolerantPropertySetResultType::UNKNOWN_PROPERTY;
}
catch (lang::IllegalArgumentException &)
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index ff61c24..a92fe6c 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -809,7 +809,7 @@ lcl_ExportHints(
case RES_TXTATR_CHARFMT:
break; // these are handled as properties of a "Text" portion
default:
- DBG_ERROR("unknown attribute");
+ OSL_FAIL("unknown attribute");
break;
}
}
@@ -1080,7 +1080,7 @@ lcl_CreatePortions(
SwTxtNode * const pTxtNode = pUnoCrsr->GetNode()->GetTxtNode();
if (!pTxtNode)
{
- DBG_ERROR("lcl_CreatePortions: no TextNode - what now ?");
+ OSL_FAIL("lcl_CreatePortions: no TextNode - what now ?");
return;
}
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index e444d00..8fc792c 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -438,11 +438,11 @@ void SwXRedline::setPropertyValue( const OUString& rPropertyName, const uno::Any
throw uno::RuntimeException();
if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_REDLINE_AUTHOR)))
{
- DBG_ERROR("currently not available");
+ OSL_FAIL("currently not available");
}
else if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_REDLINE_DATE_TIME)))
{
- DBG_ERROR("currently not available");
+ OSL_FAIL("currently not available");
}
else if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_REDLINE_COMMENT)))
{
@@ -451,14 +451,14 @@ void SwXRedline::setPropertyValue( const OUString& rPropertyName, const uno::Any
}
else if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_REDLINE_TYPE)))
{
- DBG_ERROR("currently not available");
+ OSL_FAIL("currently not available");
OUString sTmp; aValue >>= sTmp;
if(!sTmp.getLength())
throw lang::IllegalArgumentException();
}
else if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_REDLINE_SUCCESSOR_DATA)))
{
- DBG_ERROR("currently not available");
+ OSL_FAIL("currently not available");
}
else
{
@@ -512,7 +512,7 @@ uno::Any SwXRedline::getPropertyValue( const OUString& rPropertyName )
}
break;
default:
- DBG_ERROR("illegal node type");
+ OSL_FAIL("illegal node type");
}
aRet <<= xRet;
}
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx
index e25fb35..4b01fce 100644
--- a/sw/source/core/unocore/unoredlines.cxx
+++ b/sw/source/core/unocore/unoredlines.cxx
@@ -115,14 +115,14 @@ OUString SwXRedlines::getImplementationName(void) throw( uno::RuntimeException )
sal_Bool SwXRedlines::supportsService(const rtl::OUString& /*ServiceName*/)
throw( uno::RuntimeException )
{
- DBG_ERROR("not implemented");
+ OSL_FAIL("not implemented");
return sal_False;
}
uno::Sequence< OUString > SwXRedlines::getSupportedServiceNames(void)
throw( uno::RuntimeException )
{
- DBG_ERROR("not implemented");
+ OSL_FAIL("not implemented");
return uno::Sequence< OUString >();
}
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 52375ca..7d52cbc 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -964,7 +964,7 @@ table::CellContentType SwXCell::getType(void) throw( uno::RuntimeException )
case RES_BOXATR_VALUE : nRes = table::CellContentType_VALUE; break;
case RES_BOXATR_FORMULA : nRes = table::CellContentType_FORMULA; break;
default :
- DBG_ERROR( "unexpected case" );
+ OSL_FAIL( "unexpected case" );
}
return nRes;
}
@@ -2787,7 +2787,7 @@ uno::Sequence< OUString > SwXTextTable::getRowDescriptions(void) throw( uno::Run
}
else
{
- DBG_ERROR("Wo kommen die Labels her?");
+ OSL_FAIL("Wo kommen die Labels her?");
}
}
else
@@ -2823,7 +2823,7 @@ void SwXTextTable::setRowDescriptions(const uno::Sequence< OUString >& rRowDesc)
}
else
{
- DBG_ERROR("Wohin mit den Labels?");
+ OSL_FAIL("Wohin mit den Labels?");
}
}
else
@@ -2863,7 +2863,7 @@ uno::Sequence< OUString > SwXTextTable::getColumnDescriptions(void)
}
else
{
- DBG_ERROR("Wo kommen die Labels her?");
+ OSL_FAIL("Wo kommen die Labels her?");
}
}
else
@@ -2901,7 +2901,7 @@ void SwXTextTable::setColumnDescriptions(const uno::Sequence< OUString >& rColum
}
else
{
- DBG_ERROR("Wo kommen die Labels her?");
+ OSL_FAIL("Wo kommen die Labels her?");
}
}
else
@@ -4044,7 +4044,7 @@ void SwXCellRange::GetDataSequence(
pDblSeq->realloc( nSize );
else
{
- DBG_ERROR( "argument missing" );
+ OSL_FAIL( "argument missing" );
return;
}
uno::Any *pAnyData = pAnySeq ? pAnySeq->getArray() : 0;
@@ -4141,7 +4141,7 @@ void SwXCellRange::GetDataSequence(
pDblData[nDtaCnt++] = fVal;
}
else {
- DBG_ERROR( "output sequence missing" );
+ OSL_FAIL( "output sequence missing" );
}
}
}
@@ -4398,7 +4398,7 @@ uno::Sequence< OUString > SwXCellRange::getRowDescriptions(void)
}
else
{
- DBG_ERROR("Wo kommen die Labels her?");
+ OSL_FAIL("Wo kommen die Labels her?");
}
}
else
@@ -4435,7 +4435,7 @@ void SwXCellRange::setRowDescriptions(const uno::Sequence< OUString >& rRowDesc)
}
else
{
- DBG_ERROR("Wohin mit den Labels?");
+ OSL_FAIL("Wohin mit den Labels?");
}
}
}
@@ -4472,7 +4472,7 @@ uno::Sequence< OUString > SwXCellRange::getColumnDescriptions(void)
}
else
{
- DBG_ERROR("Wo kommen die Labels her?");
+ OSL_FAIL("Wo kommen die Labels her?");
}
}
else
@@ -4506,7 +4506,7 @@ void SwXCellRange::setColumnDescriptions(const uno::Sequence< OUString >& Column
}
else
{
- DBG_ERROR("Wo kommen die Labels her?");
+ OSL_FAIL("Wo kommen die Labels her?");
}
}
}
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 46c0343..e322115 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -1019,7 +1019,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
if( !xSet.is() )
{
- DBG_ERROR("Unknown Object" );
+ OSL_FAIL("Unknown Object" );
return rWrt;
}
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index caeeb5b..bd4b5cc 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -617,7 +617,7 @@ namespace sw
if(nPointCount > 0x0000ffff)
{
- DBG_ERROR("PolygonFromPolyPolygon: too many points for a single polygon (!)");
+ OSL_FAIL("PolygonFromPolyPolygon: too many points for a single polygon (!)");
nPointCount = 0x0000ffff;
}
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 4f29502..ca06612 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -342,7 +342,7 @@ void SvXMLExportItemMapper::handleSpecialItem( SvXMLAttributeList& /*rAttrList*/
const SvXMLNamespaceMap& /*rNamespaceMap*/,
const SfxItemSet* /*pSet*/ /* = NULL */ ) const
{
- DBG_ERROR( "special item not handled in xml export" );
+ OSL_FAIL( "special item not handled in xml export" );
}
/** this method is called for every item that has the
@@ -353,7 +353,7 @@ void SvXMLExportItemMapper::handleNoItem( SvXMLAttributeList& /*rAttrList*/,
const SvXMLNamespaceMap& /*rNamespaceMap*/,
const SfxItemSet& /*rSet*/ ) const
{
- DBG_ERROR( "no item not handled in xml export" );
+ OSL_FAIL( "no item not handled in xml export" );
}
/** this method is called for every item that has the
@@ -366,7 +366,7 @@ void SvXMLExportItemMapper::handleElementItem(
const SfxItemSet& /*rSet*/,
sal_uInt16 /*nFlags*/ ) const
{
- DBG_ERROR( "element item not handled in xml export" );
+ OSL_FAIL( "element item not handled in xml export" );
}
@@ -425,7 +425,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue(
break;
default:
- DBG_ERROR( "unknown member id!");
+ OSL_FAIL( "unknown member id!");
bOk = sal_False;
break;
}
@@ -454,7 +454,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue(
break;
default:
- DBG_ERROR("unknown MemberId");
+ OSL_FAIL("unknown MemberId");
};
bOk = sal_True;
@@ -1046,7 +1046,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue(
break;
default:
- DBG_ERROR("GetXMLValue not implemented for this item.");
+ OSL_FAIL("GetXMLValue not implemented for this item.");
break;
}
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 00d376b..0eb973d 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1287,7 +1287,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
}
catch( Exception& )
{
- DBG_ERROR( "SwXMLImport::SetConfigurationSettings: Exception!" );
+ OSL_FAIL( "SwXMLImport::SetConfigurationSettings: Exception!" );
}
}
pValues++;
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index f61cb3e..702a09e 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -143,7 +143,7 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet,
}
else
{
- DBG_ERROR( "Could not get a needed item for xml import!" );
+ OSL_FAIL( "Could not get a needed item for xml import!" );
}
}
else if( 0 != (pEntry->nMemberId & MID_SW_FLAG_NO_ITEM_IMPORT) )
@@ -202,7 +202,7 @@ SvXMLImportItemMapper::handleSpecialItem( const SvXMLItemMapEntry& /*rEntry*/,
const SvXMLUnitConverter& /*rUnitConverter*/,
const SvXMLNamespaceMap& /*rNamespaceMap*/ ) const
{
- DBG_ERROR( "unsuported special item in xml import" );
+ OSL_FAIL( "unsuported special item in xml import" );
return FALSE;
}
@@ -214,7 +214,7 @@ BOOL SvXMLImportItemMapper::handleNoItem( const SvXMLItemMapEntry& /*rEntry*/,
const SvXMLUnitConverter& /*rUnitConverter*/,
const SvXMLNamespaceMap& /*rNamespaceMap*/ ) const
{
- DBG_ERROR( "unsuported no item in xml import" );
+ OSL_FAIL( "unsuported no item in xml import" );
return FALSE;
}
@@ -292,7 +292,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue(
break;
default:
- DBG_ERROR( "unknown member id!");
+ OSL_FAIL( "unknown member id!");
}
}
break;
@@ -319,7 +319,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue(
pULSpace->SetLower( (sal_uInt16)nAbs, (sal_uInt16)nProp );
break;
default:
- DBG_ERROR("unknown MemberId");
+ OSL_FAIL("unknown MemberId");
}
}
break;
@@ -962,7 +962,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue(
break;
default:
- DBG_ERROR("Item not implemented!");
+ OSL_FAIL("Item not implemented!");
break;
}
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 247a8bc..6fe07f9 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -143,7 +143,7 @@ void SwXMLImport::SetStatistics(
}
nTokens |= pStat->token;
} else {
- DBG_ERROR("SwXMLImport::SetStatistics: invalid entry");
+ OSL_FAIL("SwXMLImport::SetStatistics: invalid entry");
}
}
}
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index dd6fb54..790b3da 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -727,7 +727,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
}
}
else {
- DBG_ERROR("here should be a XCell");
+ OSL_FAIL("here should be a XCell");
}
}
else
@@ -905,7 +905,7 @@ void SwXMLExport::ExportTableBox( const SwTableBox& rBox,
}
else
{
- DBG_ERROR("here should be a XCell");
+ OSL_FAIL("here should be a XCell");
ClearAttrList();
}
}
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index e62cca7..fdd5dce 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -509,7 +509,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
catch( uno::Exception )
{
// TODO/LATER: error handling
- DBG_ERROR( "Link detection or retrieving of the URL of OOo link is failed!\n" );
+ OSL_FAIL( "Link detection or retrieving of the URL of OOo link is failed!\n" );
}
}
More information about the Libreoffice-commits
mailing list