OdfFileReader - restore win build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62888 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficeOdfFile/include/cpdoccore/xml/attributes.h

@@ -63,8 +63,8 @@ namespace cpdoccore
 	class attributes 
 	{
 	public:
-        typedef typename optional<std::wstring>::Type               value_type;
-        typedef typename ::std::pair< std::wstring, std::wstring>   key_value;
+        typedef optional<std::wstring>::Type               value_type;
+        typedef std::pair< std::wstring, std::wstring>   key_value;
 
 	public:
         virtual value_type get(const std::wstring & QualifiedName) const = 0;
@@ -121,7 +121,7 @@ namespace cpdoccore
 
         typedef xml::xml_char<wchar_t> xml_char_value_type;
 
-        static typename optional<bool>::Type get_val(attributes & attr, const std::wstring & QualifiedName)
+        static optional<bool>::Type get_val(attributes & attr, const std::wstring & QualifiedName)
 		{
             attributes::value_type val = attr.get(QualifiedName);
 			if (val)
@@ -139,7 +139,7 @@ namespace cpdoccore
     class attributes_get_val_impl<char>
 	{
 	public:
-        static typename optional<char>::Type get_val(attributes & attr, const std::wstring & QualifiedName)
+        static optional<char>::Type get_val(attributes & attr, const std::wstring & QualifiedName)
 		{
             attributes::value_type val = attr.get(QualifiedName);
 			if (val)
@@ -156,7 +156,7 @@ namespace cpdoccore
     class attributes_get_val_impl<wchar_t>
 	{
 	public:
-        static typename optional<wchar_t>::Type get_val(attributes & attr, const std::wstring & QualifiedName)
+        static optional<wchar_t>::Type get_val(attributes & attr, const std::wstring & QualifiedName)
 		{
             attributes::value_type val = attr.get(QualifiedName);
 			if (val)
@@ -190,7 +190,7 @@ namespace cpdoccore
 
 	struct attributes_ptr
 	{
-        typedef typename shared_ptr< attributes >::Type Type;
+        typedef shared_ptr< attributes >::Type Type;
 	};
 
 

ASCOfficeOdfFile/src/odf/datatypes/odfattributes.h

@@ -41,7 +41,7 @@ template<> \
 class attributes_get_val_impl<V >\
 {\
 public:\
-    typedef typename optional<V>::Type optional_v_type; \
+    typedef optional<V>::Type optional_v_type; \
     static optional_v_type get_val(attributes & attr, const std::wstring & QualifiedName)\
     {\
         return attributes_get_val_impl_parse<V>::get_val(attr, QualifiedName);\

ASCOfficeOdfFile/src/xml/attributes.cpp

@@ -58,8 +58,8 @@ private:
 class attributes_impl : public attributes
 {
 public:
-    typedef typename attributes::value_type value_type;
-    typedef typename attributes::key_value  key_value;
+    typedef attributes::value_type value_type;
+    typedef attributes::key_value  key_value;
 
 public:
     attributes_impl() : check_(true){};
@@ -118,16 +118,16 @@ private:
 
 void attributes_impl::add(const std::wstring & QualifiedName, const std::wstring & Value)
 {
-    typedef typename AttribMap::value_type attr_map_value_type;
+    typedef AttribMap::value_type attr_map_value_type;
 
     values_.push_back( key_value(QualifiedName, Value) );
     attrib_.insert( attr_map_value_type(QualifiedName, values_.size() - 1) );
 }
 
-typename attributes_impl::value_type attributes_impl::get(const std::wstring & QualifiedName) const
+attributes_impl::value_type attributes_impl::get(const std::wstring & QualifiedName) const
 {
-    typedef typename AttribMap::const_iterator attr_map_iterator;
-    typedef typename attributes::value_type attr_str_type;
+    typedef AttribMap::const_iterator attr_map_iterator;
+    typedef attributes::value_type attr_str_type;
 
     attr_map_iterator i = attrib_.find( QualifiedName );
 
@@ -137,7 +137,7 @@ typename attributes_impl::value_type attributes_impl::get(const std::wstring & Q
         return attr_str_type();
 }
 
-const typename attributes_impl::key_value & attributes_impl::at(size_t _Pos) const
+const attributes_impl::key_value & attributes_impl::at(size_t _Pos) const
 {
     return values_[_Pos];
 }