diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 14:17:19 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 14:17:19 +1000 |
commit | 83017d884d58a2fe0ccaf23271ab3e232118ec79 (patch) | |
tree | 030b4586ad750d10b837dd4cbd5bb20a5782586c /sc/source/ui/xmlsource | |
parent | 9d4d4d8434e5333ecb9464c76aea795dfbd6da2c (diff) |
tdf#43157: convert sc module away from OSL_ASSERT to assert
Change-Id: Iead653868ea7e0d1ed4ba83ef1a46e1ae5874d13
Diffstat (limited to 'sc/source/ui/xmlsource')
-rw-r--r-- | sc/source/ui/xmlsource/xmlsourcedlg.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 09bd3dbabc09..ea86cd3356fe 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -268,7 +268,7 @@ SvTreeListEntry* getReferenceEntry(SvTreeListBox& rTree, SvTreeListEntry* pCurEn while (pParent) { ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*pParent); - OSL_ASSERT(pUserData); + assert(pUserData); if (pUserData->meType == ScOrcusXMLTreeParam::ElementRepeat) { // This is a repeat element. @@ -304,7 +304,7 @@ void ScXMLSourceDlg::TreeItemSelected() mpCurRefEntry = getReferenceEntry(*mpLbTree, pEntry); ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*mpCurRefEntry); - OSL_ASSERT(pUserData); + assert(pUserData); const ScAddress& rPos = pUserData->maLinkedPos; if (rPos.IsValid()) @@ -341,7 +341,7 @@ void ScXMLSourceDlg::DefaultElementSelected(SvTreeListEntry& rEntry) for (SvTreeListEntry* pChild = mpLbTree->FirstChild(&rEntry); pChild; pChild = SvTreeListBox::NextSibling(pChild)) { ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*pChild); - OSL_ASSERT(pUserData); + assert(pUserData); if (pUserData->meType != ScOrcusXMLTreeParam::Attribute) { // This child is not an attribute. Bail out. @@ -410,10 +410,10 @@ void ScXMLSourceDlg::AttributeSelected(SvTreeListEntry& rEntry) // parent element linked (but not range-linked). SvTreeListEntry* pParent = mpLbTree->GetParent(&rEntry); - OSL_ASSERT(pParent); // attribute should have a parent element. + assert(pParent); // attribute should have a parent element. ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*pParent); - OSL_ASSERT(pUserData); + assert(pUserData); if (pUserData->maLinkedPos.IsValid() && pUserData->mbRangeParent) { // Parent element is range-linked. Bail out. @@ -486,7 +486,7 @@ bool ScXMLSourceDlg::IsChildrenDirty(SvTreeListEntry* pEntry) const for (SvTreeListEntry* pChild = mpLbTree->FirstChild(pEntry); pChild; pChild = SvTreeListBox::NextSibling(pChild)) { ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*pChild); - OSL_ASSERT(pUserData); + assert(pUserData); if (pUserData->maLinkedPos.IsValid()) // Already linked. return true; |