[PATCH] Fix for fdo43460 Part XVI getLength() to isEmpty()
Olivier Hallot
olivier.hallot at alta.org.br
Thu Dec 22 09:35:41 PST 2011
Part XVI
Module
extensions
---
extensions/source/abpilot/abpfinalpage.cxx | 2 +-
extensions/source/abpilot/datasourcehandling.cxx | 6 +-
extensions/source/bibliography/bibconfig.cxx | 4 +-
extensions/source/bibliography/bibload.cxx | 4 +-
extensions/source/bibliography/datman.cxx | 12 +++---
extensions/source/bibliography/framectr.cxx | 10 ++--
extensions/source/bibliography/toolbar.cxx | 6 +-
extensions/source/config/ldap/ldapaccess.cxx | 4 +-
.../source/config/ldap/ldapuserprofilebe.cxx | 2 +-
extensions/source/dbpilots/commonpagesdbp.cxx | 2 +-
extensions/source/logging/loggerconfig.cxx | 2 +-
extensions/source/logging/plaintextformatter.cxx | 2 +-
extensions/source/nsplugin/source/so_instance.cxx | 2 +-
extensions/source/plugin/base/context.cxx | 2 +-
extensions/source/plugin/base/nfuncs.cxx | 4 +-
extensions/source/plugin/base/xplugin.cxx | 16 ++++----
extensions/source/plugin/unx/unxmgr.cxx | 2 +-
extensions/source/propctrlr/browserline.cxx | 2 +-
extensions/source/propctrlr/browserlistbox.cxx | 4 +-
extensions/source/propctrlr/cellbindinghandler.cxx | 2 +-
extensions/source/propctrlr/cellbindinghelper.cxx | 6 +-
extensions/source/propctrlr/eformshelper.cxx | 10 ++--
.../source/propctrlr/eformspropertyhandler.cxx | 14 +++---
extensions/source/propctrlr/eventhandler.cxx | 24 +++++-----
.../source/propctrlr/formcomponenthandler.cxx | 44 ++++++++++----------
extensions/source/propctrlr/formlinkdialog.cxx | 8 ++--
.../source/propctrlr/genericpropertyhandler.cxx | 2 +-
extensions/source/propctrlr/propcontroller.cxx | 14 +++---
extensions/source/propctrlr/propertyhandler.cxx | 2 +-
.../source/propctrlr/pushbuttonnavigation.cxx | 2 +-
extensions/source/propctrlr/standardcontrol.cxx | 4 +-
.../source/propctrlr/stringrepresentation.cxx | 10 ++--
.../source/propctrlr/xsdvalidationhelper.cxx | 8 ++--
extensions/source/update/check/download.cxx | 4 +-
extensions/source/update/check/updatecheck.cxx | 22 +++++-----
.../source/update/check/updatecheckconfig.cxx | 8 ++--
extensions/source/update/check/updatehdl.cxx | 4 +-
extensions/source/update/check/updateprotocol.cxx | 6 +-
extensions/source/update/feed/updatefeed.cxx | 8 ++--
extensions/source/update/ui/updatecheckui.cxx | 8 ++--
40 files changed, 149 insertions(+), 149 deletions(-)
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index ba66ef0..61ad7c1 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -82,7 +82,7 @@ namespace abp
{
::rtl::OUString sCurrentName(m_aName.GetText());
- if (0 == sCurrentName.getLength())
+ if (sCurrentName.isEmpty())
// the name must not be empty
return sal_False;
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index e0998218..2c45e5e 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -153,8 +153,8 @@ namespace abp
const Reference< XMultiServiceFactory >& _rxORB, const ::rtl::OUString& _sName,
const ::rtl::OUString& _sURL ) SAL_THROW (( ::com::sun::star::uno::Exception ))
{
- OSL_ENSURE( _sName.getLength(), "lcl_registerDataSource: invalid name!" );
- OSL_ENSURE( _sURL.getLength(), "lcl_registerDataSource: invalid URL!" );
+ OSL_ENSURE( !_sName.isEmpty(), "lcl_registerDataSource: invalid name!" );
+ OSL_ENSURE( !_sURL.isEmpty(), "lcl_registerDataSource: invalid URL!" );
try
{
@@ -573,7 +573,7 @@ namespace abp
{
SQLException aException;
aError >>= aException;
- if ( !aException.Message.getLength() )
+ if ( aException.Message.isEmpty() )
{
// prepend some context info
SQLContext aDetailedError;
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index ee72d16..aed0fba 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -194,7 +194,7 @@ BibConfig::BibConfig() :
{
pAssignmentValues[nFieldIdx++] >>= sTempLogical;
pAssignmentValues[nFieldIdx++] >>= sTempReal;
- if(sTempLogical.getLength() && sTempReal.getLength())
+ if(!(sTempLogical.isEmpty() || sTempReal.isEmpty()))
{
pMapping->aColumnPairs[nSetMapping].sLogicalColumnName = sTempLogical;
pMapping->aColumnPairs[nSetMapping++].sRealColumnName = sTempReal;
@@ -290,7 +290,7 @@ void BibConfig::Commit()
ClearNodeSet( sPrefix );
while(nFieldAssignment < COLUMN_COUNT &&
- pMapping->aColumnPairs[nFieldAssignment].sLogicalColumnName.getLength())
+ !pMapping->aColumnPairs[nFieldAssignment].sLogicalColumnName.isEmpty())
{
OUString sSubPrefix(sPrefix);
sSubPrefix += C2U("/_");
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 3ae659d..42b9aa0 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -281,7 +281,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl:
m_xDatMan = m_pDatMan;
BibDBDescriptor aBibDesc = BibModul::GetConfig()->GetBibliographyURL();
- if(!aBibDesc.sDataSource.getLength())
+ if(aBibDesc.sDataSource.isEmpty())
{
DBChangeDialogConfig_Impl aConfig;
const Sequence<OUString> aSources = aConfig.GetDataSourceNames();
@@ -532,7 +532,7 @@ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( Runt
do
{
rtl::OUString sTemp = xIdColumn->getString();
- if (sTemp.getLength() && !xIdColumn->wasNull())
+ if (!sTemp.isEmpty() && !xIdColumn->wasNull())
{
int nLen = aRet.getLength();
if(nLen == nRealNameCount)
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index f91faac..5958ba6 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -922,7 +922,7 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
if(aTableNameSeq.getLength() > 0)
{
const ::rtl::OUString* pTableNames = aTableNameSeq.getConstArray();
- if(rDesc.sTableOrQuery.getLength())
+ if(!rDesc.sTableOrQuery.isEmpty())
aActiveDataTable = rDesc.sTableOrQuery;
else
{
@@ -1045,7 +1045,7 @@ Sequence< ::rtl::OUString > BibDataManager::getQueryFields()
{
BibConfig* pConfig = BibModul::GetConfig();
::rtl::OUString aFieldString = pConfig->getQueryField();
- if(!aFieldString.getLength())
+ if(aFieldString.isEmpty())
{
Sequence< ::rtl::OUString > aSeq = getQueryFields();
const ::rtl::OUString* pFields = aSeq.getConstArray();
@@ -1063,7 +1063,7 @@ void BibDataManager::startQueryWith(const ::rtl::OUString& rQuery)
pConfig->setQueryText( rQuery );
::rtl::OUString aQueryString;
- if(rQuery.getLength()>0)
+ if(!rQuery.isEmpty())
{
aQueryString=aQuoteChar;
aQueryString+=getQueryField();
@@ -1538,7 +1538,7 @@ void BibDataManager::SetMeAsUidListener()
}
}
- if(theFieldName.getLength()>0)
+ if(!theFieldName.isEmpty())
{
Reference< XPropertySet > xPropSet;
Any aElement;
@@ -1582,7 +1582,7 @@ void BibDataManager::RemoveMeAsUidListener()
}
}
- if(theFieldName.getLength()>0)
+ if(!theFieldName.isEmpty())
{
Reference< XPropertySet > xPropSet;
Any aElement;
@@ -1634,7 +1634,7 @@ void BibDataManager::DispatchDBChangeDialog()
const ::rtl::OUString& BibDataManager::GetIdentifierMapping()
{
- if(!sIdentifierMapping.getLength())
+ if(sIdentifierMapping.isEmpty())
{
BibConfig* pConfig = BibModul::GetConfig();
BibDBDescriptor aDesc;
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index c645c9a..eede2cc 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -450,7 +450,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
else if(aCommand.EqualsAscii("Bib/sdbsource"))
{
rtl::OUString aURL = pDatMan->CreateDBChangeDialog(pParent);
- if(aURL.getLength())
+ if(!aURL.isEmpty())
{
try
{
@@ -563,7 +563,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
{
FeatureStateEvent aEvent;
aEvent.FeatureURL = pObj->aURL;
- aEvent.IsEnabled = 0 != pDatMan->getParser()->getFilter().getLength();
+ aEvent.IsEnabled = !pDatMan->getParser()->getFilter().isEmpty();
aEvent.Requery = sal_False;
aEvent.Source = (XDispatch *) this;
pObj->xListener->statusChanged( aEvent );
@@ -755,7 +755,7 @@ void BibFrameController_Impl::addStatusListener(
else if (aURL.Path == C2U("Bib/removeFilter") )
{
rtl::OUString aFilterStr=pDatMan->getFilter();
- aEvent.IsEnabled = (aFilterStr.getLength() > 0);
+ aEvent.IsEnabled = !aFilterStr.isEmpty();
}
else if(aURL.Path == C2U("Cut"))
{
@@ -800,7 +800,7 @@ void BibFrameController_Impl::addStatusListener(
uno::Any aData = xDataObj->getTransferData( aFlavor );
::rtl::OUString aText;
aData >>= aText;
- aEvent.IsEnabled = aText.getLength() > 0;
+ aEvent.IsEnabled = !aText.isEmpty();
}
catch( const uno::Exception& )
{
@@ -845,7 +845,7 @@ void BibFrameController_Impl::removeStatusListener(
BibStatusDispatch *pObj = aStatusListeners[n];
sal_Bool bFlag=pObj->xListener.is();
if (!bFlag || (pObj->xListener == aObject &&
- ( !aURL.Complete.getLength() || pObj->aURL.Path == aURL.Path )))
+ ( aURL.Complete.isEmpty() || pObj->aURL.Path == aURL.Path )))
{
aStatusListeners.DeleteAndDestroy( n );
break;
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index bd2d4a8..ba1cb90 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -283,7 +283,7 @@ void BibToolBar::InitListener()
util::URL aURL;
aURL.Complete = GetItemCommand(nId);
- if(!aURL.Complete.getLength())
+ if(aURL.Complete.isEmpty())
continue;
xTrans->parseStrict( aURL );
@@ -345,7 +345,7 @@ void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& r
uno::Reference< frame::XDispatchProvider > xDSP( xController, UNO_QUERY );
- if( xDSP.is() && aCommand.getLength())
+ if( xDSP.is() && !aCommand.isEmpty())
{
uno::Reference< lang::XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory();
@@ -382,7 +382,7 @@ void BibToolBar::Click()
if(pDatMan)
{
OUString sNew = pDatMan->CreateDBChangeDialog(GetParent());
- if(sNew.getLength())
+ if(!sNew.isEmpty())
pDatMan->setActiveDataSource(sNew);
}
CheckItem( nId, sal_False );
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index 30977dd..681c33c 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -163,7 +163,7 @@ void LdapConnection::connectSimple()
void LdapConnection::initConnection()
throw (ldap::LdapConnectionException)
{
- if (mLdapDefinition.mServer.getLength() == 0)
+ if (mLdapDefinition.mServer.isEmpty())
{
rtl::OUStringBuffer message ;
@@ -230,7 +230,7 @@ void LdapConnection::initConnection()
{
if (!isValid()) { connectSimple(); }
- if (aUser.getLength() == 0)
+ if (aUser.isEmpty())
{
throw lang::IllegalArgumentException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index 3f59431..8c9d247 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -178,7 +178,7 @@ bool LdapUserProfileBe::getLdapStringParam(
xAccess->getByName(aLdapSetting) >>= sParam;
aServerParameter = rtl::OUStringToOString(sParam, RTL_TEXTENCODING_ASCII_US);
- return aServerParameter.getLength() != 0;
+ return !aServerParameter.isEmpty();
}
//------------------------------------------------------------------------------
void LdapUserProfileBe::setPropertyValue(
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index eb455bc..7263bb6 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -285,7 +285,7 @@ namespace dbp
try
{
::rtl::OUString sCurrentDatasource = m_aDatasource.GetSelectEntry();
- if (sCurrentDatasource.getLength())
+ if (!sCurrentDatasource.isEmpty())
{
// obtain the DS object
Reference< XCompletedConnection > xDatasource;
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index cc6ec4f..4b3ba34 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -183,7 +183,7 @@ namespace logging
::rtl::OUString sServiceName;
_rxLoggerSettings->getByName( ::rtl::OUString::createFromAscii( _pServiceNameAsciiNodeName ) ) >>= sServiceName;
- if ( sServiceName.getLength() )
+ if ( !sServiceName.isEmpty() )
{
bool bSuccess = false;
if ( aSettings.getLength() )
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 2532650..83b64c3 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -148,7 +148,7 @@ namespace logging
aLogEntry.appendAscii( buffer );
aLogEntry.appendAscii( " " );
- if ( _rRecord.SourceClassName.getLength() && _rRecord.SourceMethodName.getLength() )
+ if ( !(_rRecord.SourceClassName.isEmpty() || _rRecord.SourceMethodName.isEmpty()) )
{
aLogEntry.append( _rRecord.SourceClassName );
aLogEntry.appendAscii( "::" );
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index 273c3db..b7957f9 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -381,7 +381,7 @@ sal_Bool SoPluginInstance::SetWindow(NSP_HWND hParent, int x, int y, int w, int
m_nX = x;
m_nY = y;
- if (0 == m_sURL.getLength())
+ if ( m_sURL.isEmpty() )
return sal_True;
if(!mxRemoteMSF.is())
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index a0eca24..05978fe 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/context.cxx
@@ -130,7 +130,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu
if( ! xInst.is() )
return;
- if( ! target.getLength() )
+ if( target.isEmpty() )
{
INetURLObject aURL;
aURL.SetSmartProtocol( INET_PROT_FILE );
diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx
index c14907b..d06c5b8 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -148,7 +148,7 @@ static ::rtl::OString normalizeURL( XPlugin_Impl* plugin, const ::rtl::OString&
int nPos;
if( ( nPos = aLoadURL.indexOf( "://" ) ) != -1 )
{
- if( url.getLength() && (url.getStr()[ 0 ] == '/' || url.indexOf( '/' ) != -1) )
+ if( !url.isEmpty() && (url.getStr()[ 0 ] == '/' || url.indexOf( '/' ) != -1) )
{
// this means same server but new path
nPos = aLoadURL.indexOf( '/', nPos+3 );
@@ -275,7 +275,7 @@ extern "C" {
return NPERR_INVALID_INSTANCE_ERROR;
OString aLoadURL = normalizeURL( pImpl, url );
- if( !aLoadURL.getLength() )
+ if( aLoadURL.isEmpty() )
return NPERR_INVALID_URL;
AsynchronousGetURL* pAsync = new AsynchronousGetURL();
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index c15fb72..fa9798e 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -333,7 +333,7 @@ void XPlugin_Impl::handleSpecialArgs()
}
}
- if( aURL.getLength() )
+ if( !aURL.isEmpty() )
{
// set new args, old args need not be freed as there were none set
m_nArgs = 6;
@@ -403,7 +403,7 @@ void XPlugin_Impl::handleSpecialArgs()
}
}
- if( aURL.getLength() )
+ if( !aURL.isEmpty() )
{
// SRC
prependArg( "SRC", OUStringToOString( aURL, m_aEncoding ).getStr() );
@@ -446,7 +446,7 @@ void XPlugin_Impl::modelChanged()
destroyInstance();
m_aDescription = fitDescription( getCreationURL() );
- if( !m_aDescription.Mimetype.getLength() )
+ if( m_aDescription.Mimetype.isEmpty() )
{
m_nProvidingState = PROVIDING_NONE;
return;
@@ -484,7 +484,7 @@ sal_Bool XPlugin_Impl::setModel( const uno::Reference< com::sun::star::awt::XCon
if( ! xPS.is() )
return sal_False;
- if( getCreationURL().getLength() )
+ if( !getCreationURL().isEmpty() )
{
m_xModel = Model;
modelChanged();
@@ -527,7 +527,7 @@ void XPlugin_Impl::loadPlugin()
#endif
if( ! getPluginComm() )
{
- if( m_aDescription.PluginName.getLength() )
+ if( !m_aDescription.PluginName.isEmpty() )
{
#if defined QUARTZ
PluginComm* pComm = new MacPluginComm( m_aDescription.Mimetype,
@@ -668,7 +668,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype,
m_nProvidingState = PROVIDING_NOW;
OString aMIME;
- if( mimetype.getLength() )
+ if( !mimetype.isEmpty() )
aMIME = OUStringToOString( mimetype, m_aEncoding );
else
aMIME = OUStringToOString( m_aDescription.Mimetype, m_aEncoding );
@@ -693,7 +693,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype,
if( ! m_pPluginComm )
{
loadPlugin();
- if( m_aLastGetUrl.getLength() && m_aLastGetUrl == aURL )
+ if( !m_aLastGetUrl.isEmpty() && m_aLastGetUrl == aURL )
{
// plugin is pulling data, don't push the same stream;
// this complicated method could have been avoided if
@@ -706,7 +706,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype,
if( ! m_pPluginComm )
return sal_False;
- if( ! url.getLength() )
+ if( url.isEmpty() )
// this is valid if the plugin is supposed to
// pull data (via e.g. NPN_GetURL)
return sal_True;
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index 46f64d5..d7d50c9 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -275,7 +275,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
do
{
rtl::OString aPath(aSearchPath.getToken(0, ':', nIndex));
- if (aPath.getLength())
+ if (!aPath.isEmpty())
{
DIR* pDIR = opendir(aPath.getStr());
struct dirent* pDirEnt = NULL;
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 7d724bc..7eef06c 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -434,7 +434,7 @@ namespace pcr
{
PushButton& rButton( impl_ensureButton( _bPrimary ) );
- OSL_PRECOND( _rImageURL.getLength(), "OBrowserLine::ShowBrowseButton: use the other version if you don't have an image!" );
+ OSL_PRECOND( !_rImageURL.isEmpty(), "OBrowserLine::ShowBrowseButton: use the other version if you don't have an image!" );
Image aImage;
impl_getImagesFromURL_nothrow( _rImageURL, aImage );
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index f635ea6..3299002 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -1153,7 +1153,7 @@ namespace pcr
if ( _rPropertyData.HasPrimaryButton )
{
- if ( _rPropertyData.PrimaryButtonImageURL.getLength() )
+ if ( !_rPropertyData.PrimaryButtonImageURL.isEmpty() )
rLine.pLine->ShowBrowseButton( _rPropertyData.PrimaryButtonImageURL, true );
else if ( _rPropertyData.PrimaryButtonImage.is() )
rLine.pLine->ShowBrowseButton( Image( _rPropertyData.PrimaryButtonImage ), true );
@@ -1162,7 +1162,7 @@ namespace pcr
if ( _rPropertyData.HasSecondaryButton )
{
- if ( _rPropertyData.SecondaryButtonImageURL.getLength() )
+ if ( !_rPropertyData.SecondaryButtonImageURL.isEmpty() )
rLine.pLine->ShowBrowseButton( _rPropertyData.SecondaryButtonImageURL, false );
else if ( _rPropertyData.SecondaryButtonImage.is() )
rLine.pLine->ShowBrowseButton( Image( _rPropertyData.SecondaryButtonImage ), false );
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index 1c36c7e..d58c8ae 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -195,7 +195,7 @@ namespace pcr
::rtl::OUString sControlSource;
_rNewValue >>= sControlSource;
if ( impl_isSupportedProperty_nothrow( PROPERTY_ID_BOUND_CELL ) )
- _rxInspectorUI->enablePropertyUI( PROPERTY_BOUND_CELL, sControlSource.getLength() == 0 );
+ _rxInspectorUI->enablePropertyUI( PROPERTY_BOUND_CELL, sControlSource.isEmpty() );
}
break; // case PROPERTY_ID_CONTROLSOURCE
diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx
index 74665f4..97471c3 100644
--- a/extensions/source/propctrlr/cellbindinghelper.cxx
+++ b/extensions/source/propctrlr/cellbindinghelper.cxx
@@ -240,7 +240,7 @@ namespace pcr
// get the UNO representation of the address
CellAddress aAddress;
- if ( !_rAddress.getLength() || !convertStringAddress( _rAddress, aAddress ) )
+ if ( _rAddress.isEmpty() || !convertStringAddress( _rAddress, aAddress ) )
return xBinding;
return createCellBindingFromAddress( aAddress, _bSupportIntegerExchange );
@@ -252,7 +252,7 @@ namespace pcr
Reference< XListEntrySource > xSource;
CellRangeAddress aRangeAddress;
- if ( !_rAddress.getLength() || !convertStringAddress( _rAddress, aRangeAddress ) )
+ if ( _rAddress.isEmpty() || !convertStringAddress( _rAddress, aRangeAddress ) )
return xSource;
// create a range object for this address
@@ -277,7 +277,7 @@ namespace pcr
{
try
{
- if ( _rArgumentName.getLength() )
+ if ( !_rArgumentName.isEmpty() )
{
NamedValue aArg;
aArg.Name = _rArgumentName;
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 47cb648..db5155b 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -512,34 +512,34 @@ namespace pcr
//--------------------------------------------------------------------
Reference< XPropertySet > EFormsHelper::getOrCreateBindingForModel( const ::rtl::OUString& _rTargetModel, const ::rtl::OUString& _rBindingName ) const SAL_THROW(())
{
- OSL_ENSURE( _rBindingName.getLength(), "EFormsHelper::getOrCreateBindingForModel: invalid binding name!" );
+ OSL_ENSURE( !_rBindingName.isEmpty(), "EFormsHelper::getOrCreateBindingForModel: invalid binding name!" );
return implGetOrCreateBinding( _rTargetModel, _rBindingName );
}
//--------------------------------------------------------------------
Reference< XPropertySet > EFormsHelper::implGetOrCreateBinding( const ::rtl::OUString& _rTargetModel, const ::rtl::OUString& _rBindingName ) const SAL_THROW(())
{
- OSL_ENSURE( !( !_rTargetModel.getLength() && _rBindingName .getLength() ), "EFormsHelper::implGetOrCreateBinding: no model, but a binding name?" );
+ OSL_ENSURE( !( _rTargetModel.isEmpty() && !_rBindingName.isEmpty() ), "EFormsHelper::implGetOrCreateBinding: no model, but a binding name?" );
Reference< XPropertySet > xBinding;
try
{
::rtl::OUString sTargetModel( _rTargetModel );
// determine the model which the binding should belong to
- if ( !sTargetModel.getLength() )
+ if ( sTargetModel.isEmpty() )
{
::std::vector< ::rtl::OUString > aModelNames;
getFormModelNames( aModelNames );
if ( !aModelNames.empty() )
sTargetModel = *aModelNames.begin();
- OSL_ENSURE( sTargetModel.getLength(), "EFormsHelper::implGetOrCreateBinding: unable to obtain a default model!" );
+ OSL_ENSURE( !sTargetModel.isEmpty(), "EFormsHelper::implGetOrCreateBinding: unable to obtain a default model!" );
}
Reference< xforms::XModel > xModel( getFormModelByName( sTargetModel ) );
Reference< XNameAccess > xBindingNames( xModel.is() ? xModel->getBindings() : Reference< XSet >(), UNO_QUERY );
if ( xBindingNames.is() )
{
// get or create the binding instance
- if ( _rBindingName.getLength() )
+ if ( !_rBindingName.isEmpty() )
{
if ( xBindingNames->hasByName( _rBindingName ) )
OSL_VERIFY( xBindingNames->getByName( _rBindingName ) >>= xBinding );
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 3e8332e..4b1cbc6 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -100,7 +100,7 @@ namespace pcr
::rtl::OUString EFormsPropertyHandler::getModelNamePropertyValue() const
{
::rtl::OUString sModelName = m_pHelper->getCurrentFormModelName();
- if ( !sModelName.getLength() )
+ if ( sModelName.isEmpty() )
sModelName = m_sBindingLessModelName;
return sModelName;
}
@@ -214,7 +214,7 @@ namespace pcr
bool bPreviouslyEmptyModel = !m_pHelper->getCurrentFormModel().is();
Reference< XPropertySet > xNewBinding;
- if ( sNewBindingName.getLength() )
+ if ( !sNewBindingName.isEmpty() )
// obtain the binding with this name, for the current model
xNewBinding = m_pHelper->getOrCreateBindingForModel( getModelNamePropertyValue(), sNewBindingName );
@@ -448,7 +448,7 @@ namespace pcr
{
nControlType = PropertyControlType::ComboBox;
::rtl::OUString sCurrentModel( getModelNamePropertyValue() );
- if ( sCurrentModel.getLength() )
+ if ( !sCurrentModel.isEmpty() )
m_pHelper->getBindingNames( sCurrentModel, aListEntries );
}
break;
@@ -518,9 +518,9 @@ namespace pcr
// the aspect of the binding which the dialog should modify
::rtl::OUString sFacetName( _rPropertyName );
- OSL_ENSURE( xModel.is() && xBinding.is() && sFacetName.getLength(),
+ OSL_ENSURE( xModel.is() && xBinding.is() && !sFacetName.isEmpty(),
"EFormsPropertyHandler::onInteractivePropertySelection: something is missing for the dialog initialization!" );
- if ( !( xModel.is() && xBinding.is() && sFacetName.getLength() ) )
+ if ( !( xModel.is() && xBinding.is() && !sFacetName.isEmpty() ) )
return InteractiveSelectionResult_Cancelled;
xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormModel" ) ), makeAny( xModel ) );
@@ -584,7 +584,7 @@ namespace pcr
break;
::rtl::OUString sDataModelName;
OSL_VERIFY( _rNewValue >>= sDataModelName );
- sal_Bool bBoundToSomeModel = 0 != sDataModelName.getLength();
+ sal_Bool bBoundToSomeModel = !sDataModelName.isEmpty();
_rxInspectorUI->rebuildPropertyUI( PROPERTY_BINDING_NAME );
_rxInspectorUI->enablePropertyUI( PROPERTY_BINDING_NAME, bBoundToSomeModel );
}
@@ -592,7 +592,7 @@ namespace pcr
case PROPERTY_ID_BINDING_NAME:
{
- sal_Bool bHaveABinding = ( m_pHelper->getCurrentBindingName().getLength() > 0 );
+ sal_Bool bHaveABinding = !m_pHelper->getCurrentBindingName().isEmpty();
_rxInspectorUI->enablePropertyUI( PROPERTY_BIND_EXPRESSION, bHaveABinding );
_rxInspectorUI->enablePropertyUI( PROPERTY_XSD_REQUIRED, bHaveABinding );
_rxInspectorUI->enablePropertyUI( PROPERTY_XSD_RELEVANT, bHaveABinding );
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 1a677dc..898a971 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -261,8 +261,8 @@ namespace pcr
)
continue;
- if ( ( pAssignedEvent->ScriptCode.getLength() == 0 )
- || ( pAssignedEvent->ScriptType.getLength() == 0 )
+ if ( ( pAssignedEvent->ScriptCode.isEmpty() )
+ || ( pAssignedEvent->ScriptType.isEmpty() )
)
{
OSL_FAIL( "lcl_getAssignedScriptEvent: me thinks this should not happen!" );
@@ -674,7 +674,7 @@ namespace pcr
const EventDescription& rEvent = impl_getEventForName_throw( _rPropertyName );
ScriptEventDescriptor aAssignedScript = lcl_getAssignedScriptEvent( rEvent, aAllAssignedEvents );
- OSL_ENSURE( !sNewScriptCode.getLength(), "EventHandler::convertToPropertyValue: cannot convert a non-empty display name!" );
+ OSL_ENSURE( sNewScriptCode.isEmpty(), "EventHandler::convertToPropertyValue: cannot convert a non-empty display name!" );
// Usually, there is no possibility for the user to change the content of an event binding directly in the
// input field, this instead is done with the macro assignment dialog.
// The only exception is the user pressing "DEL" while the control has the focus, in this case, we reset the
@@ -701,7 +701,7 @@ namespace pcr
(void)_rControlValueType;
::rtl::OUString sScript( aScriptEvent.ScriptCode );
- if ( sScript.getLength() )
+ if ( !sScript.isEmpty() )
{
// format is: "name (location, language)"
try
@@ -721,20 +721,20 @@ namespace pcr
const ::rtl::OUString sLangParamName( RTL_CONSTASCII_USTRINGPARAM( "language" ) );
const ::rtl::OUString sLanguage = xScriptUri->getParameter( sLangParamName );
- if ( sLocation.getLength() || sLanguage.getLength() )
+ if ( !(sLocation.isEmpty() && sLanguage.isEmpty()) )
{
aComposeBuffer.appendAscii( " (" );
// location
- OSL_ENSURE( sLocation.getLength(), "EventHandler::convertToControlValue: unexpected: no location!" );
- if ( sLocation.getLength() )
+ OSL_ENSURE( !sLocation.isEmpty(), "EventHandler::convertToControlValue: unexpected: no location!" );
+ if ( !sLocation.isEmpty() )
{
aComposeBuffer.append( sLocation );
aComposeBuffer.appendAscii( ", " );
}
// language
- if ( sLanguage.getLength() )
+ if ( !sLanguage.isEmpty() )
{
aComposeBuffer.append( sLanguage );
}
@@ -799,8 +799,8 @@ namespace pcr
// the programmatic name of the listener, to be used as "property" name
sListenerClassName = pListeners->getTypeName();
- OSL_ENSURE( sListenerClassName.getLength(), "EventHandler::getSupportedProperties: strange - no listener name ..." );
- if ( !sListenerClassName.getLength() )
+ OSL_ENSURE( !sListenerClassName.isEmpty(), "EventHandler::getSupportedProperties: strange - no listener name ..." );
+ if ( sListenerClassName.isEmpty() )
continue;
// loop through all methods
@@ -1165,7 +1165,7 @@ namespace pcr
{
::rtl::OUString sScriptCode( _rScriptEvent.ScriptCode );
::rtl::OUString sScriptType( _rScriptEvent.ScriptType );
- bool bResetScript = ( sScriptCode.getLength() == 0 );
+ bool bResetScript = sScriptCode.isEmpty();
sal_Int32 nObjectIndex = impl_getComponentIndexInParent_throw();
Reference< XChild > xChild( m_xComponent, UNO_QUERY_THROW );
@@ -1223,7 +1223,7 @@ namespace pcr
try
{
::rtl::OUString sScriptCode( _rScriptEvent.ScriptCode );
- bool bResetScript = ( sScriptCode.getLength() == 0 );
+ bool bResetScript = sScriptCode.isEmpty();
Reference< XScriptEventsSupplier > xEventsSupplier( m_xComponent, UNO_QUERY_THROW );
Reference< XNameContainer > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW );
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 1712b7c..c977d28 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -439,7 +439,7 @@ namespace pcr
Locale aLocale = pLocale[iLocale];
::rtl::OUString aResourceStr;
- if( aOldPureIdStr.getLength() != 0 )
+ if( !aOldPureIdStr.isEmpty() )
{
if( xStringResourceManager->hasEntryForIdAndLocale( aOldPureIdStr, aLocale ) )
{
@@ -536,7 +536,7 @@ namespace pcr
::rtl::OUString sControlValue;
OSL_VERIFY( _rControlValue >>= sControlValue );
- if ( sControlValue.getLength() )
+ if ( !sControlValue.isEmpty() )
{
Reference< XNameAccess > xDatabaseContext;
m_aContext.createComponent( (::rtl::OUString)SERVICE_DATABASE_CONTEXT, xDatabaseContext );
@@ -685,7 +685,7 @@ namespace pcr
::rtl::OUString sDataSource;
_rPropertyValue >>= sDataSource;
- if ( sDataSource.getLength() )
+ if ( !sDataSource.isEmpty() )
{
::svt::OFileNotation aTransformer( sDataSource );
sDataSource = aTransformer.get( ::svt::OFileNotation::N_SYSTEM );
@@ -768,7 +768,7 @@ namespace pcr
OSL_VERIFY( _rPropertyValue >>= aFont );
::rtl::OUStringBuffer displayName;
- if ( !aFont.Name.getLength() )
+ if ( aFont.Name.isEmpty() )
{
displayName.append( String( PcrRes( RID_STR_FONT_DEFAULT ) ) );
}
@@ -883,7 +883,7 @@ namespace pcr
pProperty->Handle = nPropId;
sDisplayName = m_pInfoService->getPropertyTranslation( nPropId );
- if ( !sDisplayName.getLength() )
+ if ( sDisplayName.isEmpty() )
continue;
sal_uInt32 nPropertyUIFlags = m_pInfoService->getPropertyUIFlags( nPropId );
@@ -1417,9 +1417,9 @@ namespace pcr
}
}
- if ( aDescriptor.PrimaryButtonId.getLength() )
+ if ( !aDescriptor.PrimaryButtonId.isEmpty() )
aDescriptor.HasPrimaryButton = sal_True;
- if ( aDescriptor.SecondaryButtonId.getLength() )
+ if ( !aDescriptor.SecondaryButtonId.isEmpty() )
aDescriptor.HasSecondaryButton = sal_True;
bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0;
@@ -1608,9 +1608,9 @@ namespace pcr
::rtl::OUString sControlSource;
_rNewValue >>= sControlSource;
if ( impl_componentHasProperty_throw( PROPERTY_FILTERPROPOSAL ) )
- _rxInspectorUI->enablePropertyUI( PROPERTY_FILTERPROPOSAL, sControlSource.getLength() > 0 );
+ _rxInspectorUI->enablePropertyUI( PROPERTY_FILTERPROPOSAL, !sControlSource.isEmpty() );
if ( impl_componentHasProperty_throw( PROPERTY_EMPTY_IS_NULL ) )
- _rxInspectorUI->enablePropertyUI( PROPERTY_EMPTY_IS_NULL, sControlSource.getLength() > 0 );
+ _rxInspectorUI->enablePropertyUI( PROPERTY_EMPTY_IS_NULL, !sControlSource.isEmpty() );
aDependentProperties.push_back( PROPERTY_ID_BOUNDCOLUMN );
aDependentProperties.push_back( PROPERTY_ID_SCALEIMAGE );
@@ -1680,7 +1680,7 @@ namespace pcr
{
::rtl::OUString sImageURL;
OSL_VERIFY( _rNewValue >>= sImageURL );
- _rxInspectorUI->enablePropertyUI( PROPERTY_IMAGEPOSITION, sImageURL.getLength() != 0 );
+ _rxInspectorUI->enablePropertyUI( PROPERTY_IMAGEPOSITION, !sImageURL.isEmpty() );
}
aDependentProperties.push_back( PROPERTY_ID_SCALEIMAGE );
@@ -1842,7 +1842,7 @@ namespace pcr
}
sal_Bool bIsEnabled = ( ( eLSType == ListSourceType_VALUELIST )
- || ( sListSource.getLength() == 0 )
+ || ( sListSource.isEmpty() )
);
_rxInspectorUI->enablePropertyUI( PROPERTY_STRINGITEMLIST, bIsEnabled );
}
@@ -1858,7 +1858,7 @@ namespace pcr
OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_LISTSOURCETYPE ) >>= eLSType );
_rxInspectorUI->enablePropertyUI( PROPERTY_BOUNDCOLUMN,
- ( sControlSource.getLength() > 0 )
+ ( !sControlSource.isEmpty() )
&& ( eLSType != ListSourceType_TABLEFIELDS )
&& ( eLSType != ListSourceType_VALUELIST )
);
@@ -1877,7 +1877,7 @@ namespace pcr
impl_getPropertyValue_throw( PROPERTY_IMAGE_URL ) >>= sImageURL;
_rxInspectorUI->enablePropertyUI( impl_getPropertyNameFromId_nothrow( _nPropId ),
- ( sControlSource.getLength() != 0 ) || ( sImageURL.getLength() != 0 )
+ ( !sControlSource.isEmpty() ) || ( !sImageURL.isEmpty() )
);
}
break; // case PROPERTY_ID_SCALEIMAGE, PROPERTY_ID_SCALE_MODE
@@ -1899,7 +1899,7 @@ namespace pcr
// then "Input required" does not make sense, too (since there's always an input, even if the control
// is empty).
_rxInspectorUI->enablePropertyUI( PROPERTY_INPUT_REQUIRED,
- ( sControlSource.getLength() != 0 ) && ( !bHasEmptyIsNULL || bEmptyIsNULL )
+ ( !sControlSource.isEmpty() ) && ( !bHasEmptyIsNULL || bEmptyIsNULL )
);
}
break;
@@ -1936,7 +1936,7 @@ namespace pcr
// if m_nClassId is 0, then we're inspecting a form. In this case, eButtonType is always
// FormButtonType_URL here
_rxInspectorUI->enablePropertyUI( PROPERTY_TARGET_FRAME,
- ( eButtonType == FormButtonType_URL ) && ( sTargetURL.getLength() > 0 )
+ ( eButtonType == FormButtonType_URL ) && ( !sTargetURL.isEmpty() )
);
}
break;
@@ -2372,7 +2372,7 @@ namespace pcr
::rtl::OUString sObjectName;
OSL_VERIFY( xFormSet->getPropertyValue( PROPERTY_COMMAND ) >>= sObjectName );
// when there is no command we don't need to ask for columns
- if ( sObjectName.getLength() && impl_ensureRowsetConnection_nothrow() )
+ if ( !sObjectName.isEmpty() && impl_ensureRowsetConnection_nothrow() )
{
::rtl::OUString aDatabaseName;
OSL_VERIFY( xFormSet->getPropertyValue( PROPERTY_DATASOURCE ) >>= aDatabaseName );
@@ -2552,7 +2552,7 @@ namespace pcr
Sequence< ::rtl::OUString> aQueryNames = _xQueryNames->getElementNames();
sal_uInt32 nCount = aQueryNames.getLength();
const ::rtl::OUString* pQueryNames = aQueryNames.getConstArray();
- sal_Bool bAdd = _sName.getLength();
+ sal_Bool bAdd = !_sName.isEmpty();
for ( sal_uInt32 i=0; i<nCount; i++, ++pQueryNames )
{
@@ -2804,7 +2804,7 @@ namespace pcr
::rtl::OUString sCurValue;
OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_IMAGE_URL ) >>= sCurValue );
- if ( sCurValue.getLength() != 0 && sCurValue.compareToAscii(GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH(GRAPHOBJ_URLPREFIX) ) != 0 )
+ if ( !sCurValue.isEmpty() && sCurValue.compareToAscii(GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH(GRAPHOBJ_URLPREFIX) ) != 0 )
{
aFileDlg.SetDisplayDirectory( sCurValue );
// TODO: need to set the display directory _and_ the default name
@@ -3231,7 +3231,7 @@ namespace pcr
m_xBrowserUI = _rxInspectorUI;
// disable everything which would affect this property
const ::rtl::OUString* pToDisable = xCommandUI->getPropertiesToDisable();
- while ( pToDisable->getLength() )
+ while ( !pToDisable->isEmpty() )
{
m_xBrowserUI->enablePropertyUIElements( *pToDisable++, PropertyLineElement::All, sal_False );
}
@@ -3262,7 +3262,7 @@ namespace pcr
throw NullPointerException();
const ::rtl::OUString* pToEnable = xCommandUI->getPropertiesToDisable();
- while ( pToEnable->getLength() )
+ while ( !pToEnable->isEmpty() )
{
m_xBrowserUI->enablePropertyUIElements( *pToEnable++, PropertyLineElement::All, sal_True );
}
@@ -3288,14 +3288,14 @@ namespace pcr
// first, we need the name of an existent data source
if ( _xFormProperties->getPropertySetInfo()->hasPropertyByName(PROPERTY_DATASOURCE) )
_xFormProperties->getPropertyValue( PROPERTY_DATASOURCE ) >>= sPropertyValue;
- bHas = ( sPropertyValue.getLength() != 0 ) || _bAllowEmptyDataSourceName;
+ bHas = ( !sPropertyValue.isEmpty() ) || _bAllowEmptyDataSourceName;
// then, the command should not be empty
if ( bHas )
{
if ( _xFormProperties->getPropertySetInfo()->hasPropertyByName(PROPERTY_COMMAND) )
_xFormProperties->getPropertyValue( PROPERTY_COMMAND ) >>= sPropertyValue;
- bHas = ( sPropertyValue.getLength() != 0 );
+ bHas = !sPropertyValue.isEmpty();
}
}
catch( const Exception& )
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 35d4748..1762069 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -181,7 +181,7 @@ namespace pcr
,m_sMasterLabel(_sMasterLabel)
{
FreeResource();
- if ( _sExplanation.getLength() )
+ if ( !_sExplanation.isEmpty() )
m_aExplanation.SetText(_sExplanation);
m_aSuggest.SetClickHdl ( LINK( this, FormLinkDialog, OnSuggest ) );
@@ -279,7 +279,7 @@ namespace pcr
String sDetailType = getFormDataSourceType( m_xDetailForm );
if ( !sDetailType.Len() )
{
- if ( !m_sDetailLabel.getLength() )
+ if ( m_sDetailLabel.isEmpty() )
{
::svt::OLocalResourceAccess aStringAccess( PcrRes( RID_DLG_FORMLINKS ), RSC_MODALDIALOG );
m_sDetailLabel = String( PcrRes( STR_DETAIL_FORM ) );
@@ -292,7 +292,7 @@ namespace pcr
String sMasterType = getFormDataSourceType( m_xMasterForm );
if ( !sMasterType.Len() )
{
- if ( !m_sMasterLabel.getLength() )
+ if ( m_sMasterLabel.isEmpty() )
{
::svt::OLocalResourceAccess aStringAccess( PcrRes( RID_DLG_FORMLINKS ), RSC_MODALDIALOG );
m_sMasterLabel = String( PcrRes( STR_MASTER_FORM ) );
@@ -566,7 +566,7 @@ namespace pcr
OSL_FAIL( "FormLinkDialog::getExistingRelation: caught an exception!" );
}
- return ( _rLeftFields.getLength() > 0 ) && ( _rLeftFields[ 0 ].getLength() > 0 );
+ return ( _rLeftFields.getLength() > 0 ) && ( !_rLeftFields[ 0 ].isEmpty() );
}
//------------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index b9b86a0..f593fa0 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -275,7 +275,7 @@ namespace pcr
if ( aControlValue.hasValue() && !( aControlValue >>= sURL ) )
throw RuntimeException( ::rtl::OUString(), *this );
- if ( !sURL.getLength() )
+ if ( sURL.isEmpty() )
return;
impl_dispatch_throw( sURL );
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 63cb0e01..a2c27fa 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -511,7 +511,7 @@ namespace pcr
void SAL_CALL OPropertyBrowserController::restoreViewData( const Any& Data ) throw(RuntimeException)
{
::rtl::OUString sPageSelection;
- if ( ( Data >>= sPageSelection ) && sPageSelection.getLength() )
+ if ( ( Data >>= sPageSelection ) && !sPageSelection.isEmpty() )
{
m_sPageSelection = sPageSelection;
selectPageFromViewData();
@@ -687,9 +687,9 @@ namespace pcr
}
}
- if ( m_sPageSelection.getLength() )
+ if ( !m_sPageSelection.isEmpty() )
m_sLastValidPageSelection = m_sPageSelection;
- else if ( sOldSelection.getLength() )
+ else if ( !sOldSelection.isEmpty() )
m_sLastValidPageSelection = sOldSelection;
}
@@ -1168,13 +1168,13 @@ namespace pcr
_rDescriptor.sName = _rProperty.Name;
_rDescriptor.aValue = _rDescriptor.xPropertyHandler->getPropertyValue( _rProperty.Name );
- if ( !_rDescriptor.DisplayName.getLength() )
+ if ( _rDescriptor.DisplayName.isEmpty() )
{
#ifdef DBG_UTIL
::rtl::OString sMessage( "OPropertyBrowserController::describePropertyLine: handler did not provide a display name for '" );
sMessage += ::rtl::OString( _rProperty.Name.getStr(), _rProperty.Name.getLength(), RTL_TEXTENCODING_ASCII_US );
sMessage += ::rtl::OString( "'!" );
- DBG_ASSERT( _rDescriptor.DisplayName.getLength(), sMessage.getStr() );
+ DBG_ASSERT( !_rDescriptor.DisplayName.isEmpty(), sMessage.getStr() );
#endif
_rDescriptor.DisplayName = _rProperty.Name;
}
@@ -1250,7 +1250,7 @@ namespace pcr
bool bIsActuatingProperty = impl_isActuatingProperty_nothrow( property->second.Name );
#if OSL_DEBUG_LEVEL > 0
- if ( !aDescriptor.Category.getLength() )
+ if ( aDescriptor.Category.isEmpty() )
{
::rtl::OString sMessage( "OPropertyBrowserController::UpdateUI: empty category provided for property '" );
sMessage += ::rtl::OString( property->second.Name.getStr(), property->second.Name.getLength(), osl_getThreadTextEncoding() );
@@ -1320,7 +1320,7 @@ namespace pcr
}
// activate the previously active page (if possible)
- if ( m_sLastValidPageSelection.getLength() )
+ if ( !m_sLastValidPageSelection.isEmpty() )
m_sPageSelection = m_sLastValidPageSelection;
selectPageFromViewData();
}
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index bd5fb55..7532c9a 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -417,7 +417,7 @@ namespace pcr
}
// read the measurement unit from the configuration
- if ( sConfigurationLocation.getLength() && sConfigurationProperty.getLength() )
+ if ( !(sConfigurationLocation.isEmpty() || sConfigurationProperty.isEmpty()) )
{
::utl::OConfigurationTreeRoot aConfigTree( ::utl::OConfigurationTreeRoot::createWithServiceFactory(
m_aContext.getLegacyServiceFactory(), sConfigurationLocation, -1, ::utl::OConfigurationTreeRoot::CM_READONLY ) );
diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx
index bebea45..36270fc 100644
--- a/extensions/source/propctrlr/pushbuttonnavigation.cxx
+++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx
@@ -297,7 +297,7 @@ namespace pcr
{
::rtl::OUString sTargetURL;
OSL_VERIFY( getCurrentTargetURL() >>= sTargetURL );
- return sTargetURL.getLength() != 0;
+ return !sTargetURL.isEmpty();
}
//............................................................................
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 2b740ac..e87599c 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -216,7 +216,7 @@ namespace pcr
::rtl::OUString sText( getTypedControlWindow()->GetText() );
if ( m_bIsPassword )
{
- if ( sText.getLength() )
+ if ( !sText.isEmpty() )
aPropValue <<= (sal_Int16)sText.getStr()[0];
}
else
@@ -829,7 +829,7 @@ namespace pcr
::rtl::OUString sControlValue( getTypedControlWindow()->GetSelectEntry() );
Any aPropValue;
- if ( sControlValue.getLength() )
+ if ( !sControlValue.isEmpty() )
aPropValue <<= sControlValue;
return aPropValue;
}
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index 4cee797..b44230a 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -174,7 +174,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL StringRepresentation::getSupportedSer
{
sReturn = convertSimpleToString( PropertyValue );
#ifdef DBG_UTIL
- if ( !sReturn.getLength() && PropertyValue.hasValue() )
+ if ( sReturn.isEmpty() && PropertyValue.hasValue() )
{
::rtl::OString sMessage( "StringRepresentation::convertPropertyValueToStringRepresentation: cannot convert values of type '" );
sMessage += ::rtl::OString( PropertyValue.getValueType().getTypeName().getStr(), PropertyValue.getValueType().getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US );
@@ -219,7 +219,7 @@ uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const ::rtl::OUSt
#if OSL_DEBUG_LEVEL > 0
// could not convert ...
- if ( !bCanConvert && ControlValue.getLength() )
+ if ( !bCanConvert && !ControlValue.isEmpty() )
{
::rtl::OString sMessage( "StringRepresentation::convertStringRepresentationToPropertyValue: cannot convert into values of type '" );
sMessage += ::rtl::OString( ControlValueType.getTypeName().getStr(), ControlValueType.getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US );
@@ -285,7 +285,7 @@ void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > &
}
}
- if ( !sReturn.getLength() )
+ if ( sReturn.isEmpty() )
m_xTypeConverter->convertToSimpleType( _rValue, uno::TypeClass_STRING ) >>= sReturn;
}
catch( const script::CannotConvertException& ) { }
@@ -340,7 +340,7 @@ namespace
void splitComposedStringToSequence( const ::rtl::OUString& _rComposed, Sequence< ElementType >& _out_SplitUp, const Transformer& _rTransformer )
{
_out_SplitUp.realloc( 0 );
- if ( !_rComposed.getLength() )
+ if ( _rComposed.isEmpty() )
return;
sal_Int32 tokenPos = 0;
do
@@ -464,7 +464,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue,
uno::Any StringRepresentation::convertStringToSimple( const ::rtl::OUString& _rValue,const uno::TypeClass& _ePropertyType )
{
uno::Any aReturn;
- if ( m_xTypeConverter.is() && _rValue.getLength() )
+ if ( m_xTypeConverter.is() && !_rValue.isEmpty() )
{
try
{
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx
index 67381f4..5498849 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.cxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx
@@ -134,7 +134,7 @@ namespace pcr
{
Reference< XDataType > xDataType;
- if ( _rName.getLength() )
+ if ( !_rName.isEmpty() )
{
Reference< XDataTypeRepository > xRepository = getDataTypeRepository();
if ( xRepository.is() )
@@ -172,7 +172,7 @@ namespace pcr
{
Reference< XDataType > xValidatedAgainst;
- if ( _rName.getLength() )
+ if ( !_rName.isEmpty() )
xValidatedAgainst = getDataType( _rName );
if ( xValidatedAgainst.is() )
@@ -295,9 +295,9 @@ namespace pcr
try
{
Reference< XDataTypeRepository > xFromRepository, xToRepository;
- if ( _rFromModel.getLength() )
+ if ( !_rFromModel.isEmpty() )
xFromRepository = getDataTypeRepository( _rFromModel );
- if ( _rToModel.getLength() )
+ if ( !_rToModel.isEmpty() )
xToRepository = getDataTypeRepository( _rToModel );
if ( !xFromRepository.is() || !xToRepository.is() )
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index c1d4df0..e56c16c 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -362,7 +362,7 @@ Download::start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl
// when rFile is empty, there is no remembered file name. If there is already a file with the
// same name ask the user if she wants to resume a download or restart the download
- if ( !aFile.getLength() )
+ if ( aFile.isEmpty() )
{
// GetFileName()
rtl::OUString aURL( rURL );
@@ -401,7 +401,7 @@ Download::start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl
out.DestinationDir = rDestinationDir;
out.Handler = m_aHandler;
- if( aFile.getLength() > 0 )
+ if( !aFile.isEmpty() )
{
oslFileError rc = osl_openFile(aFile.pData, &out.FileHandle, osl_File_OpenFlag_Write);
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 66acb88..ee04697 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -95,7 +95,7 @@ rtl::OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDo
{
if( pos == iter->Pos )
{
- if( (pos > 2) || !autoDownloadEnabled || ! (iter->URL2.getLength() > 0) )
+ if( (pos > 2) || !autoDownloadEnabled || iter->URL2.isEmpty() )
return iter->URL;
}
else if( (pos == iter->Pos2) && ((1 == iter->Pos) || (2 == iter->Pos)) && autoDownloadEnabled )
@@ -131,7 +131,7 @@ static inline rtl::OUString getBaseInstallation()
inline bool isObsoleteUpdateInfo(const rtl::OUString& rBuildId)
{
- return sal_True != rBuildId.equals(getBuildId()) && rBuildId.getLength() > 0;
+ return sal_True != rBuildId.equals(getBuildId()) && !rBuildId.isEmpty();
}
@@ -806,7 +806,7 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues,
rtl::OUString aLocalFileName = aModel.getLocalFileName();
- if( aLocalFileName.getLength() > 0 )
+ if( !aLocalFileName.isEmpty() )
{
bContinueDownload = true;
@@ -853,7 +853,7 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues,
{
// Bring-up release note for position 5 ..
const rtl::OUString aURL(getReleaseNote(m_aUpdateInfo, 5));
- if( aURL.getLength() > 0 )
+ if( !aURL.isEmpty() )
showReleaseNote(aURL);
// Data is outdated, probably due to installed update
@@ -957,7 +957,7 @@ UpdateCheck::install()
#if ( defined LINUX || defined SOLARIS )
nFlags = 42;
aParameter = getBaseInstallation();
- if( aParameter.getLength() > 0 )
+ if( !aParameter.isEmpty() )
osl::FileBase::getSystemPathFromFileURL(aParameter, aParameter);
aParameter += UNISTRING(" &");
@@ -1187,7 +1187,7 @@ UpdateCheck::downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFil
// Bring-up release note for position 1 ..
const rtl::OUString aURL(getReleaseNote(m_aUpdateInfo, 1, aModel->isAutoDownloadEnabled()));
- if( aURL.getLength() > 0 )
+ if( !aURL.isEmpty() )
showReleaseNote(aURL);
}
}
@@ -1211,7 +1211,7 @@ UpdateCheck::downloadFinished(const rtl::OUString& rLocalFileName)
// Bring-up release note for position 2 ..
rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get( m_xContext );
const rtl::OUString aURL(getReleaseNote(aUpdateInfo, 2, rModel->isAutoDownloadEnabled()));
- if( aURL.getLength() > 0 )
+ if( !aURL.isEmpty() )
showReleaseNote(aURL);
}
@@ -1249,7 +1249,7 @@ UpdateCheck::showDialog(bool forceCheck)
{
osl::ResettableMutexGuard aGuard(m_aMutex);
- bool update_found = m_aUpdateInfo.BuildId.getLength() > 0;
+ bool update_found = !m_aUpdateInfo.BuildId.isEmpty();
bool bSetUIState = ! m_aUpdateHandler.is();
UpdateState eDialogState = UPDATESTATES_COUNT;
@@ -1342,7 +1342,7 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo)
std::vector< ReleaseNote >::iterator iter2 = m_aUpdateInfo.ReleaseNotes.begin();
while( iter2 != m_aUpdateInfo.ReleaseNotes.end() )
{
- if( ((1 == iter2->Pos) || (2 == iter2->Pos)) && autoDownloadEnabled && (iter2->URL2.getLength() > 0))
+ if( ((1 == iter2->Pos) || (2 == iter2->Pos)) && autoDownloadEnabled && !iter2->URL2.isEmpty())
{
iter2->URL = iter2->URL2;
iter2->URL2 = rtl::OUString();
@@ -1489,7 +1489,7 @@ UpdateCheck::getUIState(const UpdateInfo& rInfo)
{
UpdateState eUIState = UPDATESTATE_NO_UPDATE_AVAIL;
- if( rInfo.BuildId.getLength() > 0 )
+ if( !rInfo.BuildId.isEmpty() )
{
if( rInfo.Sources[0].IsDirect )
eUIState = UPDATESTATE_UPDATE_AVAIL;
@@ -1538,7 +1538,7 @@ UpdateCheck::storeReleaseNote(sal_Int8 nNum, const rtl::OUString &rURL)
rc = osl::File::remove( aFilePath );
// don't store empty release notes, but delete old ones
- if ( rURL.getLength() == 0 )
+ if ( rURL.isEmpty() )
return true;
osl::File aFile( aFilePath );
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index dd67fe2..256199e 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -189,7 +189,7 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const
{
rtl::OUString aUStr = getStringValue(
(aStr + rtl::OString::valueOf(n)).getStr());
- if( aUStr.getLength() > 0 )
+ if( !aUStr.isEmpty() )
rInfo.ReleaseNotes.push_back(ReleaseNote((sal_Int8) n, aUStr));
}
}
@@ -553,7 +553,7 @@ UpdateCheckConfig::getByName( const ::rtl::OUString& aName )
rtl::OUString aStr;
aValue >>= aStr;
- if( aStr.getLength() == 0 )
+ if( aStr.isEmpty() )
aValue = uno::makeAny(getDesktopDirectory());
}
@@ -682,7 +682,7 @@ bool UpdateCheckConfig::storeExtensionVersion( const rtl::OUString& rExtensionNa
::rtl::OUString aIgnoredVersion;
uno::Any aValue( uno::Reference< beans::XPropertySet >( m_xIgnoredUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) );
aValue >>= aIgnoredVersion;
- if ( aIgnoredVersion.getLength() == 0 ) // no version means ignore all updates
+ if ( aIgnoredVersion.isEmpty() ) // no version means ignore all updates
bNotify = false;
else if ( aIgnoredVersion == rVersion ) // the user wanted to ignore this update
bNotify = false;
@@ -708,7 +708,7 @@ bool UpdateCheckConfig::checkExtensionVersion( const rtl::OUString& rExtensionNa
::rtl::OUString aIgnoredVersion;
uno::Any aValue2( uno::Reference< beans::XPropertySet >( m_xIgnoredUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) );
aValue2 >>= aIgnoredVersion;
- if ( aIgnoredVersion.getLength() == 0 ) // no version means ignore all updates
+ if ( aIgnoredVersion.isEmpty() ) // no version means ignore all updates
return false;
else if ( aIgnoredVersion == aStoredVersion ) // the user wanted to ignore this update
return false;
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 439927b..2dc19c9 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -555,7 +555,7 @@ void UpdateHandler::updateState( UpdateState eState )
setControlProperty( TEXT_STATUS, UNISTRING("Text"), uno::Any( substVariables(msUpdFound) ) );
sText = substVariables(msDownloadWarning);
- if ( msDescriptionMsg.getLength() )
+ if ( !msDescriptionMsg.isEmpty() )
sText += UNISTRING("\n\n") + msDescriptionMsg;
setControlProperty( TEXT_DESCRIPTION, UNISTRING("Text"), uno::Any( sText ) );
@@ -568,7 +568,7 @@ void UpdateHandler::updateState( UpdateState eState )
setControlProperty( TEXT_STATUS, UNISTRING("Text"), uno::Any( substVariables(msUpdFound) ) );
sText = substVariables(msDownloadNotAvail);
- if ( msDescriptionMsg.getLength() )
+ if ( !msDescriptionMsg.isEmpty() )
sText += UNISTRING("\n\n") + msDescriptionMsg;
setControlProperty( TEXT_DESCRIPTION, UNISTRING("Text"), uno::Any( sText ) );
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index a20208d..bc268e8 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -64,18 +64,18 @@ getBootstrapData(
{
rBuildID = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":ProductBuildid}" );
rtl::Bootstrap::expandMacros( rBuildID );
- if ( ! rBuildID.getLength() )
+ if ( rBuildID.isEmpty() )
return false;
rInstallSetID = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateID}" );
rtl::Bootstrap::expandMacros( rInstallSetID );
- if ( ! rInstallSetID.getLength() )
+ if ( rInstallSetID.isEmpty() )
return false;
rtl::OUString aValue( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateURL}" ) );
rtl::Bootstrap::expandMacros( aValue );
- if( aValue.getLength() > 0 )
+ if( !aValue.isEmpty() )
{
rRepositoryList.realloc(1);
rRepositoryList[0] = aValue;
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index a7d70fd..09a98a7 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -359,7 +359,7 @@ UpdateInformationProvider::UpdateInformationProvider(
"${${BRAND_BASE_DIR}/program/edition/edition.ini:"
"EDITIONNAME}"));
rtl::Bootstrap::expandMacros(edition);
- if (edition.getLength() != 0) {
+ if (!edition.isEmpty()) {
buf.append(sal_Unicode(' '));
buf.append(edition);
}
@@ -368,7 +368,7 @@ UpdateInformationProvider::UpdateInformationProvider(
xConfigurationProvider,
UNISTRING("org.openoffice.Setup/Product"),
UNISTRING("ooSetupExtension")) >>= extension;
- if (extension.getLength() != 0) {
+ if (!extension.isEmpty()) {
buf.append(sal_Unicode(' '));
buf.append(extension);
}
@@ -390,7 +390,7 @@ UpdateInformationProvider::UpdateInformationProvider(
m_aRequestHeaderList[0].Name = UNISTRING("Accept-Language");
m_aRequestHeaderList[0].Value = getConfigurationItem( xConfigurationProvider, UNISTRING("org.openoffice.Setup/L10N"), UNISTRING("ooLocale") );
- if( aUserAgent.getLength() > 0 )
+ if( !aUserAgent.isEmpty() )
{
m_aRequestHeaderList.realloc(2);
m_aRequestHeaderList[1].Name = UNISTRING("User-Agent");
@@ -608,7 +608,7 @@ UpdateInformationProvider::getUpdateInformationEnumeration(
{
rtl::OUString aXPathExpression;
- if( extensionId.getLength() > 0 )
+ if( !extensionId.isEmpty() )
aXPathExpression = UNISTRING("//atom:entry/atom:category[@term=\'") + extensionId + UNISTRING("\']/..");
else
aXPathExpression = UNISTRING("//atom:entry");
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 09dacc5..da90b4b 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -321,7 +321,7 @@ Image UpdateCheckUI::GetBubbleImage( ::rtl::OUString &rURL )
{
Image aImage;
- if ( maBubbleImageURL.getLength() != 0 )
+ if ( !maBubbleImageURL.isEmpty() )
{
uno::Reference< lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
@@ -379,11 +379,11 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl )
if ( pActiveMBar )
{
rtl::OUStringBuffer aBuf;
- if( maBubbleTitle.getLength() )
+ if( !maBubbleTitle.isEmpty() )
aBuf.append( maBubbleTitle );
- if( maBubbleText.getLength() )
+ if( !maBubbleText.isEmpty() )
{
- if( maBubbleTitle.getLength() )
+ if( !maBubbleTitle.isEmpty() )
aBuf.appendAscii( "\n\n" );
aBuf.append( maBubbleText );
}
--
1.7.5.4
--------------060806070300050805060500--
More information about the LibreOffice
mailing list