diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
commit | 97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch) | |
tree | 7974a8b9423c56982646366b0859dfb2a1a88d50 /sc/source/ui | |
parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/dbgui/filtdlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/pfiltdlg.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/dbdocfun.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fuins2.cxx | 16 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/areasdlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/cellsuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/output2.cxx | 16 | ||||
-rw-r--r-- | sc/source/ui/xmlsource/xmlsourcedlg.cxx | 12 |
10 files changed, 31 insertions, 31 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 8a464250ac1e..cfcf74a6b74f 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -605,7 +605,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint aEvent.EventId = AccessibleEventId::SELECTION_CHANGED; aEvent.NewValue <<= xChild; CommitChange(aEvent); - assert(m_mapSelectionSend.count(aNewCell) == 0 ); + OSL_ASSERT(m_mapSelectionSend.count(aNewCell) == 0 ); m_mapSelectionSend.insert(MAP_ADDR_XACC::value_type(aNewCell,xChild)); } @@ -743,7 +743,7 @@ void ScAccessibleSpreadsheet::RemoveSelection(ScMarkData &refScMarkData) } void ScAccessibleSpreadsheet::CommitFocusCell(const ScAddress &aNewCell) { - assert(!IsFormulaMode()); + OSL_ASSERT(!IsFormulaMode()); if(IsFormulaMode()) { return ; diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 75182ada423c..69dfa163c1b6 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -535,7 +535,7 @@ void ScFilterDlg::UpdateValueList( size_t nList ) else pList = m_EntryLists[nColumn].get(); - assert(pList); + OSL_ASSERT(pList); std::vector<ScTypedStrData>::const_iterator it = pList->maList.begin(), itEnd = pList->maList.end(); for (; it != itEnd; ++it) diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 5adbf08ed351..e0f0e9ec3b06 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -383,12 +383,12 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() */ if ( aStrVal.equals(aStrEmpty) ) { - assert(eOp == SC_EQUAL); + OSL_ASSERT(eOp == SC_EQUAL); rEntry.SetQueryByEmpty(); } else if ( aStrVal.equals(aStrNotEmpty) ) { - assert(eOp == SC_EQUAL); + OSL_ASSERT(eOp == SC_EQUAL); rEntry.SetQueryByNonEmpty(); } else diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index d91c4e3bf053..7fb1f3a19858 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -1230,7 +1230,7 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb return UpdatePivotTable(*pOldObj, bRecord, bApi); } - assert(pOldObj && pNewObj && pOldObj != pNewObj); + OSL_ASSERT(pOldObj && pNewObj && pOldObj != pNewObj); ScDocShellModificator aModificator( rDocShell ); WaitObject aWait( ScDocShell::GetActiveDialogParent() ); diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index f9242c063dfd..25bac55420c2 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -130,7 +130,7 @@ void lcl_ChartInit(const uno::Reference <embed::XEmbeddedObject>& xObj, ScViewDa uno::Reference< embed::XComponentSupplier > xCompSupp( xObj, uno::UNO_QUERY ); if( xCompSupp.is()) xReceiver.set( xCompSupp->getComponent(), uno::UNO_QUERY ); - assert( xReceiver.is()); + OSL_ASSERT( xReceiver.is()); if( xReceiver.is() ) { uno::Reference<chart2::data::XDataProvider> xDataProvider; @@ -702,8 +702,8 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV if( nDialogRet == ui::dialogs::ExecutableDialogResults::CANCEL ) { // leave OLE inplace mode and unmark - assert( pViewShell ); - assert( pView ); + OSL_ASSERT( pViewShell ); + OSL_ASSERT( pView ); pViewShell->DeactivateOle(); pView->UnmarkAll(); @@ -711,15 +711,15 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV pPV = pView->GetSdrPageView(); // remove the chart - assert( pPV ); + OSL_ASSERT( pPV ); SdrPage * pPage( pPV->GetPage()); - assert( pPage ); - assert( pObj ); + OSL_ASSERT( pPage ); + OSL_ASSERT( pObj ); if( pPage ) { // Remove the OLE2 object from the sdr page. SdrObject* pRemoved = pPage->RemoveObject(pObj->GetOrdNum()); - assert(pRemoved == pObj); + OSL_ASSERT(pRemoved == pObj); SdrObject::Free(pRemoved); // Don't forget to free it. } @@ -734,7 +734,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV } else { - assert( nDialogRet == ui::dialogs::ExecutableDialogResults::OK ); + OSL_ASSERT( nDialogRet == ui::dialogs::ExecutableDialogResults::OK ); //@todo maybe move chart to different table } } diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 943a9756ec98..e182575863f3 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -383,7 +383,7 @@ bool ScPrintAreasDlg::Impl_CheckRefStrings() ERRORBOX( STR_INVALID_TABREF ); - assert(pEd); + OSL_ASSERT(pEd); if (pEd) pEd->GrabFocus(); diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 6a133442d77b..034de933a539 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -3314,7 +3314,7 @@ void ScCellRangesBase::ForceChartListener_Impl() for (auto const& it : rListeners) { ScChartListener *const p = it.second.get(); - assert(p); + OSL_ASSERT(p); if (p->GetUnoSource() == static_cast<chart::XChartData*>(this) && p->IsDirty()) p->Update(); } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index c60af8f440d7..d44110def97e 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -2514,7 +2514,7 @@ css::uno::Reference<css::uno::XInterface> ScModelObj::create( ( pDocShell->GetCreateMode() == SfxObjectCreateMode::INTERNAL )); // this should never happen, i.e. the temporary document should never be // loaded, because this unlinks the data - assert( bCreate ); + OSL_ASSERT( bCreate ); if ( !xRet.is() && bCreate ) { diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index eb93937d645d..88f70a8e7249 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2747,8 +2747,8 @@ void ScOutputData::DrawEditParam::adjustForHyperlinkInPDF(Point aURLStart, Outpu void ScOutputData::DrawEditStandard(DrawEditParam& rParam) { - assert(rParam.meOrient == SVX_ORIENTATION_STANDARD); - assert(!rParam.mbAsianVertical); + OSL_ASSERT(rParam.meOrient == SVX_ORIENTATION_STANDARD); + OSL_ASSERT(!rParam.mbAsianVertical); Size aRefOne = mpRefDevice->PixelToLogic(Size(1,1)); @@ -3271,7 +3271,7 @@ bool ScOutputData::Clip( DrawEditParam& rParam, const Size& aCellSize, void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) { - assert(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); + OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); const bool bRepeat = (rParam.meHorJustAttr == SvxCellHorJustify::Repeat && !rParam.mbBreak); const bool bShrink = !rParam.mbBreak && !bRepeat && lcl_GetBoolValue(*rParam.mpPattern, ATTR_SHRINKTOFIT, rParam.mpCondSet); @@ -3532,7 +3532,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) { - assert(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); + OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); const bool bRepeat = (rParam.meHorJustAttr == SvxCellHorJustify::Repeat && !rParam.mbBreak); const bool bShrink = !rParam.mbBreak && !bRepeat && lcl_GetBoolValue(*rParam.mpPattern, ATTR_SHRINKTOFIT, rParam.mpCondSet); @@ -3787,7 +3787,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) void ScOutputData::DrawEditStacked(DrawEditParam& rParam) { - assert(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); + OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); Size aRefOne = mpRefDevice->PixelToLogic(Size(1,1)); bool bRepeat = (rParam.meHorJustAttr == SvxCellHorJustify::Repeat && !rParam.mbBreak); @@ -4131,9 +4131,9 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) { // When in asian vertical orientation, the orientation value is STANDARD, // and the asian vertical boolean is true. - assert(rParam.meOrient == SVX_ORIENTATION_STANDARD); - assert(rParam.mbAsianVertical); - assert(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); + OSL_ASSERT(rParam.meOrient == SVX_ORIENTATION_STANDARD); + OSL_ASSERT(rParam.mbAsianVertical); + OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat); Size aRefOne = mpRefDevice->PixelToLogic(Size(1,1)); diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index ea86cd3356fe..09bd3dbabc09 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); - assert(pUserData); + OSL_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); - assert(pUserData); + OSL_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); - assert(pUserData); + OSL_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); - assert(pParent); // attribute should have a parent element. + OSL_ASSERT(pParent); // attribute should have a parent element. ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*pParent); - assert(pUserData); + OSL_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); - assert(pUserData); + OSL_ASSERT(pUserData); if (pUserData->maLinkedPos.IsValid()) // Already linked. return true; |