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>

9 files changed, 30 insertions, 30 deletions

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index fb90a0b216e7..94c9348da5b1 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -160,7 +160,7 @@ sal_Bool EmbeddedObjectContainer::CommitImageSubStorage()
             {
                 // get the open mode from the parent storage
                 sal_Int32 nMode = 0;
-                uno::Any aAny = xSet->getPropertyValue( OUString("OpenMode") );
+                uno::Any aAny = xSet->getPropertyValue("OpenMode");
                 if ( aAny >>= nMode )
                     bReadOnlyMode = !(nMode & embed::ElementModes::WRITE );
             } // if ( xSet.is() )
@@ -352,7 +352,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( con
         {
             // get the open mode from the parent storage
             sal_Int32 nMode = 0;
-            uno::Any aAny = xSet->getPropertyValue( OUString("OpenMode") );
+            uno::Any aAny = xSet->getPropertyValue("OpenMode");
             if ( aAny >>= nMode )
                 bReadOnlyMode = !(nMode & embed::ElementModes::WRITE );
         }
@@ -584,7 +584,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde
             // it is correct so for now, but what if somebody introduces a new stream based embedded object?
             // Probably introducing of such an object must be restricted ( a storage must be used! ).
             uno::Reference< beans::XPropertySet > xProps( xNewStream, uno::UNO_QUERY_THROW );
-            xProps->setPropertyValue( OUString( "MediaType" ),
+            xProps->setPropertyValue("MediaType",
                     uno::makeAny( OUString( "application/vnd.sun.star.oleobject" ) ) );
         }
         catch (uno::Exception const& e)
@@ -1185,7 +1185,7 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c
                 uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY );
                 if ( xSet.is() )
                 {
-                    uno::Any aAny = xSet->getPropertyValue( OUString("MediaType") );
+                    uno::Any aAny = xSet->getPropertyValue("MediaType");
                     aAny >>= *pMediaType;
                 }
             }
@@ -1240,13 +1240,13 @@ sal_Bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno
         if ( !xPropSet.is() )
             throw uno::RuntimeException();
 
-        xPropSet->setPropertyValue( OUString("UseCommonStoragePasswordEncryption"),
+        xPropSet->setPropertyValue("UseCommonStoragePasswordEncryption",
                                     uno::makeAny( (sal_Bool)sal_True ) );
         uno::Any aAny;
         aAny <<= rMediaType;
-        xPropSet->setPropertyValue( OUString("MediaType"), aAny );
+        xPropSet->setPropertyValue("MediaType", aAny );
 
-        xPropSet->setPropertyValue( OUString("Compressed"),
+        xPropSet->setPropertyValue("Compressed",
                                     uno::makeAny( (sal_Bool)sal_True ) );
     }
     catch (const uno::Exception&)
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index e79f2a0875c7..1896a6059b59 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -372,27 +372,27 @@ namespace comphelper
 
         Type aKeyType, aValueType;
         if ( !( _arguments[0] >>= aKeyType ) )
-            throw IllegalArgumentException( OUString("com.sun.star.uno.Type expected."), *this, 1 );
+            throw IllegalArgumentException("com.sun.star.uno.Type expected.", *this, 1 );
         if ( !( _arguments[1] >>= aValueType ) )
-            throw IllegalArgumentException( OUString("com.sun.star.uno.Type expected."), *this, 2 );
+            throw IllegalArgumentException("com.sun.star.uno.Type expected.", *this, 2 );
 
         Sequence< Pair< Any, Any > > aInitialValues;
         bool bMutable = true;
         if ( nArgumentCount == 3 )
         {
             if ( !( _arguments[2] >>= aInitialValues ) )
-                throw IllegalArgumentException( OUString("[]com.sun.star.beans.Pair<any,any> expected."), *this, 2 );
+                throw IllegalArgumentException("[]com.sun.star.beans.Pair<any,any> expected.", *this, 2 );
             bMutable = false;
         }
 
         // for the value, anything is allowed, except VOID
         if ( ( aValueType.getTypeClass() == TypeClass_VOID ) || ( aValueType.getTypeClass() == TypeClass_UNKNOWN ) )
-            throw IllegalTypeException( OUString( "Unsupported value type." ), *this );
+            throw IllegalTypeException("Unsupported value type.", *this );
 
         // create the comparator for the KeyType, and throw if the type is not supported
         ::std::auto_ptr< IKeyPredicateLess > pComparator( getStandardLessPredicate( aKeyType, NULL ) );
         if ( !pComparator.get() )
-            throw IllegalTypeException( OUString( "Unsupported key type." ), *this );
+            throw IllegalTypeException("Unsupported key type.", *this );
 
         // init members
         m_aData.m_aKeyType = aKeyType;
@@ -746,7 +746,7 @@ namespace comphelper
         if ( m_disposed )
             throw DisposedException( OUString(), m_rParent );
         if ( m_mapPos == m_rMapData.m_pValues->end() )
-            throw NoSuchElementException( OUString( "No more elements." ), m_rParent );
+            throw NoSuchElementException("No more elements.", m_rParent );
 
         Any aNextElement;
         switch ( m_eType )
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index f3bc92f9e174..82a1b29de8bb 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -463,7 +463,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile )
         // b) ... or we must get it from the given URL
         OUString sURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), OUString());
         if (sURL.isEmpty())
-            throw css::uno::Exception( OUString( "Found no URL." ),
+            throw css::uno::Exception("Found no URL.",
                     css::uno::Reference< css::uno::XInterface >());
 
         // Parse URL! Only the main part has to be used further. E.g. a jumpmark can make trouble
@@ -482,7 +482,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference
     throw(::com::sun::star::uno::RuntimeException)
 {
     if ( !_rxPostData.is() )
-        throw css::lang::IllegalArgumentException( OUString( "Found invalid PostData." ),
+        throw css::lang::IllegalArgumentException("Found invalid PostData.",
                 css::uno::Reference< css::uno::XInterface >(), 1);
 
     // PostData can't be used in read/write mode!
@@ -642,7 +642,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
             else
             {
                 sal_Bool bRequestReadOnly = bReadOnly;
-                aContent.getPropertyValue( OUString( "IsReadOnly" ) ) >>= bReadOnly;
+                aContent.getPropertyValue("IsReadOnly") >>= bReadOnly;
                 if ( bReadOnly && !bRequestReadOnly && bModeRequestedExplicitly )
                         return sal_False; // the document is explicitly requested with WRITEABLE mode
             }
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 733bf2645873..68ef68ceda5f 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -273,10 +273,10 @@ sal_Bool MimeConfigurationHelper::GetVerbByShortcut( const OUString& aVerbShortc
         if ( xVerbsConfig.is() && ( xVerbsConfig->getByName( aVerbShortcut ) >>= xVerbsProps ) && xVerbsProps.is() )
         {
             embed::VerbDescriptor aTempDescr;
-            if ( ( xVerbsProps->getByName( OUString( "VerbID" ) ) >>= aTempDescr.VerbID )
-              && ( xVerbsProps->getByName( OUString( "VerbUIName" ) ) >>= aTempDescr.VerbName )
-              && ( xVerbsProps->getByName( OUString( "VerbFlags" ) ) >>= aTempDescr.VerbFlags )
-              && ( xVerbsProps->getByName( OUString( "VerbAttributes" ) ) >>= aTempDescr.VerbAttributes ) )
+            if ( ( xVerbsProps->getByName("VerbID") >>= aTempDescr.VerbID )
+              && ( xVerbsProps->getByName("VerbUIName") >>= aTempDescr.VerbName )
+              && ( xVerbsProps->getByName("VerbFlags") >>= aTempDescr.VerbFlags )
+              && ( xVerbsProps->getByName("VerbAttributes") >>= aTempDescr.VerbAttributes ) )
             {
                 aDescriptor = aTempDescr;
                 bResult = sal_True;
@@ -467,7 +467,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
                     OUString aEntryDocName;
 
                     if ( ( xObjConfig->getByName( aClassIDs[nInd] ) >>= xObjectProps ) && xObjectProps.is()
-                      && ( xObjectProps->getByName( OUString( "ObjectDocumentServiceName" ) ) >>= aEntryDocName )
+                      && ( xObjectProps->getByName("ObjectDocumentServiceName") >>= aEntryDocName )
                       && aEntryDocName == aDocName )
                     {
                         return GetObjPropsFromConfigEntry( GetSequenceClassIDRepresentation( aClassIDs[nInd] ),
@@ -501,7 +501,7 @@ OUString MimeConfigurationHelper::GetFactoryNameByStringClassID( const OUString&
         try
         {
             if ( xObjConfig.is() && ( xObjConfig->getByName( aStringClassID.toAsciiUpperCase() ) >>= xObjectProps ) && xObjectProps.is() )
-                xObjectProps->getByName( OUString( "ObjectFactory" ) ) >>= aResult;
+                xObjectProps->getByName("ObjectFactory") >>= aResult;
         }
         catch( uno::Exception& )
         {
@@ -537,7 +537,7 @@ OUString MimeConfigurationHelper::GetFactoryNameByDocumentName( const OUString&
                                   OUString( "ObjectDocumentServiceName" ) ) >>= aEntryDocName )
                       && aEntryDocName == aDocName )
                     {
-                        xObjectProps->getByName( OUString( "ObjectFactory" ) ) >>= aResult;
+                        xObjectProps->getByName("ObjectFactory") >>= aResult;
                         break;
                     }
                 }
@@ -851,7 +851,7 @@ uno::Sequence< beans::PropertyValue > MimeConfigurationHelper::SearchForFilter(
             if ( xFilterEnum->nextElement() >>= aProps )
             {
                 SequenceAsHashMap aPropsHM( aProps );
-                sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( OUString("Flags"),
+                sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault("Flags",
                                                                         (sal_Int32)0 );
                 if ( ( ( nFlags & nMustFlags ) == nMustFlags ) && !( nFlags & nDontFlags ) )
                 {
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx
index 2f3e357f0167..50255eebb523 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -109,7 +109,7 @@ void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 nNumber)
     ::osl::ResettableMutexGuard aLock(m_aMutex);
 
     if (nNumber == css::frame::UntitledNumbersConst::INVALID_NUMBER)
-        throw css::lang::IllegalArgumentException (OUString("Special valkud INVALID_NUMBER not allowed as input parameter."), m_xOwner.get(), 1);
+        throw css::lang::IllegalArgumentException ("Special valkud INVALID_NUMBER not allowed as input parameter.", m_xOwner.get(), 1);
 
     TDeadItemList               lDeadItems;
     TNumberedItemHash::iterator pComponent;
diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx
index 8bd744f77946..569d492d1049 100644
--- a/comphelper/source/misc/numbers.cxx
+++ b/comphelper/source/misc/numbers.cxx
@@ -42,7 +42,7 @@ sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormats>
         {
             staruno::Reference<starbeans::XPropertySet> xFormat(xFormats->getByKey(nKey));
             if (xFormat.is())
-                xFormat->getPropertyValue(OUString( "Type" )) >>= nReturn;
+                xFormat->getPropertyValue("Type") >>= nReturn;
         }
         catch(...)
         {
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index d9077ab882f6..1b371487ad31 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -231,7 +231,7 @@ sal_Int32 OStorageHelper::GetXStorageFormat(
     uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW );
 
     OUString aMediaType;
-    xStorProps->getPropertyValue( OUString( "MediaType" ) ) >>= aMediaType;
+    xStorProps->getPropertyValue("MediaType") >>= aMediaType;
 
     sal_Int32 nResult = 0;
 
diff --git a/comphelper/source/processfactory/processfactory.cxx b/comphelper/source/processfactory/processfactory.cxx
index 5690cc005477..a193a6eb897a 100644
--- a/comphelper/source/processfactory/processfactory.cxx
+++ b/comphelper/source/processfactory/processfactory.cxx
@@ -74,7 +74,7 @@ Reference< XComponentContext > getComponentContext(
     uno::Reference<beans::XPropertySet> const xProps( factory, uno::UNO_QUERY );
     if (xProps.is()) {
         try {
-            xRet.set( xProps->getPropertyValue( OUString("DefaultContext") ),
+            xRet.set( xProps->getPropertyValue("DefaultContext"),
                       uno::UNO_QUERY );
         }
         catch (beans::UnknownPropertyException & e) {
diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx
index 572715e334d1..906e62e513d3 100644
--- a/comphelper/source/streaming/memorystream.cxx
+++ b/comphelper/source/streaming/memorystream.cxx
@@ -147,7 +147,7 @@ void SAL_CALL UNOMemoryStream::closeInput() throw (NotConnectedException, IOExce
 void SAL_CALL UNOMemoryStream::seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException)
 {
     if( (location < 0) || (location > SAL_MAX_INT32) )
-        throw IllegalArgumentException( OUString("this implementation does not support more than 2GB!"), Reference< XInterface >(static_cast<OWeakObject*>(this)), 0 );
+        throw IllegalArgumentException("this implementation does not support more than 2GB!", Reference< XInterface >(static_cast<OWeakObject*>(this)), 0 );
 
     // seek operation should be able to resize the stream
     if ( location > static_cast< sal_Int64 >( maData.size() ) )
@@ -179,7 +179,7 @@ void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData ) t
         if( nNewSize > SAL_MAX_INT32 )
         {
             OSL_ASSERT(false);
-            throw IOException( OUString("this implementation does not support more than 2GB!"), Reference< XInterface >(static_cast<OWeakObject*>(this)) );
+            throw IOException("this implementation does not support more than 2GB!", Reference< XInterface >(static_cast<OWeakObject*>(this)) );
         }
 
         if( static_cast< sal_Int32 >( nNewSize ) > static_cast< sal_Int32 >( maData.size() ) )