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

do not add calendar modifier to format code when importing as E or EE keyword

Browse Source 
... with implicit calendar switch.

Change-Id: Ie4d848e261fe86bbe504954b2e0c7cf24bc181bc
This commit is contained in:
Eike Rathke
2016-09-13 19:33:11 +02:00
parent 426723912f
commit e12c9b4101
2 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/xmloff/xmlnumfi.hxx
View File

@@ -186,7 +186,7 @@ public:
void SetHasLongDoW(bool bSet) { bHasLongDoW = bSet; } void SetHasLongDoW(bool bSet) { bHasLongDoW = bSet; }
bool HasEra() const { return bHasEra; } bool HasEra() const { return bHasEra; }
void UpdateCalendar( const OUString& rNewCalendar ); void UpdateCalendar( const OUString& rNewCalendar, bool bImplicitSecondaryCalendarEC = false );
const LocaleDataWrapper& GetLocaleData() const; const LocaleDataWrapper& GetLocaleData() const;

39
xmloff/source/style/xmlnumfi.cxx
View File

@@ -1201,20 +1201,33 @@ void SvXMLNumFmtElementContext::EndElement()
: ( bEffLong ? NF_KEY_MM : NF_KEY_M ) ) ); : ( bEffLong ? NF_KEY_MM : NF_KEY_M ) ) );
break; break;
case XML_TOK_STYLE_YEAR: case XML_TOK_STYLE_YEAR:
rParent.UpdateCalendar( sCalendar );
//! I18N doesn't provide SYSTEM or extended date information yet //! I18N doesn't provide SYSTEM or extended date information yet
// Y after G (era) is replaced by E, also if we're switching to the
// other second known calendar for a locale.
if ( rParent.HasEra() || rParent.GetLocaleData().doesSecondaryCalendarUseEC( sCalendar))
{ {
rParent.AddNfKeyword( // Y after G (era) is replaced by E, also if we're switching to the
sal::static_int_cast< sal_uInt16 >( // other second known calendar for a locale.
bEffLong ? NF_KEY_EEC : NF_KEY_EC ) ); bool bImplicitEC = (!sCalendar.isEmpty() &&
rParent.GetLocaleData().doesSecondaryCalendarUseEC( sCalendar));
if (rParent.HasEra() || bImplicitEC)
{
// If E or EE is the first format keyword, passing
// bImplicitEC=true suppresses the superfluous calendar
// modifier for this format. This does not help for
// something like [~cal]DD/MM/EE but so far only YMD order
// is used with such calendars. Live with the modifier if
// other keywords precede this.
rParent.UpdateCalendar( sCalendar, bImplicitEC);
rParent.AddNfKeyword(
sal::static_int_cast< sal_uInt16 >(
bEffLong ? NF_KEY_EEC : NF_KEY_EC ) );
}
else
{
rParent.UpdateCalendar( sCalendar );
rParent.AddNfKeyword(
sal::static_int_cast< sal_uInt16 >(
bEffLong ? NF_KEY_YYYY : NF_KEY_YY ) );
}
} }
else
rParent.AddNfKeyword(
sal::static_int_cast< sal_uInt16 >(
bEffLong ? NF_KEY_YYYY : NF_KEY_YY ) );
break; break;
case XML_TOK_STYLE_ERA: case XML_TOK_STYLE_ERA:
rParent.UpdateCalendar( sCalendar ); rParent.UpdateCalendar( sCalendar );
@@ -2257,12 +2270,12 @@ void SvXMLNumFormatContext::AddColor( sal_uInt32 const nColor )
} }
} }
void SvXMLNumFormatContext::UpdateCalendar( const OUString& rNewCalendar ) void SvXMLNumFormatContext::UpdateCalendar( const OUString& rNewCalendar, bool bImplicitSecondaryCalendarEC )
{ {
if ( rNewCalendar != sCalendar ) if ( rNewCalendar != sCalendar )
{ {
sCalendar = rNewCalendar; sCalendar = rNewCalendar;
if ( !sCalendar.isEmpty() ) if ( !sCalendar.isEmpty() && !bImplicitSecondaryCalendarEC )
{ {
aFormatCode.append( "[~" ); // intro for calendar code aFormatCode.append( "[~" ); // intro for calendar code
aFormatCode.append( sCalendar ); aFormatCode.append( sCalendar );