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 /scripting | |
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 'scripting')
-rw-r--r-- | scripting/source/dlgprov/dlgevtatt.cxx | 12 | ||||
-rw-r--r-- | scripting/source/dlgprov/dlgprov.cxx | 4 | ||||
-rw-r--r-- | scripting/source/vbaevents/eventhelper.cxx | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index c6b19691cf0f..0826a3054641 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -118,9 +118,9 @@ namespace dlgprov try { Reference< XPropertySet > xProps( rxControl->getModel(), UNO_QUERY_THROW ); - xProps->getPropertyValue( OUString("Name" ) ) >>= msDialogCodeName; + xProps->getPropertyValue("Name") >>= msDialogCodeName; xProps.set( mxListener, UNO_QUERY_THROW ); - xProps->setPropertyValue( OUString("Model" ), args[ 0 ] ); + xProps->setPropertyValue("Model", args[ 0 ] ); } catch( const Exception& ) { @@ -171,7 +171,7 @@ namespace dlgprov { uno::Reference< beans::XPropertySet > xModelProps( rxModel, uno::UNO_QUERY_THROW ); uno::Reference< script::vba::XVBACompatibility > xVBACompat( - xModelProps->getPropertyValue( OUString( "BasicLibraries" ) ), uno::UNO_QUERY_THROW ); + xModelProps->getPropertyValue("BasicLibraries"), uno::UNO_QUERY_THROW ); mbUseFakeVBAEvents = xVBACompat->getVBACompatibilityMode(); } catch( uno::Exception& ) @@ -202,7 +202,7 @@ namespace dlgprov Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() ); if ( xSMgr.is() ) { - Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext( OUString( "ooo.vba.VBAToOOEventDesc" ), m_xContext ), UNO_QUERY ); + Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext("ooo.vba.VBAToOOEventDesc", m_xContext ), UNO_QUERY ); if ( xVBAToOOEvtDesc.is() ) xEventsSupplier.set( xVBAToOOEvtDesc->getEventSupplier( xControl, sControlName ), UNO_QUERY ); @@ -220,7 +220,7 @@ namespace dlgprov Reference< XControlModel > xControlModel = xControl->getModel(); Reference< XPropertySet > xProps( xControlModel, uno::UNO_QUERY ); OUString sName; - xProps->getPropertyValue( OUString("Name") ) >>= sName; + xProps->getPropertyValue("Name") >>= sName; if ( xEventCont.is() ) { Sequence< OUString > aNames = xEventCont->getElementNames(); @@ -362,7 +362,7 @@ namespace dlgprov Reference< XPropertySet > xProps( xDlgControl->getModel(), UNO_QUERY ); try { - xProps->getPropertyValue( OUString("Name" ) ) >>= sDialogCodeName; + xProps->getPropertyValue("Name") >>= sDialogCodeName; } catch( Exception& ){} } diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 32a993020d26..e7954d8c2b41 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -124,7 +124,7 @@ static OUString aResourceResolverPropName("ResourceResolver"); Reference< container::XNameContainer > lcl_createControlModel(const Reference< XComponentContext >& i_xContext) { Reference< XMultiComponentFactory > xSMgr_( i_xContext->getServiceManager(), UNO_QUERY_THROW ); - Reference< container::XNameContainer > xControlModel( xSMgr_->createInstanceWithContext( OUString( "com.sun.star.awt.UnoControlDialogModel" ), i_xContext ), UNO_QUERY_THROW ); + Reference< container::XNameContainer > xControlModel( xSMgr_->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", i_xContext ), UNO_QUERY_THROW ); return xControlModel; } Reference< container::XNameContainer > lcl_createDialogModel( const Reference< XComponentContext >& i_xContext, @@ -268,7 +268,7 @@ static OUString aResourceResolverPropName("ResourceResolver"); { if ( !m_BasicInfo.get() ) // shouln't get here - throw RuntimeException( OUString( "No information to create dialog" ), Reference< XInterface >() ); + throw RuntimeException("No information to create dialog", Reference< XInterface >() ); Reference< resource::XStringResourceManager > xStringResourceManager = getStringResourceFromDialogLibrary( m_BasicInfo->mxDlgLib ); OUString aURL("" ); diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 5061fe8b4ea5..92df40d6ad3f 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -475,18 +475,18 @@ public: virtual void SAL_CALL insertByName( const OUString&, const Any& ) throw (lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, RuntimeException) { - throw RuntimeException( OUString("ReadOnly container"), Reference< XInterface >() ); + throw RuntimeException("ReadOnly container", Reference< XInterface >() ); } virtual void SAL_CALL removeByName( const OUString& ) throw (::com::sun::star::container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { - throw RuntimeException( OUString("ReadOnly container"), Reference< XInterface >() ); + throw RuntimeException("ReadOnly container", Reference< XInterface >() ); } // XNameReplace virtual void SAL_CALL replaceByName( const OUString&, const Any& ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { - throw RuntimeException( OUString("ReadOnly container"), Reference< XInterface >() ); + throw RuntimeException("ReadOnly container", Reference< XInterface >() ); } @@ -674,7 +674,7 @@ EventListener::setShellFromModel() try { uno::Reference< beans::XPropertySet > xProps( m_xModel, UNO_QUERY_THROW ); - uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( OUString( "BasicLibraries" ) ), uno::UNO_QUERY_THROW ); + uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue("BasicLibraries"), uno::UNO_QUERY_THROW ); msProject = xVBAMode->getProjectName(); } catch ( uno::Exception& ) {} @@ -902,7 +902,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce uno::Reference< beans::XPropertySet > xProps; OSL_TRACE("Getting properties"); xProps.set( xControl->getModel(), uno::UNO_QUERY_THROW ); - xProps->getPropertyValue( OUString( "Name" ) ) >>= sName; + xProps->getPropertyValue("Name") >>= sName; } } //dumpEvent( evt ); |