summaryrefslogtreecommitdiffstats
path: root/dbaccess
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-19 14:16:55 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-03-19 14:18:10 +0100
commit5bb4a2ba1d8a6b98720868786e552aa8fd2a22eb (patch)
treef891d796fa21c5bfb941eaa4a3f0c05a7e179cc6 /dbaccess
parentodk: do not pack unused component.map file (diff)
downloadcore-5bb4a2ba1d8a6b98720868786e552aa8fd2a22eb.tar.gz
core-5bb4a2ba1d8a6b98720868786e552aa8fd2a22eb.zip
further OUString cleanup
Change-Id: I19954ee5976cb881a5fe73a889c8e04a19b14eb6
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/browser/dbloader.cxx4
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx18
3 files changed, 11 insertions, 13 deletions
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 4f9d37e7ad2d..ad7cbb12a210 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -163,10 +163,10 @@ extern "C" void SAL_CALL writeDBLoaderInfo(void* pRegistryKey)
aImpl += DBContentLoader::getImplementationName_Static();
OUString aImpltwo = aImpl;
- aImpltwo += OUString("/UNO/Loader");
+ aImpltwo += "/UNO/Loader";
Reference< XRegistryKey> xNewKey = xKey->createKey( aImpltwo );
aImpltwo = aImpl;
- aImpltwo += OUString("/Loader");
+ aImpltwo += "/Loader";
Reference< XRegistryKey > xLoaderKey = xKey->createKey( aImpltwo );
xNewKey = xLoaderKey->createKey( OUString("Pattern") );
xNewKey->setAsciiValue( OUString(".component:DB*") );
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 764aec993f47..d37e7625323c 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -3745,7 +3745,7 @@ OUString SbaTableQueryBrowser::getPrivateTitle() const
sTitle = aURL.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET);
if ( !sName.isEmpty() )
{
- sName += OUString(" - ");
+ sName += " - ";
sName += sTitle;
sTitle = sName;
}
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index b1b91f6beae1..b9c5279f497e 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -374,9 +374,9 @@ namespace
OUString aQuote = xMetaData->getIdentifierQuoteString();
if ( _bForce || isAppendTableAliasEnabled( _xConnection ) || pEntryTab->GetAliasName() != aDBName )
{
- aTableListStr += OUString(" ");
+ aTableListStr += " ";
if ( generateAsBeforeTableAlias( _xConnection ) )
- aTableListStr += OUString("AS ");
+ aTableListStr += "AS ";
aTableListStr += ::dbtools::quoteName( aQuote, pEntryTab->GetAliasName() );
}
aDBName = aTableListStr;
@@ -864,9 +864,7 @@ namespace
}
else
{
- aWhereStr += aWork;
- aWhereStr += OUString("=");
- aWhereStr += aCriteria;
+ aWhereStr += aWork + "=" + aCriteria;
}
}
}
@@ -1107,17 +1105,17 @@ namespace
{
// create outer join
if ( bUseEscape )
- aStr += OUString("{ OJ ");
+ aStr += "{ OJ ";
aStr += aJoin;
if ( bUseEscape )
- aStr += OUString(" }");
+ aStr += " }";
}
break;
default:
aStr += aJoin;
break;
}
- aStr += OUString(",");
+ aStr += ",";
aTableListStr += aStr;
}
}
@@ -3108,8 +3106,8 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
{
// first try the international version
OUString sSql;
- sSql += OUString("SELECT * ");
- sSql += OUString(" FROM x WHERE ");
+ sSql += "SELECT * ";
+ sSql += " FROM x WHERE ";
sSql += pEntry->GetField();
sSql += _sCriteria;
SAL_WNODEPRECATED_DECLARATIONS_PUSH