summaryrefslogtreecommitdiff
path: root/xmloff/source
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 17:41:13 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 17:41:13 +0000
commit7603005ef0f341070f87541a60fc4131e1126072 (patch)
treeedb103f0bb1beacc6aeed564660bfc15f61cb9e2 /xmloff/source
parent996362dddb090bae63bc820814759cbebe2949f8 (diff)
INTEGRATION: CWS warnings01 (1.14.32); FILE MERGED
2005/11/03 17:47:08 cl 1.14.32.1: warning free code changes for unxlngi6
Diffstat (limited to 'xmloff/source')
-rw-r--r--xmloff/source/text/XMLIndexTOCContext.cxx23
1 files changed, 10 insertions, 13 deletions
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index 4dda67a6f3ed..2b001b15eb82 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: XMLIndexTOCContext.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 15:08:59 $
+ * last change: $Author: hr $ $Date: 2006-06-19 18:41:13 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -203,14 +203,13 @@ SvXMLEnumMapEntry __READONLY_DATA aIndexTypeMap[] =
XMLIndexTOCContext::XMLIndexTOCContext(
SvXMLImport& rImport,
sal_uInt16 nPrfx,
- const OUString& rLocalName ) :
- SvXMLImportContext(rImport, nPrfx, rLocalName),
- pSourceElementName(NULL),
- bValid(sal_False),
- xBodyContextRef(),
- sTitle(RTL_CONSTASCII_USTRINGPARAM("Title")),
- sIsProtected(RTL_CONSTASCII_USTRINGPARAM("IsProtected")),
- sName(RTL_CONSTASCII_USTRINGPARAM("Name"))
+ const OUString& rLocalName )
+: SvXMLImportContext(rImport, nPrfx, rLocalName)
+, sTitle(RTL_CONSTASCII_USTRINGPARAM("Title"))
+, sIsProtected(RTL_CONSTASCII_USTRINGPARAM("IsProtected"))
+, sName(RTL_CONSTASCII_USTRINGPARAM("Name"))
+, pSourceElementName(NULL)
+, bValid(sal_False)
{
if (XML_NAMESPACE_TEXT == nPrfx)
{
@@ -218,9 +217,7 @@ XMLIndexTOCContext::XMLIndexTOCContext(
if (SvXMLUnitConverter::convertEnum(nTmp, rLocalName, aIndexTypeMap))
{
// check for array index:
- DBG_ASSERT(nTmp >= 0, "index too low");
- DBG_ASSERT(nTmp < (sizeof(aIndexServiceMap)/sizeof(sal_Char*)),
- "index too high");
+ DBG_ASSERT(nTmp < (sizeof(aIndexServiceMap)/sizeof(sal_Char*)), "index out of range");
DBG_ASSERT(sizeof(aIndexServiceMap) ==
sizeof(aIndexSourceElementMap),
"service and source element maps must be same size");