remove OUString wrap for string literals

For some functions and all kinds of Exceptions.

CannotConvertException
CloseVetoException
DisposedException
EmptyUndoStackException
ErrorCodeIOException
Exception
GridInvalidDataException
GridInvalidModelException
IOException
IllegalAccessException
IllegalArgumentException
IllegalTypeException
IndexOutOfBoundsException
NoMasterException
NoSuchElementException
NoSupportException
PropertyVetoException
RuntimeException
SAXException
ScannerException
StorageWrappedTargetException
UnsupportedFlavorException
VetoException
WrappedTargetException
ZipIOException
throwGenericSQLException
throwIllegallArgumentException

createInstance
createInstanceWithContext
forName
getByName
getPackageManager
getPropertyValue
getUnpackedValueOrDefault
getValueByName
hasPropertyByName
openKey
setName
setPropertyValue
supportsService

bash command:

for i in `cat list`; do git grep "$i\s*(\s*OUString(\s*\"" -- '*.[hc]xx'
| cut -d ':' -f1 | sort -u
| xargs sed -i
-e "s/\(\<$i\s*(\)\s*OUString(\s*\(\"[^\")\\]*\"\)\s*)\s*/\1\2/g"
-e "s/\($i.*\)\"+ /\1\" + /g";
done

Change-Id: Iaf8e641b0abf28c082906014f87a183517630535
Reviewed-on: https://gerrit.libreoffice.org/4624
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

25 files changed, 66 insertions, 66 deletions

diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index 9746196d0336..8ccf9d050fdc 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -219,7 +219,7 @@ Date DBTypeConversion::getNULLDate(const Reference< XNumberFormatsSupplier > &xS
         {
             // get the null date
             Date aDate;
-            xSupplier->getNumberFormatSettings()->getPropertyValue(OUString("NullDate")) >>= aDate;
+            xSupplier->getNumberFormatSettings()->getPropertyValue("NullDate") >>= aDate;
             return aDate;
         }
         catch ( const Exception&  )
@@ -459,7 +459,7 @@ OUString DBTypeConversion::getFormattedValue(const Reference<XColumn>& xVariant,
                          {
                              Reference< XNumberFormatsSupplier > xSupplier( xFormatter->getNumberFormatsSupplier(), UNO_SET_THROW );
                              Reference< XPropertySet > xFormatterSettings( xSupplier->getNumberFormatSettings(), UNO_SET_THROW );
-                             OSL_VERIFY( xFormatterSettings->getPropertyValue( OUString( "NullDate" ) ) >>= aFormatterNullDate );
+                             OSL_VERIFY( xFormatterSettings->getPropertyValue("NullDate") >>= aFormatterNullDate );
                          }
                          catch( const Exception& )
                          {
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 15ad7c9ad9ea..e628a6349d93 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -35,7 +35,7 @@ namespace connectivity
         ::osl::MutexGuard aGuard(m_aMutex);
         comphelper::SequenceAsHashMap aArgs(_aArguments);
         uno::Reference< sdbc::XConnection > xConnection;
-        xConnection = aArgs.getUnpackedValueOrDefault(OUString("ActiveConnection"),xConnection);
+        xConnection = aArgs.getUnpackedValueOrDefault("ActiveConnection",xConnection);
         m_xConnection = xConnection;
     }
     //------------------------------------------------------------------------------
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 9918cf15839a..afcebaa37333 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -90,7 +90,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  ) throw(SQ
         Reference< XRow > xRow(xRet,UNO_QUERY);
         ::comphelper::SequenceAsHashMap aMap(m_aConnectionInfo);
         Sequence< Any > aTypeInfoSettings;
-        aTypeInfoSettings = aMap.getUnpackedValueOrDefault(OUString("TypeInfoSettings"),aTypeInfoSettings);
+        aTypeInfoSettings = aMap.getUnpackedValueOrDefault("TypeInfoSettings",aTypeInfoSettings);
 
         if ( xRow.is() )
         {
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index 788fc88dd0a5..86527aa6ea98 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -141,7 +141,7 @@ namespace dbtools
                 {
                     Reference< XPropertySet > xDataSource( xConnectionAsChild->getParent(), UNO_QUERY_THROW );
                     Reference< XPropertySet > xDataSourceSettings(
-                        xDataSource->getPropertyValue( OUString( "Settings" ) ),
+                        xDataSource->getPropertyValue("Settings"),
                         UNO_QUERY_THROW );
 
                     _out_setting = xDataSourceSettings->getPropertyValue( OUString::createFromAscii( _asciiName ) );
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index c80fb1f46295..1ea9b14bdc5d 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -133,10 +133,10 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn,
     try
     {
         // determine the datatype of the column
-        _xColumn->getPropertyValue(OUString("Type")) >>= nDataType;
+        _xColumn->getPropertyValue("Type") >>= nDataType;
 
         if (DataType::NUMERIC == nDataType || DataType::DECIMAL == nDataType)
-            _xColumn->getPropertyValue(OUString("Scale")) >>= nScale;
+            _xColumn->getPropertyValue("Scale") >>= nScale;
     }
     catch (Exception&)
     {
@@ -144,7 +144,7 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn,
     }
     return getDefaultNumberFormat(nDataType,
                     nScale,
-                    ::cppu::any2bool(_xColumn->getPropertyValue(OUString("IsCurrency"))),
+                    ::cppu::any2bool(_xColumn->getPropertyValue("IsCurrency")),
                     _xTypes,
                     _rLocale);
 }
@@ -295,8 +295,8 @@ Reference< XConnection > getConnection_allowException(
             try
             {
                 xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPwd;
-                bPwdReq = ::cppu::any2bool(xProp->getPropertyValue(OUString("IsPasswordRequired")));
-                xProp->getPropertyValue(OUString("User")) >>= sUser;
+                bPwdReq = ::cppu::any2bool(xProp->getPropertyValue("IsPasswordRequired"));
+                xProp->getPropertyValue("User") >>= sUser;
             }
             catch(Exception&)
             {
@@ -349,7 +349,7 @@ Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) thro
     Reference< XConnection> xReturn;
     Reference< XPropertySet> xRowSetProps(_rxRowSet, UNO_QUERY);
     if (xRowSetProps.is())
-        xRowSetProps->getPropertyValue(OUString("ActiveConnection")) >>= xReturn;
+        xRowSetProps->getPropertyValue("ActiveConnection") >>= xReturn;
     return xReturn;
 }
 
@@ -371,7 +371,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
 
         // 1. already connected?
         Reference< XConnection > xExistingConn(
-            xRowSetProps->getPropertyValue( OUString( "ActiveConnection" ) ),
+            xRowSetProps->getPropertyValue("ActiveConnection"),
             UNO_QUERY );
 
         if  (   xExistingConn.is()
@@ -383,7 +383,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
         {
             if ( _bSetAsActiveConnection )
             {
-                xRowSetProps->setPropertyValue( OUString( "ActiveConnection" ), makeAny( xExistingConn ) );
+                xRowSetProps->setPropertyValue("ActiveConnection", makeAny( xExistingConn ) );
                 // no auto disposer needed, since we did not create the connection
             }
 
@@ -395,9 +395,9 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
 
         const OUString sUserProp( "User" );
         OUString sDataSourceName;
-        xRowSetProps->getPropertyValue(OUString("DataSourceName")) >>= sDataSourceName;
+        xRowSetProps->getPropertyValue("DataSourceName") >>= sDataSourceName;
         OUString sURL;
-        xRowSetProps->getPropertyValue(OUString("URL")) >>= sURL;
+        xRowSetProps->getPropertyValue("URL") >>= sURL;
 
         Reference< XConnection > xPureConnection;
         if (!sDataSourceName.isEmpty())
@@ -672,7 +672,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
 
                         if ( xComposerFac.is() )
                         {
-                            Reference< XSingleSelectQueryComposer > xComposer(xComposerFac->createInstance( OUString("com.sun.star.sdb.SingleSelectQueryComposer")),UNO_QUERY);
+                            Reference< XSingleSelectQueryComposer > xComposer(xComposerFac->createInstance("com.sun.star.sdb.SingleSelectQueryComposer"),UNO_QUERY);
                             if ( xComposer.is() )
                             {
                                 xComposer->setQuery( sStatementToExecute );
@@ -1235,19 +1235,19 @@ catch(const Exception&)
 //------------------------------------------------------------------------------
 sal_Bool canInsert(const Reference< XPropertySet>& _rxCursorSet)
 {
-    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(OUString("Privileges"))) & Privilege::INSERT) != 0));
+    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue("Privileges")) & Privilege::INSERT) != 0));
 }
 
 //------------------------------------------------------------------------------
 sal_Bool canUpdate(const Reference< XPropertySet>& _rxCursorSet)
 {
-    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(OUString("Privileges"))) & Privilege::UPDATE) != 0));
+    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue("Privileges")) & Privilege::UPDATE) != 0));
 }
 
 //------------------------------------------------------------------------------
 sal_Bool canDelete(const Reference< XPropertySet>& _rxCursorSet)
 {
-    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(OUString("Privileges"))) & Privilege::DELETE) != 0));
+    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue("Privileges")) & Privilege::DELETE) != 0));
 }
 // -----------------------------------------------------------------------------
 Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent)
@@ -1284,19 +1284,19 @@ Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Refere
             OUString sCommand;
             sal_Bool bEscapeProcessing = sal_False;
 
-            OSL_VERIFY( _rxRowSet->getPropertyValue( OUString( "CommandType" )      ) >>= nCommandType      );
-            OSL_VERIFY( _rxRowSet->getPropertyValue( OUString( "Command" )          ) >>= sCommand          );
-            OSL_VERIFY( _rxRowSet->getPropertyValue( OUString( "EscapeProcessing" ) ) >>= bEscapeProcessing );
+            OSL_VERIFY( _rxRowSet->getPropertyValue("CommandType") >>= nCommandType      );
+            OSL_VERIFY( _rxRowSet->getPropertyValue("Command") >>= sCommand          );
+            OSL_VERIFY( _rxRowSet->getPropertyValue("EscapeProcessing") >>= bEscapeProcessing );
 
             StatementComposer aComposer( xConn, sCommand, nCommandType, bEscapeProcessing );
             // append sort
-            aComposer.setOrder( getString( _rxRowSet->getPropertyValue( OUString( "Order" ) ) ) );
+            aComposer.setOrder( getString( _rxRowSet->getPropertyValue("Order") ) );
 
             // append filter
             sal_Bool bApplyFilter = sal_True;
-            _rxRowSet->getPropertyValue( OUString( "ApplyFilter" ) ) >>= bApplyFilter;
+            _rxRowSet->getPropertyValue("ApplyFilter") >>= bApplyFilter;
             if ( bApplyFilter )
-                aComposer.setFilter( getString( _rxRowSet->getPropertyValue( OUString( "Filter" ) ) ) );
+                aComposer.setFilter( getString( _rxRowSet->getPropertyValue("Filter") ) );
 
             aComposer.getQuery();
 
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 23b4f53b2036..bf9fad695f08 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -563,7 +563,7 @@ bool getBooleanDataSourceSetting( const Reference< XConnection >& _rxConnection,
         if ( xDataSourceProperties.is() )
         {
             Reference< XPropertySet > xSettings(
-                xDataSourceProperties->getPropertyValue( OUString( "Settings") ),
+                xDataSourceProperties->getPropertyValue("Settings"),
                 UNO_QUERY_THROW
             );
             OSL_VERIFY( xSettings->getPropertyValue( OUString::createFromAscii( _pAsciiSettingName ) ) >>= bValue );
@@ -587,7 +587,7 @@ bool getDataSourceSetting( const Reference< XInterface >& _xChild, const OUStrin
             return false;
 
         const Reference< XPropertySet > xSettings(
-                xDataSourceProperties->getPropertyValue( OUString( "Settings") ),
+                xDataSourceProperties->getPropertyValue("Settings"),
                 UNO_QUERY_THROW
             );
 
@@ -617,7 +617,7 @@ sal_Bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp,const O
         if ( xProp.is() )
         {
             Sequence< PropertyValue > aInfo;
-            xProp->getPropertyValue(OUString("Info")) >>= aInfo;
+            xProp->getPropertyValue("Info") >>= aInfo;
             const PropertyValue* pValue =::std::find_if(aInfo.getConstArray(),
                                                 aInfo.getConstArray() + aInfo.getLength(),
                                                 ::std::bind2nd(TPropertyValueEqualFunctor(),_sProperty));
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 625872fa22c3..820c57ee1d14 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -129,7 +129,7 @@ namespace dbtools
                 _rData.m_xColumnUpdate.set( _rxColumn, UNO_QUERY );
 
                 // determine the field type, and whether it's a numeric field
-                OSL_VERIFY( _rxColumn->getPropertyValue( OUString( "Type" ) ) >>= _rData.m_nFieldType );
+                OSL_VERIFY( _rxColumn->getPropertyValue("Type") >>= _rData.m_nFieldType );
 
                 switch ( _rData.m_nFieldType )
                 {
@@ -172,7 +172,7 @@ namespace dbtools
                 // some more formatter settings
                 _rData.m_nKeyType  = ::comphelper::getNumberFormatType( xNumberFormatsSupp->getNumberFormats(), _rData.m_nFormatKey );
                 Reference< XPropertySet > xFormatSettings( xNumberFormatsSupp->getNumberFormatSettings(), UNO_QUERY_THROW );
-                OSL_VERIFY( xFormatSettings->getPropertyValue( OUString( "NullDate" ) ) >>= _rData.m_aNullDate );
+                OSL_VERIFY( xFormatSettings->getPropertyValue("NullDate") >>= _rData.m_aNullDate );
 
                 // remember the formatter
                 _rData.m_xFormatter = i_rNumberFormatter;
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index bcf49827364c..f928945c5811 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -185,11 +185,11 @@ namespace param
             {
                 // TODO : aParamType & nScale can be obtained within the constructor ....
                 sal_Int32 nParamType = DataType::VARCHAR;
-                OSL_VERIFY( m_xDelegator->getPropertyValue( OUString( "Type" ) ) >>= nParamType );
+                OSL_VERIFY( m_xDelegator->getPropertyValue("Type") >>= nParamType );
 
                 sal_Int32 nScale = 0;
-                if ( m_xDelegatorPSI->hasPropertyByName( OUString( "Scale" ) ) )
-                    OSL_VERIFY( m_xDelegator->getPropertyValue( OUString( "Scale" ) ) >>= nScale );
+                if ( m_xDelegatorPSI->hasPropertyByName("Scale") )
+                    OSL_VERIFY( m_xDelegator->getPropertyValue("Scale") >>= nScale );
 
                 if ( m_xValueDestination.is() )
                 {
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index bf8092fe5c24..82d170266684 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -140,7 +140,7 @@ namespace dbtools
         if ( !pReturn )
         {   // is it a text field ?
             sal_Int32 nType = DataType::OTHER;
-            _rxField->getPropertyValue( OUString( "Type" ) ) >>= nType;
+            _rxField->getPropertyValue("Type") >>= nType;
 
             if  (   ( DataType::CHAR        == nType )
                 ||  ( DataType::VARCHAR     == nType )
@@ -199,10 +199,10 @@ namespace dbtools
                 try
                 {
                     Reference< XPropertySetInfo > xPSI( _rxField->getPropertySetInfo() );
-                    if ( xPSI.is() && xPSI->hasPropertyByName( OUString( "FormatKey" ) ) )
+                    if ( xPSI.is() && xPSI->hasPropertyByName("FormatKey") )
                     {
                         sal_Int32 nFormatKey = 0;
-                        _rxField->getPropertyValue( OUString( "FormatKey" ) ) >>= nFormatKey;
+                        _rxField->getPropertyValue("FormatKey") >>= nFormatKey;
                         if ( nFormatKey && m_xFormatter.is() )
                         {
                             Locale aFormatLocale;
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index 0954fd02de9f..51b492c8b8bd 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -148,12 +148,12 @@ namespace dbtools
 
                         //  a native query ?
                         sal_Bool bQueryEscapeProcessing = sal_False;
-                        xQuery->getPropertyValue( OUString( "EscapeProcessing" ) ) >>= bQueryEscapeProcessing;
+                        xQuery->getPropertyValue("EscapeProcessing") >>= bQueryEscapeProcessing;
                         if ( !bQueryEscapeProcessing )
                             break;
 
                         // the command used by the query
-                        xQuery->getPropertyValue( OUString( "Command" ) ) >>= sStatement;
+                        xQuery->getPropertyValue("Command") >>= sStatement;
                         if ( sStatement.isEmpty() )
                             break;
 
@@ -161,7 +161,7 @@ namespace dbtools
                         Reference< XMultiServiceFactory > xFactory( _rData.xConnection, UNO_QUERY_THROW );
                         ::utl::SharedUNOComponent< XSingleSelectQueryComposer > xComposer;
                         xComposer.set(
-                            xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ),
+                            xFactory->createInstance("com.sun.star.sdb.SingleSelectQueryComposer"),
                             UNO_QUERY_THROW
                         );
 
@@ -188,7 +188,7 @@ namespace dbtools
                         if ( bApplyFilter )
                         {
                             OUString sFilter;
-                            OSL_VERIFY( xQuery->getPropertyValue( OUString( "Filter" ) ) >>= sFilter );
+                            OSL_VERIFY( xQuery->getPropertyValue("Filter") >>= sFilter );
                             xComposer->setFilter( sFilter );
                         }
 
@@ -206,7 +206,7 @@ namespace dbtools
                 {
                     // create an composer
                     Reference< XMultiServiceFactory > xFactory( _rData.xConnection, UNO_QUERY_THROW );
-                    Reference< XSingleSelectQueryComposer > xComposer( xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ),
+                    Reference< XSingleSelectQueryComposer > xComposer( xFactory->createInstance("com.sun.star.sdb.SingleSelectQueryComposer"),
                         UNO_QUERY_THROW );
                     xComposer->setElementaryQuery( sStatement );
 
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 71cb3e4d442d..d956fde6d165 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -295,7 +295,7 @@ static sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, co
         if (xProp.is())
         {
             sal_Bool bVisible = sal_Bool();
-            Any aVisAny = xProp->getPropertyValue( OUString("IsVisible") );
+            Any aVisAny = xProp->getPropertyValue("IsVisible");
             if ( aVisAny >>= bVisible )
                 if (!bVisible)
                     return sal_True;                // hidden
@@ -338,7 +338,7 @@ static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const
         {
             try
             {
-                Any aUserAny = xRangeProp->getPropertyValue( OUString("IsUserDefined") );
+                Any aUserAny = xRangeProp->getPropertyValue("IsUserDefined");
                 sal_Bool bUserDefined = sal_Bool();
                 if ( aUserAny >>= bUserDefined )
                     bUnnamed = !bUserDefined;
@@ -423,7 +423,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
     Reference<XPropertySet> xDocProp( xDoc, UNO_QUERY );
     if ( xDocProp.is() )
     {
-        Any aRangesAny = xDocProp->getPropertyValue( OUString("DatabaseRanges") );
+        Any aRangesAny = xDocProp->getPropertyValue("DatabaseRanges");
         Reference<XDatabaseRanges> xRanges;
         if ( aRangesAny >>= xRanges )
         {
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 2809c857320f..93e4166580a0 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -569,7 +569,7 @@ void OCalcTable::construct()
             Reference<XPropertySet> xDocProp( xDoc, UNO_QUERY );
             if ( xDocProp.is() )
             {
-                Reference<XDatabaseRanges> xRanges(xDocProp->getPropertyValue( OUString("DatabaseRanges") ),UNO_QUERY);
+                Reference<XDatabaseRanges> xRanges(xDocProp->getPropertyValue("DatabaseRanges"),UNO_QUERY);
 
                 if ( xRanges.is() && xRanges->hasByName( m_Name ) )
                 {
@@ -583,7 +583,7 @@ void OCalcTable::construct()
                         sal_Bool bRangeHeader = sal_True;
                         Reference<XPropertySet> xFiltProp( xDBRange->getFilterDescriptor(), UNO_QUERY );
                         if ( xFiltProp.is() )
-                            xFiltProp->getPropertyValue(OUString("ContainsHeader")) >>= bRangeHeader;
+                            xFiltProp->getPropertyValue("ContainsHeader") >>= bRangeHeader;
 
                         Reference<XSheetCellRange> xSheetRange( xRefer->getReferredCells(), UNO_QUERY );
                         Reference<XCellRangeAddressable> xAddr( xSheetRange, UNO_QUERY );
@@ -617,7 +617,7 @@ void OCalcTable::construct()
         if (xProp.is())
         {
             ::com::sun::star::util::Date aDateStruct;
-            if ( xProp->getPropertyValue( OUString("NullDate") ) >>= aDateStruct )
+            if ( xProp->getPropertyValue("NullDate") >>= aDateStruct )
                 m_aNullDate = ::Date( aDateStruct.Day, aDateStruct.Month, aDateStruct.Year );
         }
     }
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 506b016d907c..b2788e6107c1 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -438,7 +438,7 @@ void OFlatTable::construct()
     m_xNumberFormatter.set( NumberFormatter::create( m_pConnection->getDriver()->getComponentContext()), UNO_QUERY_THROW);
     m_xNumberFormatter->attachNumberFormatsSupplier(xSupplier);
     Reference<XPropertySet> xProp(xSupplier->getNumberFormatSettings(),UNO_QUERY);
-    xProp->getPropertyValue(OUString("NullDate")) >>= m_aNullDate;
+    xProp->getPropertyValue("NullDate") >>= m_aNullDate;
 
     INetURLObject aURL;
     aURL.SetURL(getEntry());
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index d296773404b8..251a8526aa34 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -323,7 +323,7 @@ namespace connectivity
                 if ( xProp.is() )
                 {
                     sal_Int32 nMode = 0;
-                    xProp->getPropertyValue(OUString("OpenMode")) >>= nMode;
+                    xProp->getPropertyValue("OpenMode") >>= nMode;
                     if ( (nMode & ElementModes::WRITE) != ElementModes::WRITE )
                     {
                         aProperties.put( "readonly", OUString(  "true"  ) );
@@ -853,7 +853,7 @@ namespace connectivity
                 //.........................................................
                 // ask for the system locale setting
                 if ( xNode.is() )
-                    xNode->getPropertyValue( OUString(  "ooSetupSystemLocale"  ) ) >>= sLocaleString;
+                    xNode->getPropertyValue("ooSetupSystemLocale") >>= sLocaleString;
             }
             catch( const Exception& )
             {
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index 44b946d1ea63..12faa6a34f67 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -194,7 +194,7 @@ bool KabImplModule::impl_doAllowNewKDEVersion()
             UNO_QUERY_THROW );
 
         sal_Bool bDisableCheck = sal_False;
-        xSettings->getPropertyValue( OUString(  "DisableKDEMaximumVersionCheck"  ) ) >>= bDisableCheck;
+        xSettings->getPropertyValue("DisableKDEMaximumVersionCheck") >>= bDisableCheck;
 
         return bDisableCheck != sal_False;
     }
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx
index cad5f7ed77ff..df9254b3d6fc 100644
--- a/connectivity/source/drivers/mozab/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx
@@ -100,7 +100,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su
         {
             //.............................................................
             Reference< XNameAccess > xAliasesNode;
-            xDriverNode->getPropertyValue( OUString("ColumnAliases") ) >>= xAliasesNode;
+            xDriverNode->getPropertyValue("ColumnAliases") >>= xAliasesNode;
             OSL_ENSURE( xAliasesNode.is(), "OColumnAlias::setAlias: missing the aliases node!" );
 
             // this is a set of string nodes
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx
index 2fabd5f97f90..dd4281a81bb5 100644
--- a/connectivity/source/drivers/mozab/MConfigAccess.cxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx
@@ -125,10 +125,10 @@ namespace connectivity
                     Reference< XPropertySet > xDriverNode = createDriverConfigNode( xFactory );
                     Reference< XPropertySet > xMozPrefsNode;
                     if ( xDriverNode.is() )
-                        xDriverNode->getPropertyValue( OUString("MozillaPreferences" ) ) >>= xMozPrefsNode;
+                        xDriverNode->getPropertyValue("MozillaPreferences") >>= xMozPrefsNode;
                     OSL_ENSURE( xMozPrefsNode.is(), "getPreferredProfileName: could not access the node for the mozilla preferences!" );
                     if ( xMozPrefsNode.is() )
-                        xMozPrefsNode->getPropertyValue( OUString("ProfileName" ) ) >>= sPreferredName;
+                        xMozPrefsNode->getPropertyValue("ProfileName") >>= sPreferredName;
                     if ( xMozPrefsNode.is() )
                         xMozPrefsNode->getPropertyValue( OUString::createFromAscii(sNode) ) >>= sDescription;
                     if (sDescription.getLength() == 0)
@@ -157,10 +157,10 @@ namespace connectivity
                     Reference< XPropertySet > xDriverNode = createDriverConfigNode( xFactory );
                     Reference< XPropertySet > xMozPrefsNode;
                     if ( xDriverNode.is() )
-                        xDriverNode->getPropertyValue( OUString("MozillaPreferences" ) ) >>= xMozPrefsNode;
+                        xDriverNode->getPropertyValue("MozillaPreferences") >>= xMozPrefsNode;
                     OSL_ENSURE( xMozPrefsNode.is(), "getPreferredProfileName: could not access the node for the mozilla preferences!" );
                     if ( xMozPrefsNode.is() )
-                        xMozPrefsNode->getPropertyValue( OUString("ProfileName" ) ) >>= sPreferredName;
+                        xMozPrefsNode->getPropertyValue("ProfileName") >>= sPreferredName;
                 }
                 catch( const Exception& )
                 {
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index 1e56e719ad12..f7384cc18807 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -134,7 +134,7 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const OUString& url, con
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         //We must make sure we create an com.sun.star.mozilla.MozillaBootstrap brfore call any mozilla codes
-        Reference<XInterface> xInstance = m_xMSFactory->createInstance(OUString( "com.sun.star.mozilla.MozillaBootstrap") );
+        Reference<XInterface> xInstance = m_xMSFactory->createInstance("com.sun.star.mozilla.MozillaBootstrap");
         OSL_ENSURE( xInstance.is(), "failed to create instance" );
 
         OConnection* pCon = reinterpret_cast<OConnection*>((*m_pCreationFunc)(this));
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
index 9e91043dd41a..6248f7c8da92 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
@@ -61,7 +61,7 @@ nsProfile::nsProfile()
     Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
     OSL_ENSURE( xFactory.is(), "can't get service factory" );
 
-    Reference<XInterface> xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") );
+    Reference<XInterface> xInstance = xFactory->createInstance("com.sun.star.mozilla.MozillaBootstrap");
     OSL_ENSURE( xInstance.is(), "failed to create instance" );
     xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY);
 
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index 35e625d53898..087d541e3441 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -108,7 +108,7 @@ MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper()
         Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
         OSL_ENSURE( xFactory.is(), "can't get service factory" );
 
-        Reference<XInterface> xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") );
+        Reference<XInterface> xInstance = xFactory->createInstance("com.sun.star.mozilla.MozillaBootstrap");
         OSL_ENSURE( xInstance.is(), "failed to create instance" );
         xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY);
         m_bProfileExists = xMozillaBootstrap->shutdownProfile() > 0;
@@ -550,7 +550,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection*
         Reference<XMozillaBootstrap> xMozillaBootstrap;
         Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
         OSL_ENSURE( xFactory.is(), "can't get service factory" );
-         Reference<XInterface> xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") );
+         Reference<XInterface> xInstance = xFactory->createInstance("com.sun.star.mozilla.MozillaBootstrap");
         OSL_ENSURE( xInstance.is(), "failed to create instance" );
         xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY);
         m_bProfileExists = sal_False;
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index b086571a2e1b..a7783c956df9 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
@@ -80,7 +80,7 @@ sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::Mo
     {
         Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
         OSL_ENSURE( xFactory.is(), "can't get service factory" );
-        ::com::sun::star::uno::Reference<XInterface> xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") );
+        ::com::sun::star::uno::Reference<XInterface> xInstance = xFactory->createInstance("com.sun.star.mozilla.MozillaBootstrap");
         OSL_ENSURE( xInstance.is(), "failed to create instance" );
         xRunner = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XProxyRunner >(xInstance,UNO_QUERY);
     }
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index 4be34d8f9cba..fb274ccccaea 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -301,7 +301,7 @@ sal_Bool isProfileLocked(OConnection* _pCon)
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
     OSL_ENSURE( xFactory.is(), "can't get service factory" );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") );
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInstance = xFactory->createInstance("com.sun.star.mozilla.MozillaBootstrap");
     OSL_ENSURE( xInstance.is(), "failed to create instance" );
     xMozillaBootstrap = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XMozillaBootstrap >(xInstance,::com::sun::star::uno::UNO_QUERY);
     if (_pCon)
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index c5eca28f922d..e085bcb236a8 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -585,7 +585,7 @@ void Connection::initialize( const Sequence< Any >& aArguments )
         m_settings.pConnection = PQconnectdbParams( keywords.c_array(), values.c_array(), 0 );
     }
     if( ! m_settings.pConnection )
-        throw RuntimeException( OUString( "pq_driver: out of memory" ),
+        throw RuntimeException("pq_driver: out of memory",
                                 Reference< XInterface > () );
     if( PQstatus( m_settings.pConnection ) == CONNECTION_BAD )
     {
diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx
index d8d00fc6d1d1..dbfd24857875 100644
--- a/connectivity/workben/little/main.cxx
+++ b/connectivity/workben/little/main.cxx
@@ -58,7 +58,7 @@ void _cdecl main( int argc, char * argv[] )
         if(!xFac.is())
             return;
 
-        m_xDriver = Reference<XDriver>(xFac->createInstance(OUString("com.sun.star.sdbc.driver.dbase.Driver")),UNO_QUERY);
+        m_xDriver = Reference<XDriver>(xFac->createInstance("com.sun.star.sdbc.driver.dbase.Driver"),UNO_QUERY);
         if(m_xDriver.is())
         {
 
diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx
index a5d251c1756e..87d6854200f3 100644
--- a/connectivity/workben/testmoz/main.cxx
+++ b/connectivity/workben/testmoz/main.cxx
@@ -252,10 +252,10 @@ Reference< XMultiServiceFactory > InitializeFac( void )
 
 //  Create unconfigured Ucb:
     Reference< XUniversalContentBroker > xUcb
-        ( xSMgr->createInstance( OUString("com.sun.star.ucb.UniversalContentBroker") ), UNO_QUERY_THROW );
+        ( xSMgr->createInstance("com.sun.star.ucb.UniversalContentBroker"), UNO_QUERY_THROW );
 
     Reference< XContentProvider > xFileProvider
-        ( xSMgr->createInstance( OUString("com.sun.star.ucb.FileContentProvider") ), UNO_QUERY_THROW );
+        ( xSMgr->createInstance("com.sun.star.ucb.FileContentProvider"), UNO_QUERY_THROW );
     xUcb->registerContentProvider( xFileProvider, OUString("file"), sal_True );
 
     return xSMgr;