[Libreoffice-commits] .: svx/source
Olivier Hallot
ohallot at kemper.freedesktop.org
Sat Jan 14 06:12:29 PST 2012
svx/source/accessibility/AccessibleControlShape.cxx | 4 +-
svx/source/accessibility/AccessibleShape.cxx | 6 +--
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 2 -
svx/source/customshapes/tbxcustomshapes.cxx | 8 ++--
svx/source/dialog/docrecovery.cxx | 12 +++---
svx/source/dialog/fntctrl.cxx | 4 +-
svx/source/dialog/imapdlg.cxx | 2 -
svx/source/dialog/rubydialog.cxx | 8 ++--
svx/source/dialog/svxbmpnumvalueset.cxx | 4 +-
svx/source/fmcomp/dbaexchange.cxx | 12 +++---
svx/source/fmcomp/fmgridcl.cxx | 30 +++++++--------
svx/source/fmcomp/gridcell.cxx | 2 -
svx/source/fmcomp/gridcols.cxx | 2 -
svx/source/form/dataaccessdescriptor.cxx | 2 -
svx/source/form/databaselocationinput.cxx | 2 -
svx/source/form/datanavi.cxx | 32 ++++++++--------
svx/source/form/filtnav.cxx | 4 +-
svx/source/form/fmPropBrw.cxx | 4 +-
svx/source/form/fmcontrollayout.cxx | 4 +-
svx/source/form/fmobjfac.cxx | 2 -
svx/source/form/fmpgeimp.cxx | 14 +++----
svx/source/form/fmscriptingenv.cxx | 2 -
svx/source/form/fmshimp.cxx | 14 +++----
svx/source/form/fmtextcontrolshell.cxx | 2 -
svx/source/form/fmtools.cxx | 2 -
svx/source/form/fmundo.cxx | 6 +--
svx/source/form/fmview.cxx | 2 -
svx/source/form/fmvwimp.cxx | 12 +++---
svx/source/form/formcontrolfactory.cxx | 4 +-
svx/source/form/formcontroller.cxx | 10 ++---
svx/source/form/formcontrolling.cxx | 2 -
svx/source/form/tabwin.cxx | 4 +-
svx/source/form/xfm_addcondition.cxx | 2 -
svx/source/gallery2/gallery1.cxx | 10 ++---
svx/source/gallery2/galmisc.cxx | 2 -
svx/source/svdraw/svdoashp.cxx | 4 +-
svx/source/svdraw/svdoole2.cxx | 2 -
svx/source/tbxctrls/tbcontrl.cxx | 4 +-
svx/source/tbxctrls/tbunocontroller.cxx | 2 -
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2 -
svx/source/tbxctrls/tbxalign.cxx | 4 +-
svx/source/toolbars/fontworkbar.cxx | 4 +-
svx/source/unodraw/UnoGraphicExporter.cxx | 4 +-
svx/source/unodraw/unomtabl.cxx | 2 -
svx/source/unodraw/unoshap2.cxx | 4 +-
svx/source/unodraw/unoshap4.cxx | 4 +-
svx/source/unodraw/unoshape.cxx | 2 -
svx/source/xml/xmleohlp.cxx | 10 ++---
svx/source/xml/xmlgrhlp.cxx | 10 ++---
svx/source/xml/xmlxtimp.cxx | 4 +-
svx/source/xoutdev/xtable.cxx | 4 +-
51 files changed, 150 insertions(+), 150 deletions(-)
New commits:
commit dc04d67e94d9302278fc049d6617b62fe461ac66
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Sat Jan 14 12:10:39 2012 -0200
Fix for fdo43460 Part XXXVIII getLength() to isEmpty()
Part XXXVIII
Modules
svx
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 24a1244..9f9734b 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -372,7 +372,7 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException)
{
// check if we can obtain the "Desc" property from the model
::rtl::OUString sDesc( getControlModelStringProperty( lcl_getDescPropertyName() ) );
- if ( !sDesc.getLength() )
+ if ( sDesc.isEmpty() )
{ // no -> use the default
aDG.Initialize (STR_ObjNameSingulUno);
aDG.AddProperty (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBackground")),
@@ -648,7 +648,7 @@ Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessib
const ::rtl::OUString& rAccNameProperty = lcl_getPreferredAccNameProperty( m_xModelPropsMeta );
::rtl::OUString sName( getControlModelStringProperty( rAccNameProperty ) );
- if ( !sName.getLength() )
+ if ( sName.isEmpty() )
{ // no -> use the default
sName = AccessibleShape::CreateAccessibleName();
}
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 4523f47..7ef5c90 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -1179,20 +1179,20 @@ void AccessibleShape::UpdateNameAndDescription (void)
// Get the accessible name.
sString = GetOptionalProperty(xSet, OUString(RTL_CONSTASCII_USTRINGPARAM("Title")));
- if (sString.getLength() > 0)
+ if (!sString.isEmpty())
{
SetAccessibleName(sString, AccessibleContextBase::FromShape);
}
else
{
sString = GetOptionalProperty(xSet, OUString(RTL_CONSTASCII_USTRINGPARAM("Name")));
- if (sString.getLength() > 0)
+ if (!sString.isEmpty())
SetAccessibleName(sString, AccessibleContextBase::FromShape);
}
// Get the accessible description.
sString = GetOptionalProperty(xSet, OUString(RTL_CONSTASCII_USTRINGPARAM("Description")));
- if (sString.getLength() > 0)
+ if (!sString.isEmpty())
SetAccessibleDescription(sString, AccessibleContextBase::FromShape);
}
catch (uno::RuntimeException&)
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 890f369..fa1adb6 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -231,7 +231,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
while( aParagraphIter != aParagraphIEnd )
{
const rtl::OUString& rText = aParagraphIter->aString;
- if ( rText.getLength() )
+ if ( !rText.isEmpty() )
{
// generating vcl/font
sal_uInt16 nScriptType = i18n::ScriptType::LATIN;
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 9d22b4c..c9a4353 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -124,7 +124,7 @@ void SvxTbxCtlCustomShapes::StateChanged( sal_uInt16 nSID, SfxItemState eState,
SfxPopupWindowType SvxTbxCtlCustomShapes::GetPopupWindowType() const
{
- return( m_aCommand.getLength() == 0 ? SFX_POPUPWINDOW_ONCLICK : SFX_POPUPWINDOW_ONTIMEOUT);
+ return( m_aCommand.isEmpty() ? SFX_POPUPWINDOW_ONCLICK : SFX_POPUPWINDOW_ONTIMEOUT);
}
/*************************************************************************
@@ -145,7 +145,7 @@ SfxPopupWindow* SvxTbxCtlCustomShapes::CreatePopupWindow()
void SvxTbxCtlCustomShapes::Select( sal_Bool /*bMod1*/ )
{
- if ( m_aCommand.getLength() > 0 )
+ if ( !m_aCommand.isEmpty() )
{
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aParamSeq( 0 );
Dispatch( m_aCommand, aParamSeq );
@@ -175,7 +175,7 @@ void SAL_CALL SvxTbxCtlCustomShapes::functionSelected( const ::rtl::OUString& rC
SolarMutexGuard aGuard;
if ( !m_bDisposed )
{
- if ( m_aCommand.getLength() > 0 )
+ if ( !m_aCommand.isEmpty() )
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
Image aImage = GetImage( xFrame, m_aCommand, hasBigImages() );
@@ -190,7 +190,7 @@ void SAL_CALL SvxTbxCtlCustomShapes::updateImage( ) throw (::com::sun::star::un
// We should update the button image of our parent (toolbar).
// Use the stored command to set the correct current image.
SolarMutexGuard aGuard;
- if ( m_aCommand.getLength() > 0 )
+ if ( !m_aCommand.isEmpty() )
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
Image aImage = GetImage( xFrame, m_aCommand, hasBigImages() );
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 84e4688..e311731 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -196,7 +196,7 @@ sal_Bool RecoveryCore::existsNonRecoveredEntries()
//===============================================
sal_Bool RecoveryCore::isBrokenTempEntry(const TURLInfo& rInfo)
{
- if (!rInfo.TempURL.getLength())
+ if (rInfo.TempURL.isEmpty())
return sal_False;
// Note: If the original files was recovery ... but a temp file
@@ -213,7 +213,7 @@ sal_Bool RecoveryCore::isBrokenTempEntry(const TURLInfo& rInfo)
//===============================================
void RecoveryCore::saveBrokenTempEntries(const ::rtl::OUString& sPath)
{
- if (!sPath.getLength())
+ if (sPath.isEmpty())
return;
if (!m_xRealCore.is())
@@ -251,7 +251,7 @@ void RecoveryCore::saveBrokenTempEntries(const ::rtl::OUString& sPath)
//===============================================
void RecoveryCore::saveAllTempEntries(const ::rtl::OUString& sPath)
{
- if (!sPath.getLength())
+ if (sPath.isEmpty())
return;
if (!m_xRealCore.is())
@@ -278,7 +278,7 @@ void RecoveryCore::saveAllTempEntries(const ::rtl::OUString& sPath)
++pIt )
{
const TURLInfo& rInfo = *pIt;
- if (!rInfo.TempURL.getLength())
+ if (rInfo.TempURL.isEmpty())
continue;
lCopyArgs[2].Value <<= rInfo.ID;
@@ -1487,7 +1487,7 @@ void BrokenRecoveryDialog::impl_refresh()
{
// "Cancel" before recovery ->
// search for any temp files!
- if (!rInfo.TempURL.getLength())
+ if (rInfo.TempURL.isEmpty())
continue;
}
else
@@ -1526,7 +1526,7 @@ IMPL_LINK( BrokenRecoveryDialog, OkButtonHdl, void*, EMPTYARG )
rtl::OUString sURL;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPhysicalPath, sURL );
m_sSavePath = sURL;
- while (!m_sSavePath.getLength())
+ while (m_sSavePath.isEmpty())
impl_askForSavePath();
EndDialog(DLG_RET_OK);
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 2dc1930..6e2c2bd 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -959,7 +959,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet,
{
const SfxStringItem& rItem = ( SfxStringItem& ) rSet.Get( nWhich );
::rtl::OUString aString = rItem.GetValue();
- if( aString.getLength() != 0 )
+ if( !aString.isEmpty() )
SetPreviewText( aString );
else
SetFontNameAsPreviewText();
@@ -1196,7 +1196,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet )
{
const SfxStringItem& rItem = ( SfxStringItem& ) rSet.Get( nWhich );
::rtl::OUString aString = rItem.GetValue();
- if( aString.getLength() != 0 )
+ if( !aString.isEmpty() )
SetPreviewText( aString );
else
SetFontNameAsPreviewText();
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index e2c56dc..0aff913 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -586,7 +586,7 @@ sal_Bool SvxIMapDlg::DoSave()
}
else
{
- if( !aURL.getExtension().getLength() )
+ if( aURL.getExtension().isEmpty() )
aURL.setExtension( aExt );
SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC );
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index ab548ad..2959670 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -356,10 +356,10 @@ void SvxRubyDialog::Activate()
if(xNamed.is())
{
sCoreName = xNamed->getName();
- if(!sName.getLength())
+ if(sName.isEmpty())
sName = sCoreName;
}
- if(sName.getLength())
+ if(!sName.isEmpty())
{
sal_uInt16 nPos = aCharStyleLB.InsertEntry(sName);
aCharStyleLB.SetEntryData( nPos, new OUString(sCoreName) );
@@ -502,9 +502,9 @@ void SvxRubyDialog::Update()
aAdjustLB.SetNoSelection();
if(nPosition > -1)
aPositionLB.SelectEntryPos(nPosition ? 1 : 0);
- if(!nLen || (bCharStyleEqual && !sCharStyleName.getLength()))
+ if(!nLen || (bCharStyleEqual && sCharStyleName.isEmpty()))
sCharStyleName = C2U(cRubies);
- if(sCharStyleName.getLength())
+ if(!sCharStyleName.isEmpty())
{
for(sal_uInt16 i = 0; i < aCharStyleLB.GetEntryCount(); i++)
{
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 132834d..a450f13 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -339,7 +339,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
}
aLeft.Y() -= (pDev->GetTextHeight()/2);
- if(sPrefixes[i].getLength() &&
+ if(!sPrefixes[i].isEmpty() &&
!sPrefixes[i].equalsAsciiL(" ", 1) &&
sPrefixes[i].getStr()[0] != 0)
{
@@ -373,7 +373,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
aLeft,
aRuleFont,
aFont);
- if(sSuffixes[i].getLength()&&
+ if(!sSuffixes[i].isEmpty()&&
!sSuffixes[i].equalsAsciiL(" ", 1) &&
sSuffixes[i].getStr()[0] != 0)
{
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index cc40926..8987e41 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -85,7 +85,7 @@ namespace svx
implConstruct(
- sDataSource.getLength() ? sDataSource : sDatabaseLocation,
+ sDataSource.isEmpty() ? sDatabaseLocation : sDataSource,
sConnectionResource, nCommandType, sCommand, sFieldName );
if ( m_nFormatFlags & CTF_COLUMN_DESCRIPTOR )
@@ -212,7 +212,7 @@ namespace svx
if ((m_nFormatFlags & CTF_COLUMN_DESCRIPTOR) == CTF_COLUMN_DESCRIPTOR)
{
m_aDescriptor.setDataSource(_rDatasource);
- if ( _rConnectionResource.getLength() )
+ if ( !_rConnectionResource.isEmpty() )
m_aDescriptor[daConnectionResource] <<= _rConnectionResource;
m_aDescriptor[daCommand] <<= _rCommand;
@@ -309,11 +309,11 @@ namespace svx
if (extractColumnDescriptor(_rData, sDatasource, sDatabaseLocation,sConnectionResource,nCommandType, sCommand, sFieldName))
{
// and build an own descriptor
- if ( sDatasource.getLength() )
+ if ( !sDatasource.isEmpty() )
aDescriptor[daDataSource] <<= sDatasource;
- if ( sDatabaseLocation.getLength() )
+ if ( !sDatabaseLocation.isEmpty() )
aDescriptor[daDatabaseLocation] <<= sDatabaseLocation;
- if ( sConnectionResource.getLength() )
+ if ( !sConnectionResource.isEmpty() )
aDescriptor[daConnectionResource] <<= sConnectionResource;
aDescriptor[daCommand] <<= sCommand;
@@ -596,7 +596,7 @@ namespace svx
{
m_aDescriptor.setDataSource(_rDatasource);
// build the descriptor (the property sequence)
- if ( _rConnectionResource.getLength() )
+ if ( !_rConnectionResource.isEmpty() )
m_aDescriptor[daConnectionResource] <<= _rConnectionResource;
if ( _rxConnection.is() )
m_aDescriptor[daConnection] <<= _rxConnection;
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index ec44cf1..4d387b0 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -205,9 +205,9 @@ void FmGridHeader::RequestHelp( const HelpEvent& rHEvt )
Reference< ::com::sun::star::beans::XPropertySet > xColumn(xColumns->getByIndex(nPos),UNO_QUERY);
::rtl::OUString aHelpText;
xColumn->getPropertyValue(FM_PROP_HELPTEXT) >>= aHelpText;
- if ( !aHelpText.getLength() )
+ if ( aHelpText.isEmpty() )
xColumn->getPropertyValue(FM_PROP_DESCRIPTION) >>= aHelpText;
- if ( aHelpText.getLength() )
+ if ( !aHelpText.isEmpty() )
{
if ( rHEvt.GetMode() & HELPMODE_BALLOON )
Help::ShowBalloon( this, aItemRect.Center(), aItemRect, aHelpText );
@@ -275,10 +275,10 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
if (aColumn.has(daColumnObject))aColumn[daColumnObject] >>= xField;
if (aColumn.has(daConnection)) aColumn[daConnection] >>= xConnection;
- if ( !sFieldName.getLength()
- || !sCommand.getLength()
- || ( !sDatasouce.getLength()
- && !sDatabaseLocation.getLength()
+ if ( sFieldName.isEmpty()
+ || sCommand.isEmpty()
+ || ( sDatasouce.isEmpty()
+ && sDatabaseLocation.isEmpty()
&& !xConnection.is()
)
)
@@ -294,7 +294,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
{ // the transferable did not contain the connection -> build an own one
try
{
- ::rtl::OUString sSignificantSource( sDatasouce.getLength() ? sDatasouce : sDatabaseLocation );
+ ::rtl::OUString sSignificantSource( sDatasouce.isEmpty() ? sDatabaseLocation : sDatasouce );
xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, ::rtl::OUString(),::rtl::OUString(),static_cast<FmGridControl*>(GetParent())->getServiceManager());
}
catch(NoSuchElementException&)
@@ -396,7 +396,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
Reference< XConnection > xConnection;
::rtl::OUString sDatasouce = m_pImpl->aDropData.getDataSource();
- if ( !sDatasouce.getLength() && m_pImpl->aDropData.has(daConnectionResource) )
+ if ( sDatasouce.isEmpty() && m_pImpl->aDropData.has(daConnectionResource) )
m_pImpl->aDropData[daConnectionResource] >>= sURL;
m_pImpl->aDropData[daCommand] >>= sCommand;
m_pImpl->aDropData[daCommandType] >>= nCommandType;
@@ -526,7 +526,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
sFieldService = FieldServiceFromId(nPreferedType);
Reference< XPropertySet > xThisRoundCol;
- if ( sFieldService.getLength() )
+ if ( !sFieldService.isEmpty() )
xThisRoundCol = xFactory->createColumn(sFieldService);
if (nColCount)
xSecondCol = xThisRoundCol;
@@ -605,15 +605,15 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
Reference< XPropertySet > xForm(xFormCp->getParent(), UNO_QUERY);
if (xForm.is())
{
- if (!::comphelper::getString(xForm->getPropertyValue(FM_PROP_DATASOURCE)).getLength())
+ if (::comphelper::getString(xForm->getPropertyValue(FM_PROP_DATASOURCE)).isEmpty())
{
- if ( sDatasouce.getLength() )
+ if ( !sDatasouce.isEmpty() )
xForm->setPropertyValue(FM_PROP_DATASOURCE, makeAny(sDatasouce));
else
xForm->setPropertyValue(FM_PROP_URL, makeAny(sURL));
}
- if (!::comphelper::getString(xForm->getPropertyValue(FM_PROP_COMMAND)).getLength())
+ if (::comphelper::getString(xForm->getPropertyValue(FM_PROP_COMMAND)).isEmpty())
{
xForm->setPropertyValue(FM_PROP_COMMAND, makeAny(sCommand));
Any aCommandType;
@@ -924,7 +924,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
break;
}
- if ( aFieldType.getLength() )
+ if ( !aFieldType.isEmpty() )
{
try
{
@@ -1965,7 +1965,7 @@ namespace
if ( xProp.is() )
{
xProp->getPropertyValue(FM_PROP_HELPTEXT) >>= sRetText;
- if ( !sRetText.getLength() )
+ if ( sRetText.isEmpty() )
xProp->getPropertyValue(FM_PROP_DESCRIPTION) >>= sRetText;
}
}
@@ -1976,7 +1976,7 @@ namespace
GetModelColumnPos(
sal::static_int_cast< sal_uInt16 >(_nPosition)),
FM_PROP_HELPTEXT);
- if ( !sRetText.getLength() )
+ if ( sRetText.isEmpty() )
sRetText = getColumnPropertyFromPeer(
GetPeer(),
GetModelColumnPos(
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 1d03901..d4272f5 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3128,7 +3128,7 @@ void DbFilterField::Update()
aStatement.AssignAscii("SELECT DISTINCT ");
aStatement += String(quoteName(aQuote, aName));
- if (aFieldName.getLength() && aName != aFieldName)
+ if (!aFieldName.isEmpty() && aName != aFieldName)
{
aStatement.AppendAscii(" AS ");
aStatement += quoteName(aQuote, aFieldName).getStr();
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index afa82f1..284e6a7 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::uno;
const ::comphelper::StringSequence& getColumnTypes()
{
static ::comphelper::StringSequence aColumnTypes(10);
- if (!aColumnTypes.getConstArray()[0].getLength())
+ if (aColumnTypes.getConstArray()[0].isEmpty())
{
::rtl::OUString* pNames = aColumnTypes.getArray();
pNames[TYPE_CHECKBOX] = FM_COL_CHECKBOX;
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index 1d4df4e..720ca54 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -408,7 +408,7 @@ namespace svx
//--------------------------------------------------------------------
void ODataAccessDescriptor::setDataSource(const ::rtl::OUString& _sDataSourceNameOrLocation)
{
- if ( _sDataSourceNameOrLocation.getLength() )
+ if ( !_sDataSourceNameOrLocation.isEmpty() )
{
INetURLObject aURL(_sDataSourceNameOrLocation);
(*this)[ (( aURL.GetProtocol() == INET_PROT_FILE ) ? daDatabaseLocation : daDataSource)] <<= _sDataSourceNameOrLocation;
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 4e148ec..14a6bcb 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -135,7 +135,7 @@ namespace svx
bool DatabaseLocationInputController_Impl::prepareCommit()
{
::rtl::OUString sURL( impl_getCurrentURL() );
- if ( !sURL.getLength() )
+ if ( sURL.isEmpty() )
return false;
// check if the name exists
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index bb92182..6ea99e1 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -405,7 +405,7 @@ namespace svxform
}
::rtl::OUString sName = m_xUIHelper->getNodeDisplayName( xChild, bShowDetails );
- if ( sName.getLength() > 0 )
+ if ( !sName.isEmpty() )
{
ItemNode* pNode = new ItemNode( xChild );
SvLBoxEntry* pEntry = m_aItemList.InsertEntry(
@@ -1405,7 +1405,7 @@ namespace svxform
#endif
::rtl::OUString sNodeName =
m_xUIHelper->getNodeDisplayName( xRoot, m_pNaviWin->IsShowDetails() );
- if ( sNodeName.getLength() == 0 )
+ if ( sNodeName.isEmpty() )
sNodeName = xRoot->getNodeName();
if ( xRoot->hasChildNodes() )
AddChildren( NULL, _rImgLst, xRoot );
@@ -2234,7 +2234,7 @@ namespace svxform
}
sal_uInt16 nPageId = GetNewPageId();
- if ( sInstName.getLength() == 0 )
+ if ( sInstName.isEmpty() )
{
DBG_ERRORFILE( "DataNavigatorWindow::CreateInstancePage(): instance without name" );
String sTemp = String::CreateFromAscii( "untitled" );
@@ -2591,9 +2591,9 @@ namespace svxform
sPropName = PN_CALCULATE_EXPR;
bool bIsChecked = ( pBox->IsChecked() != sal_False );
m_xTempBinding->getPropertyValue( sPropName ) >>= sTemp;
- if ( bIsChecked && sTemp.getLength() == 0 )
+ if ( bIsChecked && sTemp.isEmpty() )
sTemp = TRUE_VALUE;
- else if ( !bIsChecked && sTemp.getLength() > 0 )
+ else if ( !bIsChecked && !sTemp.isEmpty() )
sTemp = ::rtl::OUString();
m_xTempBinding->setPropertyValue( sPropName, makeAny( sTemp ) );
}
@@ -2625,7 +2625,7 @@ namespace svxform
else
{
m_xTempBinding->getPropertyValue( sPropName ) >>= sTemp;
- if ( sTemp.getLength() == 0 )
+ if ( sTemp.isEmpty() )
sTemp = TRUE_VALUE;
sCondition = sTemp;
}
@@ -2688,7 +2688,7 @@ namespace svxform
::rtl::OUString sNewName( m_aNameED.GetText() );
if ( ( !bIsHandleBinding && !bIsHandleText && !m_xUIHelper->isValidXMLName( sNewName ) ) ||
- ( bIsHandleBinding && sNewName.getLength() == 0 ) )
+ ( bIsHandleBinding && sNewName.isEmpty() ) )
{
// Error and don't close the dialog
ErrorBox aErrBox( this, SVX_RES( RID_ERR_INVALID_XMLNAME ) );
@@ -2880,19 +2880,19 @@ namespace svxform
try
{
if ( ( m_xTempBinding->getPropertyValue( PN_REQUIRED_EXPR ) >>= sTemp )
- && sTemp.getLength() > 0 )
+ && !sTemp.isEmpty() )
m_aRequiredCB.Check( sal_True );
if ( ( m_xTempBinding->getPropertyValue( PN_RELEVANT_EXPR ) >>= sTemp )
- && sTemp.getLength() > 0 )
+ && !sTemp.isEmpty() )
m_aRelevantCB.Check( sal_True );
if ( ( m_xTempBinding->getPropertyValue( PN_CONSTRAINT_EXPR ) >>= sTemp )
- && sTemp.getLength() > 0 )
+ && !sTemp.isEmpty() )
m_aConstraintCB.Check( sal_True );
if ( ( m_xTempBinding->getPropertyValue( PN_READONLY_EXPR ) >>= sTemp )
- && sTemp.getLength() > 0 )
+ && !sTemp.isEmpty() )
m_aReadonlyCB.Check( sal_True );
if ( ( m_xTempBinding->getPropertyValue( PN_CALCULATE_EXPR ) >>= sTemp )
- && sTemp.getLength() > 0 )
+ && !sTemp.isEmpty() )
m_aCalculateCB.Check( sal_True );
}
catch ( Exception& )
@@ -3041,13 +3041,13 @@ namespace svxform
m_aResultTimer.SetTimeout( 500 );
m_aResultTimer.SetTimeoutHdl( LINK( this, AddConditionDialog, ResultHdl ) );
- if ( m_sPropertyName.getLength() > 0 )
+ if ( !m_sPropertyName.isEmpty() )
{
try
{
rtl::OUString sTemp;
if ( ( m_xBinding->getPropertyValue( m_sPropertyName ) >>= sTemp )
- && sTemp.getLength() > 0 )
+ && !sTemp.isEmpty() )
{
m_aConditionED.SetText( sTemp );
}
@@ -3446,7 +3446,7 @@ namespace svxform
IMPL_LINK( AddSubmissionDialog, OKHdl, OKButton *, EMPTYARG )
{
rtl::OUString sName(m_aNameED.GetText());
- if(!sName.getLength()) {
+ if(sName.isEmpty()) {
ErrorBox aErrorBox(this,SVX_RES(RID_ERR_EMPTY_SUBMISSIONNAME));
aErrorBox.SetText( Application::GetDisplayName() );
@@ -3601,7 +3601,7 @@ namespace svxform
m_xSubmission->getPropertyValue( PN_SUBMISSION_REPLACE ) >>= sTemp;
sTemp = lcl_ReplaceString::get().toUI( sTemp );
- if ( sTemp.getLength() == 0 )
+ if ( sTemp.isEmpty() )
sTemp = m_aReplaceLB.GetEntry(0); // first entry == "none"
nPos = m_aReplaceLB.GetEntryPos( String( sTemp ) );
if ( LISTBOX_ENTRY_NOTFOUND == nPos )
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index fecd212..bc19a1c 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -456,7 +456,7 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) th
FmFilterItem* pFilterItem = pFilter->Find( _Event.FilterComponent );
if ( pFilterItem )
{
- if ( _Event.PredicateExpression.getLength())
+ if ( !_Event.PredicateExpression.isEmpty())
{
pFilterItem->SetText( _Event.PredicateExpression );
// UI benachrichtigen
@@ -663,7 +663,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar
++pDisjunctiveTerm
)
{
- if ( pDisjunctiveTerm->getLength() == 0 )
+ if ( pDisjunctiveTerm->isEmpty() )
// no condition for this particular component in this particular conjunction term
continue;
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 4219f1f..2156493 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -329,7 +329,7 @@ FmPropBrw::~FmPropBrw()
OSL_VERIFY( m_xBrowserController->getViewData() >>= sCurrentPage );
}
- if ( !sCurrentPage.getLength() )
+ if ( sCurrentPage.isEmpty() )
sCurrentPage = m_sLastActivePage;
}
catch( const Exception& )
@@ -692,7 +692,7 @@ void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPool
// and additionally, we want to show the page which was active during
// our previous incarnation
- if ( m_sLastActivePage.getLength() )
+ if ( !m_sLastActivePage.isEmpty() )
{
try
{
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index 5b9eb04..1a94658 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -172,7 +172,7 @@ namespace svxform
OSL_VERIFY( xStyle->getPropertyValue( sCharLocalePropertyName ) >>= aDocumentCharLocale );
}
// fall back to CharLocale property at the style
- if ( !aDocumentCharLocale.Language.getLength() )
+ if ( aDocumentCharLocale.Language.isEmpty() )
{
sCharLocalePropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharLocale" ) );
if ( xStylePSI->hasPropertyByName( sCharLocalePropertyName ) )
@@ -181,7 +181,7 @@ namespace svxform
}
}
// fall back to the system locale
- if ( !aDocumentCharLocale.Language.getLength() )
+ if ( aDocumentCharLocale.Language.isEmpty() )
{
aDocumentCharLocale = rSysLocaleData.getLocale();
}
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 44afd89..36fd7d2 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -237,7 +237,7 @@ IMPL_LINK(FmFormObjFactory, MakeObject, SdrObjFactory*, pObjFactory)
}
// create the actual object
- if ( sServiceSpecifier.getLength() )
+ if ( !sServiceSpecifier.isEmpty() )
pObjFactory->pNewObj = new FmFormObj( sServiceSpecifier, pObjFactory->nIdentifier );
else
pObjFactory->pNewObj = new FmFormObj( pObjFactory->nIdentifier );
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index b5bd000..b71ed1c 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -491,7 +491,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo
// Wenn Datenbank und CursorSource gesetzt sind, dann wird
// die Form anhand dieser Kriterien gesucht, ansonsten nur aktuelle
// und die StandardForm
- if (rDatabase.is() && rCursorSource.getLength())
+ if (rDatabase.is() && !rCursorSource.isEmpty())
{
validateCurForm();
@@ -529,7 +529,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo
try { xFormProps->setPropertyValue(FM_PROP_COMMANDTYPE, makeAny(sal_Int32(CommandType::TABLE))); }
catch(Exception&) { }
- if (rDBTitle.getLength())
+ if (!rDBTitle.isEmpty())
xFormProps->setPropertyValue(FM_PROP_DATASOURCE,makeAny(rDBTitle));
else
{
@@ -595,7 +595,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource(
xFormProps->getPropertyValue(FM_PROP_DATASOURCE) >>= sFormDataSourceName;
// if there's no DataSourceName set at the form, check whether we can deduce one from its
// ActiveConnection
- if (0 == sFormDataSourceName.getLength())
+ if (sFormDataSourceName.isEmpty())
{
Reference< XConnection > xFormConnection;
xFormProps->getPropertyValue( FM_PROP_ACTIVE_CONNECTION ) >>= xFormConnection;
@@ -628,11 +628,11 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource(
// jetzt noch ueberpruefen ob CursorSource und Type uebereinstimmen
::rtl::OUString aCursorSource = ::comphelper::getString(xFormProps->getPropertyValue(FM_PROP_COMMAND));
sal_Int32 nType = ::comphelper::getINT32(xFormProps->getPropertyValue(FM_PROP_COMMANDTYPE));
- if (!aCursorSource.getLength() || ((nType == nCommandType) && (aCursorSource == _rCursorSource))) // found the form
+ if (aCursorSource.isEmpty() || ((nType == nCommandType) && (aCursorSource == _rCursorSource))) // found the form
{
xResultForm = rForm;
// Ist noch keine Datenquelle gesetzt, wird dieses hier nachgeholt
- if (!aCursorSource.getLength())
+ if (aCursorSource.isEmpty())
{
xFormProps->setPropertyValue(FM_PROP_COMMAND, makeAny(_rCursorSource));
xFormProps->setPropertyValue(FM_PROP_COMMANDTYPE, makeAny((sal_Int32)nCommandType));
@@ -675,7 +675,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource(
sName = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_NAME ) );
Reference< ::com::sun::star::container::XNameAccess > xNameAcc(xControls, UNO_QUERY);
- if (!sName.getLength() || xNameAcc->hasByName(sName))
+ if (sName.isEmpty() || xNameAcc->hasByName(sName))
{
// setzen eines default Namens ueber die ClassId
sal_Int16 nClassId( FormComponentType::CONTROL );
@@ -685,7 +685,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource(
Reference< XNameAccess >( xControls, UNO_QUERY ), xSet );
// bei Radiobuttons, die einen Namen haben, diesen nicht ueberschreiben!
- if (!sName.getLength() || nClassId != ::com::sun::star::form::FormComponentType::RADIOBUTTON)
+ if (sName.isEmpty() || nClassId != ::com::sun::star::form::FormComponentType::RADIOBUTTON)
{
xSet->setPropertyValue(FM_PROP_NAME, makeAny(sDefaultName));
}
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 0b47c5c..d604cb2 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -476,7 +476,7 @@ namespace svxform
sScriptCode = sScriptCode.copy( nPrefixLen + 1 );
}
- if ( !sMacroLocation.getLength() )
+ if ( sMacroLocation.isEmpty() )
{
// legacy format: use the app-wide Basic, if it has a respective method, otherwise fall back to the doc's Basic
if ( SFX_APP()->GetBasicManager()->HasMacro( sScriptCode ) )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index d6c2e07..95d177a 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2173,7 +2173,7 @@ void FmXFormShell::startListening()
// a "has command value"? Finally, the command value only means that it was
// intended to be loaded, not that it actually *is* loaded
::rtl::OUString aSource = ::comphelper::getString(xActiveFormSet->getPropertyValue(FM_PROP_COMMAND));
- if (aSource.getLength())
+ if (!aSource.isEmpty())
{
m_bDatabaseBar = sal_True;
@@ -2467,7 +2467,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
while ( xSearchable.is() )
{
sControlSource = iter.getCurrentValue();
- if ( sControlSource.getLength() == 0 )
+ if ( sControlSource.isEmpty() )
{
// the current element has no ControlSource, so it is a GridControl (that
// is the only thing that still permits the SearchableControlIteratore)
@@ -2527,7 +2527,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
}
else
{
- if (sControlSource.getLength() && xValidFormFields->hasByName(sControlSource))
+ if (!sControlSource.isEmpty() && xValidFormFields->hasByName(sControlSource))
{
// now I need the Control to SdrObject
if (!xControl.is())
@@ -2987,7 +2987,7 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInt
// the name of the current form
::rtl::OUStringBuffer sCompleteCurrentName( sCurrentFormName );
- if ( _rCurrentLevelPrefix.getLength() )
+ if ( !_rCurrentLevelPrefix.isEmpty() )
{
sCompleteCurrentName.appendAscii( " (" );
sCompleteCurrentName.append ( _rCurrentLevelPrefix );
@@ -2996,7 +2996,7 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInt
// the prefix for the next level
aNextLevelPrefix = _rCurrentLevelPrefix;
- if ( _rCurrentLevelPrefix.getLength() )
+ if ( !_rCurrentLevelPrefix.isEmpty() )
aNextLevelPrefix.append( (sal_Unicode)'/' );
aNextLevelPrefix.append( sCurrentFormName );
@@ -3892,11 +3892,11 @@ namespace
::rtl::OUString sPropertyValue;
OSL_VERIFY( xSet->getPropertyValue( FM_PROP_DATASOURCE ) >>= sPropertyValue );
- if ( sPropertyValue.getLength() )
+ if ( !sPropertyValue.isEmpty() )
return sal_True;
OSL_VERIFY( xSet->getPropertyValue( FM_PROP_URL ) >>= sPropertyValue );
- if ( sPropertyValue.getLength() )
+ if ( !sPropertyValue.isEmpty() )
return sal_True;
}
catch(const Exception&)
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index bf179ed..154ebe5 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -759,7 +759,7 @@ namespace svx
sError += "\n UNO name: ";
::rtl::OUString sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotForItemSet );
- if ( sUnoSlotName.getLength() )
+ if ( !sUnoSlotName.isEmpty() )
sError += ::rtl::OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US );
else
sError += "unknown (no SfxSlot)";
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index c68cfef..6a1650c 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -239,7 +239,7 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce
if (xLabelSet.is() && ::comphelper::hasProperty(FM_PROP_LABEL, xLabelSet))
{
Any aLabel( xLabelSet->getPropertyValue(FM_PROP_LABEL) );
- if ((aLabel.getValueTypeClass() == TypeClass_STRING) && ::comphelper::getString(aLabel).getLength())
+ if ((aLabel.getValueTypeClass() == TypeClass_STRING) && !::comphelper::getString(aLabel).isEmpty())
return ::comphelper::getString(aLabel);
}
}
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 8047b8c..3c2d093 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -618,7 +618,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
try
{
Any aCurrentControlSource = xSet->getPropertyValue(FM_PROP_CONTROLSOURCE);
- aNewEntry.bHasEmptyControlSource = !aCurrentControlSource.hasValue() || (::comphelper::getString(aCurrentControlSource).getLength() == 0);
+ aNewEntry.bHasEmptyControlSource = !aCurrentControlSource.hasValue() || ::comphelper::getString(aCurrentControlSource).isEmpty();
}
catch(const Exception&)
{
@@ -632,7 +632,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
{ // is it the DataField property ?
if (evt.PropertyName.equals(FM_PROP_CONTROLSOURCE))
{
- aSetPos->second.bHasEmptyControlSource = !evt.NewValue.hasValue() || (::comphelper::getString(evt.NewValue).getLength() == 0);
+ aSetPos->second.bHasEmptyControlSource = !evt.NewValue.hasValue() || ::comphelper::getString(evt.NewValue).isEmpty();
}
}
@@ -741,7 +741,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
Reference< XPropertySet > xSet(evt.Source, UNO_QUERY);
PropertySetInfoCache* pCache = static_cast<PropertySetInfoCache*>(m_pPropertySetCache);
PropertySetInfo& rSetInfo = (*pCache)[xSet];
- rSetInfo.bHasEmptyControlSource = !evt.NewValue.hasValue() || (::comphelper::getString(evt.NewValue).getLength() == 0);
+ rSetInfo.bHasEmptyControlSource = !evt.NewValue.hasValue() || ::comphelper::getString(evt.NewValue).isEmpty();
}
}
}
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 9abf1cc..252cb5c 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -440,7 +440,7 @@ SdrObject* FmFormView::CreateFieldControl(const UniString& rFieldDesc) const
sal_uInt16 nObjectType = (sal_uInt16)rFieldDesc.GetToken(2,sal_Unicode(11)).ToInt32();
::rtl::OUString sFieldName = rFieldDesc.GetToken(3,sal_Unicode(11));
- if (!sFieldName.getLength() || !sObjectName.getLength() || !sDataSource.getLength())
+ if (sFieldName.isEmpty() || sObjectName.isEmpty() || sDataSource.isEmpty())
return NULL;
ODataAccessDescriptor aColumnDescriptor;
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index a137968..879b537 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -736,7 +736,7 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/)
ENSURE_OR_CONTINUE( xFormSet.is(), "FmXFormView::OnActivate: a form which does not have properties?" );
const ::rtl::OUString aSource = ::comphelper::getString( xFormSet->getPropertyValue( FM_PROP_COMMAND ) );
- if ( aSource.getLength() )
+ if ( !aSource.isEmpty() )
{
FmXFormShell* pShImpl = m_pView->GetFormShell()->GetImpl();
if ( pShImpl )
@@ -1145,9 +1145,9 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
xConnection.reset( xExternalConnection, SharedConnection::NoTakeOwnership );
}
- if ( !sCommand.getLength()
- || !sFieldName.getLength()
- || ( !sDataSource.getLength()
+ if ( sCommand.isEmpty()
+ || sFieldName.isEmpty()
+ || ( sDataSource.isEmpty()
&& !xConnection.is()
)
)
@@ -1159,7 +1159,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
SQLErrorEvent aError;
try
{
- if ( xConnection.is() && !xDataSource.is() && !sDataSource.getLength() )
+ if ( xConnection.is() && !xDataSource.is() && sDataSource.isEmpty() )
{
Reference< XChild > xChild( xConnection, UNO_QUERY );
if ( xChild.is() )
@@ -1575,7 +1575,7 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext&
::rtl::OUString sLabel;
if ( _rxField.is() && _rxField->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) )
_rxField->getPropertyValue(FM_PROP_LABEL) >>= sLabel;
- if ( !sLabel.getLength() )
+ if ( sLabel.isEmpty() )
sLabel = sFieldName;
xLabelModel->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel + _rFieldPostfix ) );
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index b7a7e75..62d09e7 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -223,7 +223,7 @@ namespace svxform
xForm->getPropertyValue( FM_PROP_DATASOURCE ) >>= sDataSourceName;
Reference< XPropertySet > xDsProperties;
- if ( sDataSourceName.getLength() )
+ if ( !sDataSourceName.isEmpty() )
xDsProperties = xDsProperties.query( OStaticDataAccessTools().getDataSource( sDataSourceName, _rContext.getLegacyServiceFactory() ) );
if ( xDsProperties.is() )
xDsProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Info" ) ) ) >>= aInfo;
@@ -476,7 +476,7 @@ namespace svxform
{
::rtl::OUString sExistingLabel;
OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_LABEL ) >>= sExistingLabel );
- if ( !sExistingLabel.getLength() )
+ if ( sExistingLabel.isEmpty() )
{
::rtl::OUString sInitialLabel;
OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_NAME ) >>= sInitialLabel );
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 7c854bf..c6471c9 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -993,7 +993,7 @@ void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 _Component, ::
xText->setText( _PredicateExpression );
FmFilterRow& rFilterRow = m_aFilterRows[ _Term ];
- if ( _PredicateExpression.getLength() )
+ if ( !_PredicateExpression.isEmpty() )
rFilterRow[ xText ] = _PredicateExpression;
else
rFilterRow.erase( xText );
@@ -1535,7 +1535,7 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeExce
FmFilterRow& rRow = m_aFilterRows[ m_nCurrentFilterPosition ];
// do we have a new filter
- if (aText.getLength())
+ if (!aText.isEmpty())
rRow[xText] = aText;
else
{
@@ -2240,7 +2240,7 @@ void FormController::setControlLock(const Reference< XControl > & xControl)
// b.) wenn das zugehoerige Feld gespeert ist
Reference< XBoundControl > xBound(xControl, UNO_QUERY);
if (xBound.is() && (( (bLocked && bLocked != xBound->getLock()) ||
- !bLocked))) // beim entlocken immer einzelne Felder ueberprüfen
+ !bLocked))) // beim entlocken immer einzelne Felder ueberpr�fen
{
// gibt es eine Datenquelle
Reference< XPropertySet > xSet(xControl->getModel(), UNO_QUERY);
@@ -2953,7 +2953,7 @@ void SAL_CALL FormController::elementRemoved(const ContainerEvent& evt) throw( R
if (xModel.is() && m_xModelAsIndex == xModel->getParent())
{
removeControl(xControl);
- // TabOrder nicht neu berechnen, da das intern schon funktionieren muß!
+ // TabOrder nicht neu berechnen, da das intern schon funktionieren mu�!
}
// are we in filtermode and a XModeSelector has inserted an element
else if (m_bFiltering && Reference< XModeSelector > (evt.Source, UNO_QUERY).is())
@@ -3792,7 +3792,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent
continue;
// TODO: in case of binary fields, this "getString" below is extremely expensive
- if ( rColInfo.xColumn->getString().getLength() || !rColInfo.xColumn->wasNull() )
+ if ( !rColInfo.xColumn->getString().isEmpty() || !rColInfo.xColumn->wasNull() )
continue;
String sMessage( SVX_RES( RID_ERR_FIELDREQUIRED ) );
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index cbe35b8..35e87b5 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -525,7 +525,7 @@ namespace svx
bool bInsertOnlyForm( false );
OSL_VERIFY( xCursorProperties->getPropertyValue( FM_PROP_INSERTONLY ) >>= bInsertOnlyForm );
- bCanDo = bEscapeProcessing && ( sActiveCommand.getLength() > 0 ) && !bInsertOnlyForm;
+ bCanDo = bEscapeProcessing && !sActiveCommand.isEmpty() && !bInsertOnlyForm;
}
catch( const Exception& )
{
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 820d240..b63eb0e 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -116,7 +116,7 @@ void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::X
::rtl::OUString sLabel;
if ( xColumn->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) )
xColumn->getPropertyValue(FM_PROP_LABEL) >>= sLabel;
- if ( sLabel.getLength() )
+ if ( !sLabel.isEmpty() )
_rListBox.InsertEntry( sLabel,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
else
_rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
@@ -375,7 +375,7 @@ void FmFieldWin::UpdateContent(const ::com::sun::star::uno::Reference< ::com::su
// get the fields of the object
- if ( m_aConnection.is() && m_aObjectName.getLength() )
+ if ( m_aConnection.is() && !m_aObjectName.isEmpty() )
{
Reference< XComponent > xKeepFieldsAlive;
Reference< XNameAccess > xColumns = getFieldsByCommandDescriptor( m_aConnection, m_nObjectType, m_aObjectName,xKeepFieldsAlive );
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index 0f6706e..98a66b5 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -170,7 +170,7 @@ namespace svxform
//------------------------------------------------------------------------------
Dialog* OAddConditionDialog::createDialog(Window* _pParent)
{
- if ( !m_xBinding.is() || !m_sFacetName.getLength() )
+ if ( !m_xBinding.is() || m_sFacetName.isEmpty() )
throw RuntimeException( ::rtl::OUString(), *this );
return new AddConditionDialog( _pParent, m_sFacetName, m_xBinding );
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 7a26e0d..64a94ab 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -79,7 +79,7 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const Strin
if( nId && bThemeNameFromResource )
aName = String( GAL_RESID( RID_GALLERYSTR_THEME_START + (sal_uInt16) nId ) );
- if( !aName.getLength() )
+ if( aName.isEmpty() )
aName = rName;
}
@@ -345,7 +345,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
{
}
- if( aTitle.getLength() )
+ if( !aTitle.isEmpty() )
{
try
{
@@ -371,7 +371,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
{
}
- if( aTitle.getLength() )
+ if( !aTitle.isEmpty() )
{
try
{
@@ -399,7 +399,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
{
}
- if( aTitle.getLength() )
+ if( !aTitle.isEmpty() )
{
try
{
@@ -537,7 +537,7 @@ GalleryThemeEntry* Gallery::ImplGetThemeEntry( const rtl::OUString& rThemeName )
{
GalleryThemeEntry* pFound = NULL;
- if( rThemeName.getLength() )
+ if( !rThemeName.isEmpty() )
{
for ( size_t i = 0, n = aThemeList.size(); i < n && !pFound; ++i )
if( rThemeName == aThemeList[ i ]->GetThemeName() )
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index aa4c1ee..b7262c1 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -284,7 +284,7 @@ sal_Bool FileExists( const INetURLObject& rURL )
OUString aTitle;
aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aTitle;
- bRet = ( aTitle.getLength() > 0 );
+ bRet = ( !aTitle.isEmpty() );
}
catch( const ucb::ContentCreationException& )
{
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index b810dbd..97a4cad 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -185,7 +185,7 @@ static MSO_SPT ImpGetCustomShapeType( const SdrObjCustomShape& rCustoShape )
MSO_SPT eRetValue = mso_sptNil;
rtl::OUString aEngine( ( (SdrCustomShapeEngineItem&)rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE ) ).GetValue() );
- if ( !aEngine.getLength() || aEngine.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.EnhancedCustomShapeEngine" ) ) )
+ if ( aEngine.isEmpty() || aEngine.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.EnhancedCustomShapeEngine" ) ) )
{
rtl::OUString sShapeType;
const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) );
@@ -850,7 +850,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType )
rtl::OUString sShapeType;
const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) );
SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
- if ( pType && pType->getLength() )
+ if ( pType && !pType->isEmpty() )
{
sal_Int32 nType = pType->toInt32();
if ( nType )
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 904d590..8e7c3fe 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1320,7 +1320,7 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel)
mpImpl->aPersistName = aTmp;
xObjRef.AssignToContainer( &pDestPers->getEmbeddedObjectContainer(), aTmp );
}
- DBG_ASSERT( aTmp.getLength(), "Copying embedded object failed!" );
+ DBG_ASSERT( !aTmp.isEmpty(), "Copying embedded object failed!" );
}
catch( ::com::sun::star::uno::Exception& )
{
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index b5c50a5..9d9745b 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1560,7 +1560,7 @@ struct SvxStyleToolBoxControl::Impl
xParaStyles->getByName( rtl::OUString::createFromAscii( aWriterStyles[nStyle] )) >>= xStyle;
::rtl::OUString sName;
xStyle->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName"))) >>= sName;
- if( sName.getLength() )
+ if( !sName.isEmpty() )
aDefaultStyles.push_back(sName);
}
catch( const uno::Exception& )
@@ -1593,7 +1593,7 @@ struct SvxStyleToolBoxControl::Impl
Reference< beans::XPropertySet > xStyle( xCellStyles->getByName( sStyleName), UNO_QUERY_THROW );
::rtl::OUString sName;
xStyle->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName"))) >>= sName;
- if( sName.getLength() )
+ if( !sName.isEmpty() )
aDefaultStyles.push_back(sName);
}
}
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index e6247b9..2546935 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -172,7 +172,7 @@ void SvxFontSizeBox_Impl::UpdateFont( const ::com::sun::star::awt::FontDescripto
::std::auto_ptr<FontList> aHold( new FontList( this ));
_pFontList = aHold.get();
- if ( rCurrentFont.Name.getLength() > 0 )
+ if ( !rCurrentFont.Name.isEmpty() )
{
FontInfo _aFontInfo;
_aFontInfo.SetName( rCurrentFont.Name );
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index a7b3ff5..16d4d55 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -71,7 +71,7 @@ void impl_executeSearch( const css::uno::Reference< css::lang::XMultiServiceFact
if ( xDispatchProvider.is() )
{
css::uno::Reference< css::frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 );
- if ( xDispatch.is() && aURL.Complete.getLength() > 0 )
+ if ( xDispatch.is() && !aURL.Complete.isEmpty() )
xDispatch->dispatch( aURL, lArgs );
}
}
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index 9ba0df4..8761e8a 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -113,7 +113,7 @@ void SAL_CALL SvxTbxCtlAlign::functionSelected( const ::rtl::OUString& aCommand
SolarMutexGuard aGuard;
if ( !m_bDisposed )
{
- if ( aCommand.getLength() > 0 )
+ if ( !aCommand.isEmpty() )
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
Image aImage = GetImage( xFrame, aCommand, hasBigImages() );
@@ -128,7 +128,7 @@ void SAL_CALL SvxTbxCtlAlign::updateImage() throw (::com::sun::star::uno::Runtim
// We should update the button image of our parent (toolbar). Use the stored
// command to set the correct current image.
SolarMutexGuard aGuard;
- if ( m_aCommand.getLength() > 0 )
+ if ( !m_aCommand.isEmpty() )
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
Image aImage = GetImage( xFrame, m_aCommand, hasBigImages() );
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 9bac46f..bd6b5ba 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -160,7 +160,7 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet )
rtl::OUString aType;
if ( *pAny >>= aType )
{
- if ( aFontWorkShapeType.getLength() )
+ if ( !aFontWorkShapeType.isEmpty() )
{
if ( !aFontWorkShapeType.equals( aType ) ) // different FontWorkShapeTypes selected ?
{
@@ -477,7 +477,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
const SfxStringItem& rItm = (const SfxStringItem&)pArgs->Get( rReq.GetSlot() );
aCustomShape = rItm.GetValue();
}
- if ( aCustomShape.getLength() )
+ if ( !aCustomShape.isEmpty() )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
sal_uInt32 nCount = rMarkList.GetMarkCount(), i;
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 5f22203..6a66176 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -993,7 +993,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
ExportSettings aSettings( mpDoc );
ParseSettings( aDescriptor, aSettings );
- const sal_uInt16 nFilter = aSettings.maMediaType.getLength()
+ const sal_uInt16 nFilter = !aSettings.maMediaType.isEmpty()
? rFilter.GetExportFormatNumberForMediaType( aSettings.maMediaType )
: rFilter.GetExportFormatNumberForShortName( aSettings.maFilterName );
sal_Bool bVectorType = !rFilter.IsExportPixelFormat( nFilter );
@@ -1229,7 +1229,7 @@ Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames( ) thr
for( nFilter = 0; nFilter < nCount; nFilter++ )
{
OUString aMimeType( rFilter.GetExportFormatMediaType( nFilter ) );
- if( aMimeType.getLength() )
+ if( !aMimeType.isEmpty() )
{
*pStr++ = aMimeType;
nFound++;
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 1e7f1c3..bcbca44 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -405,7 +405,7 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName )
{
SolarMutexGuard aGuard;
- if( aName.getLength() == 0 )
+ if( aName.isEmpty() )
return sal_False;
String aSearchName;
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index c1cd7b4..34fd6c5 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -722,7 +722,7 @@ namespace
}
++i;
}
- return rInternalName.getLength() > 0;
+ return !rInternalName.isEmpty();
}
struct EnumConversionMap
@@ -1677,7 +1677,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const
case OWN_ATTR_GRAFSTREAMURL:
{
const OUString aStreamURL( ( (SdrGrafObj*) mpObj.get() )->GetGrafStreamURL() );
- if( aStreamURL.getLength() )
+ if( !aStreamURL.isEmpty() )
rValue <<= aStreamURL;
break;
}
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index ad517c2..ea2d969 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -422,7 +422,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
if( pOle )
{
aPersistName = pOle->GetPersistName();
- if( aPersistName.getLength() )
+ if( !aPersistName.isEmpty() )
{
::comphelper::IEmbeddedHelper *pPersist = mpObj->GetModel()->GetPersist();
if( (NULL == pPersist) || !pPersist->getEmbeddedObjectContainer().HasEmbeddedObject( pOle->GetPersistName() ) )
@@ -612,7 +612,7 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(rtl::OUString& rHexCLSID)
}
}
- if (!rHexCLSID.getLength())
+ if (rHexCLSID.isEmpty())
{
uno::Reference < embed::XEmbeddedObject > xObj( pOle2Obj->GetObjRef() );
if ( xObj.is() )
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index f2314b3..2b57510 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -492,7 +492,7 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ )
mpObj->SetUserCall( pUser );
// if this shape was already named, use this name
- if( maShapeName.getLength() )
+ if( !maShapeName.isEmpty() )
{
mpObj->SetName( maShapeName );
maShapeName = OUString();
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index f20158c..09282e1 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -275,7 +275,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
if( pOasisFormat )
*pOasisFormat = sal_True; // the default value
- if( !rURLStr.getLength() )
+ if( rURLStr.isEmpty() )
return sal_False;
// get rid of arguments
@@ -375,7 +375,7 @@ uno::Reference < embed::XStorage > SvXMLEmbeddedObjectHelper::ImplGetContainerSt
( rStorageName != maCurContainerStorageName ) )
{
if( mxContainerStorage.is() &&
- maCurContainerStorageName.getLength() > 0 &&
+ !maCurContainerStorageName.isEmpty() &&
EMBEDDEDOBJECTHELPER_MODE_WRITE == meCreateMode )
{
uno::Reference < embed::XTransactedObject > xTrans( mxContainerStorage, uno::UNO_QUERY );
@@ -383,7 +383,7 @@ uno::Reference < embed::XStorage > SvXMLEmbeddedObjectHelper::ImplGetContainerSt
xTrans->commit();
}
- if( rStorageName.getLength() > 0 && mxRootStorage.is() )
+ if( !rStorageName.isEmpty() && mxRootStorage.is() )
{
sal_Int32 nMode = EMBEDDEDOBJECTHELPER_MODE_WRITE == meCreateMode
? ::embed::ElementModes::READWRITE
@@ -533,7 +533,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject(
{
// Objects are written using ::comphelper::IEmbeddedHelper::SaveAs
sRetURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("./") );
- if( aContainerStorageName.getLength() )
+ if( !aContainerStorageName.isEmpty() )
{
sRetURL += aContainerStorageName;
sRetURL += ::rtl::OUString( '/' );
@@ -789,7 +789,7 @@ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const ::rtl::OUString& r
return sal_False;
comphelper::EmbeddedObjectContainer& rContainer = mpDocPersist->getEmbeddedObjectContainer();
- return aObjectStorageName.getLength() > 0 &&
+ return !aObjectStorageName.isEmpty() &&
rContainer.HasEmbeddedObject( aObjectStorageName );
}
}
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index e355546..d73c19e 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -591,13 +591,13 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt
uno::Reference < beans::XPropertySet > xProps( aStream.xStream, uno::UNO_QUERY );
// set stream properties (MediaType/Compression)
- if( aMimeType.getLength() )
+ if( !aMimeType.isEmpty() )
{
aAny <<= aMimeType;
xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), aAny );
}
- const sal_Bool bCompressed = ( ( 0 == aMimeType.getLength() ) || ( aMimeType == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/tiff")) ) );
+ const sal_Bool bCompressed = aMimeType.isEmpty() || ( aMimeType == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/tiff")) ) ;
aAny <<= bCompressed;
xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Compressed" ) ), aAny );
@@ -765,7 +765,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s
rtl::OUString aURLEntry;
const String sPictures( RTL_CONSTASCII_USTRINGPARAM( "Pictures/" ) );
- if ( rRequestedFileName.getLength() )
+ if ( !rRequestedFileName.isEmpty() )
{
aURLEntry = sPictures;
aURLEntry += rRequestedFileName;
@@ -874,7 +874,7 @@ void SvXMLGraphicHelper::Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper )
nUser++;
aUserData = rURL.copy( nUser, rURL.getLength() - nUser );
}
- if ( aUserData.getLength() )
+ if ( !aUserData.isEmpty() )
{
sal_Int32 nIndex2 = 0;
do
@@ -963,7 +963,7 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream()
const ::rtl::OUString aId(::rtl::OStringToOUString(
rGrfObj.GetUniqueID(), RTL_TEXTENCODING_ASCII_US));
- if( aId.getLength() )
+ if( !aId.isEmpty() )
{
aRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_GRAPHICOBJECT_URL_BASE ));
aRet += aId;
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 45ff09c..98b5d60 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -150,7 +150,7 @@ SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( sal_uInt16 nPr
IsXMLToken( aLocalName, XML_HREF ) )
{
const OUString rValue = xAttrList->getValueByIndex( i );
- if( rValue.getLength() && '#' == rValue[0] )
+ if( !rValue.isEmpty() && '#' == rValue[0] )
pAttrList->SetValueByIndex( i, rValue.copy( 1 ) );
}
else if( XML_NAMESPACE_DRAW == nPrefix_ &&
@@ -203,7 +203,7 @@ SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( sal_uInt16 nPr
break;
}
- if( aName.getLength() && aAny.hasValue() )
+ if( !aName.isEmpty() && aAny.hasValue() )
{
if( mxTable->hasByName( aName ) )
{
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 261e5eb..1eedd7a 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -243,7 +243,7 @@ bool XPropertyList::Load()
aURL.Append( aName );
- if( !aURL.getExtension().getLength() )
+ if( aURL.getExtension().isEmpty() )
aURL.setExtension( GetDefaultExt() );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ),
@@ -275,7 +275,7 @@ bool XPropertyList::Save()
aURL.Append( aName );
- if( !aURL.getExtension().getLength() )
+ if( aURL.getExtension().isEmpty() )
aURL.setExtension( GetDefaultExt() );
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ),
More information about the Libreoffice-commits
mailing list