diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:29:52 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:30 +0100 |
| commit | b9def20cea8d8364ac1fa14aaf1da775128f0fd3 (patch) | |
| tree | f34f50c24fc26f865ed27226b0f47549ae3f0025 /scripting | |
| parent | 43c8ca3f995fed8cf9fbfc6bc5ef2b779cd0a154 (diff) | |
scripting: Use appropriate OUString functions on string constants
Change-Id: Iacb434225e779de4911e9acc8431662f5eabcee3
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/basprov/basmethnode.cxx | 2 | ||||
| -rw-r--r-- | scripting/source/basprov/basprov.cxx | 2 | ||||
| -rw-r--r-- | scripting/source/provider/MasterScriptProvider.cxx | 4 | ||||
| -rw-r--r-- | scripting/source/provider/URIHelper.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index 6a7b3428f352..a3a29897e49b 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -44,7 +44,7 @@ using namespace ::sf_misc; #define BASPROV_PROPERTY_ID_EDITABLE 2 #define BASPROV_PROPERTY_URI OUString( "URI" ) -#define BASPROV_PROPERTY_EDITABLE OUString( "Editable" ) +#define BASPROV_PROPERTY_EDITABLE "Editable" #define BASPROV_DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT | PropertyAttribute::READONLY diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 843beef04a50..0dc0722fcc17 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -226,7 +226,7 @@ namespace basprov if ( !( aArguments[0] >>= m_sScriptingContext ) ) { throw IllegalArgumentException( - OUString( "BasicProviderImpl::initialize: incorrect argument type " ) + aArguments[0].getValueTypeName(), + "BasicProviderImpl::initialize: incorrect argument type " + aArguments[0].getValueTypeName(), *this, 1 ); diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index ced3d0bc8b59..5c851a48aff1 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -310,11 +310,11 @@ throw ( provider::ScriptFrameworkErrorException, // ** Special case is BASIC, all calls to getScript will be handled // by the language script provider in the current location context // even if its different - if ( ( location.equals( "document" ) + if ( ( location == "document" && m_xModel.is() ) || ( endsWith( m_sCtxString, location ) ) - || ( language.equals( "Basic" ) ) + || ( language == "Basic" ) ) { Reference< provider::XScriptProvider > xScriptProvider; diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx index 574b52cfc970..7d7d4f4944a7 100644 --- a/scripting/source/provider/URIHelper.cxx +++ b/scripting/source/provider/URIHelper.cxx @@ -122,7 +122,7 @@ ScriptingFrameworkURIHelper::initBaseURI() else if ( m_sLocation == USER_UNO_PACKAGES ) { test = "uno_packages"; - uri = OUString( USER_URI ) + USER_UNO_PACKAGES_DIR; + uri = OUStringLiteral(USER_URI) + USER_UNO_PACKAGES_DIR; } else if (m_sLocation == SHARE) { |