diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 06:46:41 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 06:46:41 +0000 |
| commit | 1625dfde3d84091c5f7dd47e73deef3c4afdaa9e (patch) | |
| tree | b9ba0cedf6dcb09e1f92d68e6804229a1cbe3d69 /sc/source/filter/xml/XMLStylesExportHelper.cxx | |
| parent | 8d11830bb08ed5dd13da8d1b08d09a6afb297bfb (diff) | |
INTEGRATION: CWS oasis (1.38.16); FILE MERGED
2004/07/07 08:47:38 sab 1.38.16.2: #i20153#; oasis changes
2004/06/24 14:58:51 sab 1.38.16.1: #i20153#; oasis changes
Diffstat (limited to 'sc/source/filter/xml/XMLStylesExportHelper.cxx')
| -rw-r--r-- | sc/source/filter/xml/XMLStylesExportHelper.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 792eb92978f8..0289a7cc4d9a 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLStylesExportHelper.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: obo $ $Date: 2004-06-04 11:10:27 $ + * last change: $Author: rt $ $Date: 2004-07-13 07:46:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,6 +96,9 @@ #ifndef _XMLOFF_XMLEVENTEXPORT_HXX #include <xmloff/XMLEventExport.hxx> #endif +#ifndef _XMLOFF_NMSPMAP_HXX +#include <xmloff/nmspmap.hxx> +#endif #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> @@ -266,7 +269,7 @@ sal_Bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, return bAdded; } -rtl::OUString ScMyValidationsContainer::GetCondition(const ScMyValidation& aValidation) +rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation) { rtl::OUString sCondition; if (aValidation.aValidationType != sheet::ValidationType_ANY) @@ -359,6 +362,9 @@ rtl::OUString ScMyValidationsContainer::GetCondition(const ScMyValidation& aVali if (aValidation.aValidationType == sheet::ValidationType_TEXT_LEN) sCondition = rtl::OUString(); } + if (sCondition.getLength()) + sCondition = rExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_OOOC, sCondition ); + return sCondition; } @@ -421,7 +427,7 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport) while (aItr != aValidationVec.end()) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, aItr->sName); - rtl::OUString sCondition = GetCondition(*aItr); + rtl::OUString sCondition = GetCondition(rExport, *aItr); if (sCondition.getLength()) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONDITION, sCondition); @@ -477,12 +483,12 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport) break; case sheet::ValidationAlertStyle_MACRO : { - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, aItr->sErrorTitle); + //rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, aItr->sErrorTitle); if (aItr->bShowErrorMessage) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_EXECUTE, XML_TRUE); else rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_EXECUTE, XML_FALSE); - SvXMLElementExport(rExport, XML_NAMESPACE_TABLE, XML_ERROR_MACRO, sal_True, sal_True); + SvXMLElementExport aEMElem(rExport, XML_NAMESPACE_TABLE, XML_ERROR_MACRO, sal_True, sal_True); { uno::Sequence<beans::PropertyValue> aSeq(3); beans::PropertyValue* pArr = aSeq.getArray(); |