summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx4
-rw-r--r--sc/source/ui/dbgui/filtdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/pfiltdlg.cxx4
-rw-r--r--sc/source/ui/docshell/dbdocfun.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx16
-rw-r--r--sc/source/ui/pagedlg/areasdlg.cxx2
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx2
-rw-r--r--sc/source/ui/unoobj/docuno.cxx2
-rw-r--r--sc/source/ui/view/output2.cxx16
-rw-r--r--sc/source/ui/xmlsource/xmlsourcedlg.cxx12
10 files changed, 31 insertions, 31 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index cfcf74a6b74f..8a464250ac1e 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);
- OSL_ASSERT(m_mapSelectionSend.count(aNewCell) == 0 );
+ 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)
{
- OSL_ASSERT(!IsFormulaMode());
+ assert(!IsFormulaMode());
if(IsFormulaMode())
{
return ;
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 69dfa163c1b6..75182ada423c 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();
- OSL_ASSERT(pList);
+ 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 e0f0e9ec3b06..5adbf08ed351 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) )
{
- OSL_ASSERT(eOp == SC_EQUAL);
+ assert(eOp == SC_EQUAL);
rEntry.SetQueryByEmpty();
}
else if ( aStrVal.equals(aStrNotEmpty) )
{
- OSL_ASSERT(eOp == SC_EQUAL);
+ assert(eOp == SC_EQUAL);
rEntry.SetQueryByNonEmpty();
}
else
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 7fb1f3a19858..d91c4e3bf053 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);
}
- OSL_ASSERT(pOldObj && pNewObj && pOldObj != pNewObj);
+ 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 25bac55420c2..f9242c063dfd 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 );
- OSL_ASSERT( xReceiver.is());
+ 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
- OSL_ASSERT( pViewShell );
- OSL_ASSERT( pView );
+ assert( pViewShell );
+ assert( pView );
pViewShell->DeactivateOle();
pView->UnmarkAll();
@@ -711,15 +711,15 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV
pPV = pView->GetSdrPageView();
// remove the chart
- OSL_ASSERT( pPV );
+ assert( pPV );
SdrPage * pPage( pPV->GetPage());
- OSL_ASSERT( pPage );
- OSL_ASSERT( pObj );
+ assert( pPage );
+ assert( pObj );
if( pPage )
{
// Remove the OLE2 object from the sdr page.
SdrObject* pRemoved = pPage->RemoveObject(pObj->GetOrdNum());
- OSL_ASSERT(pRemoved == pObj);
+ 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
{
- OSL_ASSERT( nDialogRet == ui::dialogs::ExecutableDialogResults::OK );
+ 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 e182575863f3..943a9756ec98 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 );
- OSL_ASSERT(pEd);
+ assert(pEd);
if (pEd)
pEd->GrabFocus();
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 034de933a539..6a133442d77b 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();
- OSL_ASSERT(p);
+ 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 d44110def97e..c60af8f440d7 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
- OSL_ASSERT( bCreate );
+ assert( bCreate );
if ( !xRet.is() && bCreate )
{
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 88f70a8e7249..eb93937d645d 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)
{
- OSL_ASSERT(rParam.meOrient == SVX_ORIENTATION_STANDARD);
- OSL_ASSERT(!rParam.mbAsianVertical);
+ assert(rParam.meOrient == SVX_ORIENTATION_STANDARD);
+ 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)
{
- OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat);
+ 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)
{
- OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat);
+ 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)
{
- OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat);
+ 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.
- OSL_ASSERT(rParam.meOrient == SVX_ORIENTATION_STANDARD);
- OSL_ASSERT(rParam.mbAsianVertical);
- OSL_ASSERT(rParam.meHorJustAttr != SvxCellHorJustify::Repeat);
+ assert(rParam.meOrient == SVX_ORIENTATION_STANDARD);
+ assert(rParam.mbAsianVertical);
+ 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 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;
generated by cgit (git 2.34.1) at 2024-07-15 13:26:43 +0000