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/inc | |
| 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/inc')
| -rw-r--r-- | svl/inc/svl/zforlist.hxx | 4 |
1 files changed, 1 insertions, 3 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, |