remove unnecessary use of OUString constructor in DBACCESS module

Change-Id: I831a6506211be30c5b743c20724904c903c5b3c0

39 files changed, 137 insertions, 141 deletions

diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 8571e0493a75..547b312cbe51 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -567,7 +567,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
 
-    OUStringBuffer aSql = OUString("UPDATE " + m_aComposedTableName + " SET ");
+    OUStringBuffer aSql = "UPDATE " + m_aComposedTableName + " SET ";
     // list all cloumns that should be set
     static OUString aPara(" = ?,");
     OUString aQuote  = getIdentifierQuoteString();
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 18a1cb02025c..dde644487cea 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1917,7 +1917,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                     {
                         xColumn = NULL;
                         bReFetchName = sal_True;
-                        sColumnLabel = OUString();
+                        sColumnLabel = "";
                     }
                     if(!xColumn.is())
                     {
@@ -2219,7 +2219,7 @@ Reference< XNameAccess > ORowSet::impl_getTables_throw()
         m_pTables = new OTableContainer(*this,m_aMutex,m_xActiveConnection,bCase,NULL,NULL,NULL,m_nInAppend);
         xTables = m_pTables;
         Sequence< OUString> aTableFilter(1);
-        aTableFilter[0] = OUString("%");
+        aTableFilter[0] = "%";
         m_pTables->construct(aTableFilter,Sequence< OUString>());
     }
 
@@ -2300,7 +2300,7 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw()
     // the last use the command as it is
     sal_Bool bDoEscapeProcessing = m_bUseEscapeProcessing;
 
-    m_aActiveCommand = OUString();
+    m_aActiveCommand = "";
     OUString sCommand;
 
     if ( m_aCommand.isEmpty() )
@@ -2325,7 +2325,7 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw()
             }
             else
             {
-                sCommand = OUString("SELECT * FROM ");
+                sCommand = "SELECT * FROM ";
                 OUString sCatalog, sSchema, sTable;
                 ::dbtools::qualifiedNameComponents( m_xActiveConnection->getMetaData(), m_aCommand, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation );
                 sCommand += ::dbtools::composeTableNameForSelect( m_xActiveConnection, sCatalog, sSchema, sTable );
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index f32c9188bd18..9765d8a47123 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -174,8 +174,8 @@ OUString SAL_CALL OComponentDefinition::getImplementationName(  ) throw(RuntimeE
 Sequence< OUString > OComponentDefinition::getSupportedServiceNames_static(  ) throw(RuntimeException)
 {
     Sequence< OUString > aServices(2);
-    aServices.getArray()[0] = OUString("com.sun.star.sdb.TableDefinition");
-    aServices.getArray()[1] = OUString("com.sun.star.ucb.Content");
+    aServices[0] = "com.sun.star.sdb.TableDefinition";
+    aServices[1] = "com.sun.star.ucb.Content";
 
     return aServices;
 }
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 3b38fffa2f14..dcd8b8c134b7 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -209,7 +209,7 @@ Sequence< OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames(void) th
 Sequence< OUString > DBTypeDetection::getSupportedServiceNames_Static(void) throw(  )
 {
     Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString("com.sun.star.document.ExtendedTypeDetection");
+    aSNS[0] = "com.sun.star.document.ExtendedTypeDetection";
     return aSNS;
 }
 
@@ -304,7 +304,7 @@ Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames(void) th
 Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static(void) throw(  )
 {
     Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString("com.sun.star.frame.FrameLoader");
+    aSNS[0] = "com.sun.star.frame.FrameLoader";
     return aSNS;
 }
 
@@ -573,7 +573,7 @@ IMPL_LINK( DBContentLoader, OnStartTableWizard, void*, /*NOTINTERESTEDIN*/ )
     {
         Sequence< Any > aWizArgs(1);
         PropertyValue aValue;
-        aValue.Name = OUString("DatabaseLocation");
+        aValue.Name = "DatabaseLocation";
         aValue.Value <<= m_sCurrentURL;
         aWizArgs[0] <<= aValue;
 
diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
index f2fb02a3d515..d5625e895d06 100644
--- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
@@ -56,7 +56,7 @@ OXMLConnectionResource::OXMLConnectionResource( ODBFilter& rImport,
         const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
         const OUString sValue = _xAttrList->getValueByIndex( i );
 
-        aProperty.Name = OUString();
+        aProperty.Name = "";
         aProperty.Value = Any();
 
         switch( rTokenMap.Get( nPrefix, sLocalName ) )
@@ -75,10 +75,10 @@ OXMLConnectionResource::OXMLConnectionResource( ODBFilter& rImport,
                 aProperty.Name = PROPERTY_TYPE;
                 break;
             case XML_TOK_SHOW:
-                aProperty.Name = OUString("Show");
+                aProperty.Name = "Show";
                 break;
             case XML_TOK_ACTUATE:
-                aProperty.Name = OUString("Actuate");
+                aProperty.Name = "Actuate";
                 break;
         }
         if ( !aProperty.Name.isEmpty() )
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index 530b49e19136..e39966eeab9e 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -67,7 +67,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
         sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
         OUString sValue = _xAttrList->getValueByIndex( i );
 
-        aProperty.Name = OUString();
+        aProperty.Name = "";
         aProperty.Value = Any();
 
         switch( rTokenMap.Get( nPrefix, sLocalName ) )
@@ -156,7 +156,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
                 aProperty.Value <<= sValue.toInt32();
                 break;
             case XML_TOK_JAVA_CLASSPATH:
-                aProperty.Name = OUString("JavaDriverClassPath");
+                aProperty.Name = "JavaDriverClassPath";
                 break;
         }
         if ( !aProperty.Name.isEmpty() )
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
index e59f26757499..b2c8a7a0ea6b 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
@@ -60,7 +60,7 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
         sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
         OUString sValue = _xAttrList->getValueByIndex( i );
 
-        aProperty.Name = OUString();
+        aProperty.Name = "";
 
         sal_uInt16 nToken = rTokenMap.Get( nPrefix, sLocalName );
         aTokens.push_back(nToken);
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 9dd10c6f1ec7..3e9a8be04b62 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -112,7 +112,7 @@ namespace dbaxml
     Sequence< OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< OUString > aSupported(1);
-        aSupported[0] = OUString("com.sun.star.document.ExportFilter");
+        aSupported[0] = "com.sun.star.document.ExportFilter";
         return aSupported;
     }
 
@@ -127,7 +127,7 @@ namespace dbaxml
     Sequence< OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< OUString > aSupported(1);
-        aSupported[0] = OUString("com.sun.star.document.ExportFilter");
+        aSupported[0] = "com.sun.star.document.ExportFilter";
         return aSupported;
     }
 
@@ -396,13 +396,13 @@ void ODBExport::exportDataSource()
                     sal_Int32 nValue = 0;
                     aValue >>= nValue;
                     if ( sValue == "0" )
-                        sValue = OUString("equal-integer");
+                        sValue = "equal-integer";
                     else if ( sValue == "1" )
-                        sValue = OUString("is-boolean");
+                        sValue = "is-boolean";
                     else if ( sValue == "2" )
-                        sValue = OUString("equal-boolean");
+                        sValue = "equal-boolean";
                     else if ( sValue == "3" )
-                        sValue = OUString("equal-use-only-zero");
+                        sValue = "equal-use-only-zero";
                     if ( sValue == "equal-integer" )
                         continue;
                     eToken = XML_BOOLEAN_COMPARISON_MODE;
@@ -570,7 +570,7 @@ void ODBExport::exportConnectionData()
                 {
                     OUString sExtension;
                     if ( eType == dbaccess::DST_MSACCESS )
-                        sExtension = OUString("mdb");
+                        sExtension = "mdb";
                     else
                     {
                         Reference< XPropertySet > xDataSourceSettings;
@@ -857,9 +857,9 @@ void ODBExport::exportComponent(XPropertySet* _xProp)
     sal_Bool bIsForm = sal_True;
     _xProp->getPropertyValue("IsForm") >>= bIsForm;
     if ( bIsForm )
-        sValue = OUString("forms/") + sValue;
+        sValue = "forms/" + sValue;
     else
-        sValue = OUString("reports/") + sValue;
+        sValue = "reports/" + sValue;
 
     AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,sValue);
     sal_Bool bAsTemplate = sal_False;
@@ -1305,7 +1305,7 @@ void ODBExport::GetViewSettings(Sequence<PropertyValue>& aProps)
             {
                 sal_Int32 nLength = aProps.getLength();
                 aProps.realloc(nLength + 1);
-                aProps[nLength].Name = OUString("Queries");
+                aProps[nLength].Name = "Queries";
                 Sequence< OUString> aSeq = xCollection->getElementNames();
                 const OUString* pIter = aSeq.getConstArray();
                 const OUString* pEnd   = pIter + aSeq.getLength();
@@ -1345,7 +1345,7 @@ void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps)
             if ( aPropValues.getLength() )
             {
                 aProps.realloc(nLength + 1);
-                aProps[nLength].Name = OUString("layout-settings");
+                aProps[nLength].Name = "layout-settings";
                 aProps[nLength].Value = aValue;
             }
         }
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 30e8a8649c39..8a1313d06928 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -78,11 +78,11 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
             Sequence< Any > aArguments(2);
             PropertyValue aValue;
             // set as folder
-            aValue.Name = OUString("Name");
+            aValue.Name = "Name";
             aValue.Value <<= m_sName;
             aArguments[0] <<= aValue;
             //parent
-            aValue.Name = OUString("Parent");
+            aValue.Name = "Parent";
             aValue.Value <<= _xParentContainer;
             aArguments[1] <<= aValue;
 
diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx
index bef6968de0cb..8565ffeaea78 100644
--- a/dbaccess/source/filter/xml/xmlLogin.cxx
+++ b/dbaccess/source/filter/xml/xmlLogin.cxx
@@ -92,7 +92,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
                     {
                         bUserFound = true;
                         PropertyValue aProperty;
-                        aProperty.Name = OUString("UseSystemUser");
+                        aProperty.Name = "UseSystemUser";
                         aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False);
                         rImport.addInfo(aProperty);
                     }
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
index 987e9f7d6ccd..e055d9c6bb37 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
@@ -69,7 +69,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
                 sPortNumber = sValue;
                 break;
             case XML_TOK_LOCAL_SOCKET:
-                aProperty.Name = OUString("LocalSocket");
+                aProperty.Name = "LocalSocket";
                 aProperty.Value <<= sValue;
                 rImport.addInfo(aProperty);
                 break;
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index 647d4c358f06..2d1b69827500 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -92,11 +92,11 @@ OXMLTable::OXMLTable( ODBFilter& _rImport
     Sequence< Any > aArguments(2);
     PropertyValue aValue;
     // set as folder
-    aValue.Name = OUString("Name");
+    aValue.Name = "Name";
     aValue.Value <<= m_sName;
     aArguments[0] <<= aValue;
     //parent
-    aValue.Name = OUString("Parent");
+    aValue.Name = "Parent";
     aValue.Value <<= m_xParentContainer;
     aArguments[1] <<= aValue;
     m_xTable.set(
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index b94e0ce9c65a..31743f2185a4 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -139,13 +139,13 @@ namespace dbaxml
                         {
                             uno::Sequence < beans::PropertyValue > aArgs( 3);
                             sal_Int32 nLen = 0;
-                            aArgs[nLen].Name = OUString("AsTemplate");
+                            aArgs[nLen].Name = "AsTemplate";
                             aArgs[nLen++].Value <<= sal_False;
 
-                            aArgs[nLen].Name = OUString("ReadOnly");
+                            aArgs[nLen].Name = "ReadOnly";
                             aArgs[nLen++].Value <<= sal_True;
 
-                            aArgs[nLen].Name = OUString("Hidden");
+                            aArgs[nLen].Name = "Hidden";
                             aArgs[nLen++].Value <<= sal_True;
 
                             ::comphelper::MimeConfigurationHelper aHelper( m_xContext );
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 2198d485aff6..7e705ae668aa 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -172,7 +172,7 @@ OUString OApplicationController::getImplementationName_Static() throw( RuntimeEx
 Sequence< OUString> OApplicationController::getSupportedServiceNames_Static(void) throw( RuntimeException )
 {
     Sequence< OUString> aSupported(1);
-    aSupported.getArray()[0] = OUString("com.sun.star.sdb.application.DefaultViewController");
+    aSupported[0] = "com.sun.star.sdb.application.DefaultViewController";
     return aSupported;
 }
 
@@ -1111,10 +1111,10 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
                         switch(_nId)
                         {
                             case SID_HELP_INDEX:
-                                aURL.Complete = OUString(".uno:HelpIndex");
+                                aURL.Complete = ".uno:HelpIndex";
                                 break;
                             case SID_OPENDOC:
-                                aURL.Complete = OUString(".uno:Open");
+                                aURL.Complete = ".uno:Open";
                                 break;
                         }
 
@@ -1655,16 +1655,16 @@ namespace
         switch(_eType)
         {
             case E_TABLE:
-                sToolbar = OUString("private:resource/toolbar/tableobjectbar");
+                sToolbar = "private:resource/toolbar/tableobjectbar";
                 break;
             case E_QUERY:
-                sToolbar = OUString("private:resource/toolbar/queryobjectbar");
+                sToolbar = "private:resource/toolbar/queryobjectbar";
                 break;
             case E_FORM:
-                sToolbar = OUString("private:resource/toolbar/formobjectbar");
+                sToolbar = "private:resource/toolbar/formobjectbar";
                 break;
             case E_REPORT:
-                sToolbar = OUString("private:resource/toolbar/reportobjectbar");
+                sToolbar = "private:resource/toolbar/reportobjectbar";
                 break;
             case E_NONE:
                 break;
@@ -2498,7 +2498,7 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt )
     m_aAsyncDrop.nAction        = _rEvt.mnAction;
     m_aAsyncDrop.bError         = sal_False;
     m_aAsyncDrop.bHtml          = sal_False;
-    m_aAsyncDrop.aUrl           = OUString();
+    m_aAsyncDrop.aUrl           = "";
 
     // loop through the available formats and see what we can do ...
     // first we have to check if it is our own format, if not we have to copy the stream :-(
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index cd36d9869689..9e360d9a67bf 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -1061,9 +1061,9 @@ void OAppDetailPageHelper::showPreview(const Reference< XContent >& _xContent)
             {
                 com::sun::star::ucb::Command aCommand;
                 if ( m_ePreviewMode == E_DOCUMENT )
-                    aCommand.Name = OUString("preview");
+                    aCommand.Name = "preview";
                 else
-                    aCommand.Name = OUString("getDocumentInfo");
+                    aCommand.Name = "getDocumentInfo";
 
                 Any aPreview = xContent->execute(aCommand,xContent->createCommandIdentifier(),Reference< XCommandEnvironment >());
                 if ( m_ePreviewMode == E_DOCUMENT )
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 3b0b795a71e6..f53375a3670e 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -140,8 +140,8 @@ Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames(void) th
 Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static(void) throw(  )
 {
     Sequence< OUString > aSNS( 2 );
-    aSNS.getArray()[0] = OUString("com.sun.star.frame.FrameLoader");
-    aSNS.getArray()[1] = OUString("com.sun.star.sdb.ContentLoader");
+    aSNS[0] = "com.sun.star.frame.FrameLoader";
+    aSNS[1] = "com.sun.star.sdb.ContentLoader";
     return aSNS;
 }
 
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 42c6fccebeb8..888f79389934 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -88,7 +88,7 @@ OUString SbaExternalSourceBrowser::getImplementationName_Static() throw(RuntimeE
 ::comphelper::StringSequence SbaExternalSourceBrowser::getSupportedServiceNames_Static() throw(RuntimeException)
 {
     ::comphelper::StringSequence aSupported(1);
-    aSupported.getArray()[0] = OUString("com.sun.star.sdb.FormGridView");
+    aSupported[0] = "com.sun.star.sdb.FormGridView";
     return aSupported;
 }
 
@@ -170,7 +170,7 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U
         if (sControlType.isEmpty())
         {
             SAL_WARN("dbaccess.ui", "SbaExternalSourceBrowser::dispatch(AddGridColumn) : missing argument (ColumnType) !");
-            sControlType = OUString("TextField");
+            sControlType = "TextField";
         }
         OSL_ENSURE(aControlProps.getLength(), "SbaExternalSourceBrowser::dispatch(AddGridColumn) : missing argument (ColumnProperties) !");
 
@@ -273,7 +273,7 @@ Reference< ::com::sun::star::frame::XDispatch >  SAL_CALL SbaExternalSourceBrows
             m_xUrlTransformer->parseStrict( aNewUrl );
 
         // set a new mark
-        aNewUrl.Mark = OUString("DB/FormGridView");
+        aNewUrl.Mark = "DB/FormGridView";
             // this controller is instantiated when somebody dispatches the ".component:DB/FormGridView" in any
             // frame, so we use "FormGridView" as mark that a dispatch request came from this view
 
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 31d990b6425c..a98fd401cdcf 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -130,9 +130,9 @@ OUString SbaXGridControl::getImplementationName_Static() throw( RuntimeException
 Sequence< OUString> SbaXGridControl::getSupportedServiceNames_Static(void) throw( RuntimeException )
 {
     Sequence< OUString> aSupported(3);
-    aSupported[0] = OUString("com.sun.star.form.control.InteractionGridControl");
-    aSupported[1] = OUString("com.sun.star.form.control.GridControl");
-    aSupported[2] = OUString("com.sun.star.awt.UnoControl");
+    aSupported[0] = "com.sun.star.form.control.InteractionGridControl";
+    aSupported[1] = "com.sun.star.form.control.GridControl";
+    aSupported[2] = "com.sun.star.awt.UnoControl";
     return aSupported;
 }
 
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 0e3de536e19e..ee970360925e 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -196,7 +196,7 @@ OUString SbaTableQueryBrowser::getImplementationName_Static() throw(RuntimeExcep
 ::comphelper::StringSequence SbaTableQueryBrowser::getSupportedServiceNames_Static() throw(RuntimeException)
 {
     ::comphelper::StringSequence aSupported(1);
-    aSupported.getArray()[0] = OUString("com.sun.star.sdb.DataSourceBrowser");
+    aSupported[0] = "com.sun.star.sdb.DataSourceBrowser";
     return aSupported;
 }
 
@@ -629,7 +629,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
                 Any* pValueIter = aValues.getArray();
                 if ( m_bPreview )
                 {
-                    *pStringIter++  = OUString("AlwaysShowCursor");
+                    *pStringIter++  = "AlwaysShowCursor";
                     *pValueIter++   <<= sal_False;
                     *pStringIter++  = PROPERTY_BORDER;
                     *pValueIter++   <<= sal_Int16(0);
@@ -643,16 +643,16 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
                 *pValueIter++   = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTRELIEF);
                 if ( m_bPreview )
                 {
-                    *pStringIter++  = OUString("HasNavigationBar");
+                    *pStringIter++  = "HasNavigationBar";
                     *pValueIter++       <<= sal_False;
-                    *pStringIter++  = OUString("HasRecordMarker");
+                    *pStringIter++  = "HasRecordMarker";
                     *pValueIter++       <<= sal_False;
                 }
                 *pStringIter++  = PROPERTY_ROW_HEIGHT;
                 *pValueIter++   = pData->xObjectProperties->getPropertyValue(PROPERTY_ROW_HEIGHT);
                 if ( m_bPreview )
                 {
-                    *pStringIter++  = OUString("Tabstop");
+                    *pStringIter++  = "Tabstop";
                     *pValueIter++       <<= sal_False;
                 }
                 *pStringIter++  = PROPERTY_TEXTCOLOR;
@@ -713,7 +713,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
                     case DataType::BIT:
                     case DataType::BOOLEAN:
                     {
-                        aCurrentModelType = OUString("CheckBox");
+                        aCurrentModelType = "CheckBox";
                         aInitialValues.push_back( NamedValue( OUString( "VisualEffect" ), makeAny( VisualEffect::FLAT ) ) );
                         sDefaultProperty = PROPERTY_DEFAULTSTATE;
 
@@ -735,7 +735,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
                     case DataType::BINARY:
                     case DataType::VARBINARY:
                     case DataType::LONGVARBINARY:
-                        aCurrentModelType = OUString("TextField");
+                        aCurrentModelType = "TextField";
                         sDefaultProperty = PROPERTY_DEFAULTTEXT;
                         break;
 
@@ -744,7 +744,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
                         bFormattedIsNumeric = sal_False;
                         // NO break!
                     default:
-                        aCurrentModelType = OUString("FormattedField");
+                        aCurrentModelType = "FormattedField";
                         sDefaultProperty = PROPERTY_EFFECTIVEDEFAULT;
 
                         if ( xSupplier.is() )
@@ -1109,7 +1109,7 @@ namespace
             return true;
         }
         _rDisplayName = _rDS;
-        _rUniqueId = OUString();
+        _rUniqueId = "";
         return false;
     }
 
@@ -1636,7 +1636,7 @@ void SbaTableQueryBrowser::LoadFinished(sal_Bool _bWasSynch)
 {
     SbaXDataBrowserController::LoadFinished(_bWasSynch);
 
-    m_sQueryCommand = OUString();
+    m_sQueryCommand = "";
     m_bQueryEscapeProcessing = sal_False;
 
     if (isValid() && !loadingCancelled())
@@ -2681,7 +2681,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry )
                                             Reference<XParametersSupplier> xParSup(xAnalyzer,UNO_QUERY);
                                             if ( xParSup->getParameters()->getCount() > 0 )
                                             {
-                                                OUString sFilter = OUString(" WHERE ");
+                                                OUString sFilter = " WHERE ";
                                                 sFilter = sFilter + xAnalyzer->getFilter();
                                                 OUString sReplace(sSql);
                                                 sReplace = sReplace.replaceFirst(sFilter,OUString());
@@ -3150,18 +3150,18 @@ void SbaTableQueryBrowser::impl_initialize()
 
             OUString* pStringIter = aProperties.getArray();
             Any* pValueIter = aValues.getArray();
-            *pStringIter++  = OUString("AlwaysShowCursor");
+            *pStringIter++  = "AlwaysShowCursor";
             *pValueIter++   <<= sal_False;
             *pStringIter++  = PROPERTY_BORDER;
             *pValueIter++   <<= sal_Int16(0);
 
-            *pStringIter++  = OUString("HasNavigationBar");
-            *pValueIter++       <<= sal_False;
-            *pStringIter++  = OUString("HasRecordMarker");
-            *pValueIter++       <<= sal_False;
+            *pStringIter++  = "HasNavigationBar";
+            *pValueIter++   <<= sal_False;
+            *pStringIter++  = "HasRecordMarker";
+            *pValueIter++   <<= sal_False;
 
-            *pStringIter++  = OUString("Tabstop");
-            *pValueIter++       <<= sal_False;
+            *pStringIter++  = "Tabstop";
+            *pValueIter++   <<= sal_False;
 
             Reference< XMultiPropertySet >  xFormMultiSet(getFormComponent(), UNO_QUERY);
             if ( xFormMultiSet.is() )
@@ -3563,7 +3563,7 @@ Any SbaTableQueryBrowser::getCurrentSelection( Control& _rControl ) const
 
 sal_Bool SbaTableQueryBrowser::implGetQuerySignature( OUString& _rCommand, sal_Bool& _bEscapeProcessing )
 {
-    _rCommand = OUString();
+    _rCommand = "";
     _bEscapeProcessing = sal_False;
 
     try
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 1ba8651180b8..d2c2c808e1f5 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -95,8 +95,8 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent,  WinBits nWinStyle ) :
         m_notifier = n;
     }
     css::uno::Sequence< OUString > s(2);
-    s[0] = OUString("FontHeight");
-    s[1] = OUString("FontName");
+    s[0] = "FontHeight";
+    s[1] = "FontName";
     n->addPropertiesChangeListener(s, m_listener.get());
     m_ColorConfig.AddListener(this);
 
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 3859e32005c0..09f4f1680fa1 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -150,11 +150,11 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click)
                 {
                     Sequence< Any > aValues(2);
                     PropertyValue aValue;
-                    aValue.Name = OUString("ResourceName");
+                    aValue.Name = "ResourceName";
                     aValue.Value <<= sSubFolder;
                     aValues[0] <<= aValue;
 
-                    aValue.Name = OUString("ResourceType");
+                    aValue.Name = "ResourceType";
                     aValue.Value <<= OUString("folder");
                     aValues[1] <<= aValue;
 
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index a0effcb51ceb..351c345e7d38 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -608,7 +608,7 @@ DBG_NAME(OConnectionHelper)
             OUString sContentType;
             if ( INET_PROT_FILE == eProtocol )
             {
-                sContentType = OUString("application/vnd.sun.staroffice.fsys-folder");
+                sContentType = "application/vnd.sun.staroffice.fsys-folder";
                 // the file UCP currently does not support the ContentType property
             }
             else
@@ -619,7 +619,7 @@ DBG_NAME(OConnectionHelper)
 
             // the properties which need to be set on the new content
             Sequence< OUString > aNewDirectoryProperties(1);
-            aNewDirectoryProperties[0] = OUString("Title");
+            aNewDirectoryProperties[0] = "Title";
 
             // the values to be set
             Sequence< Any > aNewDirectoryAttributes(1);
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 61be0ed065a9..8f9dae0c4529 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -603,7 +603,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr
             if (0 == pAdditionalInfo->Name.compareToAscii("JDBCDRV"))
             {   // compatibility
                 PropertyValue aCompatibility(*pAdditionalInfo);
-                aCompatibility.Name = OUString("JavaDriverClass");
+                aCompatibility.Name = "JavaDriverClass";
                 aInfos.insert(aCompatibility);
             }
             else
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index db3c14e7221c..b02ae2793718 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -458,13 +458,13 @@ OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const
         switch( m_pMySQLIntroPage->getMySQLMode() )
         {
             case OMySQLIntroPageSetup::VIA_JDBC:
-                sRet = OUString("sdbc:mysql:jdbc:");
+                sRet = "sdbc:mysql:jdbc:";
                 break;
             case OMySQLIntroPageSetup::VIA_NATIVE:
-                sRet = OUString("sdbc:mysql:mysqlc:");
+                sRet = "sdbc:mysql:mysqlc:";
                 break;
             case OMySQLIntroPageSetup::VIA_ODBC:
-                sRet = OUString("sdbc:mysql:odbc:");
+                sRet = "sdbc:mysql:odbc:";
                 break;
         }
     }
@@ -598,13 +598,13 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLInt
     switch( _pMySQLIntroPageSetup->getMySQLMode() )
     {
         case  OMySQLIntroPageSetup::VIA_ODBC:
-            sURLPrefix = OUString("sdbc:mysql:odbc:");
+            sURLPrefix = "sdbc:mysql:odbc:";
             break;
         case  OMySQLIntroPageSetup::VIA_JDBC:
-            sURLPrefix = OUString("sdbc:mysql:jdbc:");
+            sURLPrefix = "sdbc:mysql:jdbc:";
             break;
         case  OMySQLIntroPageSetup::VIA_NATIVE:
-            sURLPrefix = OUString("sdbc:mysql:mysqlc:");
+            sURLPrefix = "sdbc:mysql:mysqlc:";
             break;
     }
     activatePath( static_cast<PathId>(m_pCollection->getIndexOf(sURLPrefix) + 1), sal_True);
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 245b6b95916b..d04681367ffb 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -292,7 +292,7 @@ DBG_NAME(OTableSubscriptionPage)
                     sal_Bool bModified = ( xModi.is() && xModi->isModified() );
 
                     Sequence< OUString > aNewTableFilter(1);
-                    aNewTableFilter[0] = OUString("%");
+                    aNewTableFilter[0] = "%";
                     xProp->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(aNewTableFilter));
 
                     xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, makeAny( Sequence< OUString >() ) );
@@ -338,7 +338,7 @@ DBG_NAME(OTableSubscriptionPage)
             else
             {
                 // in addition, we need some infos about the connection used
-                m_sCatalogSeparator = OUString(".");    // (default)
+                m_sCatalogSeparator = ".";    // (default)
                 m_bCatalogAtStart = sal_True;   // (default)
                 try
                 {
@@ -498,7 +498,7 @@ DBG_NAME(OTableSubscriptionPage)
                                     if (bCatalogWildcard)
                                         sCatalog = sWildcard;
                                     else
-                                        sCatalog = OUString();
+                                        sCatalog = "";
                                     sCatalog += m_sCatalogSeparator;
                                     sCatalog += m_aTablesList.GetEntryText( pCatalog );
                                 }
@@ -525,7 +525,7 @@ DBG_NAME(OTableSubscriptionPage)
                 aTableFilter[nOldLen] = sComposedName;
 
                 // reset the composed name
-                sComposedName = OUString();
+                sComposedName = "";
             }
 
             if (bCatalogWildcard)
@@ -567,7 +567,7 @@ DBG_NAME(OTableSubscriptionPage)
             if (m_aTablesList.isWildcardChecked(m_aTablesList.getAllObjectsEntry()))
             {
                 aTableFilter.realloc(1);
-                aTableFilter[0] = OUString("%", 1, RTL_TEXTENCODING_ASCII_US);
+                aTableFilter[0] = "%";
             }
             else
             {
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 3f6ffab3412e..2a748958a074 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1387,8 +1387,7 @@ Reference<XPropertySet> createView( const OUString& _rName, const Reference< XCo
     }
     else
     {
-        sCommand = OUString( "SELECT * FROM " );
-        sCommand += composeTableNameForSelect( _rxConnection, _rxSourceObject );
+        sCommand =  "SELECT * FROM " + composeTableNameForSelect( _rxConnection, _rxSourceObject );
     }
     return createView( _rName, _rxConnection, sCommand );
 }
@@ -1465,11 +1464,11 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon
         Sequence< Any > aArguments(3);
         PropertyValue aValue;
         // set as folder
-        aValue.Name = OUString("Name");
+        aValue.Name = "Name";
         aValue.Value <<= sNewName;
         aArguments[0] <<= aValue;
         //parent
-        aValue.Name = OUString("Parent");
+        aValue.Name = "Parent";
         aValue.Value <<= xNameAccess;
         aArguments[1] <<= aValue;
 
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx
index 33384c030f0e..cbc4ded1a0c8 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -114,15 +114,15 @@ namespace dbaui
                     NamedValue      aProp;
                     sal_Int32       nArg = 0;
 
-                    aProp.Name    = OUString("ParentFrame");
+                    aProp.Name    = "ParentFrame";
                     aProp.Value <<= m_xParentFrame;
                     lArgs[nArg++] <<= aProp;
 
-                    aProp.Name    = OUString("TopWindow");
+                    aProp.Name    = "TopWindow";
                     aProp.Value <<= sal_True;
                     lArgs[nArg++] <<= aProp;
 
-                    aProp.Name    = OUString("SupportPersistentWindowState");
+                    aProp.Name    = "SupportPersistentWindowState";
                     aProp.Value <<= sal_True;
                     lArgs[nArg++] <<= aProp;
 
diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx
index 0bcb01875de8..977d5e3ab5f6 100644
--- a/dbaccess/source/ui/misc/indexcollection.cxx
+++ b/dbaccess/source/ui/misc/indexcollection.cxx
@@ -150,9 +150,9 @@ namespace dbaui
             }
 
             // set the properties
-            static const OUString s_sUniquePropertyName = OUString("IsUnique");
-            static const OUString s_sSortPropertyName = OUString("IsAscending");
-            static const OUString s_sNamePropertyName = OUString("Name");
+            static const OUString s_sUniquePropertyName = "IsUnique";
+            static const OUString s_sSortPropertyName = "IsAscending";
+            static const OUString s_sNamePropertyName = "Name";
             // the index' own props
             xIndexDescriptor->setPropertyValue(s_sUniquePropertyName, ::cppu::bool2any(_rPos->bUnique));
             xIndexDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(_rPos->sName));
@@ -252,10 +252,10 @@ namespace dbaui
 
     void OIndexCollection::implFillIndexInfo(OIndex& _rIndex, Reference< XPropertySet > _rxDescriptor) SAL_THROW((Exception))
     {
-        static const OUString s_sPrimaryIndexPropertyName = OUString("IsPrimaryKeyIndex");
-        static const OUString s_sUniquePropertyName = OUString("IsUnique");
-        static const OUString s_sSortPropertyName = OUString("IsAscending");
-        static const OUString s_sCatalogPropertyName = OUString("Catalog");
+        static const OUString s_sPrimaryIndexPropertyName = "IsPrimaryKeyIndex";
+        static const OUString s_sUniquePropertyName = "IsUnique";
+        static const OUString s_sSortPropertyName = "IsAscending";
+        static const OUString s_sCatalogPropertyName = "Catalog";
 
         _rIndex.bPrimaryKey = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sPrimaryIndexPropertyName));
         _rIndex.bUnique = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sUniquePropertyName));
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 682bd07f0e6c..ed479366debb 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -647,7 +647,7 @@ namespace
                 OUString rFieldName = pEntryField->GetField();
                 if ( !rFieldName.isEmpty() && pEntryField->IsVisible() )
                 {
-                    aTmpStr = OUString();
+                    aTmpStr = "";
                     const OUString rAlias = pEntryField->GetAlias();
                     const OUString rFieldAlias = pEntryField->GetFieldAlias();
 
@@ -741,7 +741,7 @@ namespace
 
             for (sal_uInt16 i=0 ; i < nMaxCriteria ; i++)
             {
-                aHavingStr = aWhereStr = OUString();
+                aHavingStr = aWhereStr = "";
 
                 for(aIter = _rFieldList.begin();aIter != aEnd;++aIter)
                 {
@@ -762,9 +762,7 @@ namespace
                             bCritsOnAsterikWarning = sal_True;
                             continue;
                         }
-                        aWork = OUString();
-
-                        aWork += quoteTableAlias(bMulti,pEntryField->GetAlias(),aQuote);
+                        aWork = quoteTableAlias(bMulti,pEntryField->GetAlias(),aQuote);
 
                         if ( (pEntryField->GetFunctionType() & (FKT_OTHER|FKT_NUMERIC)) || (aFieldName.toChar() == '*') )
                             aWork += aFieldName;
@@ -774,7 +772,7 @@ namespace
                         if ( pEntryField->isAggreateFunction() || pEntryField->IsGroupBy() )
                         {
                             if (aHavingStr.isEmpty())            // no more criteria
-                                aHavingStr += OUString('(');         // bracket
+                                aHavingStr += "(";               // bracket
                             else
                                 aHavingStr += C_AND;
 
@@ -782,9 +780,9 @@ namespace
                             {
                                 OSL_ENSURE(!pEntryField->GetFunction().isEmpty(),"No function name for aggregate given!");
                                 aHavingStr += pEntryField->GetFunction();
-                                aHavingStr += OUString('(');         // bracket
+                                aHavingStr += "(";              // bracket
                                 aHavingStr += aWork;
-                                aHavingStr += OUString(')');         // bracket
+                                aHavingStr += ")";             // bracket
                             }
                             else
                                 aHavingStr += aWork;
@@ -816,11 +814,11 @@ namespace
                         else
                         {
                             if ( aWhereStr.isEmpty() )           // no more criteria
-                                aWhereStr += OUString('(');          // bracket
+                                aWhereStr += "(";                // bracket
                             else
                                 aWhereStr += C_AND;
 
-                            aWhereStr += OUString(' ');
+                            aWhereStr += " ";
                             // aCriteria could have some german numbers so I have to be sure here
                             OUString aTmp = aCriteria;
                             OUString aErrorMsg;
@@ -850,7 +848,7 @@ namespace
                     else if ( !i && pEntryField->isCondition() )
                     {
                         if (aWhereStr.isEmpty())         // no more criteria
-                            aWhereStr += OUString('(');          // bracket
+                            aWhereStr += "(";            // bracket
                         else
                             aWhereStr += C_AND;
                         aWhereStr += pEntryField->GetField();
@@ -858,7 +856,7 @@ namespace
                 }
                 if (!aWhereStr.isEmpty())
                 {
-                    aWhereStr += OUString(')');                      // close bracket for the AND branch
+                    aWhereStr += ")";                          // close bracket for the AND branch
                     if (!rRetStr.isEmpty())                            // are there conditions on the field?
                         rRetStr.append(C_OR);
                     else                                        // open bracket for the OR branch
@@ -867,7 +865,7 @@ namespace
                 }
                 if (!aHavingStr.isEmpty())
                 {
-                    aHavingStr += OUString(')');                     // close bracket for the AND branch
+                    aHavingStr +=  ")";                        // close bracket for the AND branch
                     if (!rHavingStr.isEmpty())                         // are there conditions on the field?
                         rHavingStr.append(C_OR);
                     else                                        // Open bracket for the OR branch
@@ -955,9 +953,9 @@ namespace
                         aWorkStr += quoteTableAlias(bMulti,pEntryField->GetAlias(),aQuote);
                         aWorkStr += ::dbtools::quoteName(aQuote, aColumnName);
                     }
-                    aWorkStr += OUString(' ');
+                    aWorkStr += " ";
                     aWorkStr += OUString( ";ASC;DESC" ).getToken( (sal_uInt16)eOrder, ';' );
-                    aWorkStr += OUString(',');
+                    aWorkStr += ",";
                 }
             }
 
@@ -974,8 +972,7 @@ namespace
                     eErrorCode = eStatementTooLong;
                 else
                 {
-                    _rsRet = OUString(" ORDER BY ");
-                    _rsRet += aWorkStr;
+                    _rsRet = " ORDER BY " + aWorkStr;
                 }
             }
         }
@@ -1017,7 +1014,7 @@ namespace
         {
             _rTableNames[sTabName] = sal_True;
             _rsTableListStr += sTabName;
-            _rsTableListStr += OUString(',');
+            _rsTableListStr += ",";
         }
     }
     OUString GenerateFromClause( const Reference< XConnection>& _xConnection,
@@ -1128,7 +1125,7 @@ namespace
             if(!pEntryTab->ExistsAConn())
             {
                 aTableListStr += BuildTable(_xConnection,pEntryTab);
-                aTableListStr += OUString(',');
+                aTableListStr += ",";
             }
         }
 
@@ -1191,7 +1188,7 @@ namespace
                     {
                         aGroupByNames.insert(::std::map< OUString,bool>::value_type(sGroupByPart,true));
                         aGroupByStr += sGroupByPart;
-                        aGroupByStr += OUString(',');
+                        aGroupByStr += ",";
                     }
                 }
             }
@@ -2222,7 +2219,7 @@ namespace
                                 {   // we got an aggregate function but without column name inside
                                     // so we set the whole argument of the function as field name
                                     nFunctionType |= FKT_NUMERIC;
-                                    sFieldName = OUString();
+                                    sFieldName = "";
                                     pParamRef->parseNodeToStr(  sFieldName,
                                                         xConnection,
                                                         &rController.getParser().getContext(),
@@ -2759,7 +2756,7 @@ void OQueryDesignView::fillValidFields(const OUString& sAliasName, ComboBox* pFi
         if (bAllTables || (pCurrentWin->GetAliasName() == sAliasName))
         {
             strCurrentPrefix = pCurrentWin->GetAliasName();
-            strCurrentPrefix += OUString('.');
+            strCurrentPrefix += ".";
 
             pCurrentWin->EnumValidFields(aFields);
 
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index b4b9d5fc931c..3506285993a4 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -678,7 +678,7 @@ sal_Bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRe
         if (pParseNode == NULL)
             pParseNode = rParser.parseTree( devnull, _sFieldName, false );
         if (pParseNode != NULL && SQL_ISRULE(pParseNode, select_statement))
-            _sFieldName = OUString("(") + _sFieldName + ")";
+            _sFieldName = "(" + _sFieldName + ")";
     }
 
     OSQLParseNode* pParseNode = NULL;
@@ -1076,7 +1076,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
                     }
                     else
                     {
-                        sFunctionName = OUString();
+                        sFunctionName = "";
                         pEntry->SetFunction(OUString());
                         pEntry->SetFunctionType(pEntry->GetFunctionType() & ~FKT_AGGREGATE );
                     }
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index c2c497973f8a..8aaa06c94a21 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -80,8 +80,8 @@ namespace dbaui
     Sequence< OUString > OTableWindowAccess::getSupportedServiceNames_Static(void) throw( RuntimeException )
     {
         Sequence< OUString > aSupported(2);
-        aSupported[0] = OUString("com.sun.star.accessibility.Accessible");
-        aSupported[1] = OUString("com.sun.star.accessibility.AccessibleContext");
+        aSupported[0] = "com.sun.star.accessibility.Accessible";
+        aSupported[1] = "com.sun.star.accessibility.AccessibleContext";
         return aSupported;
     }
     OUString OTableWindowAccess::getImplementationName_Static(void) throw( RuntimeException )
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index c718a60abf15..aaf436291e6e 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -100,7 +100,7 @@ OUString ORelationController::getImplementationName_Static() throw( RuntimeExcep
 Sequence< OUString> ORelationController::getSupportedServiceNames_Static(void) throw( RuntimeException )
 {
     Sequence< OUString> aSupported(1);
-    aSupported.getArray()[0] = OUString("com.sun.star.sdb.RelationDesign");
+    aSupported[0] = "com.sun.star.sdb.RelationDesign";
     return aSupported;
 }
 
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 1aeca6712433..5df5078c0925 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -133,7 +133,7 @@ OUString OTableController::getImplementationName_Static() throw( RuntimeExceptio
 Sequence< OUString> OTableController::getSupportedServiceNames_Static(void) throw( RuntimeException )
 {
     Sequence< OUString> aSupported(1);
-    aSupported.getArray()[0] = OUString("com.sun.star.sdb.TableDesign");
+    aSupported[0] = "com.sun.star.sdb.TableDesign";
     return aSupported;
 }
 
@@ -446,7 +446,7 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs)
     {
         if(!bAlter || bNew)
         {
-            m_sName = OUString();
+            m_sName = "";
             stopTableListening();
             m_xTable = NULL;
         }
@@ -1241,7 +1241,7 @@ void OTableController::alterColumns()
 
                     SQLException aNewException;
                     aNewException.Message = sError;
-                    aNewException.SQLState = OUString("S1000");
+                    aNewException.SQLState = "S1000";
                     aNewException.NextException = ::cppu::getCaughtException();
 
                     throw aNewException;
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index b9d1cabf86e3..818022e35a62 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -96,7 +96,7 @@ namespace dbaui
     ::comphelper::StringSequence OAdvancedSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException)
     {
         ::comphelper::StringSequence aSupported(1);
-        aSupported.getArray()[0] = OUString("com.sun.star.sdb.AdvancedDatabaseSettingsDialog");
+        aSupported[0] = "com.sun.star.sdb.AdvancedDatabaseSettingsDialog";
         return aSupported;
     }
 
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
index 0e65b1b81e5b..4014df609cee 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
@@ -70,7 +70,7 @@ OUString ODBTypeWizDialog::getImplementationName_Static() throw(RuntimeException
 ::comphelper::StringSequence ODBTypeWizDialog::getSupportedServiceNames_Static() throw(RuntimeException)
 {
     ::comphelper::StringSequence aSupported(1);
-    aSupported.getArray()[0] = OUString("com.sun.star.sdb.DataSourceTypeChangeDialog");
+    aSupported[0] = "com.sun.star.sdb.DataSourceTypeChangeDialog";
     return aSupported;
 }
 
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index ac1281bedd79..70c627df3a24 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -85,7 +85,7 @@ OUString ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeExce
 ::comphelper::StringSequence ODBTypeWizDialogSetup::getSupportedServiceNames_Static() throw(RuntimeException)
 {
     ::comphelper::StringSequence aSupported(1);
-    aSupported.getArray()[0] = OUString("com.sun.star.sdb.DatabaseWizardDialog");
+    aSupported[0] = "com.sun.star.sdb.DatabaseWizardDialog";
     return aSupported;
 }
 
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx
index 846c81f8d77d..e88fc9fb5e0e 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.cxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx
@@ -70,7 +70,7 @@ OUString OTableFilterDialog::getImplementationName_Static() throw(RuntimeExcepti
 ::comphelper::StringSequence OTableFilterDialog::getSupportedServiceNames_Static() throw(RuntimeException)
 {
     ::comphelper::StringSequence aSupported(1);
-    aSupported.getArray()[0] = OUString("com.sun.star.sdb.TableFilterDialog");
+    aSupported[0] = "com.sun.star.sdb.TableFilterDialog";
     return aSupported;
 }
 
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index 9cae4effd0f5..00b057777d52 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -70,7 +70,7 @@ OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeExcept
 ::comphelper::StringSequence OUserSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException)
 {
     ::comphelper::StringSequence aSupported(1);
-    aSupported.getArray()[0] = OUString("com.sun.star.sdb.UserAdministrationDialog");
+    aSupported = "com.sun.star.sdb.UserAdministrationDialog";
     return aSupported;
 }
 
diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx
index 10b1f7252b55..db18a8923638 100644
--- a/dbaccess/source/ui/uno/admindlg.cxx
+++ b/dbaccess/source/ui/uno/admindlg.cxx
@@ -70,7 +70,7 @@ OUString ODataSourcePropertyDialog::getImplementationName_Static() throw(Runtime
 ::comphelper::StringSequence ODataSourcePropertyDialog::getSupportedServiceNames_Static() throw(RuntimeException)
 {
     ::comphelper::StringSequence aSupported(1);
-    aSupported.getArray()[0] = OUString("com.sun.star.sdb.DatasourceAdministrationDialog");
+    aSupported[0] = "com.sun.star.sdb.DatasourceAdministrationDialog";
     return aSupported;
 }