mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unnecessary use of OUString constructor in SCRIPTING module

Browse Source 
Change-Id: I87dd775949d1d3cc2c191e84e57b49cd66ecc750
This commit is contained in:
Noel Grandin
2013-11-04 10:31:49 +02:00
parent a5156a4163
commit 2ac50736e4
6 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripting/source/basprov/basmethnode.cxx
View File

@@ -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 );
}

8
scripting/source/dlgprov/dlgprov.cxx
View File

@@ -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;
}
}

6
scripting/source/provider/ActiveMSPList.cxx
View File

@@ -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()

2
scripting/source/provider/BrowseNodeFactoryImpl.cxx
View File

@@ -550,7 +550,7 @@ public:
{
m_vNodes.push_back( new DefaultBrowseNode( xCtx, nodes[ i ] ) );
}
m_Name = OUString("Root");
m_Name = "Root";
}
~DefaultRootBrowseNode()

8
scripting/source/stringresource/stringresource.cxx
View File

@@ -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;
}

7
scripting/source/vbaevents/eventhelper.cxx
View File

@@ -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 );