diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-29 09:54:41 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-29 09:55:31 +0200 |
commit | 4b3f9fa6740be355e5cdadd8a41ecbd8d9ace298 (patch) | |
tree | e634170ac2da193d1f004ff34b2191c1596ca361 /sw | |
parent | 92ffd0acea035dc3916fc001b4dcd901a8a7a9d2 (diff) |
Nobody would go down the corridor anymore
Change-Id: Ic2cb2c4d9534d503828308183d55cea5b8d88112
Diffstat (limited to 'sw')
29 files changed, 47 insertions, 47 deletions
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx index ff59bddf23f8..14f16ff4946a 100644 --- a/sw/source/core/SwNumberTree/SwNodeNum.cxx +++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx @@ -190,7 +190,7 @@ bool SwNodeNum::HasCountedChildren() const { SwNodeNum* pChild( dynamic_cast<SwNodeNum*>(*aIt) ); OSL_ENSURE( pChild, - "<SwNodeNum::HasCountedChildren()> - unexpected type of child -> please inform OD" ); + "<SwNodeNum::HasCountedChildren()> - unexpected type of child" ); if ( pChild && ( pChild->IsCountedForNumbering() || pChild->HasCountedChildren() ) ) @@ -263,7 +263,7 @@ bool SwNodeNum::IsCountPhantoms() const mpNumRule->IsCountPhantoms(); else { - OSL_FAIL( "<SwNodeNum::IsCountPhantoms(): missing numbering rule - please inform OD" ); + OSL_FAIL( "<SwNodeNum::IsCountPhantoms(): missing numbering rule" ); } return bResult; diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx index 8176510a4934..80151ff79fb2 100644 --- a/sw/source/core/SwNumberTree/SwNumberTree.cxx +++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx @@ -467,7 +467,7 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild, if ( nDepth < 0 ) { - OSL_FAIL( "<SwNumberTreeNode::AddChild(..)> - parameter <nDepth> out of valid range. Serious defect -> please inform OD." ); + OSL_FAIL( "<SwNumberTreeNode::AddChild(..)> - parameter <nDepth> out of valid range. Serious defect." ); return; } @@ -829,7 +829,7 @@ void SwNumberTreeNode::SetLevelInListTree( const int nLevel ) { if ( nLevel < 0 ) { - OSL_FAIL( "<SwNumberTreeNode::SetLevelInListTree(..)> - parameter <nLevel> out of valid range. Serious defect -> please inform OD." ); + OSL_FAIL( "<SwNumberTreeNode::SetLevelInListTree(..)> - parameter <nLevel> out of valid range. Serious defect." ); return; } @@ -841,7 +841,7 @@ void SwNumberTreeNode::SetLevelInListTree( const int nLevel ) { SwNumberTreeNode* pRootTreeNode = GetRoot(); OSL_ENSURE( pRootTreeNode, - "<SwNumberTreeNode::SetLevelInListTree(..)> - no root tree node found. Serious defect -> please inform OD." ); + "<SwNumberTreeNode::SetLevelInListTree(..)> - no root tree node found. Serious defect." ); RemoveMe(); pRootTreeNode->AddChild( this, nLevel ); diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index b96dcdf7574e..51a830a8f1c7 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1773,7 +1773,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( } // get default character attributes and merge these into <pSet> OSL_ENSURE( pTextNode->GetTextColl(), - "<SwAccessibleParagraph::_getDefaultAttributesImpl(..)> - missing paragraph style. Serious defect, please inform OD!" ); + "<SwAccessibleParagraph::_getDefaultAttributesImpl(..)> - missing paragraph style. Serious defect!" ); if ( pTextNode->GetTextColl() ) { SfxItemSet aCharSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()), diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 24ef818305d6..db11a23e7234 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -1086,7 +1086,7 @@ namespace //local functions originally from docfmt.cxx if ( !pNumRule ) { - OSL_FAIL( "<InsAttr(..)> - PaM in front of label, but text node has no numbering rule set. This is a serious defect, please inform OD." ); + OSL_FAIL( "<InsAttr(..)> - PaM in front of label, but text node has no numbering rule set. This is a serious defect." ); DELETECHARSETS return false; } diff --git a/sw/source/core/doc/DocumentListsManager.cxx b/sw/source/core/doc/DocumentListsManager.cxx index c4ba23fb1290..7bbede1c3a06 100644 --- a/sw/source/core/doc/DocumentListsManager.cxx +++ b/sw/source/core/doc/DocumentListsManager.cxx @@ -42,14 +42,14 @@ SwList* DocumentListsManager::createList( const OUString& rListId, if ( getListByName( sListId ) ) { - OSL_FAIL( "<DocumentListsManager::createList(..)> - provided list id already used. Serious defect -> please inform OD." ); + OSL_FAIL( "<DocumentListsManager::createList(..)> - provided list id already used. Serious defect." ); return 0; } SwNumRule* pDefaultNumRuleForNewList = m_rDoc.FindNumRulePtr( sDefaultListStyleName ); if ( !pDefaultNumRuleForNewList ) { - OSL_FAIL( "<DocumentListsManager::createList(..)> - for provided default list style name no list style is found. Serious defect -> please inform OD." ); + OSL_FAIL( "<DocumentListsManager::createList(..)> - for provided default list style name no list style is found. Serious defect." ); return 0; } @@ -87,20 +87,20 @@ SwList* DocumentListsManager::createListForListStyle( const OUString& sListStyle { if ( sListStyleName.isEmpty() ) { - OSL_FAIL( "<DocumentListsManager::createListForListStyle(..)> - no list style name provided. Serious defect -> please inform OD." ); + OSL_FAIL( "<DocumentListsManager::createListForListStyle(..)> - no list style name provided. Serious defect." ); return 0; } if ( getListForListStyle( sListStyleName ) ) { - OSL_FAIL( "<DocumentListsManager::createListForListStyle(..)> - a list for the provided list style name already exists. Serious defect -> please inform OD." ); + OSL_FAIL( "<DocumentListsManager::createListForListStyle(..)> - a list for the provided list style name already exists. Serious defect." ); return 0; } SwNumRule* pNumRule = m_rDoc.FindNumRulePtr( sListStyleName ); if ( !pNumRule ) { - OSL_FAIL( "<DocumentListsManager::createListForListStyle(..)> - for provided list style name no list style is found. Serious defect -> please inform OD." ); + OSL_FAIL( "<DocumentListsManager::createListForListStyle(..)> - for provided list style name no list style is found. Serious defect." ); return 0; } diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 863222779a01..a396a542ad92 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -92,7 +92,7 @@ static void lcl_AdjustPositioningAttr( SwDrawFrameFormat* _pFrameFormat, OSL_ENSURE( !pAnchorFrm || !pAnchorFrm->IsTextFrm() || !static_cast<const SwTextFrm*>(pAnchorFrm)->IsFollow(), - "<lcl_AdjustPositioningAttr(..)> - anchor frame is a follow. Please inform OD." ); + "<lcl_AdjustPositioningAttr(..)> - anchor frame is a follow." ); bool bVert = false; bool bR2L = false; // #i45952# - use anchor position of anchor frame, if it exist. diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index dbf47c022d65..eaab5d83da47 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -181,7 +181,7 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs ) if( pPara->pDelSet && pPara->pDelSet->Count() ) { OSL_ENSURE( !bKeepAttributes, - "<lcl_RstAttr(..)> - certain attributes are kept, but not needed. -> please inform OD" ); + "<lcl_RstAttr(..)> - certain attributes are kept, but not needed." ); SfxItemIter aIter( *pPara->pDelSet ); pItem = aIter.FirstItem(); while(pItem) diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index ea9c695d3644..e3ca08be04c3 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -673,7 +673,7 @@ static SwTextNode* lcl_FindOutlineNum( const SwOutlineNodes& rOutlNds, OUString& // but no numbering tree node. Thus, consider this situation in // the assertion condition. OSL_ENSURE( !pNd->GetNumRule(), - "<lcl_FindOutlineNum(..)> - text node with outline level and numbering rule, but without numbering tree node. This is a serious defect -> inform OD" ); + "<lcl_FindOutlineNum(..)> - text node with outline level and numbering rule, but without numbering tree node. This is a serious defect" ); } } } @@ -874,7 +874,7 @@ OUString SwDoc::SetNumRule( const SwPaM& rPam, // create new list and apply its list id const SwList* pNewList = getIDocumentListsAccess().createList( OUString(), pNewOrChangedNumRule->GetName() ); OSL_ENSURE( pNewList, - "<SwDoc::SetNumRule(..)> - could not create new list. Serious defect -> please inform OD." ); + "<SwDoc::SetNumRule(..)> - could not create new list. Serious defect." ); sListId = pNewList->GetListId(); } } @@ -1009,7 +1009,7 @@ bool SwDoc::DelNumRule( const OUString& rName, bool bBroadcast ) if ( (*mpNumRuleTable)[ nPos ] == GetOutlineNumRule() ) { - OSL_FAIL( "<SwDoc::DelNumRule(..)> - No deletion of outline list style. This is serious defect - please inform OD" ); + OSL_FAIL( "<SwDoc::DelNumRule(..)> - No deletion of outline list style. This is serious defect" ); return false; } diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 3fd8614989c1..ddd101aab9b4 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -592,7 +592,7 @@ bool SwNumRule::operator==( const SwNumRule& rRule ) const void SwNumRule::Set( sal_uInt16 i, const SwNumFormat& rNumFormat ) { - OSL_ENSURE( i < MAXLEVEL, "Serious defect, please inform OD" ); + OSL_ENSURE( i < MAXLEVEL, "Serious defect" ); if( i < MAXLEVEL ) { if( !maFormats[ i ] || !(rNumFormat == Get( i )) ) @@ -606,7 +606,7 @@ void SwNumRule::Set( sal_uInt16 i, const SwNumFormat& rNumFormat ) void SwNumRule::Set( sal_uInt16 i, const SwNumFormat* pNumFormat ) { - OSL_ENSURE( i < MAXLEVEL, "Serious defect, please inform OD" ); + OSL_ENSURE( i < MAXLEVEL, "Serious defect" ); if( i >= MAXLEVEL ) return; SwNumFormat* pOld = maFormats[ i ]; @@ -877,7 +877,7 @@ void SwNumRule::SetInvalidRule(bool bFlag) const SwTextNode* pTextNode = *aIter; // #i111681# - applying patch from cmc SwList* pList = pTextNode->GetDoc()->getIDocumentListsAccess().getListByName( pTextNode->GetListId() ); - OSL_ENSURE( pList, "<SwNumRule::SetInvalidRule(..)> - list at which the text node is registered at does not exist. This is a serious issue --> please inform OD."); + OSL_ENSURE( pList, "<SwNumRule::SetInvalidRule(..)> - list at which the text node is registered at does not exist. This is a serious issue."); if ( pList ) { aLists.insert( pList ); diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx index b462f5c81d8a..7a5afbdf3619 100644 --- a/sw/source/core/docnode/ndnum.cxx +++ b/sw/source/core/docnode/ndnum.cxx @@ -56,7 +56,7 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd) } else { - OSL_FAIL( "<SwNodes::UpdateOutlineNode(..)> - given text node isn't in the correct nodes array. This is a serious defect -> inform OD" ); + OSL_FAIL( "<SwNodes::UpdateOutlineNode(..)> - given text node isn't in the correct nodes array. This is a serious defect" ); } } } diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 95f12dd09c80..09058916e8d9 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1145,7 +1145,7 @@ class NestedUserCallHdl if ( bTmpAssert ) { - OSL_FAIL( "<SwDrawContact::_Changed(..)> - unknown nested <UserCall> event. This is serious, please inform OD." ); + OSL_FAIL( "<SwDrawContact::_Changed(..)> - unknown nested <UserCall> event. This is serious." ); } } } diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index c9be0fb9b98a..f7d0438167a5 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -569,7 +569,7 @@ static bool lcl_IsNoEndTextAttrAtPos( const SwTextNode& rTNd, sal_Int32 nPos, if ( rTNd.IsInList() ) { OSL_ENSURE( rTNd.GetNumRule(), - "<lcl_IsNoEndTextAttrAtPos(..)> - no list style found at text node. Serious defect -> please inform OD." ); + "<lcl_IsNoEndTextAttrAtPos(..)> - no list style found at text node. Serious defect." ); const SwNumRule* pNumRule = rTNd.GetNumRule(); if(pNumRule) { diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx index a6e898424cc8..cfbf5d45dfd2 100644 --- a/sw/source/core/fields/chpfld.cxx +++ b/sw/source/core/fields/chpfld.cxx @@ -138,7 +138,7 @@ void SwChapterField::ChangeExpansion(const SwTextNode &rTextNd, bool bSrchNum) sal_uInt8 nPrevLvl = nLevel; OSL_ENSURE( pONd->GetAttrOutlineLevel() >= 0 && pONd->GetAttrOutlineLevel() <= MAXLEVEL, - "<SwChapterField::ChangeExpansion(..)> - outline node with inconsistent outline level. Serious defect -> please inform OD." ); + "<SwChapterField::ChangeExpansion(..)> - outline node with inconsistent outline level. Serious defect." ); nLevel = static_cast<sal_uInt8>(pONd->GetAttrOutlineLevel()); if( nPrevLvl < nLevel ) diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index e7da51037144..3978d5ab58c5 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -625,7 +625,7 @@ void SwSetExpFieldType::SetChapter( SwSetExpField& rField, const SwNode& rNd ) } else { - OSL_FAIL( "<SwSetExpFieldType::SetChapter(..)> - text node with numbering rule, but without number. This is a serious defect -> inform OD" ); + OSL_FAIL( "<SwSetExpFieldType::SetChapter(..)> - text node with numbering rule, but without number. This is a serious defect" ); } } } diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 099d699fcd6a..b034da4ca9c1 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -505,7 +505,7 @@ OUString SwGetRefField::MakeRefNumStr( const SwTextNode& rTextNodeOfField, rTextNodeOfReferencedItem.IsCountedInList() ) { OSL_ENSURE( rTextNodeOfReferencedItem.GetNum(), - "<SwGetRefField::MakeRefNumStr(..)> - referenced paragraph has number, but no <SwNodeNum> instance --> please inform OD!" ); + "<SwGetRefField::MakeRefNumStr(..)> - referenced paragraph has number, but no <SwNodeNum> instance!" ); // Determine, up to which level the superior list labels have to be // included - default is to include all superior list labels. @@ -561,7 +561,7 @@ OUString SwGetRefField::MakeRefNumStr( const SwTextNode& rTextNodeOfField, ( nRefNumFormat == REF_NUMBER || nRefNumFormat == REF_NUMBER_FULL_CONTEXT ) ) ); OSL_ENSURE( rTextNodeOfReferencedItem.GetNumRule(), - "<SwGetRefField::MakeRefNumStr(..)> - referenced numbered paragraph has no numbering rule set --> please inform OD!" ); + "<SwGetRefField::MakeRefNumStr(..)> - referenced numbered paragraph has no numbering rule set!" ); return rTextNodeOfReferencedItem.GetNumRule()->MakeRefNumString( *(rTextNodeOfReferencedItem.GetNum()), bInclSuperiorNumLabels, diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 3cca758123e2..c321c74cb690 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -2420,7 +2420,7 @@ bool SwFEShell::GetObjAttr( SfxItemSet &rSet ) const SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall(pObj)); // --> make code robust - OSL_ENSURE( pContact, "<SwFEShell::GetObjAttr(..)> - missing <pContact> - please inform OD." ); + OSL_ENSURE( pContact, "<SwFEShell::GetObjAttr(..)> - missing <pContact>." ); if ( pContact ) { if ( i ) diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index 35be44c6c65c..96a42a98cde3 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -1247,20 +1247,20 @@ bool SwFEShell::IsFrmVertical(const bool bEnvironment, bool& bRTL, bool& bVertL2 SdrObject* pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj(); if ( !pObj ) { - OSL_FAIL( "<SwFEShell::IsFrmVertical(..)> - missing SdrObject instance in marked object list -> This is a serious situation, please inform OD" ); + OSL_FAIL( "<SwFEShell::IsFrmVertical(..)> - missing SdrObject instance in marked object list -> This is a serious situation" ); return bVert; } // #i26791# SwContact* pContact = static_cast<SwContact*>(GetUserCall( pObj )); if ( !pContact ) { - OSL_FAIL( "<SwFEShell::IsFrmVertical(..)> - missing SwContact instance at marked object -> This is a serious situation, please inform OD" ); + OSL_FAIL( "<SwFEShell::IsFrmVertical(..)> - missing SwContact instance at marked object -> This is a serious situation" ); return bVert; } const SwFrm* pRef = pContact->GetAnchoredObj( pObj )->GetAnchorFrm(); if ( !pRef ) { - OSL_FAIL( "<SwFEShell::IsFrmVertical(..)> - missing anchor frame at marked object -> This is a serious situation, please inform OD" ); + OSL_FAIL( "<SwFEShell::IsFrmVertical(..)> - missing anchor frame at marked object -> This is a serious situation" ); return bVert; } diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index 5755f6a8cc50..00ae70fc40f8 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -327,7 +327,7 @@ void SwAnchoredDrawObject::MakeObjPos() break; default: { - OSL_FAIL( "<SwAnchoredDrawObject::MakeObjPos()> - unknown anchor type - please inform OD." ); + OSL_FAIL( "<SwAnchoredDrawObject::MakeObjPos()> - unknown anchor type." ); } } diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index c8c348824146..eff7767df79e 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -578,7 +578,7 @@ const SwRect& SwAnchoredObject::GetObjRectWithSpaces() const if ( mbObjRectWithSpacesValid && maLastObjRect != GetObjRect() ) { - OSL_FAIL( "<SwAnchoredObject::GetObjRectWithSpaces> - cache for object rectangle inclusive spaces marked as valid, but it couldn't be. Missing invalidation of cache. Please inform OD." ); + OSL_FAIL( "<SwAnchoredObject::GetObjRectWithSpaces> - cache for object rectangle inclusive spaces marked as valid, but it couldn't be. Missing invalidation of cache." ); InvalidateObjRectWithSpaces(); } if ( !mbObjRectWithSpacesValid ) diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index c412a3a93d20..5e22d59a90f3 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -2397,7 +2397,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) } OSL_ENSURE( pNewUpper != m_rThis.GetUpper(), - "<SwFlowFrm::MoveBwd(..)> - moving backward to the current upper frame!? -> Please inform OD." ); + "<SwFlowFrm::MoveBwd(..)> - moving backward to the current upper frame!?" ); if ( pNewUpper ) { PROTOCOL_ENTER( &m_rThis, PROT_MOVE_BWD, 0, 0 ); diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index 80dd520f798f..d34f9d23dc47 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -596,7 +596,7 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew ) // #i87493# OSL_ENSURE( pNew->GetPageFrm() == 0 || pNew->GetPageFrm() == this, - "<SwPageFrm::AppendFlyToPage(..)> - anchored fly frame seems to be registered at another page frame. Serious defect -> please inform OD." ); + "<SwPageFrm::AppendFlyToPage(..)> - anchored fly frame seems to be registered at another page frame. Serious defect." ); // #i28701# - use new method <SetPageFrm(..)> pNew->SetPageFrm( this ); pNew->InvalidatePage( this ); @@ -834,7 +834,7 @@ void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject& _rNewObj ) } // #i87493# OSL_ENSURE( _rNewObj.GetPageFrm() == 0 || _rNewObj.GetPageFrm() == this, - "<SwPageFrm::AppendDrawObjToPage(..)> - anchored draw object seems to be registered at another page frame. Serious defect -> please inform OD." ); + "<SwPageFrm::AppendDrawObjToPage(..)> - anchored draw object seems to be registered at another page frame. Serious defect." ); _rNewObj.SetPageFrm( this ); // invalidate page in order to force a reformat of object layout of the page. diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 9a56a1ad5859..e9abe6c4f89f 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -365,7 +365,7 @@ SwFrmNotify::~SwFrmNotify() } else { - OSL_FAIL( "<SwContentNotify::~SwContentNotify()> - unknown anchored object type. Please inform OD." ); + OSL_FAIL( "<SwContentNotify::~SwContentNotify()> - unknown anchored object type." ); } } } @@ -940,7 +940,7 @@ SwContentNotify::~SwContentNotify() } if ( rAnch.GetContentAnchor()->nNode == *pIdx ) { - OSL_FAIL( "<SwContentNotify::~SwContentNotify()> - to page anchored object with content position. Please inform OD." ); + OSL_FAIL( "<SwContentNotify::~SwContentNotify()> - to page anchored object with content position." ); if ( !pPage ) { pPage = pCnt->FindPageFrm(); diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 9c20c2ffbb83..28ad96cbbf78 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -5090,7 +5090,7 @@ sal_uInt16 SwTabFrm::GetBottomLineSize() const OSL_ENSURE( IsCollapsingBorders(), "BottomLineSize only required for collapsing borders" ); - OSL_ENSURE( Lower(), "Warning! Trying to prevent a crash, please inform FME" ); + OSL_ENSURE( Lower(), "Warning! Trying to prevent a crash" ); const SwFrm* pTmp = GetLastLower(); diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 272c3152350e..381df40becae 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -2492,7 +2492,7 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr) SwRect aPrvRect; OSL_ENSURE( pContent, - "<SwRootFrm::CalcFrmRects(..)> - no content frame. This is a serious defect -> please inform OD" ); + "<SwRootFrm::CalcFrmRects(..)> - no content frame. This is a serious defect" ); while ( pContent && pContent != pEndFrm ) { if ( pContent->IsInFly() ) diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index ab31474c1cc5..784bd11a8837 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -681,7 +681,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() else { #if OSL_DEBUG_LEVEL > 1 - OSL_FAIL( "<SwToContentAnchoredObjectPosition::CalcPosition()> - code under investigation by OD, please inform OD about this assertion!" ); + OSL_FAIL( "<SwToContentAnchoredObjectPosition::CalcPosition()> - !bInSct" ); #endif nRelDiff = nRelPosY; nRelPosY = 0; diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 08da02c165cd..659e829edc8e 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -3906,7 +3906,7 @@ void SwTextNode::AddToList() { if ( IsInList() ) { - OSL_FAIL( "<SwTextNode::AddToList()> - the text node is already added to a list. Serious defect -> please inform OD" ); + OSL_FAIL( "<SwTextNode::AddToList()> - the text node is already added to a list. Serious defect" ); return; } @@ -3924,7 +3924,7 @@ void SwTextNode::AddToList() } } OSL_ENSURE( pList != 0, - "<SwTextNode::AddToList()> - no list for given list id. Serious defect -> please inform OD" ); + "<SwTextNode::AddToList()> - no list for given list id. Serious defect" ); if ( pList ) { pList->InsertListItem( *CreateNum(), GetAttrListLevel() ); @@ -4251,7 +4251,7 @@ namespace { const SfxStringItem& pListIdItem = dynamic_cast<const SfxStringItem&>(pItem); OSL_ENSURE( pListIdItem.GetValue().getLength() > 0, - "<HandleSetAttrAtTextNode(..)> - empty list id attribute not excepted. Serious defect -> please inform OD." ); + "<HandleSetAttrAtTextNode(..)> - empty list id attribute not excepted. Serious defect." ); const OUString sListIdOfTextNode = rTextNode.GetListId(); if ( pListIdItem.GetValue() != sListIdOfTextNode ) { diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 9b63caa42e1f..7e4295e57889 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -2198,7 +2198,7 @@ Any SwXNumberingRules::getPropertyValue( const OUString& rPropertyName ) else if(rPropertyName == UNO_NAME_DEFAULT_LIST_ID) { OSL_ENSURE( !pRule->GetDefaultListId().isEmpty(), - "<SwXNumberingRules::getPropertyValue(..)> - no default list id found. Serious defect -> please inform OD." ); + "<SwXNumberingRules::getPropertyValue(..)> - no default list id found. Serious defect." ); aRet <<= pRule->GetDefaultListId(); } else diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 37c1948cae3a..92d266117c2f 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -1325,7 +1325,7 @@ void SwDocStyleSheet::MergeIndentAttrsOfListStyle( SfxItemSet& rSet ) if ( pColl->AreListLevelIndentsApplicable() ) { OSL_ENSURE( pColl->GetItemState( RES_PARATR_NUMRULE ) == SfxItemState::SET, - "<SwDocStyleSheet::MergeIndentAttrsOfListStyle(..)> - list level indents are applicable at paragraph style, but no list style found. Serious defect -> please inform OD." ); + "<SwDocStyleSheet::MergeIndentAttrsOfListStyle(..)> - list level indents are applicable at paragraph style, but no list style found. Serious defect." ); const OUString sNumRule = pColl->GetNumRule().GetValue(); if (!sNumRule.isEmpty()) { diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx index 8558fbe8e710..626488e37e00 100644 --- a/sw/source/uibase/shells/txtnum.cxx +++ b/sw/source/uibase/shells/txtnum.cxx @@ -137,7 +137,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) aSet.Put(SvxNumBulletItem(aRule)); OSL_ENSURE( GetShell().GetNumLevel() < MAXLEVEL, - "<SwTextShell::ExecEnterNum()> - numbered node without valid list level. Serious defect -> please inform OD." ); + "<SwTextShell::ExecEnterNum()> - numbered node without valid list level. Serious defect." ); sal_uInt16 nLevel = GetShell().GetNumLevel(); if( nLevel < MAXLEVEL ) { |