diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-10-23 15:48:00 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-10-23 15:48:00 +0200 |
| commit | a769f7d9d79865c6d1fea39c7c3aea98b16a4a5c (patch) | |
| tree | f5682d86805bbaeb712c4a235f1be867c1b264d4 | |
| parent | 89bbc4f099c5260ab0c880ed41dc698655d81e97 (diff) | |
svarray: #i112395#: fix warnings, enable exceptions, etc.
| -rw-r--r-- | editeng/source/rtf/makefile.mk | 2 | ||||
| -rw-r--r-- | svx/source/form/fmsrcimp.cxx | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/editeng/source/rtf/makefile.mk b/editeng/source/rtf/makefile.mk index ef1c5f44b1..38b2ef7b45 100644 --- a/editeng/source/rtf/makefile.mk +++ b/editeng/source/rtf/makefile.mk @@ -38,11 +38,11 @@ TARGET=rtf # --- Files -------------------------------------------------------- EXCEPTIONSFILES= \ + $(SLO)$/rtfitem.obj \ $(SLO)$/svxrtf.obj SLOFILES= \ $(EXCEPTIONSFILES) \ - $(SLO)$/rtfitem.obj \ $(SLO)$/rtfgrf.obj # ========================================================================== diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 38fa7a9c72..65fae03f60 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -1268,7 +1268,10 @@ void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce) return; // (da ich keinen Wechsel des Iterators von aussen zulasse, heisst selber ::com::sun::star::sdbcx::Index auch immer selbe Spalte, also habe ich nix zu tun) - DBG_ASSERT((nFieldIndex >= -1) && (nFieldIndex<m_arrFieldMapping.size()), "FmSearchEngine::RebuildUsedFields : nFieldIndex is invalid!"); + DBG_ASSERT((nFieldIndex == -1) || + ((nFieldIndex >= 0) && + (static_cast<size_t>(nFieldIndex) < m_arrFieldMapping.size())), + "FmSearchEngine::RebuildUsedFields : nFieldIndex is invalid!"); // alle Felder, die ich durchsuchen muss, einsammeln m_arrUsedFields.clear(); if (nFieldIndex == -1) |