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

[thorstenb svn gnome org]

Author: thorstenb
Date: Fri Jul 18 13:21:00 2008
New Revision: 13297
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13297&view=rev

Log:
	* patches/dev300/apply:
	* patches/dev300/unoxml-boost-workaround.diff:
	Replaced non-working nested boost::bind with explicit loop.



Added:
   trunk/patches/dev300/unoxml-boost-workaround.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jul 18 13:21:00 2008
@@ -2558,6 +2558,9 @@
 
 sw-source-filter-ww8-continous-section-break-fix.diff, n#405071, i#91395, fridrich
 
+[ Fixes >= dev300-m23 ]
+unoxml-boost-workaround.diff, thorsten
+
 [ LocalizeFixes ]
 # it is Y axis, not X one [in Spanish]
 chart2-es-eje-Y.diff, i#83821, rengelha

Added: trunk/patches/dev300/unoxml-boost-workaround.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/unoxml-boost-workaround.diff	Fri Jul 18 13:21:00 2008
@@ -0,0 +1,20 @@
+--- unoxml/source/rdf/librdf_repository.cxx	1 Jul 2008 16:11:24 -0000	1.2
++++ unoxml/source/rdf/librdf_repository.cxx	18 Jul 2008 13:15:12 -0000
+@@ -1037,10 +1037,13 @@ throw (uno::RuntimeException, rdf::Repos
+ {
+     ::osl::MutexGuard g(m_aMutex);
+     ::comphelper::SequenceAsVector< uno::Reference<rdf::XURI> > ret;
+-    std::transform(m_NamedGraphs.begin(), m_NamedGraphs.end(),
+-        std::back_inserter(ret),
+-        boost::bind(&rdf::XNamedGraph::getName,
+-            boost::bind(&NamedGraphMap_t::value_type::second, _1)));
++    NamedGraphMap_t::const_iterator aCurr(m_NamedGraphs.begin());
++    NamedGraphMap_t::const_iterator const aEnd(m_NamedGraphs.end());
++    while( aCurr != aEnd )
++    {
++        ret.push_back(aCurr->second->getName());
++        ++aCurr;
++    }
+     return ret.getAsConstList();
+ }
+