diff options
author | Szabolcs Dezsi <dezsiszabi@hotmail.com> | 2012-04-06 19:49:53 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2012-04-06 20:03:42 +0200 |
commit | d6bc02f8c4cd0f50f0a2631ac7634dab408efc1f (patch) | |
tree | b5a12df1fcae025715633469b75ab4c9b6f6d279 /svtools | |
parent | 0e1c0587617e0a6e4295a13599e97cdf6d1d2ea9 (diff) |
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/config/extcolorcfg.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/fileview.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/inettbc.cxx | 4 | ||||
-rw-r--r-- | svtools/source/filter/filter.cxx | 8 | ||||
-rw-r--r-- | svtools/source/misc/embedhlp.cxx | 2 |
5 files changed, 8 insertions, 10 deletions
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 3eaf165b0bf3..f612aabd2fe1 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -324,7 +324,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) if ( m_sLoadedScheme.isEmpty() ) m_sLoadedScheme = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default")); - if ( !sScheme.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("default")) ) + if ( sScheme != "default" ) { ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("default")); if ( ExistsScheme(sDefault) ) diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 384dd5dd01c8..16360fec7848 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -2337,7 +2337,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList ) pEntry->maDisplayText = aDisplayText; // detect the image - if( !aValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SEPARATOR_STR)) ) + if( aValue != SEPARATOR_STR ) { INetURLObject aObj( !pEntry->maImageURL.isEmpty() ? pEntry->maImageURL : pEntry->maTargetURL ); pEntry->maImage = SvFileInformationManager::GetImage( aObj, sal_False ); diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 1d05ea616f68..065615848939 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -1156,9 +1156,7 @@ String SvtURLBox::GetURL() success = UCBContentHelper::GetTitle(aURL,&aTitle); - if( success && - !(aTitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("/")) - || aTitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("."))) ) + if( success && aTitle != "/" && aTitle != "." ) { aObj.SetName( aTitle ); if ( bSlash ) diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx index dce88f41558a..fb86d9bdab32 100644 --- a/svtools/source/filter/filter.cxx +++ b/svtools/source/filter/filter.cxx @@ -1353,7 +1353,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, sal_Int32 i; for ( i = 0; i < pFilterData->getLength(); i++ ) { - if ( (*pFilterData)[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PreviewSizeHint")) ) + if ( (*pFilterData)[ i ].Name == "PreviewSizeHint" ) { awt::Size aSize; if ( (*pFilterData)[ i ].Value >>= aSize ) @@ -1365,7 +1365,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, nImportFlags &=~GRFILTER_I_FLAGS_FOR_PREVIEW; } } - else if ( (*pFilterData)[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AllowPartialStreamRead")) ) + else if ( (*pFilterData)[ i ].Name == "AllowPartialStreamRead" ) { (*pFilterData)[ i ].Value >>= bAllowPartialStreamRead; if ( bAllowPartialStreamRead ) @@ -1373,7 +1373,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, else nImportFlags &=~GRFILTER_I_FLAGS_ALLOW_PARTIAL_STREAMREAD; } - else if ( (*pFilterData)[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CreateNativeLink")) ) + else if ( (*pFilterData)[ i ].Name == "CreateNativeLink" ) { (*pFilterData)[ i ].Value >>= bCreateNativeLink; } @@ -1928,7 +1928,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& sal_Int32 k, j, i = 0; for ( i = 0; i < pFilterData->getLength(); i++ ) { - if ( (*pFilterData)[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AdditionalChunks")) ) + if ( (*pFilterData)[ i ].Name == "AdditionalChunks" ) { com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aAdditionalChunkSequence; if ( (*pFilterData)[ i ].Value >>= aAdditionalChunkSequence ) diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 824fa10cad82..2ca04746395c 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -191,7 +191,7 @@ void SAL_CALL EmbedEventListener_Impl::notifyEvent( const document::EventObject& { SolarMutexGuard aGuard; - if ( pObject && aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnVisAreaChanged")) && pObject->GetViewAspect() != embed::Aspects::MSOLE_ICON && !pObject->IsChart() ) + if ( pObject && aEvent.EventName == "OnVisAreaChanged" && pObject->GetViewAspect() != embed::Aspects::MSOLE_ICON && !pObject->IsChart() ) { pObject->UpdateReplacement(); } |