loplugin:stringloop cui,dbaccess

Change-Id: I32b63d2435d36b869823ea022ebd7f8347a46ea0
Reviewed-on: https://gerrit.libreoffice.org/58211
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 28 insertions, 32 deletions

diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 6cab0eaa90d1..16216f60315f 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -259,7 +259,7 @@ namespace dbaui
         while (xRS->next())
         {
             // initialise the output line for each row
-            OUString out("");
+            OUStringBuffer out;
             // work along the columns until that are none left
             try
             {
@@ -267,7 +267,7 @@ namespace dbaui
                 for (;;)
                 {
                     // be dumb, treat everything as a string
-                    out += xRow->getString(i) + ",";
+                    out.append(xRow->getString(i)).append(",");
                     i++;
                 }
             }
@@ -276,7 +276,7 @@ namespace dbaui
             {
             }
             // report the output
-            addOutputText(out);
+            addOutputText(out.makeStringAndClear());
         }
     }
 
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 72d1bdf51ac0..66f9c8c1d4fd 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -98,11 +98,10 @@ DlgFilterCrit::DlgFilterCrit(vcl::Window * pParent,
     m_pLB_WHERECOMP2->set_width_request(aSize.Width());
     m_pLB_WHERECOMP3->set_width_request(aSize.Width());
     const sal_Int32 nEntryCount =  m_pLB_WHERECOMP1->GetEntryCount();
+    m_aSTR_COMPARE_OPERATORS.resize(nEntryCount);
     for (sal_Int32 i = 0; i < nEntryCount; ++i)
     {
-        if (i > 0)
-            m_aSTR_COMPARE_OPERATORS += ";";
-        m_aSTR_COMPARE_OPERATORS += m_pLB_WHERECOMP1->GetEntry(i);
+        m_aSTR_COMPARE_OPERATORS[i] = m_pLB_WHERECOMP1->GetEntry(i);
     }
     m_pLB_WHERECOMP1->Clear();
 
@@ -218,8 +217,8 @@ void DlgFilterCrit::dispose()
 sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const OUString& _rSelectedPredicate ) const
 {
     sal_Int32 nPredicateIndex = -1;
-    for ( sal_Int32 i=0; i < comphelper::string::getTokenCount(m_aSTR_COMPARE_OPERATORS, ';'); ++i)
-        if ( m_aSTR_COMPARE_OPERATORS.getToken(i, ';') == _rSelectedPredicate )
+    for ( size_t i=0; i < m_aSTR_COMPARE_OPERATORS.size(); ++i)
+        if ( m_aSTR_COMPARE_OPERATORS[i] == _rSelectedPredicate )
         {
             nPredicateIndex = i;
             break;
@@ -675,21 +674,21 @@ IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox&, rListBox, void )
 
         if(eColumnSearch  == ColumnSearch::FULL)
         {
-            for(sal_Int32 i=0;i < comphelper::string::getTokenCount(m_aSTR_COMPARE_OPERATORS, ';');i++)
-                pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS.getToken(i, ';'));
+            for(size_t i=0;i < m_aSTR_COMPARE_OPERATORS.size(); i++)
+                pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS[i]);
         }
         else if(eColumnSearch == ColumnSearch::CHAR)
         {
             for(sal_Int32 i=6; i<10; i++)
-                pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS.getToken(i, ';'));
+                pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS[i]);
         }
         else if(eColumnSearch == ColumnSearch::BASIC)
         {
-            sal_Int32 i;
+            size_t i;
             for( i = 0; i < 6; i++ )
-                pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS.getToken(i, ';'));
-            for(i=8; i < comphelper::string::getTokenCount(m_aSTR_COMPARE_OPERATORS, ';'); ++i)
-                pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS.getToken(i, ';'));
+                pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS[i]);
+            for(i=8; i < m_aSTR_COMPARE_OPERATORS.size(); ++i)
+                pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS[i]);
         }
         else
         {
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index cb8af47b7f9b..a5d02374760a 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -219,23 +219,23 @@ OUString DlgOrderCrit::GetOrderList( ) const
 
     Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY)->getColumns();
 
-    OUString sOrder;
+    OUStringBuffer sOrder;
     for( sal_uInt16 i=0 ; i<DOG_ROWS; i++ )
     {
         if(m_aColumnList[i]->GetSelectedEntryPos() != 0)
         {
             if(!sOrder.isEmpty())
-                sOrder += ",";
+                sOrder.append(",");
 
             OUString sName = m_aColumnList[i]->GetSelectedEntry();
-            sOrder += ::dbtools::quoteName(sQuote,sName);
+            sOrder.append(::dbtools::quoteName(sQuote,sName));
             if(m_aValueList[i]->GetSelectedEntryPos())
-                sOrder += " DESC ";
+                sOrder.append(" DESC ");
             else
-                sOrder += " ASC ";
+                sOrder.append(" ASC ");
         }
     }
-    return sOrder;
+    return sOrder.makeStringAndClear();
 }
 
 void DlgOrderCrit::BuildOrderPart()
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 431db3828481..ac348069c0e5 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -437,7 +437,6 @@ namespace dbaui
         Sequence< OUString > aTableFilter;
         static const char sWildcard[] = "%";
 
-        OUString sComposedName;
         const SvTreeListEntry* pAllObjectsEntry = m_pTablesList->getAllObjectsEntry();
         if (!pAllObjectsEntry)
             return aTableFilter;
@@ -451,6 +450,7 @@ namespace dbaui
 
             if (m_pTablesList->GetCheckButtonState(pEntry) == SvButtonState::Checked && !m_pTablesList->GetModel()->HasChildren(pEntry))
             {   // checked and a leaf, which means it's no catalog, no schema, but a real table
+                OUStringBuffer sComposedName;
                 OUString sCatalog;
                 if(m_pTablesList->GetModel()->HasParent(pEntry))
                 {
@@ -473,9 +473,9 @@ namespace dbaui
                                 bCatalogWildcard = OTableTreeListBox::isWildcardChecked(pCatalog);
                                 if (m_bCatalogAtStart)
                                 {
-                                    sComposedName += m_pTablesList->GetEntryText( pCatalog ) + m_sCatalogSeparator;
+                                    sComposedName.append(m_pTablesList->GetEntryText( pCatalog )).append(m_sCatalogSeparator);
                                     if (bCatalogWildcard)
-                                        sComposedName += sWildcard;
+                                        sComposedName.append(sWildcard);
                                 }
                                 else
                                 {
@@ -488,26 +488,23 @@ namespace dbaui
                             }
                         }
                         bSchemaWildcard = OTableTreeListBox::isWildcardChecked(pSchema);
-                        sComposedName += m_pTablesList->GetEntryText( pSchema ) + ".";
+                        sComposedName.append(m_pTablesList->GetEntryText( pSchema )).append(".");
                     }
 
                     if (bSchemaWildcard)
-                        sComposedName += sWildcard;
+                        sComposedName.append(sWildcard);
                 }
                 if (!bSchemaWildcard && !bCatalogWildcard)
-                    sComposedName += m_pTablesList->GetEntryText( pEntry );
+                    sComposedName.append(m_pTablesList->GetEntryText( pEntry ));
 
                 if (!m_bCatalogAtStart && !bCatalogWildcard)
-                    sComposedName += sCatalog;
+                    sComposedName.append(sCatalog);
 
                 // need some space
                 sal_Int32 nOldLen = aTableFilter.getLength();
                 aTableFilter.realloc(nOldLen + 1);
                 // add the new name
-                aTableFilter[nOldLen] = sComposedName;
-
-                // reset the composed name
-                sComposedName.clear();
+                aTableFilter[nOldLen] = sComposedName.makeStringAndClear();
             }
 
             if (bCatalogWildcard)