diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:54 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:54 +0200 |
| commit | ec6c98105a95bd5ddcd74b30fe51df8434c27fbd (patch) | |
| tree | fcb9f35a6d4a4d4450358a1515bf792788e3c3d1 /svl | |
| parent | da94363ed7a895fe39cee8d9b762966ebbee50ef (diff) | |
| parent | dd8d3fff260af37f152b3b6f0b8bcba2467a17fd (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
svtools/source/filter/wmf/winmtf.hxx
tools/source/fsys/urlobj.cxx
unotools/source/config/configmgr.cxx
unotools/source/config/makefile.mk
vcl/inc/vcl/cursor.hxx
vcl/source/gdi/outdevnative.cxx
vcl/source/window/abstdlg.cxx
vcl/source/window/toolbox.cxx
vcl/unx/generic/printer/ppdparser.cxx
vcl/unx/generic/printer/printerinfomanager.cxx
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/inc/svl/zforlist.hxx | 4 | ||||
| -rw-r--r-- | svl/source/numbers/zforlist.cxx | 21 |
2 files changed, 13 insertions, 12 deletions
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx index 80e9b8eeffb0..ae51e2ddcbbd 100644 --- a/svl/inc/svl/zforlist.hxx +++ b/svl/inc/svl/zforlist.hxx @@ -129,9 +129,7 @@ enum NfIndexTableOffset NF_FRACTION_START, NF_FRACTION_1 = NF_FRACTION_START, // # ?/? NF_FRACTION_2, // # ??/?? - NF_FRACTION_3, // # ?/4 - NF_FRACTION_4, // # ??/100 - NF_FRACTION_END = NF_FRACTION_4, + NF_FRACTION_END = NF_FRACTION_2, NF_NUMERIC_END = NF_FRACTION_END, diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index b4611b79babf..ffdb583261f7 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -2594,7 +2594,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, sal_Bool bLoadi // # ?/? aSingleFormatCode.Code = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "# ?/?" ) ); - String s25( RTL_CONSTASCII_USTRINGPARAM( "# ?/?" ) ); // # ?/? ImpInsertFormat( aSingleFormatCode, CLOffset + SetIndexTable( NF_FRACTION_1, ZF_STANDARD_FRACTION )); @@ -2604,14 +2603,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, sal_Bool bLoadi ImpInsertFormat( aSingleFormatCode, CLOffset + SetIndexTable( NF_FRACTION_2, ZF_STANDARD_FRACTION+1 )); - aSingleFormatCode.Code = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "# ?/4" ) ); - ImpInsertFormat( aSingleFormatCode, - CLOffset + SetIndexTable( NF_FRACTION_3, ZF_STANDARD_FRACTION+2 )); - - aSingleFormatCode.Code = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "# ?\?/100" ) ); - ImpInsertFormat( aSingleFormatCode, - CLOffset + SetIndexTable( NF_FRACTION_4, ZF_STANDARD_FRACTION+3 )); - // Week of year must be appended here because of nNewExtended const NfKeywordTable & rKeyword = pFormatScanner->GetKeywords(); aSingleFormatCode.Code = rKeyword[NF_KEY_WW]; @@ -2630,6 +2621,18 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, sal_Bool bLoadi if ( !bLoadingSO5 ) ImpGenerateAdditionalFormats( CLOffset, aNumberFormatCode, sal_False ); + sal_uInt32 nPos = CLOffset + pStdFormat->GetLastInsertKey(); + + aSingleFormatCode.Code = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "# ?/4" ) ); + ImpInsertNewStandardFormat( aSingleFormatCode, nPos+1, SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS ); + nPos++; + + aSingleFormatCode.Code = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "# ?\?/100" ) ); + ImpInsertNewStandardFormat( aSingleFormatCode, nPos+1, SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS ); + nPos++; + + pStdFormat->SetLastInsertKey( (sal_uInt16)(nPos - CLOffset) ); + if (bOldConvertMode) pFormatScanner->SetConvertMode(sal_True); } |