make dbaccess xub_StrLen free

Change-Id: I2c91c23f3dabacdb4ee65c18dc73f096041b74a9

dbaccess/source/ui/dlg/TextConnectionHelper.cxx

@@ -87,7 +87,7 @@ DBG_NAME(OTextConnectionHelper)
         DBG_CTOR(OTextConnectionHelper,NULL);
 
         sal_Int32 nCnt = comphelper::string::getTokenCount(m_aFieldSeparatorList, '\t');
-        xub_StrLen i;
+        sal_Int32 i;
 
         for( i = 0 ; i < nCnt ; i += 2 )
             m_aFieldSeparator.InsertEntry( m_aFieldSeparatorList.getToken( i, '\t' ) );
@@ -454,7 +454,7 @@ DBG_NAME(OTextConnectionHelper)
     OUString OTextConnectionHelper::GetSeparator( const ComboBox& rBox, const OUString& rList )
     {
         sal_Unicode nTok = '\t';
-        xub_StrLen  nPos(rBox.GetEntryPos( rBox.GetText() ));
+        sal_uInt16 nPos(rBox.GetEntryPos( rBox.GetText() ));
 
         if( nPos == COMBOBOX_ENTRY_NOTFOUND )
             return rBox.GetText().copy(0);
@@ -470,7 +470,7 @@ DBG_NAME(OTextConnectionHelper)
     {
         char    nTok = '\t';
         sal_Int32   nCnt = comphelper::string::getTokenCount(rList, nTok);
-        xub_StrLen  i;
+        sal_Int32 i;
 
         for( i=0 ; i<nCnt ; i+=2 )
         {

dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx

@@ -1259,9 +1259,8 @@ void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const Rectangle& r
     OUString  aLabel(ModuleRes(STR_QUERY_HANDLETEXT));
 
    // from BROW_CRIT2_ROW onwards all rows are shown "or"
-    xub_StrLen nToken = (xub_StrLen) (m_nSeekRow >= GetBrowseRow(BROW_CRIT2_ROW))
-                                ?
-            xub_StrLen(BROW_CRIT2_ROW) : xub_StrLen(GetRealRow(m_nSeekRow));
+    sal_Int32 nToken = (m_nSeekRow >= GetBrowseRow(BROW_CRIT2_ROW))
+        ?  BROW_CRIT2_ROW : GetRealRow(m_nSeekRow);
     rDev.DrawText(aRect, aLabel.getToken(nToken, ';'),TEXT_DRAW_VCENTER);
 }
 
@@ -2648,9 +2647,8 @@ OUString OSelectionBrowseBox::GetRowDescription( sal_Int32 _nRow ) const
     OUString  aLabel(ModuleRes(STR_QUERY_HANDLETEXT));
 
     // from BROW_CRIT2_ROW onwards all rows are shown as "or"
-    xub_StrLen nToken = (xub_StrLen) (_nRow >= GetBrowseRow(BROW_CRIT2_ROW))
-                                ?
-            xub_StrLen(BROW_CRIT2_ROW) : xub_StrLen(GetRealRow(_nRow));
+    sal_Int32 nToken = (_nRow >= GetBrowseRow(BROW_CRIT2_ROW))
+        ?  BROW_CRIT2_ROW : GetRealRow(_nRow);
     return aLabel.getToken(nToken, ';');
 }
 
@@ -2704,7 +2702,7 @@ void OSelectionBrowseBox::setFunctionCell(OTableFieldDescRef& _pEntry)
                 m_pFunctionCell->InsertEntry(m_aFunctionStrings.getToken(2, ';')); // 2 -> COUNT
             else
             {
-                xub_StrLen nCount = comphelper::string::getTokenCount(m_aFunctionStrings, ';');
+                sal_Int32 nCount = comphelper::string::getTokenCount(m_aFunctionStrings, ';');
                 if ( _pEntry->isNumeric() )
                     --nCount;
                 for( sal_Int32 nIdx = 1; nIdx < nCount; nIdx++ )