Skip to content

C
core
Kaydet (Commit) be9034ec authored tarafından Markus Mohrhard's avatar Markus Mohrhard
Dosyalara gözat
Seçenekler

prevent invalid files if file contains currency formats 

A regression from writing error cell information into the file.

Change-Id: Idb55646094fcd76912bdcd2102370681bcc8703d
üst cb928037
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 5 deletions
include/xmloff/numehelp.hxx
Dosyayı görüntüle @ be9034ec
......@@ -104,7 +104,8 @@ public :
sal_Bool bExportValue = sal_True, sal_uInt16 nNamespace = XML_NAMESPACE_OFFICE);
void SetNumberFormatAttributes(const sal_Int32 nNumberFormat,
const double& rValue,
sal_Bool bExportValue = sal_True, sal_uInt16 nNamespace = XML_NAMESPACE_OFFICE);
sal_Bool bExportValue = sal_True,
sal_uInt16 nNamespace = XML_NAMESPACE_OFFICE, bool bExportCurrencySymbol = true);
void SetNumberFormatAttributes(const OUString& rValue,
const OUString& rCharacters,
sal_Bool bExportValue = sal_True,
......
sc/source/filter/xml/xmlexprt.cxx
Dosyayı görüntüle @ be9034ec
......@@ -2876,7 +2876,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
aCell.nNumberFormat, aCell.fValue);
if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
aCell.nNumberFormat, aCell.fValue, false, XML_NAMESPACE_CALC_EXT);
aCell.nNumberFormat, aCell.fValue, false, XML_NAMESPACE_CALC_EXT, false);
}
break;
case table::CellContentType_TEXT :
......@@ -2940,7 +2940,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
{
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
pFormulaCell->GetStandardFormat(*pDoc->GetFormatTable(), 0),
pDoc->GetValue( aCellPos ), false, XML_NAMESPACE_CALC_EXT);
pDoc->GetValue( aCellPos ), false, XML_NAMESPACE_CALC_EXT, false);
}
}
}
......@@ -2953,7 +2953,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
{
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
aCell.nNumberFormat, pDoc->GetValue( aCellPos ), false, XML_NAMESPACE_CALC_EXT );
aCell.nNumberFormat, pDoc->GetValue( aCellPos ), false, XML_NAMESPACE_CALC_EXT, false );
}
}
......
xmloff/source/style/numehelp.cxx
Dosyayı görüntüle @ be9034ec
......@@ -517,13 +517,17 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
}
void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(
const sal_Int32 nNumberFormat, const double& rValue, sal_Bool bExportValue, sal_uInt16 nNamespace)
const sal_Int32 nNumberFormat, const double& rValue, sal_Bool bExportValue,
sal_uInt16 nNamespace, bool bExportCurrencySymbol)
{
if (pExport)
{
bool bIsStandard;
OUString sCurrency;
sal_Int16 nTypeKey = GetCellType(nNumberFormat, sCurrency, bIsStandard);
if(!bExportCurrencySymbol)
sCurrency = OUString();
WriteAttributes(nTypeKey, rValue, sCurrency, bExportValue, nNamespace);
}
else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment