diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-04-19 12:58:19 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-04-19 13:22:38 +0200 |
| commit | 59a51999c60127bc3ad6a36679f9ea7234bbfc8e (patch) | |
| tree | f863873516a7be13d5f58bd44dfcf20a0c1dc773 /svx | |
| parent | f765f52c39e79b633bbc8f1a16567572b7bf7a1a (diff) | |
svx: fix debug warnings from STL conversion
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 4 | ||||
| -rw-r--r-- | svx/source/form/navigatortree.cxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index f76654ad60a3..648c8572bf9a 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2304,7 +2304,9 @@ IMPL_LINK(FmXFormShell, OnFoundData, FmFoundRecordInformation*, pfriWhere) LoopGrids(GA_FORCE_SYNC); // und zum Feld (dazu habe ich vor dem Start des Suchens die XVclComponent-Interfaces eingesammelt) - DBG_ASSERT(pfriWhere->nFieldPos < m_arrSearchedControls.Count(), "FmXFormShell::OnFoundData : ungueltige Daten uebergeben !"); + SAL_WARN_IF(static_cast<size_t>(pfriWhere->nFieldPos) >= + m_arrSearchedControls.size(), + "svx.form", "FmXFormShell::OnFoundData : invalid index!"); SdrObject* pObject = m_arrSearchedControls.at(pfriWhere->nFieldPos); m_pShell->GetFormView()->UnMarkAll(m_pShell->GetFormView()->GetSdrPageView()); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index c6d716f227ec..bae1e49357ad 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1639,7 +1639,9 @@ namespace svxform return; CollectSelectionData(SDI_ALL); - DBG_ASSERT( m_nFormsSelected + m_nControlsSelected + (m_bRootSelected ? 1 : 0) == m_arrCurrentSelection.size(), + SAL_WARN_IF(static_cast<size_t>(m_nFormsSelected + m_nControlsSelected + + (m_bRootSelected ? 1 : 0)) != m_arrCurrentSelection.size(), + "svx.form", "NavigatorTree::ShowSelectionProperties : selection meta data invalid !"); |