Kaydet (Commit) b9def20c authored tarafından Stephan Bergmann's avatar Stephan Bergmann

scripting: Use appropriate OUString functions on string constants

Change-Id: Iacb434225e779de4911e9acc8431662f5eabcee3
üst 43c8ca3f
......@@ -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
......
......@@ -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
);
......
......@@ -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;
......
......@@ -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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment