--- a/locationdataharvester/mylocationsengine/src/lookupmaptiledb.cpp	Wed Aug 18 09:43:18 2010 +0300
+++ b/locationdataharvester/mylocationsengine/src/lookupmaptiledb.cpp	Thu Sep 02 20:20:42 2010 +0300
@@ -189,7 +189,9 @@
     if (ret != KErrNone)
     {
 		Close();
-        Open();
+        ret = Open();
+        if( ret != KErrNone )
+            return;
        
     }
 	 iItemsDatabase.Begin();
@@ -226,8 +228,9 @@
     if (ret != KErrNone)
     {
         Close();
-        Open();
-
+        ret = Open();
+        if( ret != KErrNone )
+            return;
     }
     iItemsDatabase.Begin();
 
@@ -270,8 +273,9 @@
     if (ret != KErrNone)
     {
 		Close();
-        Open();
-       
+        ret = Open();
+        if( ret != KErrNone )
+            return;       
     }
 	 iItemsDatabase.Begin();
 
@@ -315,8 +319,9 @@
     if (ret != KErrNone)
     {
 		Close();
-        Open();
-       
+        ret = Open();
+        if( ret != KErrNone )
+            return;
     }
 	 iItemsDatabase.Begin();
 
@@ -366,7 +371,9 @@
     if (ret != KErrNone)
     {
        Close();
-       Open();      
+       ret = Open();
+       if( ret != KErrNone )
+           return;
     }
     
     iItemsDatabase.Begin();
@@ -430,8 +437,9 @@
         if (ret != KErrNone)
         {
            Close();
-           ret= Open();
-           
+           ret = Open();
+           if( ret != KErrNone )
+               return;
         }
       iItemsDatabase.Begin();
 
@@ -472,8 +480,9 @@
         if (ret != KErrNone)
         {
            Close();
-           ret= Open();
-           
+           ret = Open();
+           if( ret != KErrNone )
+               return;
         }
     iItemsDatabase.Begin();
 
@@ -496,6 +505,7 @@
     }
 
     CleanupStack::PopAndDestroy( &myView ); // myView
+    Close();
 }
 
 // -----------------------------------------------------------------------------
@@ -515,7 +525,9 @@
     if (ret != KErrNone)
     {
 		Close();
-        Open();
+        ret = Open();
+        if( ret != KErrNone )
+            return EFalse;
        
     }
 	 iItemsDatabase.Begin();
@@ -553,8 +565,9 @@
     if (ret != KErrNone)
     {
         Close();
-        Open();
-       
+        ret = Open();
+        if( ret != KErrNone )
+            return EFalse;       
     }
     
     iItemsDatabase.Begin();

--- a/locationpickerservice/src/locationpickerdatamanager_p.cpp	Wed Aug 18 09:43:18 2010 +0300
+++ b/locationpickerservice/src/locationpickerdatamanager_p.cpp	Thu Sep 02 20:20:42 2010 +0300
@@ -273,9 +273,7 @@
     // add contact collection
     QStandardItem *modelItemContact = new QStandardItem();
     int conNum = aCount.value(0);
-    QString contactCollectionNum;
-    contactCollectionNum.setNum(conNum);
-    contactCollectionNum.append(" items");
+    QString contactCollectionNum(hbTrId("txt_lint_list_ln_items",conNum));
     QString contactCollectionName( hbTrId("txt_lint_list_contact_addresses") );
  
 
@@ -288,9 +286,7 @@
    
     //txt_lint_list_calender_addresses
     int calNum = aCount.value(1);
-    QString calendarCollectionNum;
-    calendarCollectionNum.setNum(calNum);
-    calendarCollectionNum.append(" items");
+    QString calendarCollectionNum(hbTrId("txt_lint_list_ln_items",calNum));
     QString calendarCollectionName( hbTrId("txt_lint_list_calendar_locations") );
     QStringList calender = (QStringList()<<calendarCollectionName<<calendarCollectionNum);
     
@@ -302,9 +298,7 @@
      
     //txt_lint_list_places_addresses
     int placNum = aCount.value(2);
-    QString placesCollectionNum;
-    placesCollectionNum.setNum(placNum);
-    placesCollectionNum.append(" items");
+    QString placesCollectionNum(hbTrId("txt_lint_list_ln_items",placNum));
     QString placesCollectionName( hbTrId("txt_lint_list_places") );
     QStringList places = (QStringList()<<placesCollectionName<<placesCollectionNum);