[Libreoffice-commits] .: 2 commits - svl/source svtools/source
Olivier Hallot
ohallot at kemper.freedesktop.org
Fri Jan 13 13:14:56 PST 2012
svl/source/config/languageoptions.cxx | 2 -
svl/source/fsstor/fsfactory.cxx | 4 +-
svl/source/fsstor/fsstorage.cxx | 10 ++---
svl/source/items/ctypeitm.cxx | 2 -
svl/source/items/srchitem.cxx | 2 -
svl/source/items/style.cxx | 2 -
svl/source/misc/filenotation.cxx | 4 +-
svl/source/misc/folderrestriction.cxx | 2 -
svl/source/misc/lockfilecommon.cxx | 2 -
svl/source/misc/restrictedpaths.cxx | 2 -
svl/source/misc/sharecontrolfile.cxx | 2 -
svl/source/numbers/numfmuno.cxx | 2 -
svl/source/numbers/zforlist.cxx | 2 -
svl/source/passwordcontainer/passwordcontainer.cxx | 38 ++++++++++-----------
svl/source/passwordcontainer/syscreds.cxx | 4 +-
svtools/source/config/colorcfg.cxx | 2 -
svtools/source/config/extcolorcfg.cxx | 8 ++--
svtools/source/contnr/contentenumeration.cxx | 4 +-
svtools/source/contnr/fileview.cxx | 14 +++----
svtools/source/contnr/templwin.cxx | 28 +++++++--------
svtools/source/control/ctrlbox.cxx | 6 +--
svtools/source/control/headbar.cxx | 4 +-
svtools/source/control/inettbc.cxx | 6 +--
svtools/source/control/scriptedtext.cxx | 2 -
svtools/source/control/tabbar.cxx | 4 +-
svtools/source/control/taskstat.cxx | 2 -
svtools/source/control/toolbarmenuacc.cxx | 2 -
svtools/source/dialogs/addresstemplate.cxx | 4 +-
svtools/source/dialogs/insdlg.cxx | 2 -
svtools/source/edit/texteng.cxx | 2 -
svtools/source/filter/FilterConfigCache.cxx | 2 -
svtools/source/filter/FilterConfigItem.cxx | 2 -
svtools/source/filter/filter.cxx | 2 -
svtools/source/graphic/descriptor.cxx | 2 -
svtools/source/graphic/graphicunofactory.cxx | 2 -
svtools/source/graphic/grfmgr.cxx | 2 -
svtools/source/graphic/provider.cxx | 4 +-
svtools/source/misc/acceleratorexecute.cxx | 8 ++--
svtools/source/misc/imagemgr.cxx | 2 -
svtools/source/misc/transfer.cxx | 8 ++--
svtools/source/svhtml/htmlout.cxx | 2 -
svtools/source/table/gridtablerenderer.cxx | 4 +-
svtools/source/table/tabledatawindow.cxx | 2 -
svtools/source/toolpanel/paneltabbar.cxx | 4 +-
svtools/source/uno/addrtempuno.cxx | 2 -
svtools/source/uno/contextmenuhelper.cxx | 6 +--
svtools/source/uno/generictoolboxcontroller.cxx | 4 +-
svtools/source/uno/popupmenucontrollerbase.cxx | 2 -
svtools/source/uno/popupwindowcontroller.cxx | 4 +-
svtools/source/uno/statusbarcontroller.cxx | 6 +--
svtools/source/uno/toolboxcontroller.cxx | 4 +-
svtools/source/uno/treecontrolpeer.cxx | 14 +++----
52 files changed, 129 insertions(+), 129 deletions(-)
New commits:
commit ad6ce5e938ce9d78bed9ce6dead5fa087de49c63
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Fri Jan 13 19:13:55 2012 -0200
Fix for fdo43460 Part XXXVII getLength() to isEmpty()
Part XXXVII
Modules
svtools
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 54f93b0..7c8d59b 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -220,7 +220,7 @@ ColorConfig_Impl::~ColorConfig_Impl()
void ColorConfig_Impl::Load(const rtl::OUString& rScheme)
{
rtl::OUString sScheme(rScheme);
- if(!sScheme.getLength())
+ if(sScheme.isEmpty())
{
//detect current scheme name
uno::Sequence < ::rtl::OUString > aCurrent(1);
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 8e20a8d..89a3466 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -305,7 +305,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
// load color settings
rtl::OUString sScheme(rScheme);
- if(!sScheme.getLength())
+ if(sScheme.isEmpty())
{
//detect current scheme name
uno::Sequence < ::rtl::OUString > aCurrent(1);
@@ -325,7 +325,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
FillComponentColors(aComponentNames,aDisplayNameMap);
}
- if ( !m_sLoadedScheme.getLength() )
+ if ( m_sLoadedScheme.isEmpty() )
m_sLoadedScheme = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default"));
if ( !sScheme.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("default")) )
@@ -338,7 +338,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
FillComponentColors(aComponentNames,aDisplayNameMap);
}
}
- if ( !bFound && sScheme.getLength() )
+ if ( !bFound && !sScheme.isEmpty() )
{
AddScheme(sScheme);
CommitCurrentSchemeName();
@@ -427,7 +427,7 @@ void ExtendedColorConfig_Impl::Notify( const uno::Sequence<OUString>& /*rProp
void ExtendedColorConfig_Impl::Commit()
{
- if ( !m_sLoadedScheme.getLength() )
+ if ( m_sLoadedScheme.isEmpty() )
return;
const ::rtl::OUString sColorEntries(RTL_CONSTASCII_USTRINGPARAM("Entries"));
const ::rtl::OUString sColor(RTL_CONSTASCII_USTRINGPARAM("/Color"));
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index 30694e7..8f20827 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -265,7 +265,7 @@ namespace svt
OUString aContentURL = xContentAccess->queryContentIdentifierString();
OUString aTargetURL = xRow->getString( ROW_TARGET_URL );
- sal_Bool bHasTargetURL = !xRow->wasNull() && aTargetURL.getLength() > 0;
+ sal_Bool bHasTargetURL = !xRow->wasNull() && !aTargetURL.isEmpty();
OUString sRealURL = bHasTargetURL ? aTargetURL : aContentURL;
@@ -432,7 +432,7 @@ namespace svt
Any aAny = xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" )) );
OUString sTitle;
- if ( ( aAny >>= sTitle ) && sTitle.getLength() > 0 )
+ if ( ( aAny >>= sTitle ) && !sTitle.isEmpty() )
{
_rRet = sTitle;
bRet = sal_True;
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 9f1c92f..b2edf1a 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -151,7 +151,7 @@ void FilterMatch::createWildCardFilterList(const String& _rFilterList,::std::vec
do
{
sToken = _rFilterList.GetToken( 0, ';', nIndex );
- if ( sToken.getLength() )
+ if ( !sToken.isEmpty() )
{
_rFilters.push_back( WildCard( sToken.toAsciiUpperCase() ) );
}
@@ -1048,7 +1048,7 @@ sal_Bool ViewTabListBox_Impl::EditedEntry( SvLBoxEntry* pEntry,
if ( pData )
aURL = OUString( pData->maURL );
- if ( ! aURL.getLength() )
+ if ( aURL.isEmpty() )
return bRet;
try
@@ -1965,7 +1965,7 @@ void SvtFileView_Impl::FilterFolderContent_Impl( const OUString &rFilter )
}
if ( !bHideTransFile &&
- ( !rFilter.getLength() || ( rFilter.compareToAscii( ALL_FILES_FILTER ) == COMPARE_EQUAL ) ) )
+ ( rFilter.isEmpty() || ( rFilter.compareToAscii( ALL_FILES_FILTER ) == COMPARE_EQUAL ) ) )
// when replacing names, there is always something to filter (no view of ".nametranslation.table")
return;
@@ -2290,7 +2290,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
OUString aSize = aValue.getToken( 0, '\t', nIndex );
aDisplayText += aSize;
- if ( aSize.getLength() )
+ if ( !aSize.isEmpty() )
pEntry->maSize = aSize.toInt64();
}
aDisplayText += aTab;
@@ -2301,7 +2301,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
OUString aDate = aValue.getToken( 0, '\t', nIndex );
aDisplayText += aDate;
- if ( aDate.getLength() )
+ if ( !aDate.isEmpty() )
{
DBG_ERRORFILE( "Don't know, how to convert date" );
;// convert date string to date
@@ -2316,7 +2316,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
if ( nIndex >= 0 )
{
OUString aBool = aValue.getToken( 0, '\t', nIndex );
- if ( aBool.getLength() )
+ if ( !aBool.isEmpty() )
pEntry->mbIsFolder = aBool.toBoolean();
}
// get the image url
@@ -2331,7 +2331,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
// detect the image
if( aValue != rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(aSeparatorStr) ) )
{
- INetURLObject aObj( pEntry->maImageURL.getLength() ? pEntry->maImageURL : pEntry->maTargetURL );
+ INetURLObject aObj( !pEntry->maImageURL.isEmpty() ? pEntry->maImageURL : pEntry->maTargetURL );
pEntry->maImage = SvFileInformationManager::GetImage( aObj, sal_False );
}
maContent.push_back( pEntry );
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 2209b6a..5cc09c9 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -185,12 +185,12 @@ void ODocumentInfoPreview::fill(
m_pEditWin->SetAutoScroll( sal_False );
aStr = i_xDocProps->getTitle();
- if (aStr.getLength()) {
+ if (!aStr.isEmpty()) {
m_pEditWin->InsertEntry( m_pInfoTable->GetString( DI_TITLE ), aStr );
}
aStr = i_xDocProps->getAuthor();
- if (aStr.getLength()) {
+ if (!aStr.isEmpty()) {
m_pEditWin->InsertEntry( m_pInfoTable->GetString( DI_FROM ), aStr );
}
@@ -199,7 +199,7 @@ void ODocumentInfoPreview::fill(
i_xDocProps->getCreationDate());
aStr = i_xDocProps->getModifiedBy();
- if (aStr.getLength()) {
+ if (!aStr.isEmpty()) {
m_pEditWin->InsertEntry( m_pInfoTable->GetString(DI_MODIFIEDBY), aStr );
}
@@ -208,7 +208,7 @@ void ODocumentInfoPreview::fill(
i_xDocProps->getModificationDate());
aStr = i_xDocProps->getPrintedBy();
- if (aStr.getLength()) {
+ if (!aStr.isEmpty()) {
m_pEditWin->InsertEntry( m_pInfoTable->GetString( DI_PRINTBY ), aStr );
}
@@ -217,18 +217,18 @@ void ODocumentInfoPreview::fill(
i_xDocProps->getPrintDate());
aStr = i_xDocProps->getSubject();
- if (aStr.getLength()) {
+ if (!aStr.isEmpty()) {
m_pEditWin->InsertEntry( m_pInfoTable->GetString( DI_THEME ), aStr );
}
aStr =
::comphelper::string::convertCommaSeparated(i_xDocProps->getKeywords());
- if (aStr.getLength()) {
+ if (!aStr.isEmpty()) {
m_pEditWin->InsertEntry( m_pInfoTable->GetString( DI_KEYWORDS ), aStr );
}
aStr = i_xDocProps->getDescription();
- if (aStr.getLength()) {
+ if (!aStr.isEmpty()) {
m_pEditWin->InsertEntry( m_pInfoTable->GetString( DI_DESCRIPTION ),
aStr );
}
@@ -252,7 +252,7 @@ void ODocumentInfoPreview::fill(
aStr = SvFileInformationManager::GetDescription(
INetURLObject(i_rURL) );
}
- if (aStr.getLength()) {
+ if (!aStr.isEmpty()) {
m_pEditWin->InsertEntry( m_pInfoTable->GetString( DI_MIMETYPE ),
aStr );
}
@@ -274,7 +274,7 @@ void ODocumentInfoPreview::fill(
UNO_QUERY );
uno::Any aNew;
aNew = xConverter->convertToSimpleType( aAny, TypeClass_STRING );
- if ((aNew >>= aStr) && aStr.getLength()) {
+ if ((aNew >>= aStr) && !aStr.isEmpty()) {
m_pEditWin->InsertEntry( name, aStr);
}
} catch (uno::Exception &) {
@@ -667,7 +667,7 @@ Sequence< ::rtl::OUString > SvtFileViewWindow_Impl::GetNewDocContents() const
// folder == false
aRow += '0';
// image url?
- if ( aImageURL.getLength() > 0 )
+ if ( !aImageURL.isEmpty() )
{
aRow += '\t';
aRow += String( aImageURL );
@@ -1567,7 +1567,7 @@ void SvtTemplateWindow::ReadViewSettings()
pIconWin->SetCursorPos( nSelectedGroup );
// open the last folder or the selected group
- if ( sLastFolder.getLength() > 0 )
+ if ( !sLastFolder.isEmpty() )
pFileWin->OpenFolder( sLastFolder );
else
IconClickHdl_Impl( NULL );
@@ -1731,10 +1731,10 @@ sal_Bool SvtDocumentTemplateDialog::CanEnableEditBtn() const
sal_Bool bEnable = sal_False;
::rtl::OUString aFolderURL = pImpl->pWin->GetFolderURL();
- if ( pImpl->pWin->IsFileSelected() && aFolderURL.getLength() )
+ if ( pImpl->pWin->IsFileSelected() && !aFolderURL.isEmpty() )
{
::rtl::OUString aFileTargetURL = pImpl->pWin->GetSelectedFile();
- bEnable = aFileTargetURL.getLength() > 0;
+ bEnable = !aFileTargetURL.isEmpty();
}
return bEnable;
@@ -1886,7 +1886,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog, UpdateHdl_Impl, Timer*, _pEventSource )
IMPL_LINK ( SvtDocumentTemplateDialog, OpenLinkHdl_Impl, svt::FixedHyperlink*, EMPTYARG )
{
::rtl::OUString sURL( aMoreTemplatesLink.GetURL() );
- if ( sURL.getLength() > 0 )
+ if ( !sURL.isEmpty() )
{
localizeWebserviceURI(sURL);
try
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index a4bfa4d..d4959ec 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1057,7 +1057,7 @@ void FontNameBox::SaveMRUEntries( const String& aFontMRUEntriesFile, xub_Unicode
rtl::OString aEntries(rtl::OUStringToOString(GetMRUEntries(cSep),
RTL_TEXTENCODING_UTF8));
- if (!aEntries.getLength() || !aFontMRUEntriesFile.Len())
+ if (aEntries.isEmpty() || !aFontMRUEntriesFile.Len())
return;
SvFileStream aStream;
@@ -1427,7 +1427,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt )
if (bSymbolFont || (!bUsingCorrectFont && sSampleText.isEmpty()))
sSampleText = makeShortRepresentativeSymbolTextForSelectedFont(*rUDEvt.GetDevice());
- if (sSampleText.getLength())
+ if (!sSampleText.isEmpty())
{
const Size &rItemSize = rUDEvt.GetDevice()->GetOutputSize();
//leave a little border at the edge
@@ -1445,7 +1445,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt )
}
//center the text on the line
- if (sSampleText.getLength() && nWidth)
+ if (!sSampleText.isEmpty() && nWidth)
{
nTextHeight = aTextRect.GetHeight();
nDesiredGap = (nH-nTextHeight)/2;
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index 22fb7a3..30343f6 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -1117,7 +1117,7 @@ void HeaderBar::RequestHelp( const HelpEvent& rHEvt )
else if ( rHEvt.GetMode() & HELPMODE_EXTENDED )
{
rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) );
- if ( aHelpId.getLength() )
+ if ( !aHelpId.isEmpty() )
{
// Wenn eine Hilfe existiert, dann ausloesen
Help* pHelp = Application::GetHelp();
@@ -1441,7 +1441,7 @@ XubString HeaderBar::GetHelpText( sal_uInt16 nItemId ) const
if ( nPos != HEADERBAR_ITEM_NOTFOUND )
{
ImplHeadItem* pItem = (*mpItemList)[ nPos ];
- if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() )
+ if ( !pItem->maHelpText.Len() && !pItem->maHelpId.isEmpty() )
{
Help* pHelp = Application::GetHelp();
if ( pHelp )
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index e33809b..94a65f2 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -252,7 +252,7 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, )
continue;
}
}
- if (( sURL.getLength() > 0 ) && ( sURL[sURL.getLength()-1] != '/' ))
+ if ( !sURL.isEmpty() && ( sURL[sURL.getLength()-1] != '/' ))
{
String sUpperURL( sURL );
sUpperURL.ToUpperAscii();
@@ -884,7 +884,7 @@ void SvtURLBox::UpdatePicklistForSmartProtocol_Impl()
seqPropertySet[nProperty].Value >>= sURL;
aCurObj.SetURL( sURL );
- if ( sURL.getLength() && ( eSmartProtocol != INET_PROT_NOT_VALID ) )
+ if ( !sURL.isEmpty() && ( eSmartProtocol != INET_PROT_NOT_VALID ) )
{
if( aCurObj.GetProtocol() != eSmartProtocol )
break;
@@ -1143,7 +1143,7 @@ String SvtURLBox::GetURL()
String aName = ParseSmart( aText, aBaseURL, SvtPathOptions().GetWorkPath() );
aObj.SetURL( aName );
::rtl::OUString aURL( aObj.GetMainURL( INetURLObject::NO_DECODE ) );
- if ( !aURL.getLength() )
+ if ( aURL.isEmpty() )
// aText itself is invalid, and even together with aBaseURL, it could not
// made valid -> no chance
return aText;
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 239cc76..1628d02 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -291,7 +291,7 @@ const Size& SvtScriptedTextHelper_Impl::GetTextSize() const
void SvtScriptedTextHelper_Impl::DrawText( const Point& _rPos )
{
- if( !maText.getLength() || maPosVec.empty() )
+ if( maText.isEmpty() || maPosVec.empty() )
return;
DBG_ASSERT( maPosVec.size() - 1 == maScriptVec.size(), "SvtScriptedTextHelper_Impl::DrawText - invalid vectors" );
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 1284709..54476af 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1548,7 +1548,7 @@ void TabBar::RequestHelp( const HelpEvent& rHEvt )
else if ( rHEvt.GetMode() & HELPMODE_EXTENDED )
{
rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) );
- if ( aHelpId.getLength() )
+ if ( !aHelpId.isEmpty() )
{
// Wenn eine Hilfe existiert, dann ausloesen
Help* pHelp = Application::GetHelp();
@@ -2487,7 +2487,7 @@ XubString TabBar::GetHelpText( sal_uInt16 nPageId ) const
if ( nPos != PAGE_NOT_FOUND )
{
ImplTabBarItem* pItem = (*mpItemList)[ nPos ];
- if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() )
+ if ( !pItem->maHelpText.Len() && !pItem->maHelpId.isEmpty() )
{
Help* pHelp = Application::GetHelp();
if ( pHelp )
diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx
index d1959a5..80acfca 100644
--- a/svtools/source/control/taskstat.cxx
+++ b/svtools/source/control/taskstat.cxx
@@ -405,7 +405,7 @@ void TaskStatusBar::RequestHelp( const HelpEvent& rHEvt )
if ( pItem )
{
rtl::OUString aHelpId( rtl::OStringToOUString( pItem->maItem.GetHelpId(), RTL_TEXTENCODING_UTF8 ) );
- if ( aHelpId.getLength() )
+ if ( !aHelpId.isEmpty() )
{
// Wenn eine Hilfe existiert, dann ausloesen
Help* pHelp = Application::GetHelp();
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index 0d04a34..e297f11 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -249,7 +249,7 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException)
if( mpParent )
aRet = mpParent->mrMenu.GetAccessibleName();
- if( !aRet.getLength() )
+ if( aRet.isEmpty() )
{
Window* pLabel = mpParent->mrMenu.GetAccessibleRelationLabeledBy();
if( pLabel && pLabel != &mpParent->mrMenu )
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 7f81984..27ed3ba 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -233,7 +233,7 @@ public:
{
ConstMapString2StringIterator aPos = m_aAliases.find( _rLogicalName );
return ( m_aAliases.end() != aPos )
- && ( aPos->second.getLength() );
+ && ( !aPos->second.isEmpty() );
}
// -------------------------------------------------------------------
@@ -413,7 +413,7 @@ void AssignmentPersistentData::Commit()
// -------------------------------------------------------------------
void AssignmentPersistentData::setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment)
{
- if (!_rAssignment.getLength())
+ if (_rAssignment.isEmpty())
{
if (hasFieldAssignment(_rLogicalName))
// the assignment exists but it should be reset
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 351236e..e59efb7 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -165,7 +165,7 @@ void SvObjectServerList::FillInsertObjects()
xEntry->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ObjectUIName" )) ) >>= aUIName;
xEntry->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ClassID" )) ) >>= aClassID;
- if ( aUIName.getLength() )
+ if ( !aUIName.isEmpty() )
{
// replace %PRODUCTNAME
sal_Int32 nIndex = aUIName.indexOf( aStringProductName );
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index 06062b8..a9f8865 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -2990,7 +2990,7 @@ void TextEngine::SetLocale( const ::com::sun::star::lang::Locale& rLocale )
::com::sun::star::lang::Locale TextEngine::GetLocale()
{
- if ( !maLocale.Language.getLength() )
+ if ( maLocale.Language.isEmpty() )
{
maLocale = Application::GetSettings().GetUILocale();
}
diff --git a/svtools/source/filter/FilterConfigCache.cxx b/svtools/source/filter/FilterConfigCache.cxx
index da71bb5..f130b25 100644
--- a/svtools/source/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter/FilterConfigCache.cxx
@@ -211,7 +211,7 @@ void FilterConfigCache::ImplInit()
xFilterSet->getPropertyValue(SREALFILTERNAME) >>= aEntry.sFilterType;
Sequence< OUString > lFlags;
xFilterSet->getPropertyValue(SFLAGS) >>= lFlags;
- if (lFlags.getLength()!=1 || !lFlags[0].getLength())
+ if (lFlags.getLength()!=1 || lFlags[0].isEmpty())
continue;
if (lFlags[0].equalsIgnoreAsciiCaseAscii("import"))
aEntry.nFlags = 1;
diff --git a/svtools/source/filter/FilterConfigItem.cxx b/svtools/source/filter/FilterConfigItem.cxx
index 4d79d96..5368c94 100644
--- a/svtools/source/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter/FilterConfigItem.cxx
@@ -278,7 +278,7 @@ PropertyValue* FilterConfigItem::GetPropertyValue( Sequence< PropertyValue >& rP
sal_Bool FilterConfigItem::WritePropertyValue( Sequence< PropertyValue >& rPropSeq, const PropertyValue& rPropValue )
{
sal_Bool bRet = sal_False;
- if ( rPropValue.Name.getLength() )
+ if ( !rPropValue.Name.isEmpty() )
{
sal_Int32 i, nCount;
for ( i = 0, nCount = rPropSeq.getLength(); i < nCount; i++ )
diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx
index 89dd2db..fd9ae22 100644
--- a/svtools/source/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -2207,7 +2207,7 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData*, pData )
nFormat = GetImportFormatNumberForShortName( rtl::OStringToOUString( aShortName, RTL_TEXTENCODING_UTF8) );
nRet = ImportGraphic( pData->maGraphic, String(), pData->mrStm, nFormat ) == 0;
}
- else if( aShortName.getLength() )
+ else if( !aShortName.isEmpty() )
{
// Export
nFormat = GetExportFormatNumberForShortName( rtl::OStringToOUString(aShortName, RTL_TEXTENCODING_UTF8) );
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index b1d1050..a2441c9 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -401,7 +401,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
aMimeType = ::rtl::OUString::createFromAscii( pMimeType );
}
- if( !aMimeType.getLength() && ( mpGraphic->GetType() != GRAPHIC_NONE ) )
+ if( aMimeType.isEmpty() && ( mpGraphic->GetType() != GRAPHIC_NONE ) )
aMimeType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VCLGRAPHIC ));
}
else
diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx
index 9a8ed3a..9de8155 100644
--- a/svtools/source/graphic/graphicunofactory.cxx
+++ b/svtools/source/graphic/graphicunofactory.cxx
@@ -59,7 +59,7 @@ GObjectImpl::GObjectImpl( uno::Sequence< uno::Any > const & args, uno::Reference
if ( args.getLength() == 1 )
{
rtl::OUString sId;
- if ( !( args[ 0 ] >>= sId ) || sId.getLength() == 0 )
+ if ( !( args[ 0 ] >>= sId ) || sId.isEmpty() )
throw lang::IllegalArgumentException();
rtl::OString bsId(rtl::OUStringToOString(sId, RTL_TEXTENCODING_UTF8));
mpGObject.reset( new GraphicObject( bsId ) );
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 3b4bfc4..2c49975 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1195,7 +1195,7 @@ GraphicObject::InspectForGraphicObjectImageURL( const Reference< XInterface >& x
{
rtl::OUString sURL;
xProps->getPropertyValue( sImageURL ) >>= sURL;
- if ( sURL.getLength() && sURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 )
+ if ( !sURL.isEmpty() && sURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 )
rvEmbedImgUrls.push_back( sURL );
}
}
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 047f4df..d5bcf46 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -298,7 +298,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const :
const ::rtl::OUString aResourceType( rResourceURL.getToken( 0, '/', nIndex ) );
const ResId aResId( rResourceURL.getToken( 0, '/', nIndex ).toInt32(), *pResMgr );
- if( aResourceType.getLength() )
+ if( !aResourceType.isEmpty() )
{
BitmapEx aBmpEx;
@@ -395,7 +395,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc
pDescriptor->init( xIStm, aURL );
xRet = pDescriptor;
}
- else if( aURL.getLength() )
+ else if( !aURL.isEmpty() )
{
uno::Reference< ::graphic::XGraphic > xGraphic( implLoadMemory( aURL ) );
if( !xGraphic.is() )
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index bace967..283d34a 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -197,7 +197,7 @@ sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey)
::rtl::OUString sCommand = impl_ts_findCommand(aAWTKey);
// No Command found? Do nothing! User isnt interested on any error handling .-)
- if (!sCommand.getLength())
+ if (sCommand.isEmpty())
return sal_False;
// SAFE -> ----------------------------------
@@ -280,7 +280,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
{
if (xDocCfg.is())
sCommand = xDocCfg->getCommandByKeyEvent(aKey);
- if (sCommand.getLength())
+ if (!sCommand.isEmpty())
return sCommand;
}
catch(const css::container::NoSuchElementException&)
@@ -290,7 +290,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
{
if (xModuleCfg.is())
sCommand = xModuleCfg->getCommandByKeyEvent(aKey);
- if (sCommand.getLength())
+ if (!sCommand.isEmpty())
return sCommand;
}
catch(const css::container::NoSuchElementException&)
@@ -300,7 +300,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
{
if (xGlobalCfg.is())
sCommand = xGlobalCfg->getCommandByKeyEvent(aKey);
- if (sCommand.getLength())
+ if (!sCommand.isEmpty())
return sCommand;
}
catch(const css::container::NoSuchElementException&)
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index c708a1d..d35fcee 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -241,7 +241,7 @@ static String GetImageExtensionByFactory_Impl( const String& rURL )
::rtl::OUString aInternalType = xTypeDetector->queryTypeByURL( rURL );
::com::sun::star::uno::Reference < ::com::sun::star::container::XNameAccess > xAccess( xTypeDetector, ::com::sun::star::uno::UNO_QUERY );
::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aTypeProps;
- if ( aInternalType.getLength() > 0 && xAccess->hasByName( aInternalType ) )
+ if ( !aInternalType.isEmpty() && xAccess->hasByName( aInternalType ) )
{
xAccess->getByName( aInternalType ) >>= aTypeProps;
sal_Int32 nProps = aTypeProps.getLength();
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 6faa7e5..5fa1e5b 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -151,7 +151,7 @@ static ::rtl::OUString ImplGetParameterString( const TransferableObjectDescripto
const ::rtl::OUString aClassName( rObjDesc.maClassName.GetHexName() );
::rtl::OUString aParams;
- if( aClassName.getLength() )
+ if( !aClassName.isEmpty() )
{
aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";classname=\"" ));
aParams += aClassName;
@@ -774,7 +774,7 @@ sal_Bool TransferableHelper::SetString( const ::rtl::OUString& rString, const Da
{
DataFlavor aFileFlavor;
- if( rString.getLength() &&
+ if( !rString.isEmpty() &&
SotExchange::GetFormatDataFlavor( FORMAT_FILE, aFileFlavor ) &&
TransferableDataHelper::IsEqual( aFileFlavor, rFlavor ) )
{
@@ -1387,7 +1387,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
try
{
- if( xMimeFact.is() && rFlavor.MimeType.getLength() )
+ if( xMimeFact.is() && !rFlavor.MimeType.isEmpty() )
xMimeType = xMimeFact->createMimeContentType( rFlavor.MimeType );
}
catch( const ::com::sun::star::uno::Exception& )
@@ -2107,7 +2107,7 @@ sal_Bool TransferableDataHelper::GetFileList(
rtl::OString aDiskString;
while( xStm->ReadLine( aDiskString ) )
- if( aDiskString.getLength() && aDiskString[0] != '#' )
+ if( !aDiskString.isEmpty() && aDiskString[0] != '#' )
rFileList.AppendFile( rtl::OStringToOUString(aDiskString, RTL_TEXTENCODING_UTF8) );
bRet = sal_True;
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 5a25a21..3ba0590 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -559,7 +559,7 @@ SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream,
{
rtl::OString sOut = lcl_FlushToAscii( rContext );
- if (sOut.getLength())
+ if (!sOut.isEmpty())
rStream << sOut.getStr();
return rStream;
diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index 5d6eff9..5a20053 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -395,7 +395,7 @@ namespace svt { namespace table
Any const rowHeading( m_pImpl->rModel.getRowHeading( m_pImpl->nCurrentRow ) );
::rtl::OUString const rowTitle( CellValueConversion::convertToString( rowHeading ) );
- if ( rowTitle.getLength() )
+ if ( !rowTitle.isEmpty() )
{
::Color const textColor = lcl_getEffectiveColor( m_pImpl->rModel.getHeaderTextColor(), _rStyle, &StyleSettings::GetFieldTextColor );
_rDevice.SetTextColor( textColor );
@@ -586,7 +586,7 @@ namespace svt { namespace table
}
::rtl::OUString const sText( CellValueConversion::convertToString( i_cellContent ) );
- if ( sText.getLength() == 0 )
+ if ( sText.isEmpty() )
return true;
Rectangle const aTargetArea( lcl_getTextRenderingArea( lcl_getContentArea( *m_pImpl, i_targetArea ) ) );
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index 5f5ad0a..1dedd36 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -141,7 +141,7 @@ namespace svt { namespace table
}
}
- if ( sHelpText.getLength() )
+ if ( !sHelpText.isEmpty() )
{
Rectangle const aControlScreenRect(
OutputToScreenPixel( Point( 0, 0 ) ),
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index b7a245e..2723534 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -588,7 +588,7 @@ namespace svt
const bool bUseImage = !!aImage && ( i_eItemContent != TABITEM_TEXT_ONLY );
const ::rtl::OUString sItemText( i_pPanel->GetDisplayName() );
- const bool bUseText = ( sItemText.getLength() != 0 ) && ( i_eItemContent != TABITEM_IMAGE_ONLY );
+ const bool bUseText = ( !sItemText.isEmpty() ) && ( i_eItemContent != TABITEM_IMAGE_ONLY );
Size aItemContentSize;
if ( bUseImage )
@@ -659,7 +659,7 @@ namespace svt
}
const ::rtl::OUString sItemText( i_pPanel->GetDisplayName() );
- const bool bUseText = ( sItemText.getLength() != 0 ) && ( i_eItemContent != TABITEM_IMAGE_ONLY );
+ const bool bUseText = ( !sItemText.isEmpty() ) && ( i_eItemContent != TABITEM_IMAGE_ONLY );
if ( bUseText )
{
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 3f3b69a..3cb151f 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -228,7 +228,7 @@ namespace svt
//------------------------------------------------------------------------------
Dialog* OAddressBookSourceDialogUno::createDialog(Window* _pParent)
{
- if ( m_xDataSource.is() && m_sTable.getLength() )
+ if ( m_xDataSource.is() && !m_sTable.isEmpty() )
return new AddressBookSourceDialog(_pParent, m_aContext.getLegacyServiceFactory(), m_xDataSource, m_sDataSourceName, m_sTable, m_aAliases );
else
return new AddressBookSourceDialog( _pParent, m_aContext.getLegacyServiceFactory() );
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index 4fcab9e..48554a3 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.cxx
@@ -326,7 +326,7 @@ ContextMenuHelper::executePopupMenu(
if ( nResult > 0 )
{
::rtl::OUString aCommand = lcl_GetItemCommandRecursive( pMenu, nResult );
- if ( aCommand.getLength() > 0 )
+ if ( !aCommand.isEmpty() )
dispatchCommand( xFrame, aCommand );
}
}
@@ -548,7 +548,7 @@ ContextMenuHelper::getLabelFromCommandURL(
{
try
{
- if ( aCmdURL.getLength() > 0 )
+ if ( !aCmdURL.isEmpty() )
{
rtl::OUString aStr;
uno::Sequence< beans::PropertyValue > aPropSeq;
@@ -614,7 +614,7 @@ ContextMenuHelper::completeMenuProperties(
if ( bShowMenuImages )
{
Image aImage;
- if ( aCmdURL.getLength() > 0 )
+ if ( !aCmdURL.isEmpty() )
aImage = getImageFromCommandURL( aCmdURL );
pMenu->SetItemImage( nId, aImage );
}
diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx
index ca34536..3dfc34e 100644
--- a/svtools/source/uno/generictoolboxcontroller.cxx
+++ b/svtools/source/uno/generictoolboxcontroller.cxx
@@ -79,7 +79,7 @@ GenericToolboxController::GenericToolboxController( const Reference< XMultiServi
m_bInitialized = sal_True;
// insert main command to our listener map
- if ( m_aCommandURL.getLength() )
+ if ( !m_aCommandURL.isEmpty() )
m_aListenerMap.insert( URLToDispatchMap::value_type( aCommand, Reference< XDispatch >() ));
}
@@ -114,7 +114,7 @@ throw ( RuntimeException )
if ( m_bInitialized &&
m_xFrame.is() &&
m_xServiceManager.is() &&
- m_aCommandURL.getLength() )
+ !m_aCommandURL.isEmpty() )
{
xURLTransformer = Reference< XURLTransformer >( m_xServiceManager->createInstance(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index 3315150..d10de66 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -376,7 +376,7 @@ void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArgum
}
}
- if ( xFrame.is() && aCommandURL.getLength() )
+ if ( xFrame.is() && !aCommandURL.isEmpty() )
{
m_xFrame = xFrame;
m_aCommandURL = aCommandURL;
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx
index 9ff12c8..553eecb 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -193,14 +193,14 @@ sal_Bool SAL_CALL PopupWindowController::supportsService( const OUString& Servic
void SAL_CALL PopupWindowController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
{
svt::ToolboxController::initialize( aArguments );
- if( m_aCommandURL.getLength() )
+ if( !m_aCommandURL.isEmpty() )
addStatusListener( m_aCommandURL );
}
// XComponent
void SAL_CALL PopupWindowController::dispose() throw (RuntimeException)
{
- if( m_aCommandURL.getLength() )
+ if( !m_aCommandURL.isEmpty() )
removeStatusListener( m_aCommandURL );
svt::ToolboxController::dispose();
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index c4823fd..ee6e645 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -173,7 +173,7 @@ throw ( Exception, RuntimeException )
}
}
- if ( m_aCommandURL.getLength() )
+ if ( !m_aCommandURL.isEmpty() )
m_aListenerMap.insert( URLToDispatchMap::value_type( m_aCommandURL, Reference< XDispatch >() ));
}
}
@@ -552,7 +552,7 @@ void StatusbarController::execute( const ::com::sun::star::uno::Sequence< ::com:
if ( m_bInitialized &&
m_xFrame.is() &&
m_xServiceManager.is() &&
- m_aCommandURL.getLength() )
+ !m_aCommandURL.isEmpty() )
{
xURLTransformer = getURLTransformer();
aCommandURL = m_aCommandURL;
@@ -594,7 +594,7 @@ void StatusbarController::execute(
if ( m_bInitialized &&
m_xFrame.is() &&
m_xServiceManager.is() &&
- m_aCommandURL.getLength() )
+ !m_aCommandURL.isEmpty() )
{
Reference< XURLTransformer > xURLTransformer( getURLTransformer() );
aTargetURL.Complete = aCommandURL;
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 4e4970b..1146f7c 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -252,7 +252,7 @@ throw ( Exception, RuntimeException )
{
}
- if ( m_aCommandURL.getLength() )
+ if ( !m_aCommandURL.isEmpty() )
m_aListenerMap.insert( URLToDispatchMap::value_type( m_aCommandURL, Reference< XDispatch >() ));
}
}
@@ -373,7 +373,7 @@ throw (::com::sun::star::uno::RuntimeException)
if ( m_bInitialized &&
m_xFrame.is() &&
m_xServiceManager.is() &&
- m_aCommandURL.getLength() )
+ !m_aCommandURL.isEmpty() )
{
aCommandURL = m_aCommandURL;
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index d2e5c55..7b94385 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -262,7 +262,7 @@ UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xN
UnoTreeListItem * pUnoItem = new UnoTreeListItem( pEntry );
- if( xNode->getNodeGraphicURL().getLength() )
+ if( !xNode->getNodeGraphicURL().isEmpty() )
{
pUnoItem->SetGraphicURL( xNode->getNodeGraphicURL() );
Image aNodeImage;
@@ -275,10 +275,10 @@ UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xN
mpTreeImpl->insert( pEntry, pParent, nPos );
- if( msDefaultExpandedGraphicURL.getLength() )
+ if( !msDefaultExpandedGraphicURL.isEmpty() )
mpTreeImpl->SetExpandedEntryBmp( pEntry, maDefaultExpandedImage );
- if( msDefaultCollapsedGraphicURL.getLength() )
+ if( !msDefaultCollapsedGraphicURL.isEmpty() )
mpTreeImpl->SetCollapsedEntryBmp( pEntry, maDefaultCollapsedImage );
updateEntry( pEntry );
@@ -729,7 +729,7 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const ::rtl::OUStri
SolarMutexGuard aGuard;
if( msDefaultExpandedGraphicURL != sDefaultExpandedGraphicURL )
{
- if( sDefaultExpandedGraphicURL.getLength() )
+ if( !sDefaultExpandedGraphicURL.isEmpty() )
loadImage( sDefaultExpandedGraphicURL, maDefaultExpandedImage );
else
maDefaultExpandedImage = Image();
@@ -742,7 +742,7 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const ::rtl::OUStri
ImplContextGraphicItem* pContextGraphicItem = dynamic_cast< ImplContextGraphicItem* >( pEntry->GetItem( 0 ) );
if( pContextGraphicItem )
{
- if( pContextGraphicItem->msExpandedGraphicURL.getLength() == 0 )
+ if( pContextGraphicItem->msExpandedGraphicURL.isEmpty() )
rTree.SetExpandedEntryBmp( pEntry, maDefaultExpandedImage );
}
pEntry = rTree.Next( pEntry );
@@ -767,7 +767,7 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const ::rtl::OUStr
SolarMutexGuard aGuard;
if( msDefaultCollapsedGraphicURL != sDefaultCollapsedGraphicURL )
{
- if( sDefaultCollapsedGraphicURL.getLength() )
+ if( !sDefaultCollapsedGraphicURL.isEmpty() )
loadImage( sDefaultCollapsedGraphicURL, maDefaultCollapsedImage );
else
maDefaultCollapsedImage = Image();
@@ -780,7 +780,7 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const ::rtl::OUStr
ImplContextGraphicItem* pContextGraphicItem = dynamic_cast< ImplContextGraphicItem* >( pEntry->GetItem( 0 ) );
if( pContextGraphicItem )
{
- if( pContextGraphicItem->msCollapsedGraphicURL.getLength() == 0 )
+ if( pContextGraphicItem->msCollapsedGraphicURL.isEmpty() )
rTree.SetCollapsedEntryBmp( pEntry, maDefaultCollapsedImage );
}
pEntry = rTree.Next( pEntry );
commit 38423e0ad2a8e2a902aeb37391aef0b543c09d68
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Fri Jan 13 15:54:57 2012 -0200
Fix for fdo43460 Part XXXVI getLength() to isEmpty()
Part XXXVI
Modules
svl
diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx
index 77f1fce..94fbf42 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -208,7 +208,7 @@ void SvtSystemLanguageOptions::Notify( const com::sun::star::uno::Sequence< r
LanguageType SvtSystemLanguageOptions::GetWin16SystemLanguage()
{
- if( m_sWin16SystemLocale.getLength() == 0 )
+ if( m_sWin16SystemLocale.isEmpty() )
return LANGUAGE_NONE;
return MsLangId::convertIsoStringToLanguage( m_sWin16SystemLocale );
}
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 464963f..e092808 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -78,7 +78,7 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance()
aTempURL = ::utl::TempFile( NULL, sal_True ).GetURL();
- if ( !aTempURL.getLength() )
+ if ( aTempURL.isEmpty() )
throw uno::RuntimeException(); // TODO: can not create tempfile
::ucbhelper::Content aResultContent(
@@ -131,7 +131,7 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA
if ( aArguments[0] >>= aURL )
{
- if ( !aURL.getLength() )
+ if ( aURL.isEmpty() )
{
OSL_FAIL( "Empty URL is provided!\n" );
throw uno::Exception(); // TODO: illegal argument
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 01e4434..47f52f4 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -90,7 +90,7 @@ sal_Bool isLocalFile_Impl( ::rtl::OUString aURL )
{
}
- return ( aSystemPath.getLength() != 0 );
+ return ( !aSystemPath.isEmpty() );
}
@@ -117,7 +117,7 @@ struct FSStorage_Impl
, m_pTypeCollection( NULL )
, m_xFactory( xFactory )
{
- OSL_ENSURE( m_aURL.getLength(), "The URL must not be empty" );
+ OSL_ENSURE( !m_aURL.isEmpty(), "The URL must not be empty" );
}
FSStorage_Impl( const ::ucbhelper::Content& aContent, sal_Int32 nMode, uno::Reference< lang::XMultiServiceFactory > xFactory )
@@ -128,7 +128,7 @@ struct FSStorage_Impl
, m_pTypeCollection( NULL )
, m_xFactory( xFactory )
{
- OSL_ENSURE( m_aURL.getLength(), "The URL must not be empty" );
+ OSL_ENSURE( !m_aURL.isEmpty(), "The URL must not be empty" );
}
~FSStorage_Impl();
@@ -1061,7 +1061,7 @@ uno::Any SAL_CALL FSStorage::getByName( const ::rtl::OUString& aName )
if ( !GetContent() )
throw io::IOException(); // TODO: error handling
- if ( !aName.getLength() )
+ if ( aName.isEmpty() )
throw lang::IllegalArgumentException();
INetURLObject aURL( m_pImpl->m_aURL );
@@ -1186,7 +1186,7 @@ sal_Bool SAL_CALL FSStorage::hasByName( const ::rtl::OUString& aName )
if ( !GetContent() )
throw io::IOException(); // TODO: error handling
- if ( !aName.getLength() )
+ if ( aName.isEmpty() )
throw lang::IllegalArgumentException();
}
catch( uno::RuntimeException& )
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index 84088c2..d34c1db 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -223,7 +223,7 @@ bool CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uIn
{
// SetValue with an empty string resets the item; so call that
// function when PutValue is called with an empty string
- if (aValue.getLength() == 0)
+ if (aValue.isEmpty())
SetValue(aValue);
else
SetValue(
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 8fca18e..d4c05c0 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -503,7 +503,7 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe
case MID_SEARCH_LOCALE:
{
sal_Int16 nLocale;
- if (aSearchOpt.Locale.Language.getLength() || aSearchOpt.Locale.Country.getLength() )
+ if (!aSearchOpt.Locale.Language.isEmpty() || !aSearchOpt.Locale.Country.isEmpty() )
nLocale = MsLangId::convertLocaleToLanguage( aSearchOpt.Locale );
else
nLocale = LANGUAGE_NONE;
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 02ed772..c49d9ad 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -220,7 +220,7 @@ sal_Bool SfxStyleSheetBase::SetName( const XubString& rName )
rtl::OUString SfxStyleSheetBase::GetDisplayName() const
{
- if( maDisplayName.getLength() == 0 )
+ if( maDisplayName.isEmpty() )
{
return aName;
}
diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx
index 065675f..1cc7309 100644
--- a/svl/source/misc/filenotation.cxx
+++ b/svl/source/misc/filenotation.cxx
@@ -67,10 +67,10 @@ namespace svt
m_sSystem = _rSystemPath;
if ( ( osl_File_E_None != osl_getFileURLFromSystemPath( m_sSystem.pData, &m_sFileURL.pData ) )
- && ( 0 == m_sFileURL.getLength() )
+ && ( m_sFileURL.isEmpty() )
)
{
- if ( _rSystemPath.getLength() )
+ if ( !_rSystemPath.isEmpty() )
{
INetURLObject aSmartParser;
aSmartParser.SetSmartProtocol( INET_PROT_FILE );
diff --git a/svl/source/misc/folderrestriction.cxx b/svl/source/misc/folderrestriction.cxx
index 8de4d29..bb2fab5 100644
--- a/svl/source/misc/folderrestriction.cxx
+++ b/svl/source/misc/folderrestriction.cxx
@@ -81,7 +81,7 @@ static bool getEnvironmentValue( const sal_Char* _pAsciiEnvName, ::rtl::OUString
_rValue = ::rtl::OUString();
::rtl::OUString sEnvName = ::rtl::OUString::createFromAscii( _pAsciiEnvName );
osl_getEnvironment( sEnvName.pData, &_rValue.pData );
- return _rValue.getLength() != 0;
+ return !_rValue.isEmpty();
}
//-----------------------------------------------------------------------------
diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx
index 5bc5996..df1421b 100644
--- a/svl/source/misc/lockfilecommon.cxx
+++ b/svl/source/misc/lockfilecommon.cxx
@@ -201,7 +201,7 @@ uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence
{
SvtUserOptions aUserOpt;
::rtl::OUString aName = aUserOpt.GetFirstName();
- if ( aName.getLength() )
+ if ( !aName.isEmpty() )
aName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) );
aName += aUserOpt.GetLastName();
diff --git a/svl/source/misc/restrictedpaths.cxx b/svl/source/misc/restrictedpaths.cxx
index 1e6e74b..37bd023 100644
--- a/svl/source/misc/restrictedpaths.cxx
+++ b/svl/source/misc/restrictedpaths.cxx
@@ -47,7 +47,7 @@ namespace svt
_rValue = ::rtl::OUString();
::rtl::OUString sEnvName = ::rtl::OUString::createFromAscii( _pAsciiEnvName );
osl_getEnvironment( sEnvName.pData, &_rValue.pData );
- return _rValue.getLength() != 0;
+ return !_rValue.isEmpty();
}
//-----------------------------------------------------------------
diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx
index 45b4578..7eda0e2 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
@@ -86,7 +86,7 @@ void ShareControlFile::OpenStream()
{
// if it is called outside of constructor the mutex must be locked already
- if ( !m_xStream.is() && m_aURL.getLength() )
+ if ( !m_xStream.is() && !m_aURL.isEmpty() )
{
uno::Reference< ucb::XCommandEnvironment > xDummyEnv;
::ucbhelper::Content aContent = ::ucbhelper::Content( m_aURL, xDummyEnv );
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 99ec182..c678876 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -115,7 +115,7 @@ const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap()
LanguageType lcl_GetLanguage( const lang::Locale& rLocale )
{
// empty language -> LANGUAGE_SYSTEM
- if ( rLocale.Language.getLength() == 0 )
+ if ( rLocale.Language.isEmpty() )
return LANGUAGE_SYSTEM;
LanguageType eRet = MsLangId::convertLocaleToLanguage( rLocale );
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 3aff518..30bd5a7 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1913,7 +1913,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat(
}
if ( rCode.Default )
pFormat->SetStandard();
- if ( rCode.DefaultName.getLength() )
+ if ( !rCode.DefaultName.isEmpty() )
pFormat->SetComment( rCode.DefaultName );
return pFormat;
}
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 5cbef9b..3afa5a5 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -341,7 +341,7 @@ void StorageItem::setEncodedMP( const ::rtl::OUString& aEncoded, sal_Bool bAccep
sendNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasMaster"));
sendNames[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Master"));
- sal_Bool bHasMaster = ( aEncoded.getLength() > 0 || bAcceptEmpty );
+ sal_Bool bHasMaster = ( !aEncoded.isEmpty() || bAcceptEmpty );
sendVals[0] <<= bHasMaster;
sendVals[1] <<= aEncoded;
@@ -481,7 +481,7 @@ void SAL_CALL PasswordContainer::disposing( const EventObject& ) throw(RuntimeEx
vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUString& aLine, const ::rtl::OUString& aMasterPasswd ) throw(RuntimeException)
{
- if( aMasterPasswd.getLength() )
+ if( !aMasterPasswd.isEmpty() )
{
rtlCipher aDecoder = rtl_cipher_create (rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeStream );
OSL_ENSURE( aDecoder, "Can't create decoder\n" );
@@ -533,7 +533,7 @@ vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUStr
::rtl::OUString PasswordContainer::EncodePasswords( vector< ::rtl::OUString > lines, const ::rtl::OUString& aMasterPasswd ) throw(RuntimeException)
{
- if( aMasterPasswd.getLength() )
+ if( !aMasterPasswd.isEmpty() )
{
::rtl::OString aSeq = ::rtl::OUStringToOString( createIndex( lines ), RTL_TEXTENCODING_UTF8 );
@@ -816,7 +816,7 @@ UrlRecord PasswordContainer::find(
{
::osl::MutexGuard aGuard( mMutex );
- if( !m_aContainer.empty() && aURL.getLength() )
+ if( !m_aContainer.empty() && !aURL.isEmpty() )
{
::rtl::OUString aUrl( aURL );
@@ -847,7 +847,7 @@ UrlRecord PasswordContainer::find(
}
}
}
- while( shorterUrl( aUrl ) && aUrl.getLength() );
+ while( shorterUrl( aUrl ) && !aUrl.isEmpty() );
}
return UrlRecord();
@@ -901,7 +901,7 @@ UrlRecord PasswordContainer::find(
if( !m_pStorageFile || !m_pStorageFile->useStorage() )
throw NoMasterException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password storing is not active!")), Reference< XInterface >(), aRMode );
- if( !m_aMasterPasswd.getLength() && aHandler.is() )
+ if( m_aMasterPasswd.isEmpty() && aHandler.is() )
{
::rtl::OUString aEncodedMP;
sal_Bool bAskAgain = sal_False;
@@ -909,7 +909,7 @@ UrlRecord PasswordContainer::find(
if( !m_pStorageFile->getEncodedMP( aEncodedMP ) )
aRMode = PasswordRequestMode_PASSWORD_CREATE;
- else if ( !aEncodedMP.getLength() )
+ else if ( aEncodedMP.isEmpty() )
{
m_aMasterPasswd = GetDefaultMasterPassword();
bDefaultPassword = sal_True;
@@ -921,7 +921,7 @@ UrlRecord PasswordContainer::find(
bAskAgain = sal_False;
::rtl::OUString aPass = RequestPasswordFromUser( aRMode, aHandler );
- if ( aPass.getLength() )
+ if ( !aPass.isEmpty() )
{
if( aRMode == PasswordRequestMode_PASSWORD_CREATE )
{
@@ -947,7 +947,7 @@ UrlRecord PasswordContainer::find(
}
}
- if ( !m_aMasterPasswd.getLength() )
+ if ( m_aMasterPasswd.isEmpty() )
throw NoMasterException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No master password!")), Reference< XInterface >(), aRMode );
return m_aMasterPasswd;
@@ -1125,7 +1125,7 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R
// the method should fail if there is no master password
if( m_pStorageFile && m_pStorageFile->useStorage() && m_pStorageFile->getEncodedMP( aEncodedMP ) )
{
- if ( !aEncodedMP.getLength() )
+ if ( aEncodedMP.isEmpty() )
{
// this is a default master password
// no UI is necessary
@@ -1139,7 +1139,7 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R
xTmpHandler.set( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" ) ) ), uno::UNO_QUERY_THROW );
}
- if ( m_aMasterPasswd.getLength() )
+ if ( !m_aMasterPasswd.isEmpty() )
{
// there is a password, it should be just rechecked
PasswordRequestMode aRMode = PasswordRequestMode_PASSWORD_ENTER;
@@ -1147,16 +1147,16 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R
do {
aPass = RequestPasswordFromUser( aRMode, xTmpHandler );
- bResult = ( aPass.getLength() && aPass.equals( m_aMasterPasswd ) );
+ bResult = ( !aPass.isEmpty() && aPass.equals( m_aMasterPasswd ) );
aRMode = PasswordRequestMode_PASSWORD_REENTER; // further questions with error notification
- } while( !bResult && aPass.getLength() );
+ } while( !bResult && !aPass.isEmpty() );
}
else
{
try
{
// ask for the password, if user provide no correct password an exception will be thrown
- bResult = ( GetMasterPassword( xTmpHandler ).getLength() > 0 );
+ bResult = !GetMasterPassword( xTmpHandler ).isEmpty();
}
catch( uno::Exception& )
{}
@@ -1186,7 +1186,7 @@ sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference<
sal_Bool bCanChangePassword = sal_True;
// if there is already a stored master password it should be entered by the user before the change happen
::rtl::OUString aEncodedMP;
- if( m_aMasterPasswd.getLength() || m_pStorageFile->getEncodedMP( aEncodedMP ) )
+ if( !m_aMasterPasswd.isEmpty() || m_pStorageFile->getEncodedMP( aEncodedMP ) )
bCanChangePassword = authorizateWithMasterPassword( xTmpHandler );
if ( bCanChangePassword )
@@ -1195,7 +1195,7 @@ sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference<
PasswordRequestMode aRMode = PasswordRequestMode_PASSWORD_CREATE;
::rtl::OUString aPass = RequestPasswordFromUser( aRMode, xTmpHandler );
- if ( aPass.getLength() )
+ if ( !aPass.isEmpty() )
{
// get all the persistent entries if it is possible
Sequence< UrlRecord > aPersistent = getAllPersistent( uno::Reference< task::XInteractionHandler >() );
@@ -1302,14 +1302,14 @@ void SAL_CALL PasswordContainer::removeMasterPassword()
sal_Bool bCanChangePassword = sal_True;
// if there is already a stored nondefault master password it should be entered by the user before the change happen
::rtl::OUString aEncodedMP;
- if( m_pStorageFile->getEncodedMP( aEncodedMP ) && aEncodedMP.getLength() )
+ if( m_pStorageFile->getEncodedMP( aEncodedMP ) && !aEncodedMP.isEmpty() )
bCanChangePassword = authorizateWithMasterPassword( xTmpHandler );
if ( bCanChangePassword )
{
// generate the default password
::rtl::OUString aPass = GetDefaultMasterPassword();
- if ( aPass.getLength() )
+ if ( !aPass.isEmpty() )
{
// get all the persistent entries if it is possible
Sequence< UrlRecord > aPersistent = getAllPersistent( uno::Reference< task::XInteractionHandler >() );
@@ -1348,7 +1348,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword()
throw uno::RuntimeException();
::rtl::OUString aEncodedMP;
- return ( m_pStorageFile->useStorage() && m_pStorageFile->getEncodedMP( aEncodedMP ) && !aEncodedMP.getLength() );
+ return ( m_pStorageFile->useStorage() && m_pStorageFile->getEncodedMP( aEncodedMP ) && aEncodedMP.isEmpty() );
}
diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx
index 66efc89..66afb75 100644
--- a/svl/source/passwordcontainer/syscreds.cxx
+++ b/svl/source/passwordcontainer/syscreds.cxx
@@ -138,7 +138,7 @@ namespace
bool findURL( StringSet const & rContainer, rtl::OUString const & aURL, rtl::OUString & aResult )
{
// TODO: This code is actually copied from svl/source/passwordcontainer.cxx
- if( !rContainer.empty() && aURL.getLength() )
+ if( !rContainer.empty() && !aURL.isEmpty() )
{
::rtl::OUString aUrl( aURL );
@@ -167,7 +167,7 @@ namespace
}
}
}
- while( removeLastSegment( aUrl ) && aUrl.getLength() );
+ while( removeLastSegment( aUrl ) && !aUrl.isEmpty() );
}
aResult = rtl::OUString();
return false;
More information about the Libreoffice-commits
mailing list