mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

write trailing text subformat also to Excel .xls and .xlsx, tdf#92457

Browse Source 
... without generating  0;;;@  from  0;@  that has different semantics.

Introduce css::util::NumberFormat::EMPTY to properly flag empty
subformats and distinguish from UNDEFINED, everything else would be an
ugly hack.

SvNumberformat::GetMappedFormatstring() now correctly supports the
trailing text subformat, so exports using it should get that
automatically.

Change-Id: If9a1bcc5ec5dfcf46688035e2b1428ab4747a68d
This commit is contained in:
Eike Rathke
2015-07-11 02:52:42 +02:00
parent 934e35c625
commit dad6be8af0
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
offapi/com/sun/star/util/NumberFormat.idl
View File

@@ -93,6 +93,12 @@ published constants NumberFormat
*/ */
const short UNDEFINED = 2048; const short UNDEFINED = 2048;
/** @internal is used to flag an empty sub format.
@since LibreOffice 5.1
*/
const short EMPTY = 4096;
}; };

9
svl/source/numbers/zformat.cxx
View File

@@ -893,7 +893,8 @@ SvNumberformat::SvNumberformat(OUString& rString,
} }
if (sStr.isEmpty()) if (sStr.isEmpty())
{ {
// empty sub format // Empty sub format.
NumFor[nIndex].Info().eScannedType = css::util::NumberFormat::EMPTY;
} }
else else
{ {
@@ -2202,7 +2203,7 @@ bool SvNumberformat::GetOutputString(double fNumber,
*ppColor = NumFor[nIx].GetColor(); *ppColor = NumFor[nIx].GetColor();
const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info(); const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
const sal_uInt16 nAnz = NumFor[nIx].GetCount(); const sal_uInt16 nAnz = NumFor[nIx].GetCount();
if (nAnz == 0 && rInfo.eScannedType == css::util::NumberFormat::UNDEFINED) if (nAnz == 0 && rInfo.eScannedType == css::util::NumberFormat::EMPTY)
{ {
return false; // Empty => nothing return false; // Empty => nothing
} }
@@ -4722,7 +4723,7 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
eOp1 == NUMBERFORMAT_OP_GE && fLimit1 == 0.0 && eOp1 == NUMBERFORMAT_OP_GE && fLimit1 == 0.0 &&
eOp2 == NUMBERFORMAT_OP_NO && fLimit2 == 0.0 ); eOp2 == NUMBERFORMAT_OP_NO && fLimit2 == 0.0 );
// with 3 or more subformats [>0];[<0];[=0] is implied if no condition specified, // with 3 or more subformats [>0];[<0];[=0] is implied if no condition specified,
// note that subformats may be empty (;;;) and NumFor[2].GetnAnz()>0 is not checked. // note that subformats may be empty (;;;) and NumFor[2].GetCount()>0 is not checked.
bDefault[2] = ( !bDefault[0] && !bDefault[1] && bDefault[2] = ( !bDefault[0] && !bDefault[1] &&
eOp1 == NUMBERFORMAT_OP_GT && fLimit1 == 0.0 && eOp1 == NUMBERFORMAT_OP_GT && fLimit1 == 0.0 &&
eOp2 == NUMBERFORMAT_OP_LT && fLimit2 == 0.0 ); eOp2 == NUMBERFORMAT_OP_LT && fLimit2 == 0.0 );
@@ -4762,7 +4763,7 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
int nSub = 0; // subformats delimited so far int nSub = 0; // subformats delimited so far
for ( int n=0; n<4; n++ ) for ( int n=0; n<4; n++ )
{ {
if ( n > 0 ) if ( n > 0 && NumFor[n].Info().eScannedType != css::util::NumberFormat::UNDEFINED )
{ {
nSem++; nSem++;
} }

4
xmloff/source/style/xmlnumfe.cxx
View File

@@ -1006,9 +1006,6 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
// #101606# An empty subformat is a valid number-style resulting in an // #101606# An empty subformat is a valid number-style resulting in an
// empty display string for the condition of the subformat. // empty display string for the condition of the subformat.
if ( nFmtType == css::util::NumberFormat::UNDEFINED && rFormat.GetNumForType( nPart,
0, false ) == 0 )
nFmtType = 0;
XMLTokenEnum eType = XML_TOKEN_INVALID; XMLTokenEnum eType = XML_TOKEN_INVALID;
switch ( nFmtType ) switch ( nFmtType )
@@ -1016,6 +1013,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
// type is 0 if a format contains no recognized elements // type is 0 if a format contains no recognized elements
// (like text only) - this is handled as a number-style. // (like text only) - this is handled as a number-style.
case 0: case 0:
case css::util::NumberFormat::EMPTY:
case css::util::NumberFormat::NUMBER: case css::util::NumberFormat::NUMBER:
case css::util::NumberFormat::SCIENTIFIC: case css::util::NumberFormat::SCIENTIFIC:
case css::util::NumberFormat::FRACTION: case css::util::NumberFormat::FRACTION: