diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-02-02 12:53:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-02-02 12:53:46 +0000 |
| commit | d120002e5860450fde4a3e45b5f1232e81913585 (patch) | |
| tree | 5bc99c1f146ab4c9e7b19a95b4a91d6031c66ff3 /sc/source/filter/xml/xmlcelli.cxx | |
| parent | 51f3946e7484d6225cc37d7b14c8c5965fea4f4c (diff) | |
INTEGRATION: CWS validationbeta (1.80.34); FILE MERGED
2005/02/01 12:00:37 sab 1.80.34.1: #i41737#; different length of XML_CONTENT_VALIDATION_NAME
Diffstat (limited to 'sc/source/filter/xml/xmlcelli.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index e6d8a949ada4..9b1becbd6286 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlcelli.cxx,v $ * - * $Revision: 1.80 $ + * $Revision: 1.81 $ * - * last change: $Author: rt $ $Date: 2005-01-11 12:39:28 $ + * last change: $Author: rt $ $Date: 2005-02-02 13:53:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -267,15 +267,6 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, pStyleName = new rtl::OUString(sValue); } break; - case 15 : - { - if (IsXMLToken(aLocalName, XML_CONTENT_VALIDATION_NAME)) //#109340# the string in this constant is different to the name; should be changed ASAP - { - DBG_ASSERT(!pContentValidationName, "here should be only one Validation Name"); - pContentValidationName = new rtl::OUString(sValue); - } - } - break; case 19 : { if (IsXMLToken(aLocalName, XML_NUMBER_ROWS_SPANNED)) @@ -298,6 +289,11 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, { if (IsXMLToken(aLocalName, XML_NUMBER_COLUMNS_REPEATED)) nCellsRepeated = sValue.toInt32(); + else if (IsXMLToken(aLocalName, XML_CONTENT_VALIDATION_NAME)) + { + DBG_ASSERT(!pContentValidationName, "here should be only one Validation Name"); + pContentValidationName = new rtl::OUString(sValue); + } } break; case 26 : |