diff options
Diffstat (limited to 'sw/source/ui')
82 files changed, 241 insertions, 241 deletions
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index afb86f388783..8f9a6b8eb71d 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -338,7 +338,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs } m_pView = ::GetActiveView(); // not owner! - DBG_ASSERT(m_pView, "no current view?") + DBG_ASSERT(m_pView, "no current view?"); if(m_pView) { // keep self alive until done. diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index 0c5d257ee395..d09e522599d7 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -238,7 +238,7 @@ static sal_uInt16 nBCTitleNo = 0; } const SfxItemSet *pArgs = rReq.GetArgs(); - DBG_ASSERT( pArgs, "no arguments in SfxRequest") + DBG_ASSERT( pArgs, "no arguments in SfxRequest"); const SfxPoolItem* pFrameItem = 0; if(pArgs) pArgs->GetItemState(SID_DOCFRAME, FALSE, &pFrameItem); diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 6bb40283d56d..e500fcc63449 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -643,7 +643,7 @@ SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemS break; } - DBG_ASSERT( pRet, "SwModule::CreateTabPage(): Unknown tabpage id" ) + DBG_ASSERT( pRet, "SwModule::CreateTabPage(): Unknown tabpage id" ); return pRet; } diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index d4e7cdd82fb7..21b63b73712b 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -947,7 +947,7 @@ void SwDocShell::Execute(SfxRequest& rReq) #ifdef DBG_UTIL { BOOL bWeb = 0 != dynamic_cast<SwWebDocShell*>(this); - DBG_ASSERT(bWeb == TRUE, "SourceView nur in der WebDocShell") + DBG_ASSERT(bWeb == TRUE, "SourceView nur in der WebDocShell"); } #endif // die SourceView ist fuer die SwWebDocShell die 1 @@ -1371,7 +1371,7 @@ void SwDocShell::Execute(SfxRequest& rReq) } catch(Exception& ) { - DBG_ERROR("control acces failed") + DBG_ERROR("control acces failed"); } xFP->setTitle( SW_RESSTR( nStrId )); @@ -1452,7 +1452,7 @@ void SwDocShell::Execute(SfxRequest& rReq) case SID_ATTR_YEAR2000: if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich , FALSE, &pItem )) { - DBG_ASSERT(pItem->ISA(SfxUInt16Item), "falsches Item") + DBG_ASSERT(pItem->ISA(SfxUInt16Item), "falsches Item"); USHORT nYear2K = ((SfxUInt16Item*)pItem)->GetValue(); //ueber Views iterieren und den State an den FormShells setzen @@ -1808,7 +1808,7 @@ ULONG SwDocShell::LoadStylesFromFile( const String& rURL, } if( aMed.IsStorage() ) { - DBG_ASSERT((pFlt ? pFlt->GetVersion() : 0) >= SOFFICE_FILEFORMAT_60, "which file version?") + DBG_ASSERT((pFlt ? pFlt->GetVersion() : 0) >= SOFFICE_FILEFORMAT_60, "which file version?"); pRead = ReadXML; // the SW3IO - Reader need the pam/wrtshell, because only then he // insert the styles! diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 33dbe30ea0e2..c7be232b2813 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -1863,7 +1863,7 @@ const SwNumRule * SwDocStyleSheet::GetNumRule() void SwDocStyleSheet::SetNumRule(const SwNumRule& rRule) { - DBG_ASSERT(pNumRule, "Wo ist die NumRule") + DBG_ASSERT(pNumRule, "Wo ist die NumRule"); rDoc.ChgNumRuleFmts( rRule ); } diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx index af8a3ed57ccd..1ab26f988261 100644 --- a/sw/source/ui/app/swmodul1.cxx +++ b/sw/source/ui/app/swmodul1.cxx @@ -177,7 +177,7 @@ SwView* SwModule::GetFirstView() SwView* SwModule::GetNextView(SwView* pView) { - DBG_ASSERT(PTR_CAST(SwView, pView),"keine SwView uebergeben") + DBG_ASSERT(PTR_CAST(SwView, pView),"keine SwView uebergeben"); const TypeId aTypeId = TYPE(SwView); SwView* pNView = (SwView*)SfxViewShell::GetNext(*pView, &aTypeId, TRUE); return pNView; diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx index 4d60cd5be496..d5c76d2323d8 100644 --- a/sw/source/ui/app/swmodule.cxx +++ b/sw/source/ui/app/swmodule.cxx @@ -504,7 +504,7 @@ void SwDLL::RegisterControls() * --------------------------------------------------*/ void SwModule::InitAttrPool() { - DBG_ASSERT(!pAttrPool, "Pool ist schon da!") + DBG_ASSERT(!pAttrPool, "Pool ist schon da!"); pAttrPool = new SwAttrPool(0); SetPool(pAttrPool); } diff --git a/sw/source/ui/config/barcfg.cxx b/sw/source/ui/config/barcfg.cxx index cc89879b742d..4859c59499e3 100644 --- a/sw/source/ui/config/barcfg.cxx +++ b/sw/source/ui/config/barcfg.cxx @@ -63,7 +63,7 @@ SwToolbarConfigItem::SwToolbarConfigItem( BOOL bWeb ) : Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { for(int nProp = 0; nProp < aNames.getLength(); nProp++) diff --git a/sw/source/ui/config/dbconfig.cxx b/sw/source/ui/config/dbconfig.cxx index 7e9f7fb172a7..52a06b389643 100644 --- a/sw/source/ui/config/dbconfig.cxx +++ b/sw/source/ui/config/dbconfig.cxx @@ -104,7 +104,7 @@ void SwDBConfig::Load() } Sequence<Any> aValues = GetProperties(rNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed"); if(aValues.getLength() == rNames.getLength()) { for(int nProp = 0; nProp < rNames.getLength(); nProp++) diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx index 194a8586a5dc..c096d148f2c3 100644 --- a/sw/source/ui/config/fontcfg.cxx +++ b/sw/source/ui/config/fontcfg.cxx @@ -133,7 +133,7 @@ SwStdFontConfig::SwStdFontConfig() : Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { for(int nProp = 0; nProp < aNames.getLength(); nProp++) @@ -321,7 +321,7 @@ sal_Int32 SwStdFontConfig::GetDefaultHeightFor(USHORT nFontType, LanguageType eL -----------------------------------------------------------------------*/ void SwStdFontConfig::ChangeInt( USHORT nFontType, sal_Int32 nHeight ) { - DBG_ASSERT( nFontType < DEF_FONT_COUNT, "invalid index in SwStdFontConfig::ChangInt()") + DBG_ASSERT( nFontType < DEF_FONT_COUNT, "invalid index in SwStdFontConfig::ChangInt()"); if( nFontType < DEF_FONT_COUNT && nDefaultFontHeight[nFontType] != nHeight) { SvtLinguOptions aLinguOpt; @@ -350,7 +350,7 @@ void SwStdFontConfig::ChangeInt( USHORT nFontType, sal_Int32 nHeight ) -----------------------------------------------------------------------*/ sal_Int32 SwStdFontConfig::GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType, LanguageType eLang ) { - DBG_ASSERT(nFont + FONT_PER_GROUP * nScriptType < DEF_FONT_COUNT, "wrong index in SwStdFontConfig::GetFontHeight()") + DBG_ASSERT(nFont + FONT_PER_GROUP * nScriptType < DEF_FONT_COUNT, "wrong index in SwStdFontConfig::GetFontHeight()"); sal_Int32 nRet = nDefaultFontHeight[nFont + FONT_PER_GROUP * nScriptType]; if(nRet <= 0) return GetDefaultHeightFor(nFont + FONT_PER_GROUP * nScriptType, eLang); diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index e94c60d8f75f..f17af2f8061a 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -450,7 +450,7 @@ void SwTestAccountSettingsDialog::Test() } catch(uno::Exception&) { - DBG_ERROR("exception caught") + DBG_ERROR("exception caught"); } } diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx index b2f05beb8f93..dab5e97cc2e8 100644 --- a/sw/source/ui/config/modcfg.cxx +++ b/sw/source/ui/config/modcfg.cxx @@ -94,7 +94,7 @@ const InsCaptionOpt* SwModuleOptions::GetCapOption( { if(bHTML) { - DBG_ERROR("no caption option in sw/web!") + DBG_ERROR("no caption option in sw/web!"); return 0; } else @@ -121,7 +121,7 @@ BOOL SwModuleOptions::SetCapOption(BOOL bHTML, const InsCaptionOpt* pOpt) if(bHTML) { - DBG_ERROR("no caption option in sw/web!") + DBG_ERROR("no caption option in sw/web!"); } else if (pOpt) { @@ -394,7 +394,7 @@ void SwRevisionConfig::Load() const Sequence<OUString>& aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { for(int nProp = 0; nProp < aNames.getLength(); nProp++) @@ -941,7 +941,7 @@ void SwInsertConfig::Load() const Sequence<OUString>& aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { InsCaptionOpt* pWriterTableOpt = 0; @@ -1238,7 +1238,7 @@ void SwTableConfig::Load() const Sequence<OUString>& aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { for(int nProp = 0; nProp < aNames.getLength(); nProp++) @@ -1356,7 +1356,7 @@ void SwMiscConfig::Load() const Sequence<OUString>& aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { OUString sTmp; diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/ui/config/prtopt.cxx index dd4fc6bb2820..41a118614b95 100644 --- a/sw/source/ui/config/prtopt.cxx +++ b/sw/source/ui/config/prtopt.cxx @@ -96,7 +96,7 @@ SwPrintOptions::SwPrintOptions(sal_Bool bWeb) : Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { for(int nProp = 0; nProp < aNames.getLength(); nProp++) diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index 0fda220ebce7..bfe68b3d6b3a 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -187,7 +187,7 @@ int SwBaseNumRules::Load(SvStream &rStream) // gleiche VERSION_40A wie das SP2 #55402# if(VERSION_40A == nVersion) { - DBG_ERROR("Version 364 ist nicht eindeutig #55402#") + DBG_ERROR("Version 364 ist nicht eindeutig #55402#"); } else if( VERSION_30B == nVersion || VERSION_31B == nVersion || ACT_NUM_VERSION >= nVersion ) diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx index c7d1c06ba96e..8fce4c53fc56 100644 --- a/sw/source/ui/config/usrpref.cxx +++ b/sw/source/ui/config/usrpref.cxx @@ -201,7 +201,7 @@ void SwContentViewConfig::Load() Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { for(int nProp = 0; nProp < aNames.getLength(); nProp++) @@ -349,7 +349,7 @@ void SwLayoutViewConfig::Load() Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { for(int nProp = 0; nProp < aNames.getLength(); nProp++) @@ -503,7 +503,7 @@ void SwGridConfig::Load() Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { Size aSnap(rParent.GetSnapSize()); @@ -596,7 +596,7 @@ void SwCursorConfig::Load() Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { @@ -661,7 +661,7 @@ void SwWebColorConfig::Load() { Sequence<Any> aValues = GetProperties(aPropNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aPropNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aPropNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aPropNames.getLength()) { for(int nProp = 0; nProp < aPropNames.getLength(); nProp++) diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index ac55625694df..b68bdc0e923a 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -234,7 +234,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) : SwMailMergeConfigItem& rConfigItem = m_pAddressPage->GetWizard()->GetConfigItem(); const SwDBData& rCurrentData = rConfigItem.GetCurrentDBData(); - DBG_ASSERT(m_xDBContext.is(), "service 'com.sun.star.sdb.DatabaseContext' not found!") + DBG_ASSERT(m_xDBContext.is(), "service 'com.sun.star.sdb.DatabaseContext' not found!"); sal_Bool bEnableEdit = sal_False; sal_Bool bEnableOK = sal_True; m_aListLB.SelectAll( FALSE ); @@ -359,7 +359,7 @@ IMPL_LINK(SwAddressListDialog, FilterHdl_Impl, PushButton*, EMPTYARG) } catch(Exception& ) { - DBG_ERROR("exception caught in SwAddressListDialog::FilterHdl_Impl") + DBG_ERROR("exception caught in SwAddressListDialog::FilterHdl_Impl"); } } } @@ -651,7 +651,7 @@ void SwAddressListDialog::DetectTablesAndQueries( } catch(Exception& ) { - DBG_ERROR("exception caught in SwAddressListDialog::DetectTablesAndQueries") + DBG_ERROR("exception caught in SwAddressListDialog::DetectTablesAndQueries"); m_aOK.Enable( sal_False ); } } diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index d7f0f9f8ae61..3f7484932010 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -250,7 +250,7 @@ void SwAddressControl_Impl::SetCurrentDataSet(sal_uInt32 nSet) { m_bNoDataSet = false; m_nCurrentDataSet = nSet; - DBG_ASSERT(m_pData->aDBData.size() > m_nCurrentDataSet, "wrong data set index") + DBG_ASSERT(m_pData->aDBData.size() > m_nCurrentDataSet, "wrong data set index"); if(m_pData->aDBData.size() > m_nCurrentDataSet) { ::std::vector<Edit*>::iterator aEditIter; @@ -258,7 +258,7 @@ void SwAddressControl_Impl::SetCurrentDataSet(sal_uInt32 nSet) for(aEditIter = m_aEdits.begin(); aEditIter != m_aEdits.end(); ++aEditIter, ++nIndex) { DBG_ASSERT(nIndex < m_pData->aDBData[m_nCurrentDataSet].size(), - "number of colums doesn't match number of Edits") + "number of colums doesn't match number of Edits"); (*aEditIter)->SetText(m_pData->aDBData[m_nCurrentDataSet][nIndex]); } } @@ -457,7 +457,7 @@ SwCreateAddressListDialog::SwCreateAddressListDialog( String sHeader = sLine.GetToken( 0, '\t', nIndex ); DBG_ASSERT(sHeader.Len() > 2 && sHeader.GetChar(0) == '\"' && sHeader.GetChar(sHeader.Len() - 1) == '\"', - "Wrong format of header") + "Wrong format of header"); if(sHeader.Len() > 2) { m_pCSVData->aDBColumnHeaders.push_back( sHeader.Copy(1, sHeader.Len() -2)); @@ -475,7 +475,7 @@ SwCreateAddressListDialog::SwCreateAddressListDialog( String sData = sLine.GetToken( 0, '\t', nIndex ); DBG_ASSERT(sData.Len() >= 2 && sData.GetChar(0) == '\"' && sData.GetChar(sData.Len() - 1) == '\"', - "Wrong format of line") + "Wrong format of line"); if(sData.Len() >= 2) aNewData.push_back(sData.Copy(1, sData.Len() - 2)); else diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 3cfe4b02efbf..3048eac3de22 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -383,7 +383,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, } catch(const Exception& ) { - DBG_ERROR("illegal number format key") + DBG_ERROR("illegal number format key"); } } } @@ -1235,7 +1235,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, #endif ) { - DBG_ERROR(ByteString(String(aExcept.Message), gsl_getSystemTextEncoding()).GetBuffer()) + DBG_ERROR(ByteString(String(aExcept.Message), gsl_getSystemTextEncoding()).GetBuffer()); } } diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 7759ae2c204d..d13311ed0828 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -313,7 +313,7 @@ BOOL lcl_MoveAbsolute(SwDSParam* pParam, long nAbsPos) } else { - DBG_ERROR("no absolute positioning available") + DBG_ERROR("no absolute positioning available"); } } catch(Exception aExcept) @@ -364,7 +364,7 @@ BOOL SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc ) { SetMergeType( rMergeDesc.nMergeType ); - DBG_ASSERT(!bInMerge && !pImpl->pMergeData, "merge already activated!") + DBG_ASSERT(!bInMerge && !pImpl->pMergeData, "merge already activated!"); SwDBData aData; aData.nCommandType = CommandType::TABLE; @@ -442,7 +442,7 @@ BOOL SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc ) { pImpl->pMergeData->bEndOfDB = TRUE; pImpl->pMergeData->CheckEndOfDB(); - DBG_ERROR("exception in MergeNew()") + DBG_ERROR("exception in MergeNew()"); } uno::Reference<XDataSource> xSource = SwNewDBMgr::getDataSourceAsParent(xConnection,aData.sDataSource); @@ -1092,14 +1092,14 @@ BOOL SwNewDBMgr::MergePrintDocuments( SwView& rView, rView.SetAdditionalPrintOptions(aViewProperties); SwMailMergeConfigItem* pConfigItem = rView.GetMailMergeConfigItem(); - DBG_ASSERT(pConfigItem, "mail merge config item is missing") + DBG_ASSERT(pConfigItem, "mail merge config item is missing"); if(!pConfigItem) return sal_False; USHORT nDocStart = pConfigItem->GetPrintRangeStart(); USHORT nDocEnd = pConfigItem->GetPrintRangeEnd(); DBG_ASSERT(nDocStart < nDocEnd && nDocEnd <= pConfigItem->GetMergedDocumentCount(), - "merge print settings are not correct") + "merge print settings are not correct"); for( sal_uInt32 nPrintDocument = nDocStart; nPrintDocument < nDocEnd; ++nPrintDocument) { @@ -1490,7 +1490,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, if(rMergeDescriptor.bCreateSingleFile || bAsSingleFile ) { - DBG_ASSERT( pTargetShell, "no target shell available!" ) + DBG_ASSERT( pTargetShell, "no target shell available!" ); // copy created file into the target document rWorkShell.ConvertFieldsToText(); rWorkShell.SetNumberingRestart(); @@ -1527,7 +1527,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, pTargetShell->InsertPageBreak( &sModifiedStartingPageDesc, nStartingPageNo ); else pTargetShell->SetPageStyle(sModifiedStartingPageDesc); - DBG_ASSERT(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended") + DBG_ASSERT(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended"); //#i51359# add a second paragraph in case there's only one { SwNodeIndex aIdx( pWorkDoc->GetNodes().GetEndOfExtras(), 2 ); @@ -1580,7 +1580,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, String sMailAddress = GetDBField( xColumnProp, aDBFormat); if(!SwMailMergeHelper::CheckMailAddress( sMailAddress )) { - DBG_ERROR("invalid e-Mail address in database column") + DBG_ERROR("invalid e-Mail address in database column"); } else { @@ -1609,7 +1609,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, //read in the temporary file and use it as mail body SfxMedium aMedium( sFileURL, STREAM_READ, TRUE); SvStream* pInStream = aMedium.GetInStream(); - DBG_ASSERT(pInStream, "no output file created?") + DBG_ASSERT(pInStream, "no output file created?"); if(pInStream) { pInStream->SetStreamCharSet( eEncoding ); @@ -1663,7 +1663,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, // save the single output document if(rMergeDescriptor.bCreateSingleFile || bAsSingleFile) { - DBG_ASSERT( aTempFile.get(), "Temporary file not available" ) + DBG_ASSERT( aTempFile.get(), "Temporary file not available" ); INetURLObject aTempFileURL(bAsSingleFile ? sSubject : aTempFile->GetURL()); SfxMedium* pDstMed = new SfxMedium( aTempFileURL.GetMainURL( INetURLObject::NO_DECODE ), @@ -1791,7 +1791,7 @@ ULONG SwNewDBMgr::GetColumnFmt( const String& rDBName, } catch(Exception&) { - DBG_ERROR("Exception in getColumns()") + DBG_ERROR("Exception in getColumns()"); } if(!xCols.is() || !xCols->hasByName(rColNm)) return nRet; @@ -1878,14 +1878,14 @@ ULONG SwNewDBMgr::GetColumnFmt( uno::Reference< XDataSource> xSource, } catch(const Exception&) { - DBG_ERROR("illegal number format key") + DBG_ERROR("illegal number format key"); } } } } catch( const Exception& ) { - DBG_ERROR("no FormatKey property found") + DBG_ERROR("no FormatKey property found"); } if(bUseDefault) nRet = SwNewDBMgr::GetDbtoolsClient().getDefaultNumberFormat(xColumn, xDocNumberFormatTypes, aLocale); @@ -2010,7 +2010,7 @@ uno::Reference< sdbcx::XColumnsSupplier> SwNewDBMgr::GetColumnSupplier(uno::Refe } catch( const uno::Exception& ) { - DBG_ERROR("Exception in SwDBMgr::GetColumnSupplier") + DBG_ERROR("Exception in SwDBMgr::GetColumnSupplier"); } return xRet; @@ -2024,7 +2024,7 @@ String SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps, { uno::Reference< XColumn > xColumn(xColumnProps, UNO_QUERY); String sRet; - DBG_ASSERT(xColumn.is(), "SwNewDBMgr::::ImportDBField: illegal arguments") + DBG_ASSERT(xColumn.is(), "SwNewDBMgr::::ImportDBField: illegal arguments"); if(!xColumn.is()) return sRet; @@ -2081,7 +2081,7 @@ String SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps, } catch(Exception& ) { - DBG_ERROR("exception caught") + DBG_ERROR("exception caught"); } } @@ -2114,7 +2114,7 @@ String SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps, ---------------------------------------------------------------------------*/ void SwNewDBMgr::EndMerge() { - DBG_ASSERT(bInMerge, "merge is not active") + DBG_ASSERT(bInMerge, "merge is not active"); bInMerge = FALSE; delete pImpl->pMergeData; pImpl->pMergeData = 0; @@ -2230,7 +2230,7 @@ BOOL SwNewDBMgr::GetMergeColumnCnt(const String& rColumnName, USHORT nLanguag ---------------------------------------------------------------------------*/ BOOL SwNewDBMgr::ToNextMergeRecord() { - DBG_ASSERT(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge") + DBG_ASSERT(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge"); return ToNextRecord(pImpl->pMergeData); } /* -----------------------------10.07.01 14:28-------------------------------- @@ -2315,7 +2315,7 @@ BOOL SwNewDBMgr::ExistsNextRecord() const sal_uInt32 SwNewDBMgr::GetSelectedRecordId() { sal_uInt32 nRet = 0; - DBG_ASSERT(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge") + DBG_ASSERT(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge"); if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is()) return FALSE; try @@ -2332,7 +2332,7 @@ sal_uInt32 SwNewDBMgr::GetSelectedRecordId() ---------------------------------------------------------------------------*/ sal_Bool SwNewDBMgr::ToRecordId(sal_Int32 nSet) { - DBG_ASSERT(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge") + DBG_ASSERT(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge"); if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is()|| nSet < 0) return FALSE; sal_Bool bRet = FALSE; @@ -2835,7 +2835,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, if(!sDataSource.getLength() || !sDataTableOrQuery.getLength()) { - DBG_ERROR("PropertyValues missing or unset") + DBG_ERROR("PropertyValues missing or unset"); return; } @@ -2997,7 +2997,7 @@ void SwNewDBMgr::InsertText(SwWrtShell& rSh, } if(!sDataSource.getLength() || !sDataTableOrQuery.getLength() || !xResSet.is()) { - DBG_ERROR("PropertyValues missing or unset") + DBG_ERROR("PropertyValues missing or unset"); return; } uno::Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); @@ -3033,7 +3033,7 @@ void SwNewDBMgr::InsertText(SwWrtShell& rSh, } catch(Exception& ) { - DBG_ERROR("exception caught") + DBG_ERROR("exception caught"); } } delete pDlg; @@ -3074,7 +3074,7 @@ uno::Reference<XDataSource> SwNewDBMgr::getDataSourceAsParent(const uno::Referen } catch(const Exception&) { - DBG_ERROR("exception in getDataSourceAsParent caught") + DBG_ERROR("exception in getDataSourceAsParent caught"); } return xSource; } @@ -3158,7 +3158,7 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig, { pImpl->pMergeData->bEndOfDB = TRUE; pImpl->pMergeData->CheckEndOfDB(); - DBG_ERROR("exception in MergeNew()") + DBG_ERROR("exception in MergeNew()"); } //bCancel is set from the PrintMonitor @@ -3323,7 +3323,7 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig, pTargetShell->SetPageStyle(sModifiedStartingPageDesc); } USHORT nPageCountBefore = pTargetShell->GetPageCnt(); - DBG_ASSERT(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended") + DBG_ASSERT(!pTargetShell->GetTableFmt(),"target document ends with a table - paragraph should be appended"); //#i51359# add a second paragraph in case there's only one { SwNodeIndex aIdx( pWorkDoc->GetNodes().GetEndOfExtras(), 2 ); @@ -3381,7 +3381,7 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig, } catch( Exception& ) { - DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments") + DBG_ERROR("exception caught in SwNewDBMgr::MergeDocuments"); } if(sSourceDocURL.Len()) File::remove( sSourceDocURL ); diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index d8c8da37f92d..e284096f8f8a 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -196,7 +196,7 @@ BOOL SwDBTreeList_Impl::HasContext() if(xContainer.is()) xContainer->addContainerListener( this ); } - DBG_ASSERT(xDBContext.is(), "com.sun.star.sdb.DataBaseContext: service not available") + DBG_ASSERT(xDBContext.is(), "com.sun.star.sdb.DataBaseContext: service not available"); } return xDBContext.is(); } @@ -371,7 +371,7 @@ void SwDBTreeList::RequestingChilds(SvLBoxEntry* pParent) if(xTSupplier.is()) { Reference<XNameAccess> xTbls = xTSupplier->getTables(); - DBG_ASSERT(xTbls->hasByName(sTableName), "table not available anymore?") + DBG_ASSERT(xTbls->hasByName(sTableName), "table not available anymore?"); try { Any aTable = xTbls->getByName(sTableName); @@ -389,7 +389,7 @@ void SwDBTreeList::RequestingChilds(SvLBoxEntry* pParent) if(xQSupplier.is()) { Reference<XNameAccess> xQueries = xQSupplier->getQueries(); - DBG_ASSERT(xQueries->hasByName(sTableName), "table not available anymore?") + DBG_ASSERT(xQueries->hasByName(sTableName), "table not available anymore?"); try { Any aQuery = xQueries->getByName(sTableName); diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index ae9f739415b0..ca3489b99776 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -602,7 +602,7 @@ void SwSendMailDialog::SendMails() { if(!m_pConfigItem) { - DBG_ERROR("config item not set") + DBG_ERROR("config item not set"); return; } String sErrorMessage; @@ -617,7 +617,7 @@ void SwSendMailDialog::SendMails() LeaveWait(); if(!bIsLoggedIn) { - DBG_ERROR("create error message") + DBG_ERROR("create error message"); return; } m_pImpl->xMailDispatcher.set( new MailDispatcher(xSmtpServer)); diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index 82b6876a341f..83847af76163 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -192,7 +192,7 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer( } catch(uno::Exception& ) { - DBG_ERROR("exception caught") + DBG_ERROR("exception caught"); } return xSmtpServer; } @@ -286,7 +286,7 @@ void SwAddressPreview::SetAddress(const ::rtl::OUString& rAddress) -----------------------------------------------------------------------*/ sal_uInt16 SwAddressPreview::GetSelectedAddress()const { - DBG_ASSERT(pImpl->nSelectedAddress < pImpl->aAdresses.size(), "selection invalid") + DBG_ASSERT(pImpl->nSelectedAddress < pImpl->aAdresses.size(), "selection invalid"); return pImpl->nSelectedAddress; } /*-- 25.06.2004 10:32:48--------------------------------------------------- @@ -294,7 +294,7 @@ sal_uInt16 SwAddressPreview::GetSelectedAddress()const -----------------------------------------------------------------------*/ void SwAddressPreview::SelectAddress(sal_uInt16 nSelect) { - DBG_ASSERT(pImpl->nSelectedAddress < pImpl->aAdresses.size(), "selection invalid") + DBG_ASSERT(pImpl->nSelectedAddress < pImpl->aAdresses.size(), "selection invalid"); pImpl->nSelectedAddress = nSelect; // now make it visible.. sal_uInt16 nSelectRow = nSelect / pImpl->nColumns; @@ -601,7 +601,7 @@ String SwAddressPreview::FillData( } catch( sdbc::SQLException& ) { - DBG_ERROR("SQLException caught") + DBG_ERROR("SQLException caught"); } } } @@ -630,7 +630,7 @@ SwMergeAddressItem SwAddressIterator::Next() { aRet.bIsColumn = true; xub_StrLen nClose = sAddress.Search('>'); - DBG_ASSERT(nClose != STRING_NOTFOUND, "closing '>' not found") + DBG_ASSERT(nClose != STRING_NOTFOUND, "closing '>' not found"); aRet.sText = sAddress.Copy(1, nClose - 1); sAddress.Erase(0, nClose + 1); } diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index cf82352d742c..a15460737de5 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -969,7 +969,7 @@ void SwCustomizeAddressBlockDialog::MoveFocus( Window* pMember, bool bNext ) } if( aMemberIter == aControls.end() ) { - DBG_ERROR( "Window not found?" ) + DBG_ERROR( "Window not found?" ); return; } diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx index 2199c0f3f8cc..7438988a88fd 100644 --- a/sw/source/ui/dbui/mmconfigitem.cxx +++ b/sw/source/ui/dbui/mmconfigitem.cxx @@ -240,7 +240,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() : const Sequence<OUString>& rNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(rNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed"); if(aValues.getLength() == rNames.getLength()) { for(int nProp = 0; nProp < rNames.getLength(); nProp++) @@ -466,7 +466,7 @@ void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHeaders) } else { - DBG_ERROR("parse error in address block or greeting line") + DBG_ERROR("parse error in address block or greeting line"); } } else @@ -1009,7 +1009,7 @@ Reference< XResultSet> SwMailMergeConfigItem::GetResultSet() const } catch(Exception&) { - DBG_ERROR("exception caught in xResultSet->SetFilter()") + DBG_ERROR("exception caught in xResultSet->SetFilter()"); } xRowSet->execute(); m_pImpl->xResultSet = xRowSet.get(); @@ -1019,7 +1019,7 @@ Reference< XResultSet> SwMailMergeConfigItem::GetResultSet() const } catch(Exception& ) { - DBG_ERROR("exception caught in: SwMailMergeConfigItem::GetResultSet() ") + DBG_ERROR("exception caught in: SwMailMergeConfigItem::GetResultSet() "); } } return m_pImpl->xResultSet; @@ -1063,7 +1063,7 @@ void SwMailMergeConfigItem::SetFilter(::rtl::OUString& rFilter) } catch(Exception&) { - DBG_ERROR("exception caught in SwMailMergeConfigItem::SetFilter()") + DBG_ERROR("exception caught in SwMailMergeConfigItem::SetFilter()"); } } } @@ -1865,7 +1865,7 @@ void SwMailMergeConfigItem::AddMergedDocument(SwDocMergeInfo& rInfo) -----------------------------------------------------------------------*/ SwDocMergeInfo& SwMailMergeConfigItem::GetDocumentMergeInfo(sal_uInt32 nDocument) { - DBG_ASSERT(m_pImpl->aMergeInfos.size() > nDocument,"invalid document index") + DBG_ASSERT(m_pImpl->aMergeInfos.size() > nDocument,"invalid document index"); return m_pImpl->aMergeInfos[nDocument]; } /*-- 14.06.2004 11:46:26--------------------------------------------------- diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 9ab94a8a82fe..b831fc410396 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -588,7 +588,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig // Male: [database.sGenderColumn] == "rFemaleGenderValue" && [database.rGenderColumn] // Neutral: [database.sNameColumn] DBG_ASSERT(sGenderColumn.Len() && rFemaleGenderValue.getLength(), - "gender settings not available - how to form the condition?") + "gender settings not available - how to form the condition?"); //column used as lastname for(sal_Int8 eGender = SwMailMergeConfigItem::FEMALE; eGender <= SwMailMergeConfigItem::NEUTRAL; ++eGender) @@ -698,7 +698,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig //put the cursor to the start of the paragraph rShell.SttPara(); - DBG_ASSERT(0 == rShell.GetTableFmt(), "What to do with a table here?") + DBG_ASSERT(0 == rShell.GetTableFmt(), "What to do with a table here?"); } /*-- 10.05.2004 09:34:25--------------------------------------------------- diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index e0ab2f213f35..d6083d1fc712 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -110,7 +110,7 @@ IMPL_LINK( SwMailMergeMergePage, FindHdl_Impl, PushButton*, EMPTYARG) aSearchItem.SetBackward(m_aBackwardsCB.IsChecked()); SwView* pTargetView = m_pWizard->GetConfigItem().GetTargetView(); - DBG_ASSERT(pTargetView, "no target view exists") + DBG_ASSERT(pTargetView, "no target view exists"); if(pTargetView) { pTargetView->GetViewFrame()->GetDispatcher()->Execute( diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 9c63c6d1b9b1..803ef93b9cdc 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -455,7 +455,7 @@ void SwMailMergeOutputPage::ActivatePage() SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); SwView* pTargetView = rConfigItem.GetTargetView(); - DBG_ASSERT(pTargetView, "no target view exists") + DBG_ASSERT(pTargetView, "no target view exists"); if(pTargetView) { SfxPrinter* pPrinter = pTargetView->GetWrtShell().getIDocumentDeviceAccess()->getPrinter( true ); @@ -467,7 +467,7 @@ void SwMailMergeOutputPage::ActivatePage() m_aPrinterLB.SelectEntry( rConfigItem.GetSelectedPrinter() ); SwView* pSourceView = rConfigItem.GetSourceView(); - DBG_ASSERT(pSourceView, "no source view exists") + DBG_ASSERT(pSourceView, "no source view exists"); if(pSourceView) { SwDocShell* pDocShell = pSourceView->GetDocShell(); @@ -686,7 +686,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveStartHdl_Impl, PushButton*, pButton) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); SwView* pSourceView = rConfigItem.GetSourceView(); - DBG_ASSERT( pSourceView, "source view missing") + DBG_ASSERT( pSourceView, "source view missing"); if(pSourceView) { SfxViewFrame* pSourceViewFrm = pSourceView->GetViewFrame(); @@ -736,7 +736,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); SwView* pTargetView = rConfigItem.GetTargetView(); - DBG_ASSERT(pTargetView, "no target view exists") + DBG_ASSERT(pTargetView, "no target view exists"); if(!pTargetView) return 0; @@ -933,7 +933,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrinterChangeHdl_Impl, ListBox*, pBox) IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG) { SwView* pTargetView = m_pWizard->GetConfigItem().GetTargetView(); - DBG_ASSERT(pTargetView, "no target view exists") + DBG_ASSERT(pTargetView, "no target view exists"); if(!pTargetView) return 0; @@ -1038,7 +1038,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) //get the composed document SwView* pTargetView = rConfigItem.GetTargetView(); - DBG_ASSERT(pTargetView, "no target view exists") + DBG_ASSERT(pTargetView, "no target view exists"); if(!pTargetView) return 0; @@ -1256,7 +1256,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) sal_Int32 nTarget = #endif rConfigItem.MoveResultSet(rInfo.nDBRow); - DBG_ASSERT( nTarget == rInfo.nDBRow, "row of current document could not be selected") + DBG_ASSERT( nTarget == rInfo.nDBRow, "row of current document could not be selected"); DBG_ASSERT( sEMailColumn.Len(), "No email column selected"); ::rtl::OUString sEMail = lcl_GetColumnValueOf(sEMailColumn, xColAccess); SwMailDescriptor aDesc; @@ -1272,7 +1272,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) pInStream->SetStreamCharSet( eEncoding ); else { - DBG_ERROR("no output file created?") + DBG_ERROR("no output file created?"); continue; } ByteString sLine; diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 8d443794173e..96b87c93779e 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -176,7 +176,7 @@ IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton) Reference<XPropertySet> xPrSet(xSource, UNO_QUERY); xPrSet->getPropertyValue(C2U("Name")) >>= sDataSourceName; } - DBG_ASSERT(sDataSourceName.getLength(), "no data source found") + DBG_ASSERT(sDataSourceName.getLength(), "no data source found"); Sequence<PropertyValue> aProperties(5); PropertyValue* pProperties = aProperties.getArray(); pProperties[0].Name = C2U("DataSourceName"); diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx index 8ee1d236a2dd..4e1c60c67a1d 100644 --- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx @@ -383,7 +383,7 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence (void) { DBG_ASSERT(m_pSpellState->m_bDrawingsSpelled && m_pSpellState->m_bOtherSpelled && m_pSpellState->m_bBodySpelled, - "not all parts of the document are already spelled") + "not all parts of the document are already spelled"); if(m_pSpellState->m_xStartRange.is()) { LockFocusNotification( true ); @@ -434,7 +434,7 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence (void) void SwSpellDialogChildWindow::ApplyChangedSentence(const svx::SpellPortions& rChanged) { SwWrtShell* pWrtShell = GetWrtShell_Impl(); - DBG_ASSERT(!m_pSpellState->m_bInitialCall, "ApplyChangedSentence in initial call or after resume") + DBG_ASSERT(!m_pSpellState->m_bInitialCall, "ApplyChangedSentence in initial call or after resume"); if(pWrtShell && !m_pSpellState->m_bInitialCall) { ShellModes eSelMode = pWrtShell->GetView().GetShellMode(); @@ -571,7 +571,7 @@ void SwSpellDialogChildWindow::GetFocus() else { OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); - DBG_ASSERT(pOLV, "no OutlinerView in SwSpellDialogChildWindow::GetFocus()") + DBG_ASSERT(pOLV, "no OutlinerView in SwSpellDialogChildWindow::GetFocus()"); if(!pOLV || !m_pSpellState->m_aESelection.IsEqual(pOLV->GetSelection())) bInvalidate = true; } @@ -627,7 +627,7 @@ void SwSpellDialogChildWindow::LoseFocus() SdrOutliner* pOutliner = pSdrView->GetTextEditOutliner(); m_pSpellState->m_pOutliner = pOutliner; OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); - DBG_ASSERT(pOutliner && pOLV, "no Outliner/OutlinerView in SwSpellDialogChildWindow::LoseFocus()") + DBG_ASSERT(pOutliner && pOLV, "no Outliner/OutlinerView in SwSpellDialogChildWindow::LoseFocus()"); if(pOLV) { m_pSpellState->m_aESelection = pOLV->GetSelection(); @@ -687,7 +687,7 @@ bool SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellM case SHELL_MODE_TABLE_TEXT: case SHELL_MODE_TABLE_LIST_TEXT: case SHELL_MODE_DRAWTEXT: - DBG_ERROR("text already active in SwSpellDialogChildWindow::MakeTextSelection_Impl()") + DBG_ERROR("text already active in SwSpellDialogChildWindow::MakeTextSelection_Impl()"); break; case SHELL_MODE_FRAME: @@ -873,7 +873,7 @@ bool SwSpellDialogChildWindow::SpellDrawText_Impl(SwWrtShell& rSh, ::svx::SpellP bool bRet = false; SdrView* pSdrView = rSh.GetDrawView(); SdrOutliner* pOutliner = pSdrView ? pSdrView->GetTextEditOutliner() : 0; - DBG_ASSERT(pOutliner, "No Outliner in SwSpellDialogChildWindow::SpellDrawText_Impl") + DBG_ASSERT(pOutliner, "No Outliner in SwSpellDialogChildWindow::SpellDrawText_Impl"); if(pOutliner) { bRet = pOutliner->SpellSentence(pSdrView->GetTextEditOutlinerView()->GetEditView(), rPortions, m_bIsGrammarCheckingOn); @@ -899,7 +899,7 @@ bool SwSpellDialogChildWindow::SpellDrawText_Impl(SwWrtShell& rSh, ::svx::SpellP -----------------------------------------------------------------------*/ void SwSpellDialogChildWindow::LockFocusNotification(bool bLock) { - DBG_ASSERT(m_pSpellState->m_bLockFocus != bLock, "invalid locking - no change of state") + DBG_ASSERT(m_pSpellState->m_bLockFocus != bLock, "invalid locking - no change of state"); m_pSpellState->m_bLockFocus = bLock; } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index a2710ebaa67a..7e6e9b39bd03 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1532,7 +1532,7 @@ void SwInsertSectionTabDialog::SetSection(const SwSection& rSect) short SwInsertSectionTabDialog::Ok() { short nRet = SfxTabDialog::Ok(); - DBG_ASSERT(pToInsertSection, "keiner Section?") + DBG_ASSERT(pToInsertSection, "keiner Section?"); const SfxItemSet* pOutputItemSet = GetOutputItemSet(); rWrtSh.InsertSection(*pToInsertSection, pOutputItemSet); SfxViewFrame* pViewFrm = rWrtSh.GetView().GetViewFrame(); diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index ad394e7a9c85..a8ee568b7520 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -292,7 +292,7 @@ BOOL SwGlossaryHdl::CopyOrMove( const String& rSourceGroupName, String& rSource //Der Index muss hier ermittelt werden, weil rSourceShortName in CopyBlock evtl veraendert wird USHORT nDeleteIdx = pSourceGroup->GetIndex( rSourceShortName ); - DBG_ASSERT(USHRT_MAX != nDeleteIdx, "Eintrag nicht gefunden") + DBG_ASSERT(USHRT_MAX != nDeleteIdx, "Eintrag nicht gefunden"); ULONG nRet = pSourceGroup->CopyBlock( *pDestGroup, rSourceShortName, rLongName ); if(!nRet && bMove) { diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx index ce29c218625d..617d5519ad99 100644 --- a/sw/source/ui/docvw/PostItMgr.cxx +++ b/sw/source/ui/docvw/PostItMgr.cxx @@ -726,13 +726,13 @@ bool SwPostItMgr::BorderOverPageBorder(unsigned long aPage) const { if ( mPages[aPage-1]->mList->empty() ) { - DBG_ERROR("Notes SidePane painted but no rects and page lists calculated!") + DBG_ERROR("Notes SidePane painted but no rects and page lists calculated!"); return false; } SwPostItItem_iterator aItem = mPages[aPage-1]->mList->end(); --aItem; - DBG_ASSERT ((*aItem)->pPostIt,"BorderOverPageBorder: NULL postIt, should never happen") + DBG_ASSERT ((*aItem)->pPostIt,"BorderOverPageBorder: NULL postIt, should never happen"); if ((*aItem)->pPostIt) { const long aSidebarheight = mPages[aPage-1]->bScrollbar ? mpEditWin->PixelToLogic(Size(0,GetSidebarScrollerHeight())).Height() : 0; diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index 0c49c426cfed..fffd1fff412e 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -200,7 +200,7 @@ SwEnvCfgItem::SwEnvCfgItem() : Sequence<Any> aValues = GetProperties(aNames); EnableNotification(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { for(int nProp = 0; nProp < aNames.getLength(); nProp++) diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 72c38b6e3eff..bc86c4719c4b 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -786,7 +786,7 @@ sal_Bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet) { String* pGroup = (String*)aAutoTextGroupLB.GetEntryData( aAutoTextGroupLB.GetSelectEntryPos()); - DBG_ASSERT(pGroup, "no group selected?") + DBG_ASSERT(pGroup, "no group selected?"); if(pGroup) aLabItem.sGlossaryGroup = *pGroup; diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx index 60e95fbc77c3..76a971c60db6 100644 --- a/sw/source/ui/envelp/labelcfg.cxx +++ b/sw/source/ui/envelp/labelcfg.cxx @@ -241,7 +241,7 @@ void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer, { if(!AddNode(OUString(), rManufacturer)) { - DBG_ERROR("New configuration node could not be created") + DBG_ERROR("New configuration node could not be created"); return ; } else diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx index 0f7bb9cfa622..6406861f114b 100644 --- a/sw/source/ui/envelp/labimg.cxx +++ b/sw/source/ui/envelp/labimg.cxx @@ -293,7 +293,7 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) : Sequence<Any> aValues = GetProperties(aNames); EnableNotification(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); sal_Bool bNoConfigValues = sal_True; if(aValues.getLength() == aNames.getLength()) { diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index f02a33310599..c60859790db0 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -172,7 +172,7 @@ void SwXSelChgLstnr_Impl::selectionChanged( const EventObject& ) throw (Runtime ---------------------------------------------------------------------------*/ void SwXSelChgLstnr_Impl::disposing( const EventObject& ) throw (RuntimeException) { - DBG_ERROR("disposing") + DBG_ERROR("disposing"); } /*------------------------------------------------------------------------ Beschreibung: diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 7f8b3b1e0900..70638a83f163 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -149,7 +149,7 @@ void SwChangeDBDlg::FillDBPopup() Reference<XInterface> xInstance = xMgr->createInstance( C2U( "com.sun.star.sdb.DatabaseContext" )); xDBContext = Reference<XNameAccess>(xInstance, UNO_QUERY) ; } - DBG_ASSERT(xDBContext.is(), "com.sun.star.sdb.DataBaseContext: service not available") + DBG_ASSERT(xDBContext.is(), "com.sun.star.sdb.DataBaseContext: service not available"); const SwDBData& rDBData = pSh->GetDBData(); String sDBName(rDBData.sDataSource); diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 44f3b8b66509..df77741d5cd7 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -268,7 +268,7 @@ static SwWrtShell* lcl_GetShell() SwView* pView; if ( 0 != (pView = ::GetActiveView()) ) return pView->GetWrtShellPtr(); - DBG_ERROR("no current shell found!") + DBG_ERROR("no current shell found!"); return 0; } @@ -302,7 +302,7 @@ BOOL SwFldMgr::CanInsertRefMark( const String& rStr ) { BOOL bRet = FALSE; SwWrtShell *pSh = pWrtShell ? pWrtShell : lcl_GetShell(); - DBG_ASSERT(pSh, "no SwWrtShell found") + DBG_ASSERT(pSh, "no SwWrtShell found"); if(pSh) { USHORT nCnt = pSh->GetCrsrCnt(); @@ -323,7 +323,7 @@ BOOL SwFldMgr::CanInsertRefMark( const String& rStr ) void SwFldMgr::RemoveFldType(USHORT nResId, const String& rName ) { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); - DBG_ASSERT(pSh, "no SwWrtShell found") + DBG_ASSERT(pSh, "no SwWrtShell found"); if( pSh ) pSh->RemoveFldType(nResId, rName); } @@ -331,7 +331,7 @@ void SwFldMgr::RemoveFldType(USHORT nResId, const String& rName ) USHORT SwFldMgr::GetFldTypeCount(USHORT nResId) const { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); - DBG_ASSERT(pSh, "no SwWrtShell found") + DBG_ASSERT(pSh, "no SwWrtShell found"); return pSh ? pSh->GetFldTypeCount(nResId) : 0; } @@ -339,7 +339,7 @@ USHORT SwFldMgr::GetFldTypeCount(USHORT nResId) const SwFieldType* SwFldMgr::GetFldType(USHORT nResId, USHORT nId) const { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); - DBG_ASSERT(pSh, "no SwWrtShell found") + DBG_ASSERT(pSh, "no SwWrtShell found"); return pSh ? pSh->GetFldType(nId, nResId) : 0; } @@ -347,7 +347,7 @@ SwFieldType* SwFldMgr::GetFldType(USHORT nResId, USHORT nId) const SwFieldType* SwFldMgr::GetFldType(USHORT nResId, const String& rName) const { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); - DBG_ASSERT(pSh, "no SwWrtShell found") + DBG_ASSERT(pSh, "no SwWrtShell found"); return pSh ? pSh->GetFldType(nResId, rName) : 0; } @@ -521,7 +521,7 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill) { BOOL bRet = FALSE; SwWrtShell *pSh = pWrtShell ? pWrtShell : lcl_GetShell(); - DBG_ASSERT(pSh, "no SwWrtShell found") + DBG_ASSERT(pSh, "no SwWrtShell found"); if(pSh) { const USHORT nPos = GetPos(nTypeId); @@ -848,7 +848,7 @@ BOOL SwFldMgr::GoNextPrev( BOOL bNext, SwFieldType* pTyp ) void SwFldMgr::InsertFldType(SwFieldType& rType) { SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); - DBG_ASSERT(pSh, "no SwWrtShell found") + DBG_ASSERT(pSh, "no SwWrtShell found"); if(pSh) pSh->InsertFldType(rType); } @@ -880,7 +880,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) SwWrtShell* pCurShell = rData.pSh; if(!pCurShell) pCurShell = pWrtShell ? pWrtShell : ::lcl_GetShell(); - DBG_ASSERT(pCurShell, "no SwWrtShell found") + DBG_ASSERT(pCurShell, "no SwWrtShell found"); if(!pCurShell) return FALSE; @@ -1455,7 +1455,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, const USHORT nTypeId = pTmpFld->GetTypeId(); SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); - DBG_ASSERT(pSh, "no SwWrtShell found") + DBG_ASSERT(pSh, "no SwWrtShell found"); if(!pSh) return; pSh->StartAllAction(); @@ -1777,7 +1777,7 @@ Reference<XNumberingTypeInfo> SwFldMgr::GetNumberingInfo() const ::rtl::OUString::createFromAscii( "com.sun.star.text.DefaultNumberingProvider" )); Reference<XDefaultNumberingProvider> xDefNum(xI, UNO_QUERY); - DBG_ASSERT(xDefNum.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\"") + DBG_ASSERT(xDefNum.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\""); ((SwFldMgr*)this)->xNumberingInfo = Reference<XNumberingTypeInfo>(xDefNum, UNO_QUERY); } return xNumberingInfo; diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx index 6d00f7ceb693..a295226eff01 100644 --- a/sw/source/ui/fldui/xfldui.cxx +++ b/sw/source/ui/fldui/xfldui.cxx @@ -95,7 +95,7 @@ BOOL SwFldMgr::IsDBNumeric( const String& rDBName, const String& rTblQryName, if(xTSupplier.is()) { Reference<XNameAccess> xTbls = xTSupplier->getTables(); - DBG_ASSERT(xTbls->hasByName(rTblQryName), "table not available anymore?") + DBG_ASSERT(xTbls->hasByName(rTblQryName), "table not available anymore?"); try { Any aTable = xTbls->getByName(rTblQryName); @@ -112,7 +112,7 @@ BOOL SwFldMgr::IsDBNumeric( const String& rDBName, const String& rTblQryName, if(xQSupplier.is()) { Reference<XNameAccess> xQueries = xQSupplier->getQueries(); - DBG_ASSERT(xQueries->hasByName(rTblQryName), "table not available anymore?") + DBG_ASSERT(xQueries->hasByName(rTblQryName), "table not available anymore?"); try { Any aQuery = xQueries->getByName(rTblQryName); @@ -133,7 +133,7 @@ BOOL SwFldMgr::IsDBNumeric( const String& rDBName, const String& rTblQryName, } catch(Exception& ) { - DBG_ERROR("Exception in getColumns()") + DBG_ERROR("Exception in getColumns()"); } if(xCols.is() && xCols->hasByName(rFldName)) { diff --git a/sw/source/ui/frmdlg/colmgr.cxx b/sw/source/ui/frmdlg/colmgr.cxx index aea87fa0d2f7..06af4061fe83 100644 --- a/sw/source/ui/frmdlg/colmgr.cxx +++ b/sw/source/ui/frmdlg/colmgr.cxx @@ -83,7 +83,7 @@ USHORT SwColMgr::GetGutterWidth( USHORT nPos ) const nRet = GetCount() > 1 ? aFmtCol.GetGutterWidth() : DEF_GUTTER_WIDTH; else { - DBG_ASSERT(nPos < GetCount() - 1, "Spalte ueberindiziert" ) + DBG_ASSERT(nPos < GetCount() - 1, "Spalte ueberindiziert" ); const SwColumns& rCols = aFmtCol.GetColumns(); nRet = rCols.GetObject(nPos)->GetRight() + rCols.GetObject(nPos + 1)->GetLeft(); } @@ -101,7 +101,7 @@ void SwColMgr::SetGutterWidth(USHORT nGutterWidth, USHORT nPos ) aFmtCol.SetGutterWidth(nGutterWidth, nWidth); else { - DBG_ASSERT(nPos < GetCount() - 1, "Spalte ueberindiziert" ) + DBG_ASSERT(nPos < GetCount() - 1, "Spalte ueberindiziert" ); SwColumns& rCols = aFmtCol.GetColumns(); USHORT nGutterWidth2 = nGutterWidth / 2; rCols.GetObject(nPos)->SetRight(nGutterWidth2); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index f2389e5ba026..d96a072d6893 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -975,7 +975,7 @@ IMPL_LINK( SwColumnPage, GapModify, PercentField *, pFld ) if(aAutoWidthBox.IsChecked()) { USHORT nMaxGap = pColMgr->GetActualSize() - nCols * MINLAY; - DBG_ASSERT(nCols, "Abstand kann nicht ohne Spalten eingestellt werden") + DBG_ASSERT(nCols, "Abstand kann nicht ohne Spalten eingestellt werden"); nMaxGap /= nCols - 1; if(nActValue > nMaxGap) { diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 5d1d126965d3..3225e120248a 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2929,7 +2929,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) aTmpName1 = ((const SfxStringItem*)pItem)->GetValue(); } - DBG_ASSERT(pWrtSh, "keine Shell?") + DBG_ASSERT(pWrtSh, "keine Shell?"); if( bNew || !aTmpName1.Len() ) switch( nDlgType ) diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index aee1eb8dfc17..f1e5c2c06f72 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -194,7 +194,7 @@ IMPL_LINK( SwMultiTOXTabDialog, CreateExample_Hdl, void*, EMPTYARG ) } catch(Exception&) { - DBG_ERROR("::CreateExample() - exception caught") + DBG_ERROR("::CreateExample() - exception caught"); } return 0; } @@ -223,7 +223,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( { DBG_ASSERT(pxIndexSectionsArr[nTOXIndex] && pxIndexSectionsArr[nTOXIndex]->xContainerSection.is(), - "Section not created") + "Section not created"); uno::Reference< frame::XModel > & xModel = pExampleFrame->GetModel(); sal_Bool bInitialCreate = sal_True; if(!pxIndexSectionsArr[nTOXIndex]->xDocumentIndex.is()) @@ -449,7 +449,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( uno::Any aFormatAccess = xIdxProps->getPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_LEVEL_FORMAT))); DBG_ASSERT(aFormatAccess.getValueType() == ::getCppuType((uno::Reference<container::XIndexReplace>*)0), - "wrong property type") + "wrong property type"); uno::Reference< container::XIndexReplace > xFormatAccess; @@ -513,7 +513,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( } catch(Exception&) { - DBG_ERROR("::CreateExample() - exception caught") + DBG_ERROR("::CreateExample() - exception caught"); } } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index c05a11edaff6..680220b96be0 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1279,7 +1279,7 @@ void SwTOXSelectTabPage::ApplyTOXDescription() for( long nCnt = 0; nCnt < aSortAlgorithmLB.GetEntryCount(); ++nCnt ) { const String* pEntryData = (const String*)aSortAlgorithmLB.GetEntryData( (USHORT)nCnt ); - DBG_ASSERT(pEntryData, "no entry data available") + DBG_ASSERT(pEntryData, "no entry data available"); if( pEntryData && *pEntryData == rDesc.GetSortAlgorithm()) { aSortAlgorithmLB.SelectEntryPos( (USHORT)nCnt ); @@ -1396,7 +1396,7 @@ void SwTOXSelectTabPage::FillTOXDescription() rDesc.SetLanguage(aLanguageLB.GetSelectLanguage()); const String* pEntryData = (const String*)aSortAlgorithmLB.GetEntryData( aSortAlgorithmLB.GetSelectEntryPos() ); - DBG_ASSERT(pEntryData, "no entry data available") + DBG_ASSERT(pEntryData, "no entry data available"); if(pEntryData) rDesc.SetSortAlgorithm(*pEntryData); } @@ -1673,7 +1673,7 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox) --------------------------------------------------*/ IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl, ListBox*, pBox) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); switch((long)pBox->GetEntryData( pBox->GetSelectEntryPos() )) { case AREA_DOCUMENT : break; @@ -1938,7 +1938,7 @@ public: void SetLinkEnd() { DBG_ASSERT(TOKEN_LINK_START == aFormToken.eTokenType, - "call SetLinkEnd for link start only!") + "call SetLinkEnd for link start only!"); aFormToken.eTokenType = TOKEN_LINK_END; aFormToken.sText.AssignAscii(SwForm::aFormLinkEnd); SetText(aFormToken.sText); @@ -1946,7 +1946,7 @@ public: void SetLinkStart() { DBG_ASSERT(TOKEN_LINK_END == aFormToken.eTokenType, - "call SetLinkStart for link start only!") + "call SetLinkStart for link start only!"); aFormToken.eTokenType = TOKEN_LINK_START; aFormToken.sText.AssignAscii(SwForm::aFormLinkStt); SetText(aFormToken.sText); @@ -2588,7 +2588,7 @@ IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, PushButton*, pButton) else { Control* pCtrl = aTokenWIN.GetActiveControl(); - DBG_ASSERT(WINDOW_EDIT != pCtrl->GetType(), "Remove should be disabled") + DBG_ASSERT(WINDOW_EDIT != pCtrl->GetType(), "Remove should be disabled"); if( WINDOW_EDIT != pCtrl->GetType() ) { //fill it into the ListBox @@ -2735,7 +2735,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox) { sal_uInt32 nSearch = aToken.nAuthorityField; sal_uInt16 nLstBoxPos = aAuthFieldsLB.GetEntryPos( (void*) nSearch ); - DBG_ASSERT(LISTBOX_ENTRY_NOTFOUND != nLstBoxPos, "Entry not found?") + DBG_ASSERT(LISTBOX_ENTRY_NOTFOUND != nLstBoxPos, "Entry not found?"); aAuthFieldsLB.RemoveEntry(nLstBoxPos); } @@ -2915,7 +2915,7 @@ IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl, ListBox*, pBox) if(sEntry == sNoCharStyle) sEntry.Erase(); Control* pCtrl = aTokenWIN.GetActiveControl(); - DBG_ASSERT(pCtrl, "no active control?") + DBG_ASSERT(pCtrl, "no active control?"); if(pCtrl) { if(WINDOW_EDIT == pCtrl->GetType()) @@ -2936,7 +2936,7 @@ IMPL_LINK(SwTOXEntryTabPage, ChapterInfoHdl, ListBox*, pBox) if(LISTBOX_ENTRY_NOTFOUND != nPos) { Control* pCtrl = aTokenWIN.GetActiveControl(); - DBG_ASSERT(pCtrl, "no active control?") + DBG_ASSERT(pCtrl, "no active control?"); if(pCtrl && WINDOW_EDIT != pCtrl->GetType()) ((SwTOXButton*)pCtrl)->SetChapterInfo(nPos); @@ -2950,7 +2950,7 @@ IMPL_LINK(SwTOXEntryTabPage, ChapterInfoOutlineHdl, NumericField*, pField) const sal_uInt16 nLevel = static_cast<BYTE>(pField->GetValue()); Control* pCtrl = aTokenWIN.GetActiveControl(); - DBG_ASSERT(pCtrl, "no active control?") + DBG_ASSERT(pCtrl, "no active control?"); if(pCtrl && WINDOW_EDIT != pCtrl->GetType()) ((SwTOXButton*)pCtrl)->SetOutlineLevel(nLevel); @@ -2965,7 +2965,7 @@ IMPL_LINK(SwTOXEntryTabPage, NumberFormatHdl, ListBox*, pBox) if(LISTBOX_ENTRY_NOTFOUND != nPos) { Control* pCtrl = aTokenWIN.GetActiveControl(); - DBG_ASSERT(pCtrl, "no active control?") + DBG_ASSERT(pCtrl, "no active control?"); if(pCtrl && WINDOW_EDIT != pCtrl->GetType()) { ((SwTOXButton*)pCtrl)->SetEntryNumberFormat(nPos);//i89791 @@ -2983,7 +2983,7 @@ IMPL_LINK(SwTOXEntryTabPage, TabPosHdl, MetricField*, pField) Control* pCtrl = aTokenWIN.GetActiveControl(); DBG_ASSERT(pCtrl && WINDOW_EDIT != pCtrl->GetType() && TOKEN_TAB_STOP == ((SwTOXButton*)pCtrl)->GetFormToken().eTokenType, - "no active style::TabStop control?") + "no active style::TabStop control?"); if( pCtrl && WINDOW_EDIT != pCtrl->GetType() ) { ((SwTOXButton*)pCtrl)->SetTabPosition( static_cast< SwTwips >( @@ -3000,7 +3000,7 @@ IMPL_LINK(SwTOXEntryTabPage, FillCharHdl, ComboBox*, pBox) Control* pCtrl = aTokenWIN.GetActiveControl(); DBG_ASSERT(pCtrl && WINDOW_EDIT != pCtrl->GetType() && TOKEN_TAB_STOP == ((SwTOXButton*)pCtrl)->GetFormToken().eTokenType, - "no active style::TabStop control?") + "no active style::TabStop control?"); if(pCtrl && WINDOW_EDIT != pCtrl->GetType()) { sal_Unicode cSet; @@ -3023,7 +3023,7 @@ IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, CheckBox*, pBox) Control* pCurCtrl = aTokenWIN.GetActiveControl(); DBG_ASSERT(WINDOW_EDIT != pCurCtrl->GetType() && ((SwTOXButton*)pCurCtrl)->GetFormToken().eTokenType == TOKEN_TAB_STOP, - "no style::TabStop selected!") + "no style::TabStop selected!"); const SwFormToken& rToken = ((SwTOXButton*)pCurCtrl)->GetFormToken(); sal_Bool bChecked = pBox->IsChecked(); @@ -3167,7 +3167,7 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) if(TOKEN_TEXT == aToken.eTokenType) { - DBG_ASSERT(!bLastWasText, "text following text is invalid") + DBG_ASSERT(!bLastWasText, "text following text is invalid"); Control* pCtrl = InsertItem(aToken.sText, aToken); bLastWasText = sal_True; if(!GetActiveControl()) @@ -3304,7 +3304,7 @@ void SwTokenWindow::InsertAtSelection( const String& rText, const SwFormToken& rToken) { - DBG_ASSERT(pActiveCtrl, "no active control!") + DBG_ASSERT(pActiveCtrl, "no active control!"); if(!pActiveCtrl) return; SwFormToken aToInsertToken(rToken); @@ -3391,7 +3391,7 @@ void SwTokenWindow::InsertAtSelection( if(bPostLinkStartFound) { - DBG_ASSERT(pExchange, "no control to exchange?") + DBG_ASSERT(pExchange, "no control to exchange?"); if(pExchange) { ((SwTOXButton*)pExchange)->SetLinkEnd(); @@ -3401,7 +3401,7 @@ void SwTokenWindow::InsertAtSelection( if(bPreEndLinkFound) { - DBG_ASSERT(pExchange, "no control to exchange?") + DBG_ASSERT(pExchange, "no control to exchange?"); if(pExchange) { ((SwTOXButton*)pExchange)->SetLinkStart(); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index e228c9a03c64..ab6e219d8a25 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -257,7 +257,7 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent, void SwIndexMarkDlg::InitControls() { - DBG_ASSERT(pSh && pTOXMgr, "Shell nicht da?") + DBG_ASSERT(pSh && pTOXMgr, "Shell nicht da?"); // Inhalts-Verzeichnis const SwTOXType* pType = pTOXMgr->GetTOXType(TOX_CONTENT, 0); ASSERT(pType, "Kein Verzeichnistyp !!"); @@ -904,7 +904,7 @@ IMPL_LINK( SwIndexMarkDlg, DelHdl, Button *, EMPTYARG ) void SwIndexMarkDlg::UpdateDialog() { - DBG_ASSERT(pSh && pTOXMgr, "Shell nicht da?") + DBG_ASSERT(pSh && pTOXMgr, "Shell nicht da?"); SwTOXMark* pMark = pTOXMgr->GetCurTOXMark(); ASSERT(pMark, "Keine aktuelle Markierung"); if(!pMark) @@ -1125,7 +1125,7 @@ SfxModelessDialog(_pBindings, pChild, pParent, SvtCJKOptions().IsCJKFontEnabled( { FreeResource(); SwWrtShell* pWrtShell = ::GetActiveWrtShell(); - DBG_ASSERT(pWrtShell, "No shell?") + DBG_ASSERT(pWrtShell, "No shell?"); aDlg.ReInitDlg(*pWrtShell); Initialize(pInfo); } @@ -1422,8 +1422,8 @@ IMPL_LINK( SwAuthMarkDlg, InsertHdl, PushButton *, EMPTYARG ) if(pSh) { sal_Bool bDifferent = sal_False; - DBG_ASSERT(m_sFields[AUTH_FIELD_IDENTIFIER].Len() , "No Id is set!") - DBG_ASSERT(m_sFields[AUTH_FIELD_AUTHORITY_TYPE].Len() , "No authority type is set!") + DBG_ASSERT(m_sFields[AUTH_FIELD_IDENTIFIER].Len() , "No Id is set!"); + DBG_ASSERT(m_sFields[AUTH_FIELD_AUTHORITY_TYPE].Len() , "No authority type is set!"); //check if the entry already exists with different content const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) pSh->GetFldType(RES_AUTHORITY, aEmptyStr); @@ -1506,7 +1506,7 @@ IMPL_LINK(SwAuthMarkDlg, CreateEntryHdl, PushButton*, pButton) { DBG_ASSERT(LISTBOX_ENTRY_NOTFOUND == aEntryLB.GetEntryPos(m_sFields[AUTH_FIELD_IDENTIFIER]), - "entry exists!") + "entry exists!"); aEntryLB.InsertEntry(m_sFields[AUTH_FIELD_IDENTIFIER]); aEntryLB.SelectEntry(m_sFields[AUTH_FIELD_IDENTIFIER]); } @@ -1628,7 +1628,7 @@ IMPL_LINK(SwAuthMarkDlg, IsEntryAllowedHdl, Edit*, pEdit) --------------------------------------------------*/ void SwAuthMarkDlg::InitControls() { - DBG_ASSERT(pSh, "Shell nicht da?") + DBG_ASSERT(pSh, "Shell nicht da?"); SwField* pField = pSh->GetCurFld(); ASSERT(bNewEntry || pField, "Keine aktuelle Markierung"); if(bNewEntry) @@ -1645,7 +1645,7 @@ void SwAuthMarkDlg::InitControls() const SwAuthEntry* pEntry = ((SwAuthorityFieldType*)pField->GetTyp())-> GetEntryByHandle(((SwAuthorityField*)pField)->GetHandle()); - DBG_ASSERT(pEntry, "No authority entry found") + DBG_ASSERT(pEntry, "No authority entry found"); if(!pEntry) return; for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++) @@ -1838,12 +1838,12 @@ String SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) const String sRet; if( AUTH_FIELD_AUTHORITY_TYPE == eField ) { - DBG_ASSERT(pTypeListBox, "No ListBox") + DBG_ASSERT(pTypeListBox, "No ListBox"); sRet = String::CreateFromInt32(pTypeListBox->GetSelectEntryPos()); } else if( AUTH_FIELD_IDENTIFIER == eField && !m_bNewEntryMode) { - DBG_ASSERT(pIdentifierBox, "No ComboBox") + DBG_ASSERT(pIdentifierBox, "No ComboBox"); sRet = pIdentifierBox->GetText(); } else @@ -1924,7 +1924,7 @@ SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* _pBindings, FreeResource(); Initialize(pInfo); SwWrtShell* pWrtShell = ::GetActiveWrtShell(); - DBG_ASSERT(pWrtShell, "No shell?") + DBG_ASSERT(pWrtShell, "No shell?"); aDlg.ReInitDlg(*pWrtShell); } /* -----------------06.10.99 10:27------------------- diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx index d43249bdaa00..4e0cbe897ac9 100644 --- a/sw/source/ui/index/toxmgr.cxx +++ b/sw/source/ui/index/toxmgr.cxx @@ -418,7 +418,7 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc, } - DBG_ASSERT(pNewTOX, "no TOXBase created!" ) + DBG_ASSERT(pNewTOX, "no TOXBase created!" ); if(!pNewTOX) return FALSE; diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx index 70128474ca63..3df94b9e6e31 100644 --- a/sw/source/ui/lingu/hhcwrp.cxx +++ b/sw/source/ui/lingu/hhcwrp.cxx @@ -327,7 +327,7 @@ void SwHHCWrapper::ChangeText( const String &rNewText, // set selection to sub string to be replaced in original text xub_StrLen nChgInNodeStartIndex = static_cast< xub_StrLen >( nStartIndex + nCorrectionOffset + nChgPos ); - DBG_ASSERT( rWrtShell.GetCrsr()->HasMark(), "cursor misplaced (nothing selected)" ) + DBG_ASSERT( rWrtShell.GetCrsr()->HasMark(), "cursor misplaced (nothing selected)" ); rWrtShell.GetCrsr()->GetMark()->nContent.Assign( pStartTxtNode, nChgInNodeStartIndex ); rWrtShell.GetCrsr()->GetPoint()->nContent.Assign( pStartTxtNode, nChgInNodeStartIndex + nChgLen ); #ifdef DEBUG diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index be430849417e..5bc9a657b6ae 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -712,7 +712,7 @@ void SwSpellPopup::Execute( USHORT nId ) } break; case MN_INSERT: - DBG_ERROR("geht noch nicht!") + DBG_ERROR("geht noch nicht!"); break; case MN_LANGUAGE_WORD: case MN_LANGUAGE_PARA: diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 1f39529337c9..44a3e0750890 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -314,7 +314,7 @@ void SwEndNoteOptionPage::SelectNumbering(int eNum) break; #ifdef DBG_UTIL default: - DBG_ERROR("Which numbering type?") + DBG_ERROR("Which numbering type?"); #endif } aNumCountBox.SelectEntry(sSelect); diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index f8cb9c69f3e4..e5269a6f7dd7 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -293,7 +293,7 @@ IMPL_LINK( SwGlossaryGroupDlg, NewHdl, Button*, EMPTYARG ) // sGroup.ToLower(); sGroup += GLOS_DELIM; sGroup += String::CreateFromInt32(aPathLB.GetSelectEntryPos()); - DBG_ASSERT(!pGlosHdl->FindGroupName(sGroup), "Gruppe bereits vorhanden!") + DBG_ASSERT(!pGlosHdl->FindGroupName(sGroup), "Gruppe bereits vorhanden!"); if(!pInsertedArr) pInsertedArr = new SvStrings; pInsertedArr->Insert(new String(sGroup), pInsertedArr->Count()); @@ -396,7 +396,7 @@ IMPL_LINK( SwGlossaryGroupDlg, RenameHdl, Button *, EMPTYARG ) sNewName += GLOS_DELIM; sNewName += String::CreateFromInt32(aPathLB.GetSelectEntryPos()); - DBG_ASSERT(!pGlosHdl->FindGroupName(sNewName), "Gruppe bereits vorhanden!") + DBG_ASSERT(!pGlosHdl->FindGroupName(sNewName), "Gruppe bereits vorhanden!"); // befindet sich der umzubenennende Name unter den // den neuen - dann austauschen diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx index 8b7b63b9c3e2..94d2f04a9b0e 100644 --- a/sw/source/ui/misc/glosdoc.cxx +++ b/sw/source/ui/misc/glosdoc.cxx @@ -274,7 +274,7 @@ sal_Bool SwGlossaries::RenameGroupDoc( sOldFileURL += rOldGroup.GetToken(0, GLOS_DELIM); sOldFileURL += SwGlossaries::GetExtension(); BOOL bExist = FStatHelper::IsDocument( sOldFileURL ); - DBG_ASSERT(bExist, "Gruppe existiert nicht!") + DBG_ASSERT(bExist, "Gruppe existiert nicht!"); if(bExist) { sal_uInt16 nNewPath = (sal_uInt16)rNewGroup.GetToken(1, GLOS_DELIM).ToInt32(); @@ -290,7 +290,7 @@ sal_Bool SwGlossaries::RenameGroupDoc( sTempNewFilePath += INET_PATH_TOKEN; sTempNewFilePath += sNewFileName ; bExist = FStatHelper::IsDocument( sTempNewFilePath ); - DBG_ASSERT(!bExist, "Gruppe existiert bereits!") + DBG_ASSERT(!bExist, "Gruppe existiert bereits!"); if(!bExist) { BOOL bCopyCompleted = SWUnoHelper::UCB_CopyFile( diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 1c5d1560f1b2..5fd8453bebd0 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -636,7 +636,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) if(aTitle.Len() && pGlossaryHdl->DelGlossary(aShortName)) { SvLBoxEntry* pChild = DoesBlockExist(aTitle, aShortName); - DBG_ASSERT(pChild, "Eintrag nicht gefunden!") + DBG_ASSERT(pChild, "Eintrag nicht gefunden!"); SvLBoxEntry* pParent = aCategoryBox.GetParent(pChild); aCategoryBox.Select(pParent); diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx index 7ffe01e8d6be..38e2cc6fc0bd 100644 --- a/sw/source/ui/misc/numberingtypelistbox.cxx +++ b/sw/source/ui/misc/numberingtypelistbox.cxx @@ -64,7 +64,7 @@ SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, const ResId& rResI uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.text.DefaultNumberingProvider" ) ); uno::Reference<text::XDefaultNumberingProvider> xDefNum(xI, uno::UNO_QUERY); - DBG_ASSERT(xDefNum.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\"") + DBG_ASSERT(xDefNum.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\""); pImpl->xInfo = uno::Reference<text::XNumberingTypeInfo>(xDefNum, uno::UNO_QUERY); Reload(nTypeFlags); @@ -164,7 +164,7 @@ sal_Int16 SwNumberingTypeListBox::GetSelectedNumberingType() nRet = (sal_Int16)(ULONG)GetEntryData(nSelPos); #ifdef DBG_UTIL else - DBG_ERROR("SwNumberingTypeListBox not selected") + DBG_ERROR("SwNumberingTypeListBox not selected"); #endif return nRet; } diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx index 20185cb15ca9..c8422f665b7d 100644 --- a/sw/source/ui/ribbar/inputwin.cxx +++ b/sw/source/ui/ribbar/inputwin.cxx @@ -193,7 +193,7 @@ void SwInputWindow::ShowWin() pView->GetHLineal().SetActive( FALSE ); pView->GetVLineal().SetActive( FALSE ); - DBG_ASSERT(pWrtShell, "Keine WrtShell!") + DBG_ASSERT(pWrtShell, "Keine WrtShell!"); // Cursor in Tabelle bIsTable = pWrtShell->IsCrsrInTbl() ? TRUE : FALSE; diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx index 098857864f18..fc086a1143c2 100644 --- a/sw/source/ui/ribbar/tbxanchr.cxx +++ b/sw/source/ui/ribbar/tbxanchr.cxx @@ -144,7 +144,7 @@ void SwTbxAnchor::Click() } if(!pActiveView) { - DBG_ERROR("No active view could be found") + DBG_ERROR("No active view could be found"); return; } SwWrtShell* pWrtShell = pActiveView->GetWrtShellPtr(); diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 6df543b2d612..6c10952d0e2e 100755 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -159,7 +159,7 @@ SfxUndoManager* SwAnnotationShell::GetUndoManager() SwPostItMgr* pPostItMgr = rView.GetPostItMgr(); if ( !pPostItMgr || !pPostItMgr->GetActivePostIt() ) { - DBG_ASSERT(pPostItMgr,"PostItMgr::Layout(): We are looping forever") + DBG_ASSERT(pPostItMgr,"PostItMgr::Layout(): We are looping forever"); return 0; } return &pPostItMgr->GetActivePostIt()->Engine()->GetUndoManager(); diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 6418686f09c1..e46fbe523f77 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -1222,7 +1222,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) case FN_PAGE_STYLE_SET_PAPER_SIZE: case FN_PAGE_STYLE_SET_PAPER_BIN: { - DBG_ERROR("not implemented") + DBG_ERROR("not implemented"); } break; diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index 178e87ee081e..1e9ea6189d97 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -154,7 +154,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) //Sonderfall Align per Menue if(pItem && nSlotId == SID_OBJECT_ALIGN) { - DBG_ASSERT(PTR_CAST(SfxEnumItem, pItem),"SfxEnumItem erwartet") + DBG_ASSERT(PTR_CAST(SfxEnumItem, pItem),"SfxEnumItem erwartet"); nSlotId = nSlotId + ((const SfxEnumItem*)pItem)->GetValue(); nSlotId++; } @@ -656,7 +656,7 @@ IMPL_LINK( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxNameDialog*, pNam SwWrtShell &rSh = GetShell(); SdrView *pSdrView = rSh.GetDrawView(); const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - DBG_ASSERT(rMarkList.GetMarkCount() == 1, "wrong draw selection") + DBG_ASSERT(rMarkList.GetMarkCount() == 1, "wrong draw selection"); SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); const String sCurrentName = pObj->GetName(); String sNewName; diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 63ab19a75258..550a4524ed96 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -468,7 +468,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) //needs cast - no non-const method available SwFrmFmt* pPrevFmt = (SwFrmFmt*) lcl_GetFrmFmtByName(rSh, sPrevName); - DBG_ASSERT(pPrevFmt, "No frame found!") + DBG_ASSERT(pPrevFmt, "No frame found!"); if(pPrevFmt) { rSh.Chain(*pPrevFmt, *pCurrFlyFmt); @@ -502,7 +502,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) //needs cast - no non-const method available SwFrmFmt* pNextFmt = (SwFrmFmt*) lcl_GetFrmFmtByName(rSh, sNextName); - DBG_ASSERT(pNextFmt, "No frame found!") + DBG_ASSERT(pNextFmt, "No frame found!"); if(pNextFmt) { rSh.Chain(*(SwFrmFmt*) diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 8050be00c4db..97a331201751 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -262,7 +262,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) if( SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_FIELD_FORMAT, FALSE, &pItem )) nFormat = ((SfxUInt32Item *)pItem)->GetValue(); - DBG_WARNING("Command is not yet used") + DBG_WARNING("Command is not yet used"); sal_Unicode cSeparator = ' '; SwInsertFld_Data aData(nType, 0, aPar1, aPar2, nFormat, GetShellPtr(), cSeparator ); bRes = aFldMgr.InsertFld(aData); diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx index e77a0151a7d1..3eb67f725acd 100644 --- a/sw/source/ui/shells/textidx.cxx +++ b/sw/source/ui/shells/textidx.cxx @@ -171,7 +171,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq) { SwWrtShell& rSh = GetShell(); const SwTOXBase* pBase = rSh.GetCurTOX(); - DBG_ASSERT(pBase, "no TOXBase to remove") + DBG_ASSERT(pBase, "no TOXBase to remove"); if( pBase ) rSh.DeleteTOX(*pBase, TRUE); } diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index be8c9842a9e2..c18d7b6f7d07 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -226,7 +226,7 @@ void SwFormatTablePage::Init() IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn ) { - DBG_ASSERT(pTblData, "Tabellendaten nicht da?") + DBG_ASSERT(pTblData, "Tabellendaten nicht da?"); BOOL bIsChecked = pBtn->IsChecked(); sal_Int64 nLeft = aLeftMF.DenormalizePercent(aLeftMF.GetValue(FUNIT_TWIP )); sal_Int64 nRight = aRightMF.DenormalizePercent(aRightMF.GetValue(FUNIT_TWIP )); @@ -672,7 +672,7 @@ void SwFormatTablePage::Reset( const SfxItemSet& ) ------------------------------------------------------------------------*/ void SwFormatTablePage::ActivatePage( const SfxItemSet& rSet ) { - DBG_ASSERT(pTblData, "Tabellendaten nicht da?") + DBG_ASSERT(pTblData, "Tabellendaten nicht da?"); if(SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_REP )) { SwTwips nCurWidth = text::HoriOrientation::FULL != pTblData->GetAlign() ? @@ -1129,7 +1129,7 @@ void SwTableColumnPage::UpdateCols( USHORT nAktPos ) nDiff = 0; SetVisibleWidth(nAktPos, GetVisibleWidth(nAktPos) -nDiff); } - DBG_ASSERT(nDiff >= 0, "nDiff < 0 kann hier nicht sein!") + DBG_ASSERT(nDiff >= 0, "nDiff < 0 kann hier nicht sein!"); } } } @@ -1137,7 +1137,7 @@ void SwTableColumnPage::UpdateCols( USHORT nAktPos ) { // Differenz wird ueber die Tabellenbreite ausgeglichen, // andere Spalten bleiben unveraendert - DBG_ASSERT(nDiff <= pTblData->GetSpace() - nTableWidth, "Maximum falsch eingestellt" ) + DBG_ASSERT(nDiff <= pTblData->GetSpace() - nTableWidth, "Maximum falsch eingestellt" ); SwTwips nActSpace = pTblData->GetSpace() - nTableWidth; if(nDiff > nActSpace) { @@ -1153,7 +1153,7 @@ void SwTableColumnPage::UpdateCols( USHORT nAktPos ) { // Alle Spalten werden proportional mitveraendert, die Tabellenbreite wird // entsprechend angepasst - DBG_ASSERT(nDiff * nNoOfVisibleCols <= pTblData->GetSpace() - nTableWidth, "Maximum falsch eingestellt" ) + DBG_ASSERT(nDiff * nNoOfVisibleCols <= pTblData->GetSpace() - nTableWidth, "Maximum falsch eingestellt" ); long nAdd = nDiff; if(nDiff * nNoOfVisibleCols > pTblData->GetSpace() - nTableWidth) { @@ -1350,7 +1350,7 @@ SwTwips SwTableColumnPage::GetVisibleWidth(USHORT nPos) i++; } SwTwips nReturn = pTblData->GetColumns()[i].nWidth; - DBG_ASSERT(i < nNoOfCols, "Array index out of range") + DBG_ASSERT(i < nNoOfCols, "Array index out of range"); while(!pTblData->GetColumns()[i].bVisible && (i + 1) < nNoOfCols) nReturn += pTblData->GetColumns()[++i].nWidth; @@ -1369,7 +1369,7 @@ void SwTableColumnPage::SetVisibleWidth(USHORT nPos, SwTwips nNewWidth) nPos--; i++; } - DBG_ASSERT(i < nNoOfCols, "Array index out of range") + DBG_ASSERT(i < nNoOfCols, "Array index out of range"); pTblData->GetColumns()[i].nWidth = nNewWidth; while(!pTblData->GetColumns()[i].bVisible && (i + 1) < nNoOfCols) pTblData->GetColumns()[++i].nWidth = 0; diff --git a/sw/source/ui/table/tablemgr.cxx b/sw/source/ui/table/tablemgr.cxx index dd0b62fda11b..bfb9b08ef5a4 100644 --- a/sw/source/ui/table/tablemgr.cxx +++ b/sw/source/ui/table/tablemgr.cxx @@ -370,7 +370,7 @@ USHORT SwTableFUNC::GetColCount() const int SwTableFUNC::GetRightSeparator(int nNum) const { - DBG_ASSERT( nNum < (int)GetColCount() ,"Index out of range") + DBG_ASSERT( nNum < (int)GetColCount() ,"Index out of range"); int i = 0; while( nNum >= 0 ) { diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index a77de112f525..471c549f2179 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -292,7 +292,7 @@ SwSrcView::SwSrcView(SfxViewFrame* pViewFrame, SfxViewShell*) : SwSrcView::~SwSrcView() { SwDocShell* pDocShell = GetDocShell(); - DBG_ASSERT(PTR_CAST(SwWebDocShell, pDocShell), "Wieso keine WebDocShell?") + DBG_ASSERT(PTR_CAST(SwWebDocShell, pDocShell), "Wieso keine WebDocShell?"); const TextSelection& rSel = aEditWin.GetTextView()->GetSelection(); ((SwWebDocShell*)pDocShell)->SetSourcePara( static_cast< USHORT >( rSel.GetStart().GetPara() ) ); @@ -989,7 +989,7 @@ void SwSrcView::Load(SwDocShell* pDocShell) pDocShell->SetModified();// das Flag wird zwischendurch zurueckgesetzt // AutoLoad abschalten pDocShell->SetAutoLoad(INetURLObject(), 0, FALSE); - DBG_ASSERT(PTR_CAST(SwWebDocShell, pDocShell), "Wieso keine WebDocShell?") + DBG_ASSERT(PTR_CAST(SwWebDocShell, pDocShell), "Wieso keine WebDocShell?"); USHORT nLine = ((SwWebDocShell*)pDocShell)->GetSourcePara(); aEditWin.SetStartLine(nLine); aEditWin.GetTextEngine()->ResetUndo(); diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index ff994e40c50a..625b8defba40 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -387,7 +387,7 @@ BOOL SwView::InsertGraphicDlg( SfxRequest& rReq ) } catch(Exception& ) { - DBG_ERROR("control acces failed") + DBG_ERROR("control acces failed"); } SFX_REQUEST_ARG( rReq, pName, SfxStringItem, SID_INSERT_GRAPHIC , sal_False ); @@ -418,7 +418,7 @@ BOOL SwView::InsertGraphicDlg( SfxRequest& rReq ) try { Any aVal = xCtrlAcc->getValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0); - DBG_ASSERT(aVal.hasValue(), "Value CBX_INSERT_AS_LINK not found") + DBG_ASSERT(aVal.hasValue(), "Value CBX_INSERT_AS_LINK not found"); bAsLink = aVal.hasValue() ? *(sal_Bool*) aVal.getValue() : sal_True; Any aTemplateValue = xCtrlAcc->getValue( ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE, @@ -429,7 +429,7 @@ BOOL SwView::InsertGraphicDlg( SfxRequest& rReq ) } catch(Exception& ) { - DBG_ERROR("control acces failed") + DBG_ERROR("control acces failed"); } } rReq.AppendItem( SfxBoolItem( FN_PARAM_1, bAsLink ) ); @@ -453,7 +453,7 @@ BOOL SwView::InsertGraphicDlg( SfxRequest& rReq ) else { Any aVal = xCtrlAcc->getValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0); - DBG_ASSERT(aVal.hasValue(), "Value CBX_INSERT_AS_LINK not found") + DBG_ASSERT(aVal.hasValue(), "Value CBX_INSERT_AS_LINK not found"); bAsLink = aVal.hasValue() ? *(sal_Bool*) aVal.getValue() : sal_True; Any aTemplateValue = xCtrlAcc->getValue( ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE, diff --git a/sw/source/ui/uiview/viewcoll.cxx b/sw/source/ui/uiview/viewcoll.cxx index e010a43b29d7..d1bd291e917c 100644 --- a/sw/source/ui/uiview/viewcoll.cxx +++ b/sw/source/ui/uiview/viewcoll.cxx @@ -58,7 +58,7 @@ void SwView::ExecColl(SfxRequest &rReq) { case FN_SET_PAGE: { - DBG_ASSERT(!this, "Not implemented") + DBG_ASSERT(!this, "Not implemented"); } break; case FN_SET_PAGE_STYLE: diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index 37cea7d8f96b..bc044d651959 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -725,7 +725,7 @@ void SwView::SetImageButtonColor(Color& rColor) ---------------------------------------------------------------------------*/ void SwView::ShowHScrollbar(sal_Bool bShow) { - DBG_ASSERT(pHScrollbar, "Scrollbar invalid") + DBG_ASSERT(pHScrollbar, "Scrollbar invalid"); pHScrollbar->ExtendedShow(bShow); } /* -----------------------------2002/06/26 13:57------------------------------ @@ -733,7 +733,7 @@ void SwView::ShowHScrollbar(sal_Bool bShow) ---------------------------------------------------------------------------*/ sal_Bool SwView::IsHScrollbarVisible()const { - DBG_ASSERT(pHScrollbar, "Scrollbar invalid") + DBG_ASSERT(pHScrollbar, "Scrollbar invalid"); return pHScrollbar->IsVisible( FALSE ) || pHScrollbar->IsAuto(); } /* -----------------------------2002/06/26 13:57------------------------------ @@ -741,7 +741,7 @@ sal_Bool SwView::IsHScrollbarVisible()const ---------------------------------------------------------------------------*/ void SwView::ShowVScrollbar(sal_Bool bShow) { - DBG_ASSERT(pVScrollbar, "Scrollbar invalid") + DBG_ASSERT(pVScrollbar, "Scrollbar invalid"); pVScrollbar->ExtendedShow(bShow); pPageUpBtn->Show(bShow); pPageDownBtn->Show(bShow); @@ -752,7 +752,7 @@ void SwView::ShowVScrollbar(sal_Bool bShow) ---------------------------------------------------------------------------*/ sal_Bool SwView::IsVScrollbarVisible()const { - DBG_ASSERT(pVScrollbar, "Scrollbar invalid") + DBG_ASSERT(pVScrollbar, "Scrollbar invalid"); return pVScrollbar->IsVisible( FALSE ); } diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index 17c4c44f5a49..593718fe3f09 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -143,7 +143,7 @@ void SwView::InvalidateRulerPos() GetViewFrame()->GetBindings().Invalidate(aInval); - DBG_ASSERT(pHRuler, "warum ist das Lineal nicht da?") + DBG_ASSERT(pHRuler, "warum ist das Lineal nicht da?"); pHRuler->ForceUpdate(); pVRuler->ForceUpdate(); } @@ -870,7 +870,7 @@ void SwView::CalcAndSetBorderPixel( SvBorder &rToFill, BOOL /*bInner*/ ) rToFill.Left() = nWidth; } - DBG_ASSERT(pHRuler, "warum ist das Lineal nicht da?") + DBG_ASSERT(pHRuler, "warum ist das Lineal nicht da?"); if ( pHRuler->IsVisible() ) rToFill.Top() = pHRuler->GetSizePixel().Height(); diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index b6633d2c1f9e..6223d1d0234a 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -1092,7 +1092,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) const SvxTabStopItem& rDefTabs = (const SvxTabStopItem&) rSh.GetDefault(RES_PARATR_TABSTOP); - DBG_ASSERT(pHRuler, "warum ist das Lineal nicht da?") + DBG_ASSERT(pHRuler, "warum ist das Lineal nicht da?"); long nDefTabDist = ::GetTabDist(rDefTabs); pHRuler->SetDefTabDist( nDefTabDist ); pVRuler->SetDefTabDist( nDefTabDist ); diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 09ced94e2bb3..54da1ede78a8 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -454,7 +454,7 @@ SwXMailMerge::~SwXMailMerge() //! because there is no automatism that will do that later. //! #120086# if ( eVetoed == CloseModelAndDocSh( xModel, xDocSh ) ) - DBG_WARNING( "owner ship transfered to vetoing object!" ) + DBG_WARNING( "owner ship transfered to vetoing object!" ); xModel = 0; xDocSh = 0; // destroy doc shell @@ -645,7 +645,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( { if (!aCurDataSourceName.getLength() || !aCurDataCommand.getLength() ) { - DBG_ERROR("PropertyValues missing or unset") + DBG_ERROR("PropertyValues missing or unset"); throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Either the ResultSet or DataSourceName and DataCommand must be set." ) ), static_cast < cppu::OWeakObject * > ( this ), 0 ); } diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index 13df17c830de..5338679e6a16 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -250,7 +250,7 @@ Reference< XPropertySet > SwXModule::getViewSettings(void) throw( uno::RuntimeE if(!pxViewSettings) { ((SwXModule*)this)->pxViewSettings = new Reference< XPropertySet > ; - DBG_ERROR("Web oder Text?") + DBG_ERROR("Web oder Text?"); *pxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( sal_False, 0 ) ); } return *pxViewSettings; @@ -264,7 +264,7 @@ Reference< XPropertySet > SwXModule::getPrintSettings(void) throw( uno::Runtime if(!pxPrintSettings) { ((SwXModule*)this)->pxPrintSettings = new Reference< XPropertySet > ; - DBG_ERROR("Web oder Text?") + DBG_ERROR("Web oder Text?"); *pxPrintSettings = static_cast < HelperBaseNoState * > ( new SwXPrintSettings ( PRINT_SETTINGS_MODULE ) ); } return *pxPrintSettings; diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 62c91dbb6774..8f1f015936f1 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -2282,7 +2282,7 @@ void SwXTextDocument::addPropertyChangeListener(const OUString& /*PropertyName*/ const Reference< XPropertyChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } /*-- 10.05.99 13:58:59--------------------------------------------------- @@ -2291,7 +2291,7 @@ void SwXTextDocument::removePropertyChangeListener(const OUString& /*PropertyNam const Reference< XPropertyChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } /*-- 10.05.99 13:59:00--------------------------------------------------- @@ -2300,7 +2300,7 @@ void SwXTextDocument::addVetoableChangeListener(const OUString& /*PropertyName*/ const Reference< XVetoableChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } /*-- 10.05.99 13:59:00--------------------------------------------------- @@ -2309,7 +2309,7 @@ void SwXTextDocument::removeVetoableChangeListener(const OUString& /*PropertyNam const Reference< XVetoableChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } /* -----------------25.10.99 10:42------------------- @@ -3414,7 +3414,7 @@ sal_Bool SwXLinkNameAccessWrapper::hasElements(void) throw( RuntimeException ) sal_Bool bRet = sal_False; if(pxDoc) { - DBG_ERROR("not implemented") + DBG_ERROR("not implemented"); } else { @@ -3730,7 +3730,7 @@ Reference<XInterface> SwXDocumentPropertyHelper::GetDrawTable(short nWhich) xRet = xDrawDefaults; break; #ifdef DBG_UTIL - default: DBG_ERROR("which table?") + default: DBG_ERROR("which table?"); #endif } } diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index aa4222ca73da..ec6ba322548e 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -1111,7 +1111,7 @@ void SAL_CALL SwXTextView::addPropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& /*rxListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } @@ -1120,7 +1120,7 @@ void SAL_CALL SwXTextView::removePropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& /*rxListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } @@ -1129,7 +1129,7 @@ void SAL_CALL SwXTextView::addVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& /*rxListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } @@ -1138,7 +1138,7 @@ void SAL_CALL SwXTextView::removeVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& /*rxListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } /* -----------------------------06.04.00 11:07-------------------------------- @@ -1221,7 +1221,7 @@ sal_Bool SwXTextViewCursor::IsTextSelection( sal_Bool bAllowTables ) const sal_Bool SwXTextViewCursor::isVisible(void) throw( uno::RuntimeException ) { ::vos::OGuard aGuard(Application::GetSolarMutex()); - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); return sal_True; } /*-- 17.12.98 09:36:25--------------------------------------------------- @@ -1230,7 +1230,7 @@ sal_Bool SwXTextViewCursor::isVisible(void) throw( uno::RuntimeException ) void SwXTextViewCursor::setVisible(sal_Bool /*bVisible*/) throw( uno::RuntimeException ) { ::vos::OGuard aGuard(Application::GetSolarMutex()); - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } /*-- 17.12.98 09:36:26--------------------------------------------------- diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 8446186bdaf1..226de19d3fc0 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -572,7 +572,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) { DBG_ASSERT(nMemberCount == pWrtShell->GetTblFrmFmtCount(sal_True), - "MemberCount differiert") + "MemberCount differiert"); Point aNullPt; nMemberCount = pWrtShell->GetTblFrmFmtCount(sal_True); for(sal_uInt16 i = 0; i < nMemberCount; i++) @@ -1175,7 +1175,7 @@ void SwContentTree::RequestingChilds( SvLBoxEntry* pParent ) { if(!pParent->HasChilds()) { - DBG_ASSERT(pParent->GetUserData(), "keine UserData?") + DBG_ASSERT(pParent->GetUserData(), "keine UserData?"); SwContentType* pCntType = (SwContentType*)pParent->GetUserData(); sal_uInt16 nCount = pCntType->GetMemberCount(); @@ -1259,7 +1259,7 @@ IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG ) { SvLBoxEntry* pEntry = GetCurEntry(); // ist es ein Inhaltstyp? - DBG_ASSERT(pEntry, "kein aktueller Eintrag!") + DBG_ASSERT(pEntry, "kein aktueller Eintrag!"); if(pEntry) { if(lcl_IsContentType(pEntry)) @@ -1272,7 +1272,7 @@ IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG ) } //Inhaltstyp anspringen: SwContent* pCnt = (SwContent*)pEntry->GetUserData(); - DBG_ASSERT( pCnt, "keine UserData") + DBG_ASSERT( pCnt, "keine UserData"); GotoContent(pCnt); if(pCnt->GetParent()->GetType() == CONTENT_TYPE_FRAME) pActiveShell->EnterStdMode(); @@ -1493,7 +1493,7 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, sal_Int8& rDragMode ) { SwWrtShell* pWrtShell = GetWrtShell(); - DBG_ASSERT(pWrtShell, "keine Shell!") + DBG_ASSERT(pWrtShell, "keine Shell!"); SvLBoxEntry* pEntry = GetCurEntry(); if(!pEntry || lcl_IsContentType(pEntry) || !pWrtShell) return sal_False; @@ -2262,7 +2262,7 @@ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget, } DBG_ASSERT( pEntry && - lcl_IsContent(pEntry),"Source == 0 oder Source hat keinen Content" ) + lcl_IsContent(pEntry),"Source == 0 oder Source hat keinen Content" ); GetParentWindow()->MoveOutline( nSourcePos, nTargetPos, sal_True); @@ -2304,7 +2304,7 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, DBG_ASSERT( pEntry && - lcl_IsContent(pEntry),"Source == 0 oder Source hat keinen Content" ) + lcl_IsContent(pEntry),"Source == 0 oder Source hat keinen Content" ); GetParentWindow()->MoveOutline( nSourcePos, nTargetPos, sal_False); //TreeListBox wird aus dem Dokument neu geladen diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 17d18c6e23a6..613bbac403b2 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -943,13 +943,13 @@ void SwGlobalTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ) break; case CTX_EDIT: { - DBG_ASSERT(pCont, "Edit ohne Entry ? " ) + DBG_ASSERT(pCont, "Edit ohne Entry ? " ); EditContent(pCont); } break; case CTX_EDIT_LINK: { - DBG_ASSERT(pCont, "Edit ohne Entry ? " ) + DBG_ASSERT(pCont, "Edit ohne Entry ? " ); SfxStringItem aName(FN_EDIT_REGION, pCont->GetSection()->GetName()); rDispatch.Execute(FN_EDIT_REGION, SFX_CALLMODE_ASYNCHRON, &aName, 0L); } @@ -1174,7 +1174,7 @@ void SwGlobalTree::HideTree() void SwGlobalTree::ExecCommand(USHORT nCmd) { SvLBoxEntry* pEntry = FirstSelected(); - DBG_ASSERT(pEntry, "gleich knallt's") + DBG_ASSERT(pEntry, "gleich knallt's"); if(FN_GLOBAL_EDIT == nCmd) { const SwGlblDocContent* pCont = (const SwGlblDocContent*) @@ -1440,7 +1440,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* _pContent, const Sequen //update the global document content after each inserted document rSh.GetGlobalDocContent(aTempContents); SwGlblDocContent* pAnchorContent = 0; - DBG_ASSERT(aTempContents.Count() > (nAnchorContent + nFile), "invalid anchor content -> last insertion failed") + DBG_ASSERT(aTempContents.Count() > (nAnchorContent + nFile), "invalid anchor content -> last insertion failed"); if ( aTempContents.Count() > (nAnchorContent + nFile) ) pAnchorContent = aTempContents.GetObject(nAnchorContent + (USHORT)nFile); else diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx index 169b03d17d76..7072cb254274 100644 --- a/sw/source/ui/utlui/gloslst.cxx +++ b/sw/source/ui/utlui/gloslst.cxx @@ -249,7 +249,7 @@ USHORT SwGlossaryList::GetGroupCount() String SwGlossaryList::GetGroupName(USHORT nPos, BOOL bNoPath, String* pTitle) { - DBG_ASSERT(aGroupArr.Count() > nPos, "Gruppe nicht vorhanden") + DBG_ASSERT(aGroupArr.Count() > nPos, "Gruppe nicht vorhanden"); String sRet(aEmptyStr); if(nPos < aGroupArr.Count()) { @@ -271,7 +271,7 @@ String SwGlossaryList::GetGroupName(USHORT nPos, BOOL bNoPath, String* pTitle) USHORT SwGlossaryList::GetBlockCount(USHORT nGroup) { - DBG_ASSERT(aGroupArr.Count() > nGroup, "Gruppe nicht vorhanden") + DBG_ASSERT(aGroupArr.Count() > nGroup, "Gruppe nicht vorhanden"); if(nGroup < aGroupArr.Count()) { AutoTextGroup* pGroup = aGroupArr.GetObject(nGroup); @@ -287,7 +287,7 @@ USHORT SwGlossaryList::GetBlockCount(USHORT nGroup) String SwGlossaryList::GetBlockName(USHORT nGroup, USHORT nBlock, String& rShortName) { - DBG_ASSERT(aGroupArr.Count() > nGroup, "Gruppe nicht vorhanden") + DBG_ASSERT(aGroupArr.Count() > nGroup, "Gruppe nicht vorhanden"); if(nGroup < aGroupArr.Count()) { AutoTextGroup* pGroup = aGroupArr.GetObject(nGroup); diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx index 5d45c22ba85d..68383d7d28c2 100644 --- a/sw/source/ui/utlui/navicfg.cxx +++ b/sw/source/ui/utlui/navicfg.cxx @@ -87,7 +87,7 @@ SwNavigationConfig::SwNavigationConfig() : Sequence<Any> aValues = GetProperties(aNames); // EnableNotification(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { for(int nProp = 0; nProp < aNames.getLength(); nProp++) diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 50e43cd2a0c1..9758f47728a9 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -1277,7 +1277,7 @@ IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem) { aContentTree.Clear(); pContentView = PTR_CAST(SwView, pFrame->GetViewShell()); - DBG_ASSERT(pContentView, "keine SwView") + DBG_ASSERT(pContentView, "keine SwView"); if(pContentView) pContentWrtShell = pContentView->GetWrtShellPtr(); else diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx index 166cf6397b8c..3ccb08f6272f 100644 --- a/sw/source/ui/utlui/numfmtlb.cxx +++ b/sw/source/ui/utlui/numfmtlb.cxx @@ -185,7 +185,7 @@ void NumFormatListBox::SetFormatType(const short nFormatType) else { SwView *pView = GetView(); - DBG_ASSERT(pView, "no view found") + DBG_ASSERT(pView, "no view found"); if(!pView) return; SwWrtShell &rSh = pView->GetWrtShell(); @@ -334,7 +334,7 @@ void NumFormatListBox::SetDefFormat(const ULONG nDefFmt) else { SwView *pView = GetView(); - DBG_ASSERT(pView, "no view found") + DBG_ASSERT(pView, "no view found"); if(!pView) return; SwWrtShell &rSh = pView->GetWrtShell(); diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 29331bbfaaa1..85d8aa2cf7a6 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -109,7 +109,7 @@ IMPL_LINK(SwRenameXNamedDlg, OkHdl, OKButton*, EMPTYARG) } catch(uno::RuntimeException&) { - DBG_ERROR("Name wurde nicht geaendert") + DBG_ERROR("Name wurde nicht geaendert"); } EndDialog(RET_OK); return 0; diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 97759c98f9a1..fb64e51c97f8 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -717,7 +717,7 @@ SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, USHORT *pPercent, } else { - DBG_ERROR("wo soll die Breite denn herkommen?") + DBG_ERROR("wo soll die Breite denn herkommen?"); } const SvxLRSpaceItem& rLRSpace = pFmt->GetLRSpace(); nWidth -= (rLRSpace.GetRight() + rLRSpace.GetLeft()); |