diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-02-29 01:15:16 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-02-29 01:23:09 +0900 |
commit | a138709519b00b65cf5b530a319ed67ca657a1f4 (patch) | |
tree | 526d2cd8d3279c5e0a2c7494a1c347b5d92be9d9 | |
parent | 51af20c8b4183fc796f5c9d4be25d3560a20ca3e (diff) |
Drop comparison with empty rtl::OUString
-rw-r--r-- | framework/source/fwi/helper/mischelper.cxx | 4 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/lingu/olmenu.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/bc.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx index 8a50e942a161..3964826af56c 100644 --- a/framework/source/fwi/helper/mischelper.cxx +++ b/framework/source/fwi/helper/mischelper.cxx @@ -162,7 +162,7 @@ void FillLangItems( std::set< OUString > &rLangItems, rLangItems.clear(); //1--add current language - if( rCurLang != OUString() && + if( !rCurLang.isEmpty() && LANGUAGE_DONTKNOW != rLanguageTable.GetType( rCurLang )) rLangItems.insert( rCurLang ); @@ -195,7 +195,7 @@ void FillLangItems( std::set< OUString > &rLangItems, } //5--keyboard language - if( rKeyboardLang != OUString()) + if( !rKeyboardLang.isEmpty() ) { if ( IsScriptTypeMatchingToLanguage( nScriptType, rLanguageTable.GetType( rKeyboardLang ))) rLangItems.insert( rKeyboardLang ); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index a3176fa41362..132a867038da 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -1188,7 +1188,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos) { OUString usDir2(usDir1 + arCollectDirs[j]); // prevent that we scan the whole /usr, /usr/lib, etc directories - if (arCollectDirs[j] != OUString()) + if (!arCollectDirs[j].isEmpty()) { //usr/java/xxx //Examin every subdirectory diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index db4bd4e3d3a9..23e5535700c6 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -225,7 +225,7 @@ void SwSpellPopup::fillLangPopupMenu( OUString aKeyboardLang( aSeq[2] ); OUString aGuessedTextLang( aSeq[3] ); - if (aCurLang != OUString() && + if (!aCurLang.isEmpty() && LANGUAGE_DONTKNOW != aLanguageTable.GetType( aCurLang )) aLangItems.insert( aCurLang ); diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 38271ac4d90b..4c1c9f04415e 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -603,7 +603,7 @@ BaseContent::addProperty( lang::IllegalArgumentException, RuntimeException) { - if( ( m_nState & JustInserted ) || ( m_nState & Deleted ) || Name == rtl::OUString() ) + if( ( m_nState & JustInserted ) || ( m_nState & Deleted ) || Name.isEmpty() ) { throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 ); } |