diff options
author | Noel Grandin <noel@peralex.com> | 2013-11-04 10:31:49 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-11-11 08:36:06 +0200 |
commit | 2ac50736e4a3d442a43d3f9d368be45c57ad9285 (patch) | |
tree | cf005b636c7aeda848e38baba86c9a123394f3f1 /scripting | |
parent | ThumbnailView: item found by mouse pos is always visible (diff) | |
download | core-2ac50736e4a3d442a43d3f9d368be45c57ad9285.tar.gz core-2ac50736e4a3d442a43d3f9d368be45c57ad9285.zip |
remove unnecessary use of OUString constructor in SCRIPTING module
Change-Id: I87dd775949d1d3cc2c191e84e57b49cd66ecc750
Diffstat (limited to 'scripting')
-rw-r--r-- | scripting/source/basprov/basmethnode.cxx | 10 | ||||
-rw-r--r-- | scripting/source/dlgprov/dlgprov.cxx | 8 | ||||
-rw-r--r-- | scripting/source/provider/ActiveMSPList.cxx | 6 | ||||
-rw-r--r-- | scripting/source/provider/BrowseNodeFactoryImpl.cxx | 2 | ||||
-rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 8 | ||||
-rw-r--r-- | scripting/source/vbaevents/eventhelper.cxx | 7 |
6 files changed, 20 insertions, 21 deletions
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index f1d3088179a1..b8aec63a67ec 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -76,7 +76,7 @@ namespace basprov StarBASIC* pBasic = static_cast< StarBASIC* >( pModule->GetParent() ); if ( pBasic ) { - m_sURI = OUString("vnd.sun.star.script:"); + m_sURI = "vnd.sun.star.script:"; m_sURI += pBasic->GetName(); m_sURI += "."; m_sURI += pModule->GetName(); @@ -259,15 +259,15 @@ namespace basprov Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create( m_xContext ) ); Sequence < PropertyValue > aArgs(7); - aArgs[0].Name = OUString("Document"); + aArgs[0].Name = "Document"; aArgs[0].Value <<= sDocURL; aArgs[1].Name = OUString("LibName"); aArgs[1].Value <<= sLibName; - aArgs[2].Name = OUString("Name"); + aArgs[2].Name = "Name"; aArgs[2].Value <<= sModName; - aArgs[3].Name = OUString("Type"); + aArgs[3].Name = "Type"; aArgs[3].Value <<= OUString("Module"); - aArgs[4].Name = OUString("Line"); + aArgs[4].Name = "Line"; aArgs[4].Value <<= static_cast< sal_uInt32 >( nLine1 ); xHelper->executeDispatch( xProv, OUString(".uno:BasicIDEAppear"), OUString(), 0, aArgs ); } diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 281eb24d8523..a0c048046f8a 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -74,7 +74,7 @@ namespace comp_DialogModelProvider uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() { uno::Sequence< OUString > s(1); - s[0] = OUString("com.sun.star.awt.UnoControlDialogModelProvider"); + s[0] = "com.sun.star.awt.UnoControlDialogModelProvider"; return s; } @@ -190,9 +190,9 @@ static OUString aResourceResolverPropName("ResourceResolver"); if ( !pNames ) { static Sequence< OUString > aNames(3); - aNames.getArray()[0] = OUString( "com.sun.star.awt.DialogProvider" ); - aNames.getArray()[1] = OUString( "com.sun.star.awt.DialogProvider2" ); - aNames.getArray()[2] = OUString( "com.sun.star.awt.ContainerWindowProvider" ); + aNames[0] = "com.sun.star.awt.DialogProvider"; + aNames[1] = "com.sun.star.awt.DialogProvider2"; + aNames[2] = "com.sun.star.awt.ContainerWindowProvider"; pNames = &aNames; } } diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx index 98d18a85500e..089062bd2dff 100644 --- a/scripting/source/provider/ActiveMSPList.cxx +++ b/scripting/source/provider/ActiveMSPList.cxx @@ -45,9 +45,9 @@ namespace func_provider ActiveMSPList::ActiveMSPList( const Reference< XComponentContext > & xContext ) : m_xContext( xContext ) { - userDirString = OUString("user"); - shareDirString = OUString("share"); - bundledDirString = OUString("bundled"); + userDirString = "user"; + shareDirString = "share"; + bundledDirString = "bundled"; } ActiveMSPList::~ActiveMSPList() diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index 569c5bd363e1..e9c510545bf6 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -550,7 +550,7 @@ public: { m_vNodes.push_back( new DefaultBrowseNode( xCtx, nodes[ i ] ) ); } - m_Name = OUString("Root"); + m_Name = "Root"; } ~DefaultRootBrowseNode() diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index f727e4864864..ce814efaff3f 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -81,7 +81,7 @@ namespace stringresource static Sequence< OUString > getSupportedServiceNames_StringResourceImpl() { Sequence< OUString > names(1); - names[0] = OUString( "com.sun.star.resource.StringResource" ); + names[0] = "com.sun.star.resource.StringResource"; return names; } @@ -1052,7 +1052,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage { xProps->setPropertyValue( aPropName, uno::makeAny( aMime ) ); - aPropName = OUString("UseCommonStoragePasswordEncryption"); + aPropName = "UseCommonStoragePasswordEncryption"; xProps->setPropertyValue( aPropName, uno::makeAny( sal_True ) ); } @@ -2271,7 +2271,7 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale static Sequence< OUString > getSupportedServiceNames_StringResourceWithStorageImpl() { Sequence< OUString > names(1); - names[0] = OUString( "com.sun.star.resource.StringResourceWithStorage" ); + names[0] = "com.sun.star.resource.StringResourceWithStorage"; return names; } @@ -2598,7 +2598,7 @@ bool StringResourceWithStorageImpl::implLoadLocale( LocaleItem* pLocaleItem ) static Sequence< OUString > getSupportedServiceNames_StringResourceWithLocationImpl() { Sequence< OUString > names(1); - names[0] = OUString( "com.sun.star.resource.StringResourceWithLocation" ); + names[0] = "com.sun.star.resource.StringResourceWithLocation"; return names; } diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 990586f0e2b4..69971f8b8efc 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -356,8 +356,7 @@ eventMethodToDescriptor( const OUString& rEventMethod, ScriptEventDescriptor& ev // set this it VBAInterop, ensures that it doesn't // get persisted or shown in property editors - evtDesc.ScriptType = OUString( - "VBAInterop" ); + evtDesc.ScriptType = OUString( "VBAInterop" ); return true; } return false; @@ -650,7 +649,7 @@ OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), m_bDocClosed( { registerProperty( EVENTLSTNR_PROPERTY_MODEL, EVENTLSTNR_PROPERTY_ID_MODEL, beans::PropertyAttribute::TRANSIENT, &m_xModel, ::getCppuType( &m_xModel ) ); - msProject = OUString("Standard"); + msProject = "Standard"; } void @@ -868,7 +867,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce OSL_TRACE("evt.MethodName is %s", OUStringToOString( evt.MethodName, RTL_TEXTENCODING_UTF8 ).getStr() ); OSL_TRACE("Argument[0] is %s", OUStringToOString( comphelper::anyToString( evt.Arguments[0] ), RTL_TEXTENCODING_UTF8 ).getStr() ); OSL_TRACE("Getting Control"); - OUString sName = OUString( "UserForm" ); + OUString sName = "UserForm"; OSL_TRACE("Getting Name"); uno::Reference< awt::XDialog > xDlg( aEvent.Source, uno::UNO_QUERY ); |