msvc10 work around: use complete std:numpunct<char> implementation otherwise it crashes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34488 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/numpunct_lyx_char_type.h b/src/support/numpunct_lyx_char_type.h
index 9dbdeb2c168a0c7d014da236d024d2795f77b109..d5b339b7ce1bdb6f6d98adf5ae936fac0cae01bd 100644 (file)
--- a/src/support/numpunct_lyx_char_type.h
+++ b/src/support/numpunct_lyx_char_type.h
@@ -20,42 +20,37 @@ namespace std
 {\r
 \r
        template<>\r
-       class numpunct<lyx::char_type> : public locale::facet\r
+       class numpunct<lyx::char_type> : public numpunct<char>\r
        {\r
        public:\r
 \r
                typedef lyx::char_type char_type;\r
                typedef basic_string<lyx::char_type> string_type;\r
 \r
+               static locale::id id;\r
 \r
-               static locale::id                       id;\r
-\r
-               explicit numpunct(size_t __refs = 0) : chared(__refs)\r
+               explicit numpunct(size_t __refs = 0) : numpunct<char>(__refs)\r
                {}\r
 \r
                char_type decimal_point() const\r
-               { return chared.decimal_point(); }\r
+               { return numpunct<char>::decimal_point(); }\r
 \r
                char_type thousands_sep() const\r
-               { return chared.thousands_sep(); }\r
+               { return numpunct<char>::thousands_sep(); }\r
 \r
                string grouping() const\r
-               { return chared.grouping(); }\r
+               { return numpunct<char>::grouping(); }\r
 \r
                string_type truename() const\r
-               { return lyx::from_ascii(chared.truename()); }\r
+               { return lyx::from_ascii(numpunct<char>::truename()); }\r
 \r
                string_type falsename() const\r
-               { return lyx::from_ascii(chared.falsename()); }\r
+               { return lyx::from_ascii(numpunct<char>::falsename()); }\r
 \r
 \r
        protected:\r
                virtual ~numpunct();\r
 \r
-\r
-       private:\r
-               numpunct<char> chared;\r
-\r
        };\r
 \r
 \r