diff options
author | Oliver Bolte <obo@openoffice.org> | 2008-05-28 09:17:23 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2008-05-28 09:17:23 +0000 |
commit | 63d653379e9e376bbb2580eda3b54e529977ac84 (patch) | |
tree | e8b832746c8f27ce419f346f83e85f5f138a0084 /sc/source/filter/xml/XMLStylesExportHelper.cxx | |
parent | 9bf074cf6242ecbb3c1cad46a15af27c45f6b435 (diff) |
INTEGRATION: CWS calcodfversion (1.50.38); FILE MERGED
2008/04/18 12:48:21 er 1.50.38.2: RESYNC: (1.50-1.51); FILE MERGED
2008/04/09 21:08:42 er 1.50.38.1: #i88113# handle XML_NAMESPACE_OF with GRAM_ODFF
Diffstat (limited to 'sc/source/filter/xml/XMLStylesExportHelper.cxx')
-rw-r--r-- | sc/source/filter/xml/XMLStylesExportHelper.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 0cf802e79cf2..32766c1b1897 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: XMLStylesExportHelper.cxx,v $ - * $Revision: 1.51 $ + * $Revision: 1.52 $ * * This file is part of OpenOffice.org. * @@ -295,11 +295,8 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const } if (sCondition.getLength()) { - sal_uInt16 nNamespacePrefix; const ScGrammar::Grammar eGrammar = rExport.GetDocument()->GetStorageGrammar(); - /* FIXME: when support for ODF 1.2 and ODFF is ready in xmloff, this - * should be XML_NAMESPACE_OF instead of XML_NAMESPACE_NONE! */ - nNamespacePrefix = (eGrammar == ScGrammar::GRAM_ODFF ? XML_NAMESPACE_NONE : XML_NAMESPACE_OOOC); + sal_uInt16 nNamespacePrefix = (eGrammar == ScGrammar::GRAM_ODFF ? XML_NAMESPACE_OF : XML_NAMESPACE_OOOC); sCondition = rExport.GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sCondition, sal_False ); } |