diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 11:43:46 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 11:43:46 +0000 |
| commit | 9cf926dd69124eb96df49ceda03977fac2da6127 (patch) | |
| tree | 10b9146ed606d71c0b6541bf3ada81b50766cde6 /sc/source/filter/xml/xmlcelli.cxx | |
| parent | b1ad3aad732eb84cdaef7f96417b7cfaee98de3d (diff) | |
INTEGRATION: CWS dr47 (1.88.92); FILE MERGED
2006/05/08 13:53:27 dr 1.88.92.3: RESYNC: (1.89-1.90); FILE MERGED
2006/04/05 09:19:55 dr 1.88.92.2: RESYNC: (1.88-1.89); FILE MERGED
2006/03/16 10:44:52 nn 1.88.92.1: #i59328# detect invalid repeat values
Diffstat (limited to 'sc/source/filter/xml/xmlcelli.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 95679bd82527..ede0301b9308 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlcelli.cxx,v $ * - * $Revision: 1.90 $ + * $Revision: 1.91 $ * - * last change: $Author: vg $ $Date: 2006-04-07 16:25:37 $ + * last change: $Author: obo $ $Date: 2006-07-10 12:43:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -270,7 +270,7 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, case 23 : { if (IsXMLToken(aLocalName, XML_NUMBER_COLUMNS_REPEATED)) - nCellsRepeated = sValue.toInt32(); + nCellsRepeated = std::max( sValue.toInt32(), (sal_Int32) 1 ); else if (IsXMLToken(aLocalName, XML_CONTENT_VALIDATION_NAME)) { DBG_ASSERT(!pContentValidationName, "here should be only one Validation Name"); |