From 67d16fc0811b50aa2e8f53684c7d5f5e0764f1a0 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 26 Jun 2015 13:52:50 +0200
Subject: loplugin:stringconstant: handle OUString+=OUString(literal)

Change-Id: Idcbd6b31a3147fc883fed49095e518af170daf38
---
 dbaccess/source/ui/querydesign/QTableWindow.cxx    | 3 +--
 dbaccess/source/ui/querydesign/QueryDesignView.cxx | 8 ++++----
 dbaccess/source/ui/querydesign/QueryTableView.cxx  | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 607552ff2389..289da9cf5a4a 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -90,8 +90,7 @@ bool OQueryTableWindow::Init()
     // Alias with successive number
     if (pContainer->CountTableAlias(sAliasName, m_nAliasNum))
     {
-        sAliasName += OUString('_');
-        sAliasName += OUString::number(m_nAliasNum);
+        sAliasName += "_" + OUString::number(m_nAliasNum);
     }
 
     sAliasName = comphelper::string::remove(sAliasName, '"');
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index a101bd81dd22..bdb2dc77ede5 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -930,16 +930,16 @@ namespace
                     else if ( pEntryField->isNumericOrAggreateFunction() )
                     {
                         OSL_ENSURE(!pEntryField->GetFunction().isEmpty(),"Function name cannot be empty! ;-(");
-                        aWorkStr += pEntryField->GetFunction();
-                        aWorkStr +=  OUString('(');
-                        aWorkStr += quoteTableAlias(bMulti,pEntryField->GetAlias(),aQuote);
+                        aWorkStr += pEntryField->GetFunction() + "("
+                            + quoteTableAlias(
+                                bMulti, pEntryField->GetAlias(), aQuote);
                         // only quote column name when we don't have a numeric
                         if ( pEntryField->isNumeric() )
                             aWorkStr += aColumnName;
                         else
                             aWorkStr += ::dbtools::quoteName(aQuote, aColumnName);
 
-                        aWorkStr +=  OUString(')');
+                        aWorkStr += ")";
                     }
                     else if ( pEntryField->isOtherFunction() )
                     {
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 3dcd670b276f..c86c7ce435d8 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -391,7 +391,7 @@ void OQueryTableView::AddTabWin(const OUString& _rTableName, const OUString& _rA
                                     ::dbtools::eInDataManipulation);
         OUString sRealName(sSchema);
         if (!sRealName.isEmpty())
-            sRealName+= OUString('.');
+            sRealName += ".";
         sRealName += sTable;
 
         AddTabWin(_rTableName, sRealName, _rAliasName, bNewTable);
-- 
cgit