[Libreoffice-commits] .: framework/source jvmfwk/plugins sw/source ucb/source
Takeshi Abe
tabe at kemper.freedesktop.org
Tue Feb 28 08:23:41 PST 2012
framework/source/fwi/helper/mischelper.cxx | 4 ++--
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2 +-
sw/source/ui/lingu/olmenu.cxx | 2 +-
ucb/source/ucp/file/bc.cxx | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit a138709519b00b65cf5b530a319ed67ca657a1f4
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Wed Feb 29 01:15:16 2012 +0900
Drop comparison with empty rtl::OUString
diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index 8a50e94..3964826 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 a3176fa..132a867 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 db4bd4e..23e5535 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 38271ac..4c1c9f0 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 );
}
More information about the Libreoffice-commits
mailing list