strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#86901# GENERAL keyword may appear anywhere in format code

Browse source
This commit is contained in:
Eike Rathke 2001-07-16 16:26:03 +00:00
parent fbfb1b4e38
commit a19f15834a
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xmloff/source/style/xmlnumfe.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: xmlnumfe.cxx,v $
*
* $Revision: 1.21 $
* $Revision: 1.22 $
*
* last change: $Author: dvo $ $Date: 2001-06-29 21:07:18 $
* last change: $Author: er $ $Date: 2001-07-16 17:26:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1399,6 +1399,9 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
AddToTextElement_Impl( *pElemStr );
}
break;
case NF_KEY_GENERAL :
WriteNumberElement_Impl( -1, 1, OUString(), sal_False );
break;
case NF_KEY_CCC:
if (pElemStr)
{

22
xmloff/source/style/xmlnumfi.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: xmlnumfi.cxx,v $
*
* $Revision: 1.15 $
* $Revision: 1.16 $
*
* last change: $Author: dvo $ $Date: 2001-06-29 21:07:18 $
* last change: $Author: er $ $Date: 2001-07-16 17:26:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1326,6 +1326,13 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo )
bAutoDec = ( rInfo.nDecimals < 0 );
bAutoInt = ( rInfo.nInteger < 0 );
if ( bAutoDec )
{ // This denotes the GENERAL keyword in proper case which may appear
// anywhere in any format code.
aFormatCode.append( pFormatter->GetStandardName( nFormatLang ) );
return ;
}
sal_uInt16 nPrec = 0;
sal_uInt16 nLeading = 0;
if ( rInfo.nDecimals >= 0 ) // < 0 : Default
@ -1333,17 +1340,6 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo )
if ( rInfo.nInteger >= 0 ) // < 0 : Default
nLeading = (sal_uInt16) rInfo.nInteger;
if ( bAutoDec )
{
// use language defaults for other than builtin formats
const LocaleDataWrapper& rLoc = pData->GetLocaleData( nFormatLang );
if ( nType == XML_TOK_STYLES_CURRENCY_STYLE )
nPrec = rLoc.getCurrDigits();
else
nPrec = 2; //! was rInt.GetNumDigits(), how about LocaleData providing this?
}
if ( bAutoInt )
{
//!...