diff options
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/zforfind.cxx | 2 | ||||
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index a4086335562b..bb249be090a4 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -2431,7 +2431,7 @@ void ImpSvNumberInputScan::InitText() delete [] pUpperMonthText; delete [] pUpperAbbrevMonthText; - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem > xElems + ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > xElems = pCal->getMonths(); nElems = xElems.getLength(); pUpperMonthText = new String[nElems]; diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index e6da6105f25e..a56abdc3b0dd 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -3194,7 +3194,9 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber, break; case NF_KEY_MMMMM: // MMMMM OutString += rCal.getDisplayString( - CalendarDisplayCode::LONG_MONTH_NAME, nNatNum ).GetChar(0); + (ImpUseGenitiveMonth( nUseGenitiveMonth, NumFor[nIx]) ? + CalendarDisplayCode::NARROW_GENITIVE_MONTH_NAME : + CalendarDisplayCode::NARROW_MONTH_NAME), nNatNum ); break; case NF_KEY_Q: // Q OutString += rCal.getDisplayString( @@ -3521,7 +3523,9 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber, break; case NF_KEY_MMMMM: // MMMMM OutString += rCal.getDisplayString( - CalendarDisplayCode::LONG_MONTH_NAME, nNatNum ).GetChar(0); + (ImpUseGenitiveMonth( nUseGenitiveMonth, NumFor[nIx]) ? + CalendarDisplayCode::NARROW_GENITIVE_MONTH_NAME : + CalendarDisplayCode::NARROW_MONTH_NAME), nNatNum ); break; case NF_KEY_Q: // Q OutString += rCal.getDisplayString( |