diff options
| author | Eike Rathke <er@openoffice.org> | 2001-06-08 11:05:54 +0000 |
|---|---|---|
| committer | Eike Rathke <er@openoffice.org> | 2001-06-08 11:05:54 +0000 |
| commit | 69496db2b94a466538d2d70d7d2be246dc36105e (patch) | |
| tree | 00c0be8a9ec9f675902bcf50287079d5388ca182 /xmloff/source/style | |
| parent | 66a2d0eae49207235eff2feb179e82e266471bb6 (diff) | |
#87970# mask off defined for currency
Diffstat (limited to 'xmloff/source/style')
| -rw-r--r-- | xmloff/source/style/numehelp.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index 37be5f1cfa4f..0c3f968971cb 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: numehelp.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: sab $ $Date: 2001-06-08 07:13:34 $ + * last change: $Author: er $ $Date: 2001-06-08 12:05:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,7 +130,7 @@ sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNu { aFormat.nType = GetCellType(nNumberFormat, bIsStandard, xNumberFormatsSupplier); aFormat.bIsStandard = bIsStandard; - if (aFormat.nType == util::NumberFormat::CURRENCY) + if ((aFormat.nType & ~util::NumberFormat::DEFINED) == util::NumberFormat::CURRENCY) if (GetCurrencySymbol(nNumberFormat, aFormat.sCurrency, xNumberFormatsSupplier)) sCurrency = aFormat.sCurrency; aNumberFormats.insert(aFormat); @@ -368,7 +368,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(SvXMLExpor sal_Bool bIsStandard; sal_Int16 nTypeKey = GetCellType(nNumberFormat, bIsStandard, rXMLExport.GetNumberFormatsSupplier()); rtl::OUString sCurrency; - if (nTypeKey == util::NumberFormat::CURRENCY) + if ((nTypeKey & ~util::NumberFormat::DEFINED) == util::NumberFormat::CURRENCY) GetCurrencySymbol(nNumberFormat, sCurrency, rXMLExport.GetNumberFormatsSupplier()); WriteAttributes(rXMLExport, nTypeKey, rValue, sCurrency, nNamespace, bExportValue); } |