diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-12 12:24:35 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-12 12:24:35 +0100 |
commit | 6088eb600bf68b65b4fe6eb89224d3cf66361cbf (patch) | |
tree | 9820021814f253b31c9970082854b828790f8257 /unotools/source | |
parent | 55cd108d48f1554d5acef02662d7e93b18b38e34 (diff) |
unotools: Use appropriate OUString functions on string constants
Change-Id: I14d3a3187b8528e3ff9743245b869773c2eb5e98
Diffstat (limited to 'unotools/source')
-rw-r--r-- | unotools/source/config/eventcfg.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/saveopt.cxx | 4 | ||||
-rw-r--r-- | unotools/source/ucbhelper/tempfile.cxx | 2 | ||||
-rw-r--r-- | unotools/source/ucbhelper/ucblockbytes.cxx | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index b93dd9e9e1ce..ef1f984b4eb7 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -240,7 +240,7 @@ void SAL_CALL GlobalEventConfig_Impl::replaceByName( const OUString& aName, cons sal_Int32 nPropCount = props.getLength(); for( sal_Int32 index = 0; index < nPropCount; ++index ) { - if ( props[ index ].Name.equalsAscii( "Script" ) ) + if ( props[ index ].Name == "Script" ) props[ index ].Value >>= macroURL; } m_eventBindingHash[ aName ] = macroURL; diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index f1427cf04f80..fa7e065e3e00 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -771,7 +771,7 @@ SvtLoadOptions_Impl::SvtLoadOptions_Impl() , bLoadUserDefinedSettings( false ) { Sequence< OUString > aNames(1); - aNames[0] = OUString::createFromAscii(cUserDefinedSettings); + aNames[0] = cUserDefinedSettings; Sequence< Any > aValues = GetProperties( aNames ); EnableNotification( aNames ); const Any* pValues = aValues.getConstArray(); @@ -787,7 +787,7 @@ SvtLoadOptions_Impl::~SvtLoadOptions_Impl() void SvtLoadOptions_Impl::Commit() { Sequence< OUString > aNames(1); - aNames[0] = OUString::createFromAscii(cUserDefinedSettings); + aNames[0] = cUserDefinedSettings; Sequence< Any > aValues( 1 ); aValues[0].setValue(&bLoadUserDefinedSettings, ::getBooleanCppuType()); PutProperties( aNames, aValues ); diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 7665b3d81432..3ad492e24fba 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -58,7 +58,7 @@ OUString getParentName( const OUString& aFileName ) if( aParent.endsWith(":") && aParent.getLength() == 6 ) aParent += "/"; - if( aParent.equalsAscii( "file://" ) ) + if( aParent.equalsIgnoreAsciiCase( "file://" ) ) aParent = "file:///"; return aParent; diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 0ec9f4759dbf..42bce6ab4f94 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -875,8 +875,8 @@ static bool UCBOpenContentSync( return _UCBOpenContentSync( xLockBytes,xContent,rArg,xSink,xInteract,xProgress,xHandler); - if ( !aScheme.equalsAscii( "http" ) && - !aScheme.equalsAscii( "https" ) ) + if ( !aScheme.equalsIgnoreAsciiCase( "http" ) && + !aScheme.equalsIgnoreAsciiCase( "https" ) ) xLockBytes->SetStreamValid_Impl(); Reference< XPropertiesChangeListener > xListener; @@ -1112,7 +1112,7 @@ static bool _UCBOpenContentSync( // http protocol must be handled in a special way: during the opening process the input stream may change // only the last inputstream after notifying the document headers is valid - if ( !aScheme.equalsAscii("http") ) + if ( !aScheme.equalsIgnoreAsciiCase("http") ) xLockBytes->SetStreamValid_Impl(); Reference< XPropertiesChangeListener > xListener = new UcbPropertiesChangeListener_Impl( xLockBytes ); |