diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-15 10:12:09 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-15 10:12:09 +0100 |
commit | 0c1b8516cb290f072e59da62198575cdbc131fce (patch) | |
tree | 2b53954159c808d0c9274b0cdfe452fb371a3507 /forms | |
parent | 260fbeb21a86f7483891016a483c0b175947a35e (diff) |
forms: Use appropriate OUString functions on string constants
Change-Id: I196e847e2f63d1bac6ed0f520cba67508aec1a5d
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/component/Filter.cxx | 6 | ||||
-rw-r--r-- | forms/source/misc/InterfaceContainer.cxx | 8 | ||||
-rw-r--r-- | forms/source/xforms/binding.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 3b566e9ca67d..9e1d53e2c6fd 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -800,19 +800,19 @@ namespace frm continue; } - if ( pName->equalsAscii( "MessageParent" ) ) + if ( *pName == "MessageParent" ) { // the message parent *pValue >>= m_xMessageParent; OSL_ENSURE( m_xMessageParent.is(), "OFilterControl::initialize: invalid MessageParent!" ); } - else if ( pName->equalsAscii( "NumberFormatter" ) ) + else if ( *pName == "NumberFormatter" ) { // the number format. This argument is optional. *pValue >>= m_xFormatter; OSL_ENSURE( m_xFormatter.is(), "OFilterControl::initialize: invalid NumberFormatter!" ); } - else if ( pName->equalsAscii( "ControlModel" ) ) + else if ( *pName == "ControlModel" ) { // the control model for which we act as filter control if ( !(*pValue >>= xControlModel ) ) diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index e740c3723f9f..0d4ef2d40a11 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -359,15 +359,15 @@ struct TransformEventTo52Format : public ::std::unary_function< ScriptEventDescr { void operator()( ScriptEventDescriptor& _rDescriptor ) { - if ( _rDescriptor.ScriptType.equalsAscii( "StarBasic" ) ) + if ( _rDescriptor.ScriptType == "StarBasic" ) { // it's a starbasic macro sal_Int32 nPrefixLength = _rDescriptor.ScriptCode.indexOf( ':' ); if ( 0 <= nPrefixLength ) { // the macro name does not already contain a : #ifdef DBG_UTIL const OUString sPrefix = _rDescriptor.ScriptCode.copy( 0, nPrefixLength ); - DBG_ASSERT( sPrefix.equalsAscii( "document" ) - || sPrefix.equalsAscii( "application" ), + DBG_ASSERT( sPrefix == "document" + || sPrefix == "application", "TransformEventTo52Format: invalid (unknown) prefix!" ); #endif // cut the prefix @@ -382,7 +382,7 @@ struct TransformEventTo60Format : public ::std::unary_function< ScriptEventDescr { void operator()( ScriptEventDescriptor& _rDescriptor ) { - if ( _rDescriptor.ScriptType.equalsAscii( "StarBasic" ) ) + if ( _rDescriptor.ScriptType == "StarBasic" ) { // it's a starbasic macro if ( _rDescriptor.ScriptCode.indexOf( ':' ) < 0 ) { // the macro name does not already contain a : diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index 2bfb98b29f7f..919ff0d89639 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -1237,7 +1237,7 @@ void Binding::handleEvent( const XEvent_t& xEvent ) OUString sType(xEvent->getType()); //OUString sEventMIPChanged("xforms-generic"); //if(sType.equals(sEventMIPChanged)) { - if(sType.equalsAscii("xforms-generic")) { + if(sType == "xforms-generic") { // the modification of the 'mnDeferModifyNotifications'-member // is necessary to prevent infinite notication looping. |