diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-06-29 21:24:12 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-06-29 21:52:54 +0000 |
commit | ba0a57702cdef7a0389c06841711d7e3079d471c (patch) | |
tree | 223c0dd50de4b71cf7df9d0073f7cacca1f18c8d /svl | |
parent | 8a7ede404ca4980f169c4ce634805ea5c1b6b56e (diff) |
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>
Diffstat (limited to 'svl')
-rw-r--r-- | svl/source/fsstor/fsstorage.cxx | 14 | ||||
-rw-r--r-- | svl/source/misc/documentlockfile.cxx | 2 | ||||
-rw-r--r-- | svl/source/misc/sharecontrolfile.cxx | 2 | ||||
-rw-r--r-- | svl/source/passwordcontainer/passwordcontainer.cxx | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index bb8c6c86c5a1..5d5bfefe1616 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -429,7 +429,7 @@ void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >& catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException("Can't copy raw stream", uno::Reference< io::XInputStream >(), aCaught ); } @@ -537,7 +537,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException("Can't copy raw stream", uno::Reference< io::XInputStream >(), aCaught ); } @@ -645,7 +645,7 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement( catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException("Can't copy raw stream", uno::Reference< io::XInputStream >(), aCaught ); } @@ -718,7 +718,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const OUSt catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException("Can't copy raw stream", uno::Reference< io::XInputStream >(), aCaught ); } @@ -916,7 +916,7 @@ void SAL_CALL FSStorage::renameElement( const OUString& aElementName, const OUSt catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException("Can't copy raw stream", uno::Reference< io::XInputStream >(), aCaught ); } @@ -1001,7 +1001,7 @@ void SAL_CALL FSStorage::copyElementTo( const OUString& aElementName, catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException("Can't copy raw stream", uno::Reference< io::XInputStream >(), aCaught ); } @@ -1531,7 +1531,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException("Can't copy raw stream", uno::Reference< io::XInputStream >(), aCaught ); } diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx index 3f142093417b..67b20b9ebcfa 100644 --- a/svl/source/misc/documentlockfile.cxx +++ b/svl/source/misc/documentlockfile.cxx @@ -120,7 +120,7 @@ bool DocumentLockFile::CreateOwnLockFile() // try to let the file be hidden if possible try { - aTargetContent.setPropertyValue( OUString( "IsHidden" ), uno::makeAny( sal_True ) ); + aTargetContent.setPropertyValue("IsHidden", uno::makeAny( sal_True ) ); } catch( uno::Exception& ) {} } catch( ucb::NameClashException& ) diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx index 49443c868261..62e413a8973a 100644 --- a/svl/source/misc/sharecontrolfile.cxx +++ b/svl/source/misc/sharecontrolfile.cxx @@ -110,7 +110,7 @@ void ShareControlFile::OpenStream() // try to let the file be hidden if possible try { - aContent.setPropertyValue( OUString( "IsHidden" ), uno::makeAny( sal_True ) ); + aContent.setPropertyValue("IsHidden", uno::makeAny( sal_True ) ); } catch( uno::Exception& ) {} // Try to open one more time diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 3e9c3b0b9275..fad97e943f14 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -515,7 +515,7 @@ vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, co // problems with decoding OSL_FAIL( "Problem with decoding\n" ); - throw RuntimeException( OUString("Can't decode!"), Reference< XInterface >() ); + throw RuntimeException("Can't decode!", Reference< XInterface >() ); } @@ -595,7 +595,7 @@ OUString PasswordContainer::EncodePasswords( vector< OUString > lines, const OUS // problems with encoding OSL_FAIL( "Problem with encoding\n" ); - throw RuntimeException( OUString("Can't encode!"), Reference< XInterface >() ); + throw RuntimeException("Can't encode!", Reference< XInterface >() ); } //------------------------------------------------------------------------- @@ -889,7 +889,7 @@ OUString PasswordContainer::GetMasterPassword( const Reference< XInteractionHand { PasswordRequestMode aRMode = PasswordRequestMode_PASSWORD_ENTER; if( !m_pStorageFile || !m_pStorageFile->useStorage() ) - throw NoMasterException( OUString("Password storing is not active!"), Reference< XInterface >(), aRMode ); + throw NoMasterException("Password storing is not active!", Reference< XInterface >(), aRMode ); if( m_aMasterPasswd.isEmpty() && aHandler.is() ) { @@ -938,7 +938,7 @@ OUString PasswordContainer::GetMasterPassword( const Reference< XInteractionHand } if ( m_aMasterPasswd.isEmpty() ) - throw NoMasterException( OUString("No master password!"), Reference< XInterface >(), aRMode ); + throw NoMasterException("No master password!", Reference< XInterface >(), aRMode ); return m_aMasterPasswd; } |