applied_patches/0610-binfilter-stl.diff

   1 --- binfilter/bf_svx/source/svdraw/svx_svdouno.cxx.orig 2006-07-12 12:48:54.000000000 +0200
   2 +++ binfilter/bf_svx/source/svdraw/svx_svdouno.cxx      2006-07-12 12:50:32.000000000 +0200
   3 @@ -746,7 +746,7 @@
   4  /*N*/         SdrViewIter aIter( this );
   5  /*N*/      for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() )
   6  /*N*/         {
   7 -/*N*/             ::std::set< SdrView* >::const_iterator aPrevPos = aPreviouslyVisible.find( pView );
   8 +/*N*/             ::std::set< SdrView* >::iterator aPrevPos = aPreviouslyVisible.find( pView );
   9  /*N*/             if ( aPreviouslyVisible.end() != aPrevPos )
  10  /*N*/             {   // in pView, we were visible _before_ the layer change, and are
  11  /*N*/                 // visible _after_ the layer change, too
  12 --- binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx.orig     2006-07-12 13:16:27.000000000 +0200
  13 +++ binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx  2006-07-12 13:17:43.000000000 +0200
  14 @@ -99,7 +99,12 @@
  15
  16  int SvXMLNamespaceMap::operator ==( const SvXMLNamespaceMap& rCmp ) const
  17  {
  18 +#if STLPORT_VERSION >= 500
  19 +//FIXME: STLport5 alternative map compare?
  20 +       return static_cast < int > (aNameHash.size() == rCmp.aNameHash.size());
  21 +#else
  22         return static_cast < int > (aNameHash == rCmp.aNameHash);
  23 +#endif
  24  }
  25
  26  sal_uInt16 SvXMLNamespaceMap::_Add( const OUString& rPrefix, const OUString &rName, sal_uInt16 nKey )
  27 --- binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx.orig   2006-07-12 13:23:46.000000000 +0200
  28 +++ binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx        2006-07-12 13:24:42.000000000 +0200
  29 @@ -172,13 +172,13 @@
  30
  31  sal_Bool SvXMLNumUsedList_Impl::IsUsed( sal_uInt32 nKey ) const
  32  {
  33 -       SvXMLuInt32Set::iterator aItr = aUsed.find(nKey);
  34 +       SvXMLuInt32Set::const_iterator aItr = aUsed.find(nKey);
  35         return (aItr != aUsed.end());
  36  }
  37
  38  sal_Bool SvXMLNumUsedList_Impl::IsWasUsed( sal_uInt32 nKey ) const
  39  {
  40 -       SvXMLuInt32Set::iterator aItr = aWasUsed.find(nKey);
  41 +       SvXMLuInt32Set::const_iterator aItr = aWasUsed.find(nKey);
  42         return (aItr != aWasUsed.end());
  43  }
  44