[Libreoffice-commits] .: ucb/source

[Michael Stahl]

 ucb/source/core/ucb.cxx      |    4 ++--
 ucb/source/inc/regexpmap.hxx |    2 --
 ucb/source/inc/regexpmap.tpt |   14 ++------------
 3 files changed, 4 insertions(+), 16 deletions(-)

New commits:
commit 33839f90e6f8275a584b483827585a6da05aab75
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jun 5 23:37:15 2012 +0200

    ucb: try to fix weird STL assertion on tinderbox
    
    Seems there's uninitialized iterators somewhere, let's try if removing
    the silly default constructor here improves anything.
    
    Change-Id: I2ba239df9b532805e177378f9fa35023d087716a

diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 64a412b..fec9972 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -399,7 +399,7 @@ UniversalContentBroker::registerContentProvider(
 {
     osl::MutexGuard aGuard(m_aMutex);
 
-    ProviderMap_Impl::iterator aIt;
+    ProviderMap_Impl::iterator aIt(m_aProviders.end());
     try
     {
         aIt = m_aProviders.find(Scheme);
@@ -445,7 +445,7 @@ void SAL_CALL UniversalContentBroker::deregisterContentProvider(
 {
     osl::MutexGuard aGuard(m_aMutex);
 
-    ProviderMap_Impl::iterator aMapIt;
+    ProviderMap_Impl::iterator aMapIt(m_aProviders.end());
     try
     {
         aMapIt = m_aProviders.find(Scheme);
diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx
index 717a077..e023633 100644
--- a/ucb/source/inc/regexpmap.hxx
+++ b/ucb/source/inc/regexpmap.hxx
@@ -101,8 +101,6 @@ class RegexpMapIter: public RegexpMapConstIter< Val >
     friend class RegexpMap< Val >; // to access ctor
 
 public:
-    RegexpMapIter() {}
-
     RegexpMapIter & operator ++();
 
     RegexpMapIter operator ++(int);
diff --git a/ucb/source/inc/regexpmap.tpt b/ucb/source/inc/regexpmap.tpt
index 4fe69a6..0090029 100644
--- a/ucb/source/inc/regexpmap.tpt
+++ b/ucb/source/inc/regexpmap.tpt
@@ -74,10 +74,6 @@ public:
 	typedef RegexpMapImpl< Val > MapImpl;
 	typedef typename List< Val >::iterator ListIterator;
 
-	// Solaris needs these for the ctor...
-
-	inline RegexpMapIterImpl();
-
 	inline RegexpMapIterImpl(MapImpl * pTheMap, int nTheList,
 							 ListIterator aTheIndex);
 
@@ -96,6 +92,8 @@ public:
 	RegexpMapEntry< Val > & get();
 
 private:
+    RegexpMapIterImpl(); // not implemented
+
 	mutable RegexpMapEntry< Val > m_aEntry;
 	typename List< Val >::iterator m_aIndex;
 	RegexpMapImpl< Val > * m_pMap;
@@ -108,14 +106,6 @@ private:
 }
 
 template< typename Val >
-inline RegexpMapIterImpl< Val >::RegexpMapIterImpl():
-	m_aEntry(rtl::OUString(), 0),
-	m_pMap(0),
-	m_nList(-1),
-	m_bEntrySet(false)
-{}
-
-template< typename Val >
 inline RegexpMapIterImpl< Val >::RegexpMapIterImpl(MapImpl * pTheMap,
 												   int nTheList,
 												   ListIterator aTheIndex):