diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:59:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:59:34 +0000 |
| commit | 749d2db9666f8125de58e55060d4abcd5cdc0625 (patch) | |
| tree | a3fbfec6244169a331c8086733da6be54336b642 /sc/source/filter/xml/XMLStylesExportHelper.cxx | |
| parent | 60f51de1b9f4582550c6bae1e9ab092762f5e25e (diff) | |
INTEGRATION: CWS odff (1.48.118); FILE MERGED
2008/02/27 18:34:21 er 1.48.118.2: RESYNC: (1.48-1.49); FILE MERGED
2008/02/15 14:23:05 er 1.48.118.1: #i81063# grammar here, grammar there, grammar everywhere
Diffstat (limited to 'sc/source/filter/xml/XMLStylesExportHelper.cxx')
| -rw-r--r-- | sc/source/filter/xml/XMLStylesExportHelper.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 3c1e3b7eaf11..43aecbdfaea4 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: XMLStylesExportHelper.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.50 $ * - * last change: $Author: rt $ $Date: 2008-01-29 15:35:04 $ + * last change: $Author: kz $ $Date: 2008-03-06 15:59:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -341,7 +341,14 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const sCondition = rtl::OUString(); } if (sCondition.getLength()) - sCondition = rExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_OOOC, sCondition, sal_False ); + { + 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); + sCondition = rExport.GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sCondition, sal_False ); + } return sCondition; } |