ooo-build r12675 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Tue May 27 06:58:04 2008
New Revision: 12675
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12675&view=rev

Log:
	* patches/dev300/comphelper-msvc8-fix.diff: parser bug in vc2005 -
	reverted to inclass-inline for the relevant methods.
	* patches/dev300/apply: added aforementioned patch for m13 upwards



Added:
   trunk/patches/dev300/comphelper-msvc8-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue May 27 06:58:04 2008
@@ -1410,9 +1410,10 @@
 # Multi-language installer stuff
 win32-multi-lang-installer.diff, i#66062, i#88638, i#88639, tml
 
-# fix for visual studio express 2005 ( ooo-build only )
+# fixes for visual studio express 2005 ( ooo-build only )
 2005-express-stl-remove.diff, noelpwer, i#71404
-
+[ Win32Only >= dev300-m13 ]
+comphelper-msvc8-fix.diff, thorsten, i#89973
 
 [ VBABits ]
 # Parse (& ignore) 'Attribute' statements

Added: trunk/patches/dev300/comphelper-msvc8-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/comphelper-msvc8-fix.diff	Tue May 27 06:58:04 2008
@@ -0,0 +1,46 @@
+--- comphelper/inc/comphelper/stlunosequence.hxx	14 May 2008 09:31:23 -0000	1.2
++++ comphelper/inc/comphelper/stlunosequence.hxx	26 May 2008 15:54:15 -0000
+@@ -82,8 +82,15 @@ namespace comphelper { namespace stlunos
+             typedef const V& reference;
+             StlSequenceConstIterator();
+             StlSequenceConstIterator(S * uno_sequence, typename StlSequenceIterator<S,V>::difference_type by);
+-            typename StlSequenceIterator<S,V>::const_reference operator*() const;
+-            typename StlSequenceIterator<S,V>::const_reference operator[](const typename StlSequenceIterator<S,V>::difference_type by) const;
++            typename StlSequenceIterator<S,V>::const_reference operator*() const
++            {
++                return (*(this->m_UnoSequence))[this->m_Index];
++            }
++
++            typename StlSequenceIterator<S,V>::const_reference operator[](const typename StlSequenceIterator<S,V>::difference_type by) const
++            {
++                return (*(this->m_UnoSequence))[this->m_Index+by];
++            }
+     };
+ 
+     template<typename S, typename V>
+@@ -151,12 +158,6 @@ namespace comphelper { namespace stlunos
+     }
+ 
+     template<typename S, typename V>
+-    inline typename StlSequenceIterator<S,V>::const_reference StlSequenceConstIterator<S, V>::operator*() const
+-    {
+-        return (*(this->m_UnoSequence))[this->m_Index];
+-    }
+-
+-    template<typename S, typename V>
+     inline StlSequenceIterator<S,V>& StlSequenceIterator<S, V>::operator++()
+     {
+         ++m_Index;
+@@ -278,12 +279,6 @@ namespace comphelper { namespace stlunos
+         return (*(this->m_UnoSequence))[this->m_Index+by];
+     }
+ 
+-    template<typename S, typename V>
+-    inline typename StlSequenceIterator<S,V>::const_reference StlSequenceConstIterator<S, V>::operator[](const typename StlSequenceIterator<S,V>::difference_type by) const
+-    {
+-        return (*(this->m_UnoSequence))[this->m_Index+by];
+-    }
+-
+     // StlSequence
+     template<typename S, typename V>
+     StlSequence<S,V>::StlSequence(S& uno_sequence)