[Libreoffice-commits] .: sw/source
Olivier Hallot
ohallot at kemper.freedesktop.org
Tue Jan 17 13:08:27 PST 2012
sw/source/core/access/accnotextframe.cxx | 8 ++---
sw/source/core/access/accpara.cxx | 2 -
sw/source/core/access/acctextframe.cxx | 8 ++---
sw/source/core/crsr/crossrefbookmark.cxx | 2 -
sw/source/core/crsr/findattr.cxx | 6 +--
sw/source/core/crsr/findtxt.cxx | 2 -
sw/source/core/doc/doc.cxx | 4 +-
sw/source/core/doc/docbm.cxx | 2 -
sw/source/core/doc/docfld.cxx | 8 ++---
sw/source/core/edit/edlingu.cxx | 4 +-
sw/source/core/edit/edtox.cxx | 2 -
sw/source/core/fields/dbfld.cxx | 6 +--
sw/source/core/fields/docufld.cxx | 2 -
sw/source/core/layout/dbg_lay.cxx | 6 +--
sw/source/core/text/EnhancedPDFExportHelper.cxx | 2 -
sw/source/core/text/wrong.cxx | 2 -
sw/source/core/txtnode/txtedt.cxx | 4 +-
sw/source/core/undo/unins.cxx | 2 -
sw/source/core/unocore/XMLRangeHelper.cxx | 4 +-
sw/source/core/unocore/unobkm.cxx | 2 -
sw/source/core/unocore/unochart.cxx | 12 +++----
sw/source/core/unocore/unocoll.cxx | 2 -
sw/source/core/unocore/unocrsrhelper.cxx | 18 +++++------
sw/source/core/unocore/unoftn.cxx | 2 -
sw/source/core/unocore/unoidx.cxx | 18 +++++------
sw/source/core/unocore/unoobj2.cxx | 4 +-
sw/source/core/unocore/unoparagraph.cxx | 2 -
sw/source/core/unocore/unoredline.cxx | 2 -
sw/source/core/unocore/unosect.cxx | 14 ++++----
sw/source/core/unocore/unosett.cxx | 2 -
sw/source/core/unocore/unostyle.cxx | 8 ++---
sw/source/core/unocore/unotbl.cxx | 2 -
sw/source/core/unocore/unotext.cxx | 2 -
sw/source/filter/html/css1atr.cxx | 10 +++---
sw/source/filter/html/htmlatr.cxx | 12 +++----
sw/source/filter/html/htmldraw.cxx | 2 -
sw/source/filter/html/htmlfly.cxx | 10 +++---
sw/source/filter/html/htmlforw.cxx | 36 +++++++++++------------
sw/source/filter/html/htmlplug.cxx | 10 +++---
sw/source/filter/html/swhtml.cxx | 10 +++---
sw/source/filter/html/wrthtml.cxx | 2 -
sw/source/filter/ww8/docxattributeoutput.cxx | 26 ++++++++--------
sw/source/filter/ww8/docxexport.cxx | 4 +-
sw/source/filter/ww8/rtfexport.cxx | 10 +++---
sw/source/filter/ww8/wrtw8nds.cxx | 2 -
sw/source/filter/ww8/ww8par.cxx | 8 ++---
sw/source/filter/ww8/ww8par5.cxx | 4 +-
sw/source/filter/ww8/ww8toolbar.cxx | 2 -
sw/source/filter/xml/swxml.cxx | 2 -
sw/source/filter/xml/wrtxml.cxx | 4 +-
sw/source/filter/xml/xmlbrsh.cxx | 4 +-
sw/source/filter/xml/xmlexpit.cxx | 2 -
sw/source/filter/xml/xmlfmt.cxx | 8 ++---
sw/source/filter/xml/xmlfmte.cxx | 6 +--
sw/source/filter/xml/xmlimpit.cxx | 2 -
sw/source/filter/xml/xmlitemi.cxx | 2 -
sw/source/filter/xml/xmlithlp.cxx | 2 -
sw/source/filter/xml/xmltble.cxx | 4 +-
sw/source/filter/xml/xmltbli.cxx | 26 ++++++++--------
sw/source/filter/xml/xmltexte.cxx | 14 ++++----
sw/source/filter/xml/xmltexti.cxx | 18 +++++------
sw/source/ui/app/docst.cxx | 2 -
sw/source/ui/chrdlg/chardlg.cxx | 2 -
sw/source/ui/config/mailconfigpage.cxx | 2 -
sw/source/ui/config/modcfg.cxx | 2 -
sw/source/ui/config/optcomp.cxx | 2 -
sw/source/ui/dbui/addresslistdialog.cxx | 10 +++---
sw/source/ui/dbui/customizeaddresslistdialog.cxx | 2 -
sw/source/ui/dbui/dbinsdlg.cxx | 4 +-
sw/source/ui/dbui/dbmgr.cxx | 8 ++---
sw/source/ui/dbui/mailmergechildwindow.cxx | 8 ++---
sw/source/ui/dbui/mailmergehelper.cxx | 10 +++---
sw/source/ui/dbui/mmaddressblockpage.cxx | 4 +-
sw/source/ui/dbui/mmconfigitem.cxx | 14 ++++----
sw/source/ui/dbui/mmdocselectpage.cxx | 8 ++---
sw/source/ui/dbui/mmgreetingspage.cxx | 4 +-
sw/source/ui/dbui/mmlayoutpage.cxx | 12 +++----
sw/source/ui/dbui/mmoutputpage.cxx | 6 +--
sw/source/ui/dbui/selectdbtabledialog.cxx | 2 -
sw/source/ui/dialog/uiregionsw.cxx | 2 -
sw/source/ui/docvw/romenu.cxx | 2 -
sw/source/ui/envelp/label1.cxx | 2 -
sw/source/ui/envelp/labelcfg.cxx | 2 -
sw/source/ui/envelp/mailmrge.cxx | 2 -
sw/source/ui/fldui/flddb.cxx | 4 +-
sw/source/ui/fldui/fldmgr.cxx | 6 +--
sw/source/ui/lingu/hhcwrp.cxx | 2 -
sw/source/ui/lingu/olmenu.cxx | 14 ++++----
sw/source/ui/shells/drformsh.cxx | 8 ++---
sw/source/ui/shells/grfshex.cxx | 2 -
sw/source/ui/uiview/srcview.cxx | 2 -
sw/source/ui/uiview/view2.cxx | 2 -
sw/source/ui/uiview/viewling.cxx | 4 +-
sw/source/ui/uiview/viewprt.cxx | 2 -
sw/source/ui/uno/SwXDocumentSettings.cxx | 2 -
sw/source/ui/uno/swdetect.cxx | 2 -
sw/source/ui/uno/unoatxt.cxx | 4 +-
sw/source/ui/uno/unodispatch.cxx | 4 +-
sw/source/ui/uno/unomailmerge.cxx | 22 +++++++-------
sw/source/ui/utlui/unotools.cxx | 2 -
sw/source/ui/vba/vbafield.cxx | 6 +--
sw/source/ui/vba/vbafind.cxx | 2 -
sw/source/ui/vba/vbarange.cxx | 8 ++---
sw/source/ui/vba/vbaselection.cxx | 8 ++---
sw/source/ui/vba/vbastyle.cxx | 6 +--
sw/source/ui/vba/vbastyles.cxx | 2 -
sw/source/ui/vba/vbasystem.cxx | 6 +--
sw/source/ui/vba/vbatemplate.cxx | 4 +-
sw/source/ui/wrtsh/wrtsh2.cxx | 4 +-
sw/source/ui/wrtsh/wrtsh3.cxx | 4 +-
sw/source/ui/wrtsh/wrtundo.cxx | 4 +-
111 files changed, 328 insertions(+), 328 deletions(-)
New commits:
commit 964617156260cd157d4f39be01a5d3dec1c29a27
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Tue Jan 17 17:47:34 2012 -0200
Fix for fdo43460 Part XL getLength() to isEmpty()
Part XL
Modules
sw
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 3c65915..f9a5ea6 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -76,7 +76,7 @@ SwAccessibleNoTextFrame::SwAccessibleNoTextFrame(
msTitle = pNd->GetTitle();
msDesc = pNd->GetDescription();
- if ( msDesc.getLength() == 0 &&
+ if ( msDesc.isEmpty() &&
msTitle != GetName() )
{
msDesc = msTitle;
@@ -95,7 +95,7 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
// suppress handling of RES_NAME_CHANGED in case that attribute Title is
// used as the accessible name.
if ( nWhich != RES_NAME_CHANGED ||
- msTitle.getLength() == 0 )
+ msTitle.isEmpty() )
{
SwAccessibleFrameBase::Modify( pOld, pNew );
}
@@ -136,7 +136,7 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
const String& rDesc = pNd->GetDescription();
msDesc = rDesc;
- if ( msDesc.getLength() == 0 &&
+ if ( msDesc.isEmpty() &&
msTitle != GetName() )
{
msDesc = msTitle;
@@ -174,7 +174,7 @@ OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleName (void)
CHECK_FOR_DEFUNC( XAccessibleContext )
- if ( msTitle.getLength() != 0 )
+ if ( !msTitle.isEmpty() )
{
return msTitle;
}
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 30c3165..59249ad 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -817,7 +817,7 @@ sal_Bool SwAccessibleParagraph::GetTextBoundary(
CHECK_FOR_DEFUNC( XAccessibleContext );
osl::MutexGuard aGuard2( aMutex );
- if( !sDesc.getLength() )
+ if( sDesc.isEmpty() )
sDesc = GetDescription();
return sDesc;
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index 72861ed..0f8175a 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -69,7 +69,7 @@ SwAccessibleTextFrame::SwAccessibleTextFrame(
msTitle = pFlyFrmFmt->GetObjTitle();
msDesc = pFlyFrmFmt->GetObjDescription();
- if ( msDesc.getLength() == 0 &&
+ if ( msDesc.isEmpty() &&
msTitle != GetName() )
{
msDesc = msTitle;
@@ -87,7 +87,7 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
// #i73249# - suppress handling of RES_NAME_CHANGED
// in case that attribute Title is used as the accessible name.
if ( nWhich != RES_NAME_CHANGED ||
- msTitle.getLength() == 0 )
+ msTitle.isEmpty() )
{
SwAccessibleFrameBase::Modify( pOld, pNew );
}
@@ -131,7 +131,7 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
dynamic_cast<const SwFlyFrmFmt*>( pFlyFrm->GetFmt() );
const String& rDesc = pFlyFrmFmt->GetObjDescription();
msDesc = rDesc;
- if ( msDesc.getLength() == 0 &&
+ if ( msDesc.isEmpty() &&
msTitle != GetName() )
{
msDesc = msTitle;
@@ -159,7 +159,7 @@ OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName (void)
CHECK_FOR_DEFUNC( XAccessibleContext )
- if ( msTitle.getLength() != 0 )
+ if ( !msTitle.isEmpty() )
{
return msTitle;
}
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 48ab3b8..9f77b6c 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -47,7 +47,7 @@ namespace sw { namespace mark
"<CrossRefBookmark::CrossRefBookmark(..)>"
"- creation of cross-reference bookmark with an expanded PaM that does not expand over exactly one whole paragraph.");
SetMarkPos(*rPaM.Start());
- if(!rName.getLength())
+ if(rName.isEmpty())
m_aName = MarkBase::GenerateNewName(rPrefix);
}
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 4ba652c..e88eda0 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -1102,7 +1102,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
{
// String ersetzen ?? (nur wenn Text angegeben oder nicht attributiert
// gesucht wird)
- sal_Bool bReplaceTxt = pSearchOpt && ( pSearchOpt->replaceString.getLength() ||
+ sal_Bool bReplaceTxt = pSearchOpt && ( !pSearchOpt->replaceString.isEmpty() ||
!pSet->Count() );
sal_Bool bReplaceAttr = pReplSet && pReplSet->Count();
sal_Bool bMoveFirst = !bReplaceAttr;
@@ -1245,7 +1245,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
int SwFindParaAttr::IsReplaceMode() const
{
- return ( pSearchOpt && pSearchOpt->replaceString.getLength() ) ||
+ return ( pSearchOpt && !pSearchOpt->replaceString.isEmpty() ) ||
( pReplSet && pReplSet->Count() );
}
@@ -1262,7 +1262,7 @@ sal_uLong SwCursor::Find( const SfxItemSet& rSet, sal_Bool bNoCollections,
Link aLnk( pDoc->GetOle2Link() );
pDoc->SetOle2Link( Link() );
- sal_Bool bReplace = ( pSearchOpt && ( pSearchOpt->replaceString.getLength() ||
+ sal_Bool bReplace = ( pSearchOpt && ( !pSearchOpt->replaceString.isEmpty() ||
!rSet.Count() ) ) ||
(pReplSet && pReplSet->Count());
bool const bStartUndo = pDoc->GetIDocumentUndoRedo().DoesUndo() && bReplace;
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 85ef477..121257c 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -225,7 +225,7 @@ sal_uInt8 SwPaM::Find( const SearchOptions& rSearchOpt, sal_Bool bSearchInNotes
SwMoveFn fnMove, const SwPaM * pRegion,
sal_Bool bInReadOnly )
{
- if( !rSearchOpt.searchString.getLength() )
+ if( rSearchOpt.searchString.isEmpty() )
return sal_False;
SwPaM* pPam = MakeRegion( fnMove, pRegion );
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 8c61466..41fba16 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1380,7 +1380,7 @@ void SwDoc::CalculatePagesForPrinting(
// please note
}
- if (aPageRange.getLength() == 0) // empty string -> print all
+ if (aPageRange.isEmpty()) // empty string -> print all
{
// set page range to print to 'all pages'
aPageRange = OUString::valueOf( (sal_Int32)1 );
@@ -1552,7 +1552,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
const sal_Int32 nContent = rOptions.getIntValue( "PrintContent", 0 );
if (nContent == 1)
aPageRange = rOptions.getStringValue( "PageRange", rtl::OUString() );
- if (aPageRange.getLength() == 0) // empty string -> print all
+ if (aPageRange.isEmpty()) // empty string -> print all
{
// set page range to print to 'all pages'
aPageRange = OUString::valueOf( (sal_Int32)1 );
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index a3ce131..fdbddb5 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -833,7 +833,7 @@ namespace sw { namespace mark
::rtl::OUString MarkManager::getUniqueMarkName(const ::rtl::OUString& rName) const
{
- OSL_ENSURE(rName.getLength(),
+ OSL_ENSURE(!rName.isEmpty(),
"<MarkManager::getUniqueMarkName(..)>"
" - a name should be proposed");
if(!hasMark(rName)) return rName;
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 198e794..cb7aa37 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1524,7 +1524,7 @@ void SwDoc::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc )
else
((SwDBNumSetField&)rDBFld).SetCondValid( bPar1 );
- if( rDBFld.GetRealDBData().sDataSource.getLength() )
+ if( !rDBFld.GetRealDBData().sDataSource.isEmpty() )
{
// Edit a certain database
if( RES_DBNEXTSETFLD == nFldType )
@@ -1606,10 +1606,10 @@ SwDBData SwDoc::GetDBData()
const SwDBData& SwDoc::GetDBDesc()
{
- if(!aDBData.sDataSource.getLength())
+ if(aDBData.sDataSource.isEmpty())
{
const sal_uInt16 nSize = pFldTypes->Count();
- for(sal_uInt16 i = 0; i < nSize && !aDBData.sDataSource.getLength(); ++i)
+ for(sal_uInt16 i = 0; i < nSize && aDBData.sDataSource.isEmpty(); ++i)
{
SwFieldType& rFldType = *((*pFldTypes)[i]);
sal_uInt16 nWhich = rFldType.Which();
@@ -1642,7 +1642,7 @@ const SwDBData& SwDoc::GetDBDesc()
}
}
}
- if(!aDBData.sDataSource.getLength())
+ if(aDBData.sDataSource.isEmpty())
aDBData = GetNewDBMgr()->GetAddressDBName();
return aDBData;
}
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index acf4748..b502d12 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -440,7 +440,7 @@ uno::Any SwConvIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
xEmpty, pPageCnt, pPageSt, false, &rArgs ) >>= aConvText;
bGoOn = GetCrsrCnt() > 1;
- if( aConvText.getLength() )
+ if( !aConvText.isEmpty() )
{
bGoOn = sal_False;
SwPosition* pNewPoint = new SwPosition( *pCrsr->GetPoint() );
@@ -830,7 +830,7 @@ uno::Any SwEditShell::SpellContinue(
}
--nStartAction;
- if( aRet.getLength() || xRet.is() )
+ if( !aRet.isEmpty() || xRet.is() )
{
// dann die awt::Selection sichtbar machen
StartAction();
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 3a178ed..c47a605 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -387,7 +387,7 @@ void SwEditShell::ApplyAutoMark()
// ; -> delimiter between entries ->
// Format: TextToSearchFor;AlternativeString;PrimaryKey;SecondaryKey;CaseSensitive;WordOnly
// Leading and trailing blanks are ignored
- if( aRdLine.getLength() && '#' != aRdLine[0] )
+ if( !aRdLine.isEmpty() && '#' != aRdLine[0] )
{
String sLine( aRdLine, eChrSet );
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 2633750..66ebfc9 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -77,7 +77,7 @@ SwDBFieldType::SwDBFieldType(SwDoc* pDocPtr, const String& rNam, const SwDBData&
sColumn(rNam),
nRefCnt(0)
{
- if(aDBData.sDataSource.getLength() || aDBData.sCommand.getLength())
+ if(!aDBData.sDataSource.isEmpty() || !aDBData.sCommand.isEmpty())
{
sName = aDBData.sDataSource;
sName += DB_DELIM;
@@ -497,7 +497,7 @@ SwDBNameInfField::SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, s
SwDBData SwDBNameInfField::GetDBData(SwDoc* pDoc)
{
SwDBData aRet;
- if(aDBData.sDataSource.getLength())
+ if(!aDBData.sDataSource.isEmpty())
aRet = aDBData;
else
aRet = pDoc->GetDBData();
@@ -514,7 +514,7 @@ void SwDBNameInfField::SetDBData(const SwDBData & rDBData)
String SwDBNameInfField::GetFieldName() const
{
String sStr( SwField::GetFieldName() );
- if (aDBData.sDataSource.getLength())
+ if (!aDBData.sDataSource.isEmpty())
{
sStr += ':';
sStr += String(aDBData.sDataSource);
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 8b0ecf0..2f588ae 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -625,7 +625,7 @@ String SwTemplNameFieldType::Expand(sal_uLong nFmt) const
if( FF_UI_NAME == nFmt )
aRet = xDocProps->getTemplateName();
- else if( xDocProps->getTemplateURL().getLength() )
+ else if( !xDocProps->getTemplateURL().isEmpty() )
{
if( FF_UI_RANGE == nFmt )
{
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 87f6d83..fc166cb 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -380,7 +380,7 @@ void SwImplProtocol::CheckLine( rtl::OString& rLine )
bNo = sal_True; // Diese(n) Funktion/Typ entfernen
aTok = aTok.copy(1);
}
- if( aTok.getLength() )
+ if( !aTok.isEmpty() )
{
sal_uLong nVal;
sscanf( aTok.getStr(), "%li", &nVal );
@@ -442,14 +442,14 @@ void SwImplProtocol::FileInit()
if( '\n' == c || '\r' == c ) // Zeilenende
{
aLine = aLine.trim();
- if( aLine.getLength() )
+ if( !aLine.isEmpty() )
CheckLine( aLine ); // Zeile auswerten
aLine = rtl::OString();
}
else
aLine = rtl::OString(c);
}
- if( aLine.getLength() )
+ if( !aLine.isEmpty() )
CheckLine( aLine ); // letzte Zeile auswerten
}
aStream.Close();
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index c26d0c8..a66d224 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1519,7 +1519,7 @@ SwEnhancedPDFExportHelper::SwEnhancedPDFExportHelper( SwEditShell& rSh,
mbSkipEmptyPages( bSkipEmptyPages ),
mbEditEngineOnly( bEditEngineOnly )
{
- if ( rPageRange.getLength() )
+ if ( !rPageRange.isEmpty() )
mpRangeEnum = new StringRangeEnumerator( rPageRange, 0, mrSh.GetPageCount()-1 );
if ( mbSkipEmptyPages )
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 6764f05..2441f94 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -188,7 +188,7 @@ MSHORT SwWrongList::GetWrongPos( xub_StrLen nValue ) const
{
// For smart tag lists, we may not use a binary search. We return the
// position of the first smart tag which coveres nValue
- if ( 0 != maList[0].maType.getLength() || maList[0].mpSubList )
+ if ( !maList[0].maType.isEmpty() || maList[0].mpSubList )
{
std::vector<SwWrongArea>::const_iterator aIter = maList.begin();
while ( aIter != maList.end() )
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index e8335ee..71749fd 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1087,7 +1087,7 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs )
m_Text = aOldTxt;
}
- return rArgs.aConvText.getLength() ? 1 : 0;
+ return rArgs.aConvText.isEmpty() ? 0 : 1;
}
// Die Aehnlichkeiten zu SwTxtNode::Spell sind beabsichtigt ...
@@ -1828,7 +1828,7 @@ void SwTxtNode::CountWords( SwDocStat& rStat,
const sal_uInt32 nExpandBegin = ModelToViewHelper::ConvertToViewPosition( pConversionMap, nStt );
const sal_uInt32 nExpandEnd = ModelToViewHelper::ConvertToViewPosition( pConversionMap, nEnd );
- if ( aExpandText.getLength() <= 0 )
+ if ( aExpandText.isEmpty() )
{
OSL_ENSURE(aExpandText.getLength() >= 0, "Node text expansion error: length < 0." );
return;
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 00c7b58..f08cfa0 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -699,7 +699,7 @@ void SwUndoReplace::Impl::UndoImpl(::sw::UndoRedoContext & rContext)
pNd->RestoreMetadata(m_pMetadataUndoStart);
}
- if (m_sOld.getLength())
+ if (!m_sOld.isEmpty())
{
pNd->InsertText( m_sOld, aIdx );
}
diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx
index e77b416..8b49a5e 100644
--- a/sw/source/core/unocore/XMLRangeHelper.cxx
+++ b/sw/source/core/unocore/XMLRangeHelper.cxx
@@ -287,7 +287,7 @@ bool lcl_getCellRangeAddressFromXMLString(
sTableSecondName );
}
if( bResult &&
- sTableSecondName.getLength() &&
+ !sTableSecondName.isEmpty() &&
! sTableSecondName.equals( rOutRange.aTableName ))
bResult = false;
}
@@ -364,7 +364,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange )
::rtl::OUStringBuffer aBuffer;
- if( (rRange.aTableName).getLength())
+ if( !rRange.aTableName.isEmpty())
{
bool bNeedsEscaping = ( rRange.aTableName.indexOf( aQuote ) > -1 );
bool bNeedsQuoting = bNeedsEscaping || ( rRange.aTableName.indexOf( aSpace ) > -1 );
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index 551b083..9b33568 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -244,7 +244,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
SwUnoInternalPaM aPam(*m_pImpl->m_pDoc);
::sw::XTextRangeToSwPaM(aPam, xTextRange);
UnoActionContext aCont(m_pImpl->m_pDoc);
- if (!m_pImpl->m_sMarkName.getLength())
+ if (m_pImpl->m_sMarkName.isEmpty())
{
m_pImpl->m_sMarkName = OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmark"));
}
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 048faf8..6238767 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -638,7 +638,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
// get sub-ranges and check that they all are from the very same table
sal_Bool bOk = GetSubranges( aRangeRepresentation, aSubRanges, sal_True );
- if (!bOk && pDoc && aChartOleObjectName.getLength() )
+ if (!bOk && pDoc && !aChartOleObjectName.isEmpty() )
{
//try to correct the range here
//work around wrong writer ranges ( see Issue 58464 )
@@ -667,7 +667,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
//thus the first row is missing and an invalid row at the end is added.
//Therefore we need to shift the range one row up
SwRangeDescriptor aDesc;
- if (aRangeRepresentation.getLength() == 0)
+ if (aRangeRepresentation.isEmpty())
return xRes; // we cant handle this thus returning an empty references
aRangeRepresentation = aRangeRepresentation.copy( 1 ); // get rid of '.' to have only the cell range left
FillRangeDescriptor( aDesc, aRangeRepresentation );
@@ -1336,7 +1336,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
OUString aSortedCellRanges;
for (sal_Int32 i = 0; i < nSortedRanges; ++i)
{
- if (aSortedCellRanges.getLength())
+ if (!aSortedCellRanges.isEmpty())
aSortedCellRanges += OUString::valueOf( (sal_Unicode) ';');
aSortedCellRanges += pSortedRanges[i];
}
@@ -1376,7 +1376,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
if (nLabelSeqLen > 0) // == 0 means no label sequence in use
bFirstCellIsLabel = sal_True;
//
- OSL_ENSURE( aSortedCellRanges.getLength(), "CellRangeRepresentation missing" );
+ OSL_ENSURE( !aSortedCellRanges.isEmpty(), "CellRangeRepresentation missing" );
OUString aBrokenCellRangeForExport( GetBrokenCellRangeForExport( aSortedCellRanges ) );
//
aResult.realloc(5);
@@ -1385,7 +1385,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
aResult[nProps++].Value <<= bFirstCellIsLabel;
aResult[nProps ].Name = C2U("CellRangeRepresentation");
aResult[nProps++].Value <<= aSortedCellRanges;
- if (0 != aBrokenCellRangeForExport.getLength())
+ if (!aBrokenCellRangeForExport.isEmpty())
{
aResult[nProps ].Name = C2U("BrokenCellRangeForExport");
aResult[nProps++].Value <<= aBrokenCellRangeForExport;
@@ -1857,7 +1857,7 @@ rtl::OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const rtl::OUSt
XMLRangeHelper::CellRange aCellRange( XMLRangeHelper::getCellRangeFromXMLString( aRange ));
// check that there is only one table used in all ranges
- if (aFirstFoundTable.getLength() == 0)
+ if (aFirstFoundTable.isEmpty())
aFirstFoundTable = aCellRange.aTableName;
if (aCellRange.aTableName != aFirstFoundTable)
throw lang::IllegalArgumentException();
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 4996bd3..3ea7552 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -114,7 +114,7 @@ public:
rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException )
{
// Initialise the code name
- if ( msThisDocumentCodeName.getLength() == 0 )
+ if ( msThisDocumentCodeName.isEmpty() )
{
try
{
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 47be88b..b4a5c6d 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -786,9 +786,9 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
uno::Reference < io::XStream > xStream;
uno::Reference < io::XInputStream > xInputStream;
- if( !sFileName.getLength() )
+ if( sFileName.isEmpty() )
aMediaDescriptor[comphelper::MediaDescriptor::PROP_URL()] >>= sFileName;
- if( !sFileName.getLength() )
+ if( sFileName.isEmpty() )
aMediaDescriptor[comphelper::MediaDescriptor::PROP_FILENAME()] >>= sFileName;
aMediaDescriptor[comphelper::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream;
aMediaDescriptor[comphelper::MediaDescriptor::PROP_STREAM()] >>= xStream;
@@ -800,7 +800,7 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
if ( !xInputStream.is() && xStream.is() )
xInputStream = xStream->getInputStream();
- if(!pDocSh || (!sFileName.getLength() && !xInputStream.is()))
+ if(!pDocSh || (sFileName.isEmpty() && !xInputStream.is()))
return;
SfxObjectFactory& rFact = pDocSh->GetFactory();
@@ -833,7 +833,7 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
pMed = xReadStorage.is() ?
new SfxMedium(xReadStorage, sBaseURL, 0 ) :
new SfxMedium(sFileName, STREAM_READ, sal_True, 0, 0 );
- if( sBaseURL.getLength() )
+ if( !sBaseURL.isEmpty() )
pMed->GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, sBaseURL ) );
SfxFilterMatcher aMatcher( rFact.GetFilterContainer()->GetName() );
@@ -864,9 +864,9 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
pMed = new SfxMedium(sFileName, STREAM_READ, sal_True, pFilter, 0);
}
}
- if(sFilterOptions.getLength())
+ if(!sFilterOptions.isEmpty())
pMed->GetItemSet()->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, sFilterOptions ) );
- if( sBaseURL.getLength())
+ if(!sBaseURL.isEmpty())
pMed->GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, sBaseURL ) );
}
@@ -883,7 +883,7 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
SwReader* pRdr;
SfxItemSet* pSet = pMed->GetItemSet();
pSet->Put(SfxBoolItem(FN_API_CALL, sal_True));
- if(sPassword.getLength())
+ if(!sPassword.isEmpty())
pSet->Put(SfxStringItem(SID_PASSWORD, sPassword));
Reader *pRead = pDocSh->StartConvertFrom( *pMed, &pRdr, 0, pUnoCrsr);
if( pRead )
@@ -954,7 +954,7 @@ sal_Bool DocInsertStringSplitCR(
{
OSL_ENSURE( nIdx - nStartIdx >= 0, "index negative!" );
aTxt = rText.Copy( nStartIdx, nIdx - nStartIdx );
- if (aTxt.getLength() &&
+ if (!aTxt.isEmpty() &&
!rDoc.InsertString( rNewCursor, aTxt, nInsertFlags ))
{
OSL_FAIL( "Doc->Insert(Str) failed." );
@@ -969,7 +969,7 @@ sal_Bool DocInsertStringSplitCR(
nIdx = rText.Search( '\r', nStartIdx );
}
aTxt = rText.Copy( nStartIdx );
- if (aTxt.getLength() &&
+ if (!aTxt.isEmpty() &&
!rDoc.InsertString( rNewCursor, aTxt, nInsertFlags ))
{
OSL_FAIL( "Doc->Insert(Str) failed." );
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index 8bd69c1..3e1cb79 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -335,7 +335,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
pNewDoc->DeleteAndJoin(aPam);
aPam.DeleteMark();
SwFmtFtn aFootNote(m_pImpl->m_bIsEndnote);
- if (m_pImpl->m_sLabel.getLength())
+ if (!m_pImpl->m_sLabel.isEmpty())
{
aFootNote.SetNumStr(m_pImpl->m_sLabel);
}
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index f4fd5d7..de9d433 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -1435,7 +1435,7 @@ SwXDocumentIndex::setName(const OUString& rName) throw (uno::RuntimeException)
{
SolarMutexGuard g;
- if (!rName.getLength())
+ if (rName.isEmpty())
{
throw uno::RuntimeException();
}
@@ -1805,7 +1805,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
break;
case TOX_USER:
{
- if (!m_pImpl->m_sUserIndexName.getLength())
+ if (m_pImpl->m_sUserIndexName.isEmpty())
{
pTOXType = pDoc->GetTOXType( m_pImpl->m_eTOXType, 0 );
}
@@ -1845,30 +1845,30 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
//which must now return sal_True
::sw::XTextRangeToSwPaM(aPam, xTextRange);
SwTOXMark aMark (pTOXType);
- if (m_pImpl->m_sAltText.getLength())
+ if (!m_pImpl->m_sAltText.isEmpty())
{
aMark.SetAlternativeText(m_pImpl->m_sAltText);
}
switch (m_pImpl->m_eTOXType)
{
case TOX_INDEX:
- if (m_pImpl->m_sPrimaryKey.getLength())
+ if (!m_pImpl->m_sPrimaryKey.isEmpty())
{
aMark.SetPrimaryKey(m_pImpl->m_sPrimaryKey);
}
- if (m_pImpl->m_sSecondaryKey.getLength())
+ if (!m_pImpl->m_sSecondaryKey.isEmpty())
{
aMark.SetSecondaryKey(m_pImpl->m_sSecondaryKey);
}
- if (m_pImpl->m_sTextReading.getLength())
+ if (!m_pImpl->m_sTextReading.isEmpty())
{
aMark.SetTextReading(m_pImpl->m_sTextReading);
}
- if (m_pImpl->m_sPrimaryKeyReading.getLength())
+ if (!m_pImpl->m_sPrimaryKeyReading.isEmpty())
{
aMark.SetPrimaryKeyReading(m_pImpl->m_sPrimaryKeyReading);
}
- if (m_pImpl->m_sSecondaryKeyReading.getLength())
+ if (!m_pImpl->m_sSecondaryKeyReading.isEmpty())
{
aMark.SetSecondaryKeyReading(m_pImpl->m_sSecondaryKeyReading);
}
@@ -2850,7 +2850,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
throw lang::IllegalArgumentException();
}
aToken.cTabFillChar =
- (sFillChar.getLength()) ? sFillChar[0] : ' ';
+ sFillChar.isEmpty() ? ' ' : sFillChar[0];
}
else if (pProperties[j].Name.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("Text")))
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 6d6f3c1..3262b35 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -885,7 +885,7 @@ throw (uno::RuntimeException)
m_pImpl->m_rDoc.DeleteAndJoin(aCursor);
}
- if (rText.getLength())
+ if (!rText.isEmpty())
{
SwUnoCursorHelper::DocInsertStringSplitCR(
m_pImpl->m_rDoc, aCursor, rText, bForceExpandHints);
@@ -1727,7 +1727,7 @@ void SwUnoCursorHelper::SetString(SwCursor & rCursor, const OUString& rString)
{
pDoc->DeleteAndJoin(rCursor);
}
- if (rString.getLength())
+ if (!rString.isEmpty())
{
String aText(rString);
const bool bSuccess( SwUnoCursorHelper::DocInsertStringSplitCR(
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index a9cbe42..c4e9d61 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -331,7 +331,7 @@ SwXParagraph::attachToText(SwXText & rParent, SwTxtNode & rTxtNode)
rTxtNode.Add(m_pImpl.get());
rTxtNode.SetXParagraph(uno::Reference<text::XTextContent>(this));
m_pImpl->m_xParentText = &rParent;
- if (m_pImpl->m_sText.getLength())
+ if (!m_pImpl->m_sText.isEmpty())
{
try { setString(m_pImpl->m_sText); }
catch(...){}
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index fececdb..977730e 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -448,7 +448,7 @@ void SwXRedline::setPropertyValue( const OUString& rPropertyName, const uno::Any
{
OSL_FAIL("currently not available");
OUString sTmp; aValue >>= sTmp;
- if(!sTmp.getLength())
+ if(sTmp.isEmpty())
throw lang::IllegalArgumentException();
}
else if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_REDLINE_SUCCESSOR_DATA)))
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 836c679..bfb786f 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -299,14 +299,14 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
UnoActionContext aCont(pDoc);
pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_INSSECTION, NULL );
- if (!m_pImpl->m_sName.getLength())
+ if (m_pImpl->m_sName.isEmpty())
{
m_pImpl->m_sName = C2U("TextSection");
}
SectionType eType = (m_pImpl->m_pProps->m_bDDE)
? DDE_LINK_SECTION
- : ((m_pImpl->m_pProps->m_sLinkFileName.getLength() ||
- m_pImpl->m_pProps->m_sSectionRegion.getLength())
+ : ((!m_pImpl->m_pProps->m_sLinkFileName.isEmpty() ||
+ !m_pImpl->m_pProps->m_sSectionRegion.isEmpty())
? FILE_LINK_SECTION : CONTENT_SECTION);
// index header section?
if (m_pImpl->m_bIndexHeader)
@@ -405,7 +405,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
// XML import must hide sections depending on their old
// condition status
- if (m_pImpl->m_pProps->m_sCondition.getLength() != 0)
+ if (!m_pImpl->m_pProps->m_sCondition.isEmpty())
{
pRet->SetCondHidden(m_pImpl->m_pProps->m_bCondHidden);
}
@@ -690,12 +690,12 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
else
{
if (pSectionData->GetType() != FILE_LINK_SECTION &&
- aLink.FileURL.getLength())
+ !aLink.FileURL.isEmpty())
{
pSectionData->SetType(FILE_LINK_SECTION);
}
::rtl::OUStringBuffer sFileNameBuf;
- if (aLink.FileURL.getLength())
+ if (!aLink.FileURL.isEmpty())
{
sFileNameBuf.append( URIHelper::SmartRel2Abs(
pFmt->GetDoc()->GetDocShell()->GetMedium()
@@ -730,7 +730,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
else
{
if (pSectionData->GetType() != FILE_LINK_SECTION &&
- sLink.getLength())
+ !sLink.isEmpty())
{
pSectionData->SetType(FILE_LINK_SECTION);
}
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 76cf9c8..d347c0c 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1925,7 +1925,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
{
// #i93725#
// do not accept "empty" font
- if ( pDesc->Name.getLength() > 0 )
+ if ( !pDesc->Name.isEmpty() )
{
Font aFont;
SvxUnoFontDescriptor::ConvertToFont( *pDesc, aFont );
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 9b8b495..5e63754 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -380,7 +380,7 @@ void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL,
sal_Bool bLoadStyleOverwrite = sal_True;
sal_Bool bLoadStyleNumbering = sal_True;
sal_Bool bLoadStyleFrame = sal_True;
- if(IsValid() && rURL.getLength())
+ if(IsValid() && !rURL.isEmpty())
{
const uno::Any* pVal;
int nCount = aOptions.getLength();
@@ -1974,7 +1974,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
{
OUString sName;
rValue >>= sName;
- SwRegisterItem aReg( sName.getLength() != 0);
+ SwRegisterItem aReg( !sName.isEmpty() );
aReg.SetWhich(SID_SWREGISTER_MODE);
rBase.GetItemSet().Put(aReg);
String aString;
@@ -2000,7 +2000,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
SwStyleNameMapper::FillUIName(sTmp, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
pRuby->SetCharFmtName( sTmp );
pRuby->SetCharFmtId( 0 );
- if(sTmp.getLength())
+ if(!sTmp.isEmpty())
{
sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( sTmp, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
pRuby->SetCharFmtId(nId);
@@ -2063,7 +2063,7 @@ put_itemset:
OUString sNewNumberingRuleName;
rValue >>= sNewNumberingRuleName;
String sTmp( sNewNumberingRuleName );
- if ( sNewNumberingRuleName.getLength() == 0 ||
+ if ( sNewNumberingRuleName.isEmpty() ||
sTmp != pDoc->GetOutlineNumRule()->GetName() )
{
rBase.mxNewBase->GetCollection()->DeleteAssignmentToListLevelOfOutlineStyle();
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 42cf9b2..a928d15 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -709,7 +709,7 @@ void lcl_setString( SwXCell &rCell, const rtl::OUString &rTxt,
double lcl_getValue( SwXCell &rCell )
{
double fRet;
- if(rCell.IsValid() && rCell.getString().getLength()!=0)
+ if(rCell.IsValid() && !rCell.getString().isEmpty())
fRet = rCell.pBox->GetFrmFmt()->GetTblBoxValue().GetValue();
else
::rtl::math::setNan( &fRet );
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 180dd37..db82b18 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1404,7 +1404,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
pCursor->MovePara( fnParaCurr, fnParaEnd );
m_pImpl->m_pDoc->DontExpandFmt( *pCursor->Start() );
- if (rText.getLength())
+ if (!rText.isEmpty())
{
const xub_StrLen nContentPos = pCursor->GetPoint()->nContent.GetIndex();
SwUnoCursorHelper::DocInsertStringSplitCR(
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index c16febe..46598df 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -854,7 +854,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
// Wenn eine PoolId gesetzt ist, entspricht der Name der
// Vorlage dem szugehoerigen Token
- OSL_ENSURE( (rRefPoolId != 0) == (rToken.getLength() > 0),
+ OSL_ENSURE( (rRefPoolId != 0) == (!rToken.isEmpty()),
"Token missing" );
}
else
@@ -1000,11 +1000,11 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
// Wenn ein Token gesetzt ist, enthaelt nPoolId die dazugehoerige
// Vorlage
- if( rToken.getLength() && !rRefPoolId )
+ if( !rToken.isEmpty() && !rRefPoolId )
rRefPoolId = nPoolId;
}
- if( rToken.getLength() || bStop )
+ if( !rToken.isEmpty() || bStop )
{
// Anhalten wenn eine HTML-Tag-Vorlage gefunden wurde
break;
@@ -1017,7 +1017,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
}
}
- if( rToken.getLength() )
+ if( !rToken.isEmpty() )
{
// Es ist eine HTML-Tag-Vorlage
if( !nDeep )
@@ -1064,7 +1064,7 @@ static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, String& rSelector,
rRefPoolId, &aPseudo );
if( nDeep )
{
- if( aToken.getLength() )
+ if( !aToken.isEmpty() )
rSelector = String( aToken, RTL_TEXTENCODING_ASCII_US );
else
rSelector.Erase();
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 8cc76ac..73de842 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -341,7 +341,7 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
// Den Selektor des Formats holen
sal_uInt16 nDeep = SwHTMLWriter::GetCSS1Selector( pFmt, aToken, aClass,
nRefPoolId );
- OSL_ENSURE( nDeep ? aToken.getLength()>0 : aToken.getLength()==0,
+ OSL_ENSURE( nDeep ? !aToken.isEmpty() : aToken.isEmpty(),
"Hier stimmt doch was mit dem Token nicht!" );
OSL_ENSURE( nDeep ? nRefPoolId : !nRefPoolId,
"Hier stimmt doch was mit der Vergleichs-Vorlage nicht!" );
@@ -642,7 +642,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// Jetzt wird festgelegt, was aufgrund des Tokens so moeglich ist
sal_uInt16 nToken = 0; // Token fuer Tag-Wechsel
sal_Bool bOutNewLine = sal_False; // nur ein LF ausgeben?
- if( pFmtInfo->aToken.getLength() )
+ if( !pFmtInfo->aToken.isEmpty() )
{
// Es ist eine HTML-Tag-Vorlage oder die Vorlage ist von einer
// solchen abgeleitet
@@ -1117,7 +1117,7 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo )
SwHTMLWriter & rHWrt = (SwHTMLWriter&)rWrt;
// wenn es kein Token gibt haben wir auch nichts auszugeben
- if( !rInfo.aToken.getLength() )
+ if( rInfo.aToken.isEmpty() )
{
rHWrt.FillNextNumInfo();
const SwHTMLNumRuleInfo& rNextInfo = *rHWrt.GetNextNumInfo();
@@ -1837,7 +1837,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
const SwCharFmt* pFmt = rChrFmt.GetCharFmt();
const SwHTMLFmtInfo *pFmtInfo = GetFmtInfo( *pFmt, rFmtInfos );
- if( pFmtInfo->aToken.getLength() )
+ if( !pFmtInfo->aToken.isEmpty() )
{
// das Zeichenvorlagen-Tag muss vor den harten
// Attributen ausgegeben werden
@@ -3230,7 +3230,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
{
rtl::OStringBuffer sOut;
sOut.append('<');
- if( pFmtInfo->aToken.getLength() > 0 )
+ if( !pFmtInfo->aToken.isEmpty() )
sOut.append(pFmtInfo->aToken);
else
sOut.append(OOO_STRING_SVTOOLS_HTML_span);
@@ -3268,7 +3268,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
else
{
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
- pFmtInfo->aToken.getLength() ? pFmtInfo->aToken.getStr()
+ !pFmtInfo->aToken.isEmpty() ? pFmtInfo->aToken.getStr()
: OOO_STRING_SVTOOLS_HTML_span,
sal_False );
}
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index c99433a..14d81d4 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -856,7 +856,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_marquee, sal_False );
- if( aEndTags.getLength() )
+ if( !aEndTags.isEmpty() )
rWrt.Strm() << aEndTags.getStr();
return rWrt;
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 7742f20..45dfe8e 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -1195,7 +1195,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
rHTMLWrt.Strm() << '>';
- if( aEndTags.getLength() )
+ if( !aEndTags.isEmpty() )
rWrt.Strm() << aEndTags.getStr();
if( rHTMLWrt.aINetFmts.Count() )
@@ -1488,7 +1488,7 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, HTML_FRMOPTS_SPACER );
rWrt.Strm() << '>';
- if( aEndTags.getLength() )
+ if( !aEndTags.isEmpty() )
rWrt.Strm() << aEndTags.getStr();
return rWrt;
@@ -1553,7 +1553,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
rHTMLWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, sal_False );
- if( aEndTags.getLength() )
+ if( !aEndTags.isEmpty() )
rWrt.Strm() << aEndTags.getStr();
return rWrt;
@@ -1733,7 +1733,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
const SwStartNode* pSttNd = rWrt.pDoc->GetNodes()[nStt]->GetStartNode();
OSL_ENSURE( pSttNd, "Wo ist der Start-Node" );
- if( !bHeader && aSpacer.getLength() )
+ if( !bHeader && !aSpacer.isEmpty() )
{
rHTMLWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), aSpacer.getStr() );
@@ -1754,7 +1754,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
}
- if( bHeader && aSpacer.getLength() )
+ if( bHeader && !aSpacer.isEmpty() )
{
rHTMLWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), aSpacer.getStr() );
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index a71c2d3..f2638dc 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -204,7 +204,7 @@ void lcl_html_outEvents( SvStream& rStrm,
rtl::OStringBuffer sOut;
sOut.append(' ');
if( pOpt && (EXTENDED_STYPE != eScriptType ||
- !pDescs[i].AddListenerParam.getLength()) )
+ pDescs[i].AddListenerParam.isEmpty()) )
sOut.append(pOpt);
else
{
@@ -220,7 +220,7 @@ void lcl_html_outEvents( SvStream& rStrm,
HTMLOutFuncs::Out_String( rStrm, pDescs[i].ScriptCode, eDestEnc, pNonConvertableChars );
rStrm << '\"';
if( EXTENDED_STYPE == eScriptType &&
- pDescs[i].AddListenerParam.getLength() )
+ !pDescs[i].AddListenerParam.isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdaddparam)
.append(rtl::OUStringToOString(sListener,
@@ -514,7 +514,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
uno::Any aTmp = xFormPropSet->getPropertyValue(
OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
- ((OUString*)aTmp.getValue())->getLength() )
+ !((OUString*)aTmp.getValue())->isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
Strm() << sOut.makeStringAndClear().getStr();
@@ -526,7 +526,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
aTmp = xFormPropSet->getPropertyValue(
OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")) );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
- ((OUString*)aTmp.getValue())->getLength() )
+ !((OUString*)aTmp.getValue())->isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_action).append("=\"");
Strm() << sOut.makeStringAndClear().getStr();
@@ -578,7 +578,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
aTmp = xFormPropSet->getPropertyValue(
OUString(RTL_CONSTASCII_USTRINGPARAM("TargetFrame")) );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0)&&
- ((OUString*)aTmp.getValue())->getLength() )
+ !((OUString*)aTmp.getValue())->isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_target).append("=\"");
Strm() << sOut.makeStringAndClear().getStr();
@@ -653,7 +653,7 @@ void SwHTMLWriter::OutHiddenControls(
aTmp = xPropSet->getPropertyValue(
OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
- ((OUString*)aTmp.getValue())->getLength() )
+ !((OUString*)aTmp.getValue())->isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
.append("=\"");
@@ -665,7 +665,7 @@ void SwHTMLWriter::OutHiddenControls(
aTmp = xPropSet->getPropertyValue(
OUString(RTL_CONSTASCII_USTRINGPARAM("HiddenValue")) );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
- ((OUString*)aTmp.getValue())->getLength() )
+ !((OUString*)aTmp.getValue())->isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_value)
.append("=\"");
@@ -812,7 +812,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
{
const OUString& rVal = *(OUString*)aTmp.getValue();
- if( !rVal.getLength() )
+ if( rVal.isEmpty() )
bEmptyValue = sal_True;
else if( rVal.compareToAscii( OOO_STRING_SVTOOLS_HTML_on ) != 0 )
sValue = rVal;
@@ -844,7 +844,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
aTmp = xPropSet->getPropertyValue(
OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
- ((OUString*)aTmp.getValue())->getLength() )
+ !((OUString*)aTmp.getValue())->isEmpty() )
{
sValue = *(OUString*)aTmp.getValue();
}
@@ -964,7 +964,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
{
aTmp = xPropSet->getPropertyValue( sDefaultText );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
- ((OUString*)aTmp.getValue())->getLength() )
+ !((OUString*)aTmp.getValue())->isEmpty() )
{
sValue = *(OUString*)aTmp.getValue();
}
@@ -1013,7 +1013,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
aTmp = xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
- ((OUString*)aTmp.getValue())->getLength() )
+ !((OUString*)aTmp.getValue())->isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name).
append(RTL_CONSTASCII_STRINGPARAM("=\""));
@@ -1030,7 +1030,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_disabled);
}
- if( sValue.getLength() || bEmptyValue )
+ if( !sValue.isEmpty() || bEmptyValue )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_value).append(
RTL_CONSTASCII_STRINGPARAM("=\""));
@@ -1046,7 +1046,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
aTmp = xPropSet->getPropertyValue(
OUString(RTL_CONSTASCII_USTRINGPARAM("ImageURL")) );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
- ((OUString*)aTmp.getValue())->getLength() )
+ !((OUString*)aTmp.getValue())->isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src).
append(RTL_CONSTASCII_STRINGPARAM("=\""));
@@ -1160,7 +1160,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
{
aTmp = xPropSet->getPropertyValue( sPropName );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
- ((OUString*)aTmp.getValue())->getLength() )
+ !((OUString*)aTmp.getValue())->isEmpty() )
{
Font aFixedFont( OutputDevice::GetDefaultFont(
DEFAULTFONT_FIXED, LANGUAGE_ENGLISH_US,
@@ -1297,7 +1297,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
rHTMLWrt.OutNewLine(); // jede Option bekommt eine eigene Zeile
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_option);
- if( sVal.getLength() || bEmptyVal )
+ if( !sVal.isEmpty() || bEmptyVal )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_value).
append(RTL_CONSTASCII_STRINGPARAM("=\""));
@@ -1330,7 +1330,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
aTmp = xPropSet->getPropertyValue(
OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultText")) );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0)&&
- ((OUString*)aTmp.getValue())->getLength() )
+ !((OUString*)aTmp.getValue())->isEmpty() )
{
sVal = String( *(OUString*)aTmp.getValue() );
}
@@ -1353,7 +1353,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
{
aTmp = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Label")));
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
- ((OUString*)aTmp.getValue())->getLength() )
+ !((OUString*)aTmp.getValue())->isEmpty() )
{
sValue = *(OUString*)aTmp.getValue();
HTMLOutFuncs::Out_String( rWrt.Strm(), sValue,
@@ -1361,7 +1361,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
}
}
- if( aEndTags.getLength() )
+ if( !aEndTags.isEmpty() )
rWrt.Strm() << aEndTags.getStr();
// Controls sind nicht absatz-gebunden, deshalb kein LF mehr ausgeben!
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index cb3692b..31f00de 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -1033,7 +1033,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
::rtl::OUString aStr;
String aURL;
aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")) );
- if( (aAny >>= aStr) && aStr.getLength() )
+ if( (aAny >>= aStr) && !aStr.isEmpty() )
{
aURL = URIHelper::simpleNormalizedMakeRelative( rWrt.GetBaseURL(),
aStr);
@@ -1050,7 +1050,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
::rtl::OUString aType;
aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginMimeType")) );
- if( (aAny >>= aType) && aType.getLength() )
+ if( (aAny >>= aType) && !aType.isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type)
.append("=\"");
@@ -1082,7 +1082,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
// CODEBASE
::rtl::OUString aCd;
aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase")) );
- if( (aAny >>= aCd) && aCd.getLength() )
+ if( (aAny >>= aCd) && !aCd.isEmpty() )
{
String sCodeBase( URIHelper::simpleNormalizedMakeRelative(rWrt.GetBaseURL(), aCd) );
if( sCodeBase.Len() )
@@ -1109,7 +1109,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
::rtl::OUString aAppletName;
aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletName")) );
aAny >>= aAppletName;
- if( aAppletName.getLength() )
+ if( !aAppletName.isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
.append("=\"");
@@ -1248,7 +1248,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_iframe, sal_False );
}
- if( aEndTags.getLength() )
+ if( !aEndTags.isEmpty() )
rWrt.Strm() << aEndTags.getStr();
return rWrt;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index b4f7f16..b559b74 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -855,7 +855,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_False ).nNode.GetIndex() )
xDPS->getDocumentProperties());
OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
if ( xDocProps.is() && (xDocProps->getAutoloadSecs() > 0) &&
- (xDocProps->getAutoloadURL().getLength() == 0) )
+ (xDocProps->getAutoloadURL().isEmpty()) )
{
xDocProps->setAutoloadURL(aPathToFile);
}
@@ -5480,10 +5480,10 @@ void SwHTMLParser::AddMetaUserDefined( ::rtl::OUString const & i_rMetaName )
{
// unless we already have 4 names, append the argument to m_InfoNames
::rtl::OUString* pName // the first empty string in m_InfoNames
- (!m_InfoNames[0].getLength() ? &m_InfoNames[0] :
- (!m_InfoNames[1].getLength() ? &m_InfoNames[1] :
- (!m_InfoNames[2].getLength() ? &m_InfoNames[2] :
- (!m_InfoNames[3].getLength() ? &m_InfoNames[3] : 0 ))));
+ (m_InfoNames[0].isEmpty() ? &m_InfoNames[0] :
+ (m_InfoNames[1].isEmpty() ? &m_InfoNames[1] :
+ (m_InfoNames[2].isEmpty() ? &m_InfoNames[2] :
+ (m_InfoNames[3].isEmpty() ? &m_InfoNames[3] : 0 ))));
if (pName)
{
(*pName) = i_rMetaName;
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 32c2611..346247f 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1045,7 +1045,7 @@ void SwHTMLWriter::OutBookmarks()
// auch nicht eingelesen wird.
// erst die SWG spezifischen Daten:
- if(dynamic_cast< const ::sw::mark::IBookmark* >(pBookmark) && pBookmark->GetName().getLength() )
+ if(dynamic_cast< const ::sw::mark::IBookmark* >(pBookmark) && !pBookmark->GetName().isEmpty() )
OutAnchor( pBookmark->GetName() );
if( ++nBkmkTabPos >= pMarkAccess->getMarksCount() )
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index df37cf0..18ade46 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -188,7 +188,7 @@ public:
// #TODO check if this defaulted
m_pSerializer->startElementNS( XML_w, XML_sizeAuto, FSEND );
m_pSerializer->endElementNS( XML_w, XML_sizeAuto );
- if ( rDefault.getLength() )
+ if ( !rDefault.isEmpty() )
{
m_pSerializer->singleElementNS( XML_w, XML_default,
FSNS( XML_w, XML_val ),
@@ -202,7 +202,7 @@ public:
void WriteFormText( const rtl::OUString& rName, const rtl::OUString& rDefault )
{
writeCommonStart( rName );
- if ( rDefault.getLength() )
+ if ( !rDefault.isEmpty() )
{
m_pSerializer->startElementNS( XML_w, XML_textInput, FSEND );
m_pSerializer->singleElementNS( XML_w, XML_default,
@@ -798,7 +798,7 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos )
// Write the bookmark start if any
OUString aBkmName( m_sFieldBkm );
- if ( aBkmName.getLength( ) > 0 )
+ if ( !aBkmName.isEmpty() )
{
m_pSerializer->singleElementNS( XML_w, XML_bookmarkStart,
FSNS( XML_w, XML_id ), OString::valueOf( sal_Int32( m_nNextMarkId ) ).getStr( ),
@@ -820,7 +820,7 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos )
}
// Write the bookmark end if any
- if ( aBkmName.getLength( ) > 0 )
+ if ( !aBkmName.isEmpty() )
{
m_pSerializer->singleElementNS( XML_w, XML_bookmarkEnd,
FSNS( XML_w, XML_id ), OString::valueOf( sal_Int32( m_nNextMarkId ) ).getStr( ),
@@ -1101,7 +1101,7 @@ void DocxAttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen nPos, co
lang::Locale aLocale( SwBreakIt::Get()->GetLocale(
rNode.GetLang( nPos ) ) );
OUString sLang( aLocale.Language );
- if ( aLocale.Country.getLength( ) > 0 )
+ if ( !aLocale.Country.isEmpty() )
sLang += OUString(RTL_CONSTASCII_USTRINGPARAM( "-" )) + OUString( aLocale.Country );
m_pSerializer->singleElementNS( XML_w, XML_lid,
FSNS( XML_w, XML_val ),
@@ -1223,7 +1223,7 @@ bool DocxAttributeOutput::StartURL( const String& rUrl, const String& rTarget )
OUStringToOString( OUString( sMark ), RTL_TEXTENCODING_UTF8 ).getStr( ) );
OUString sTarget( rTarget );
- if ( sTarget.getLength( ) > 0 )
+ if ( !sTarget.isEmpty() )
{
OString soTarget = OUStringToOString( sTarget, RTL_TEXTENCODING_UTF8 );
m_pHyperlinkAttrList->add(FSNS( XML_w, XML_tgtFrame ), soTarget.getStr());
@@ -2007,7 +2007,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size
nImageType = XML_embed;
}
- if ( aRelId.getLength() == 0 )
+ if ( aRelId.isEmpty() )
return;
m_pSerializer->startElementNS( XML_w, XML_drawing,
@@ -2684,7 +2684,7 @@ void DocxAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, sal_uInt16
// nNumType corresponds to w:fmt. See WW8Export::GetNumId() for more precisions
OString aFmt( impl_NumberingType( nNumType ) );
- if ( aFmt.getLength() )
+ if ( !aFmt.isEmpty() )
pAttr->add( FSNS( XML_w, XML_fmt ), aFmt.getStr() );
XFastAttributeListRef xAttrs( pAttr );
@@ -2850,7 +2850,7 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
// format
OString aFmt( impl_NumberingType( nNumberingType ) );
- if ( aFmt.getLength() )
+ if ( !aFmt.isEmpty() )
m_pSerializer->singleElementNS( XML_w, XML_numFmt,
FSNS( XML_w, XML_val ), aFmt.getStr(),
FSEND );
@@ -3025,11 +3025,11 @@ void DocxAttributeOutput::CharEscapement( const SvxEscapementItem& rEscapement )
sIss = OString( "superscript" );
}
- if ( sIss.getLength( ) > 0 )
+ if ( !sIss.isEmpty() )
m_pSerializer->singleElementNS( XML_w, XML_vertAlign,
FSNS( XML_w, XML_val ), sIss.getStr(), FSEND );
- if ( sIss.getLength() == 0 || sIss.match( OString( "baseline" ) ) )
+ if ( sIss.isEmpty() || sIss.match( OString( "baseline" ) ) )
{
long nHeight = ((SvxFontHeightItem&)m_rExport.GetItem(
RES_CHRATR_FONTSIZE )).GetHeight();
@@ -4065,7 +4065,7 @@ void DocxAttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert
break;
}
- if ( sAlign.getLength() > 0 )
+ if ( !sAlign.isEmpty() )
m_pFlyAttrList->add( FSNS( XML_w, XML_yAlign ), sAlign );
else
m_pFlyAttrList->add( FSNS( XML_w, XML_y ),
@@ -4121,7 +4121,7 @@ void DocxAttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHor
break;
}
- if ( sAlign.getLength() > 0 )
+ if ( !sAlign.isEmpty() )
m_pFlyAttrList->add( FSNS( XML_w, XML_xAlign ), sAlign );
else
m_pFlyAttrList->add( FSNS( XML_w, XML_x ),
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 98049c6..6d8930c 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -258,12 +258,12 @@ void DocxExport::DoComboBox(const rtl::OUString& rName,
m_pDocumentFS->singleElementNS( XML_w, XML_enabled, FSEND );
- if ( rHelp.getLength( ) > 0 )
+ if ( !rHelp.isEmpty() )
m_pDocumentFS->singleElementNS( XML_w, XML_helpText,
FSNS( XML_w, XML_val ), OUStringToOString( rHelp, RTL_TEXTENCODING_UTF8 ).getStr(),
FSEND );
- if ( rToolTip.getLength( ) > 0 )
+ if ( !rToolTip.isEmpty() )
m_pDocumentFS->singleElementNS( XML_w, XML_statusText,
FSNS( XML_w, XML_val ), OUStringToOString( rToolTip, RTL_TEXTENCODING_UTF8 ).getStr(),
FSEND );
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index e1d55e2..8534f82 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -344,18 +344,18 @@ void RtfExport::DoFormText(const SwInputField* pFld )
::rtl::OUString sStatus = pFld->GetToolTip();
m_pAttrOutput->RunText().append("{" OOO_STRING_SVTOOLS_RTF_FIELD "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FLDINST "{ FORMTEXT }");
m_pAttrOutput->RunText().append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FORMFIELD " {" OOO_STRING_SVTOOLS_RTF_FFTYPE "0" );
- if( sHelp.getLength() )
+ if( !sHelp.isEmpty() )
m_pAttrOutput->RunText().append( OOO_STRING_SVTOOLS_RTF_FFOWNHELP );
- if( sStatus.getLength() )
+ if( !sStatus.isEmpty() )
m_pAttrOutput->RunText().append( OOO_STRING_SVTOOLS_RTF_FFOWNSTAT );
m_pAttrOutput->RunText().append( OOO_STRING_SVTOOLS_RTF_FFTYPETXT "0" );
- if( sName.getLength() )
+ if( !sName.isEmpty() )
m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFNAME " ").append( OutString( sName, eDefaultEncoding )).append( "}" );
- if( sHelp.getLength() )
+ if( !sHelp.isEmpty() )
m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFHELPTEXT " ").append( OutString( sHelp, eDefaultEncoding )).append( "}" );
m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFDEFTEXT " ").append( OutString( sResult, eDefaultEncoding )).append( "}" );
- if( sStatus.getLength() )
+ if( !sStatus.isEmpty() )
m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFSTATTEXT " ").append( OutString( sStatus, eDefaultEncoding )).append( "}");
m_pAttrOutput->RunText().append( "}}}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " " );
m_pAttrOutput->RunText().append( OutString( sResult, eDefaultEncoding )).append( "}}" );
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index ad4b03e..998197d 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1880,7 +1880,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
rtl::OUString sOleId;
uno::Any aValue = it->second;
aValue >>= sOleId;
- if ( sOleId.getLength( ) > 0 )
+ if ( !sOleId.isEmpty() )
OutputLinkedOLE( sOleId );
}
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 5335ae7..a14279d 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2822,7 +2822,7 @@ namespace
//See https://bugs.freedesktop.org/show_bug.cgi?id=34319 for an example
void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddString)
{
- if (!rAddString.getLength())
+ if (rAddString.isEmpty())
return;
uno::Reference<i18n::XBreakIterator> xBI(pBreakIt->GetBreakIter());
@@ -4233,7 +4233,7 @@ void SwWW8ImplReader::ReadDocInfo()
rtl::OUString aName = pMedium->GetName();
INetURLObject aURL( aName );
sTemplateURL = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI);
- if ( sTemplateURL.getLength() > 0 )
+ if ( !sTemplateURL.isEmpty() )
xDocProps->setTemplateURL( sTemplateURL );
}
}
@@ -4253,7 +4253,7 @@ void SwWW8ImplReader::ReadDocInfo()
// attempt to convert to url ( won't work for obvious reasons on linux
if ( sPath.Len() )
::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPath, aURL );
- if (!aURL.getLength())
+ if (aURL.isEmpty())
xDocProps->setTemplateURL( aURL );
else
xDocProps->setTemplateURL( sPath );
@@ -4353,7 +4353,7 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedF
aURL = sGlobalTemplates[ i ];
else
osl::FileBase::getFileURLFromSystemPath( sGlobalTemplates[ i ], aURL );
- if ( !aURL.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) || ( sCreatedFrom.getLength() && sCreatedFrom.equals( aURL ) ) )
+ if ( !aURL.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) || ( !sCreatedFrom.isEmpty() && sCreatedFrom.equals( aURL ) ) )
continue; // don't try and read the same document as ourselves
SotStorageRef rRoot = new SotStorage( aURL, STREAM_STD_READWRITE, STORAGE_TRANSACTED );
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index e39f5c7..6a7a02a 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -731,7 +731,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
break;
default:
rtl::OUString aCode = maFieldStack.back().GetBookmarkCode();
- if ( aCode.getLength() > 0 )
+ if ( !aCode.isEmpty() )
{
// Unhandled field with stored code
SwPosition aEndPos = *pPaM->GetPoint();
@@ -2326,7 +2326,7 @@ bool CanUseRemoteLink(const String &rGrfName)
aCnt.getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")))
>>= aTitle;
- bUseRemote = (aTitle.getLength() > 0);
+ bUseRemote = !aTitle.isEmpty();
}
catch ( ... )
{
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 06cf7e7..2f18072 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -707,7 +707,7 @@ TBC::ImportToolBarControl( CTBWrapper& rWrapper, const css::uno::Reference< css:
if ( bBuiltin )
{
rtl::OUString sCommand = helper.MSOCommandToOOCommand( cmdId );
- if ( sCommand.getLength() > 0 )
+ if ( !sCommand.isEmpty() )
{
beans::PropertyValue aProp;
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index d0be621..5a6e5ff 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -831,7 +831,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con
StreamPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dummyObjectName"));
}
- if( StreamPath.getLength() )
+ if( !StreamPath.isEmpty() )
{
sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath"));
xInfoSet->setPropertyValue( sPropName, makeAny( StreamPath ) );
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 259f9de..fe1395e 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -248,7 +248,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
else
aName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "dummyObjectName" ) );
- if( aName.getLength() )
+ if( !aName.isEmpty() )
{
sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath"));
xInfoSet->setPropertyValue( sPropName, makeAny( aName ) );
@@ -365,7 +365,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
if ( xModule.is() )
{
::rtl::OUString aModuleID = xModule->getIdentifier();
- bStoreMeta = ( aModuleID.getLength()
+ bStoreMeta = ( !aModuleID.isEmpty()
&& ( aModuleID.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.FormDesign" ) ) )
|| aModuleID.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.TextReportDesign" ) ) ) ) );
}
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index df130d1..0753d8a 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -221,7 +221,7 @@ void SwXMLBrushItemExport::exportXML( const SvxBrushItem& rItem )
rItem, sURL, MID_GRAPHIC_LINK, rUnitConv ) )
{
sValue = GetExport().AddEmbeddedGraphicObject( sURL );
- if( sValue.getLength() )
+ if( !sValue.isEmpty() )
{
GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sValue );
GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
@@ -244,7 +244,7 @@ void SwXMLBrushItemExport::exportXML( const SvxBrushItem& rItem )
{
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_BACKGROUND_IMAGE,
sal_True, sal_True );
- if( sURL.getLength() )
+ if( !sURL.isEmpty() )
{
// optional office:binary-data
GetExport().AddEmbeddedGraphicObjectAsBase64( sURL );
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index f1afbd0..5018607 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -169,7 +169,7 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport,
for( sal_uInt16 i=0; i < nCount; i++ )
{
OUString sPrefix( pUnknown->GetAttrPrefix( i ) );
- if( sPrefix.getLength() )
+ if( !sPrefix.isEmpty() )
{
OUString sNamespace( pUnknown->GetAttrNamespace( i ) );
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 8320b91..5e54d6b 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -119,7 +119,7 @@ inline sal_Bool SwXMLConditionParser_Impl::MatchName( OUString& rName )
nPos++;
}
rName = sBuffer.makeStringAndClear();
- return rName.getLength() > 0;
+ return !rName.isEmpty();
}
inline sal_Bool SwXMLConditionParser_Impl::MatchNumber( sal_uInt32& rNumber )
@@ -132,9 +132,9 @@ inline sal_Bool SwXMLConditionParser_Impl::MatchNumber( sal_uInt32& rNumber )
}
OUString sNum( sBuffer.makeStringAndClear() );
- if( sNum.getLength() )
+ if( !sNum.isEmpty() )
rNumber = sNum.toInt32();
- return sNum.getLength() > 0;
+ return !sNum.isEmpty();
}
SwXMLConditionParser_Impl::SwXMLConditionParser_Impl( const OUString& rInp ) :
@@ -512,7 +512,7 @@ void SwXMLItemSetStyleContext_Impl::SetAttribute( sal_uInt16 nPrefixKey,
else if ( IsXMLToken( rLocalName, XML_DATA_STYLE_NAME ) )
{
// if we have a valid data style name
- if (rValue.getLength() > 0)
+ if (!rValue.isEmpty())
{
sDataStyleName = rValue;
bDataStyleIsResolved = sal_False; // needs to be resolved
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 80d2475..a57b895 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -133,7 +133,7 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily )
// written after cell styles)
addDataStyle(nFormat);
OUString sDataStyleName = getDataStyleName(nFormat);
- if( sDataStyleName.getLength() > 0 )
+ if( !sDataStyleName.isEmpty() )
AddAttribute( XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME,
sDataStyleName );
}
@@ -316,10 +316,10 @@ void SwXMLAutoStylePoolP::exportStyleAttributes(
OUString sStyleName;
aProperty->maValue >>= sStyleName;
// #i70748# - export also empty list styles
- if( sStyleName.getLength() )
+ if( !sStyleName.isEmpty() )
{
OUString sTmp = rExport.GetTextParagraphExport()->GetListAutoStylePool().Find( sStyleName );
- if( sTmp.getLength() )
+ if( !sTmp.isEmpty() )
sStyleName = sTmp;
}
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 28051ee..bdf8795 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -841,7 +841,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue(
if( bOk )
pVertOrient->SetVertOrient( nValue );
//#i8855# text::VertOrientation::NONE is stored as empty string and should be applied here
- else if(!rValue.getLength())
+ else if(rValue.isEmpty())
{
pVertOrient->SetVertOrient( text::VertOrientation::NONE );
bOk = sal_True;
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index a04c959..9566767 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -208,7 +208,7 @@ sal_Bool SwXMLImportTableItemMapper_Impl::handleNoItem(
void SwXMLImportTableItemMapper_Impl::finished(
SfxItemSet & rSet, SvXMLUnitConverter const& rUnitConverter) const
{
- if (m_FoMarginValue.getLength())
+ if (!m_FoMarginValue.isEmpty())
{
sal_uInt16 const Ids[4][2] = {
{ RES_LR_SPACE, MID_L_MARGIN },
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index 4db411c..18a1b6b 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -117,7 +117,7 @@ sal_Bool lcl_frmitems_parseXMLBorder( const OUString& rValue,
rNamedWidth = USHRT_MAX;
sal_Int32 nTemp;
- while( aTokens.getNextToken( aToken ) && aToken.getLength() != 0 )
+ while( aTokens.getNextToken( aToken ) && !aToken.isEmpty() )
{
if( !rHasWidth &&
rUnitConverter.convertEnum( rNamedWidth, aToken,
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index f3ee9c7..0a77c1b 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -836,7 +836,7 @@ void SwXMLExport::ExportTableBox( const SwTableBox& rBox,
// if this cell has a formula, export it
// (with value and number format)
- if (sCellFormula.getLength()>0)
+ if (!sCellFormula.isEmpty())
{
OUString sQValue =
GetNamespaceMap().GetQNameByKey(
@@ -860,7 +860,7 @@ void SwXMLExport::ExportTableBox( const SwTableBox& rBox,
AddAttribute( XML_NAMESPACE_OFFICE,
XML_VALUE_TYPE, XML_STRING );
}
- else if ( (-1 != nNumberFormat) && (xText->getString().getLength() > 0) )
+ else if ( (-1 != nNumberFormat) && !xText->getString().isEmpty() )
{
// number format key:
// (export values only if cell contains text;)
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 978e5e1..43a284b 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -776,7 +776,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl(
sal_Int32 nWidth = MINLAY;
sal_Bool bRelWidth = sal_True;
- if( aStyleName.getLength() )
+ if( !aStyleName.isEmpty() )
{
const SfxPoolItem *pItem;
const SfxItemSet *pAutoItemSet = 0;
@@ -1339,7 +1339,7 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
SwDoc *pDoc = SwImport::GetDocFromXMLImport( GetSwImport() );
String sTblName;
- if( aName.getLength() )
+ if( !aName.isEmpty() )
{
const SwTableFmt *pTblFmt = pDoc->FindTblFmtByName( aName );
if( !pTblFmt )
@@ -1533,7 +1533,7 @@ void SwXMLTableContext::InsertColumn( sal_Int32 nWidth2, sal_Bool bRelWidth2,
else if( nWidth2 > USHRT_MAX )
nWidth2 = USHRT_MAX;
aColumnWidths.push_back( ColumnWidthInfo(nWidth2, bRelWidth2) );
- if( (pDfltCellStyleName && pDfltCellStyleName->getLength() > 0) ||
+ if( (pDfltCellStyleName && !pDfltCellStyleName->isEmpty()) ||
pColumnDefaultCellStyleNames )
{
if( !pColumnDefaultCellStyleNames )
@@ -1657,13 +1657,13 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName,
}
OUString sStyleName( rStyleName );
- if( !sStyleName.getLength() )
+ if( sStyleName.isEmpty() )
{
sStyleName = ((*pRows)[(sal_uInt16)nCurRow])->GetDefaultCellStyleName();
- if( !sStyleName.getLength() && HasColumnDefaultCellStyleNames() )
+ if( sStyleName.isEmpty() && HasColumnDefaultCellStyleNames() )
{
sStyleName = GetColumnDefaultCellStyleName( nCurCol );
- if( !sStyleName.getLength() )
+ if( sStyleName.isEmpty() )
sStyleName = aDfltCellStyleName;
}
}
@@ -2062,7 +2062,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
sal_Bool bNew;
SwTableBoxFmt *pBoxFmt2 = GetSharedBoxFormat(
pBox, sStyleName, nColWidth, pCell->IsProtected(),
- pCell->GetStartNode() && pCell->GetFormula().getLength() == 0 &&
+ pCell->GetStartNode() && pCell->GetFormula().isEmpty() &&
! pCell->HasValue(),
bNew, &bModifyLocked );
@@ -2071,7 +2071,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
{
// set style
const SfxItemSet *pAutoItemSet = 0;
- if( pCell->GetStartNode() && sStyleName.getLength() &&
+ if( pCell->GetStartNode() && !sStyleName.isEmpty() &&
GetSwImport().FindAutomaticStyle(
XML_STYLE_FAMILY_TABLE_CELL, sStyleName, &pAutoItemSet ) )
{
@@ -2092,8 +2092,8 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
// then make it a text cell!
bool bSuppressNumericContent = false;
if( pCell->HasValue() && (pCell->GetValue() == 0.0) &&
- (pCell->GetFormula().getLength() == 0) &&
- (sStyleName.getLength() != 0) )
+ pCell->GetFormula().isEmpty() &&
+ !sStyleName.isEmpty() )
{
// default num format?
const SfxPoolItem* pItem = NULL;
@@ -2139,7 +2139,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
// the normal case: set formula and value (if available)
const OUString& rFormula = pCell->GetFormula();
- if (rFormula.getLength() > 0)
+ if (!rFormula.isEmpty())
{
// formula cell: insert formula if valid
SwTblBoxFormula aFormulaItem( rFormula );
@@ -2220,7 +2220,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
const SfxItemSet *pAutoItemSet = 0;
const OUString& rStyleName = (*pRows)[(sal_uInt16)nTopRow]->GetStyleName();
if( 1UL == (nBottomRow - nTopRow) &&
- rStyleName.getLength() &&
+ !rStyleName.isEmpty() &&
GetSwImport().FindAutomaticStyle(
XML_STYLE_FAMILY_TABLE_ROW, rStyleName, &pAutoItemSet ) )
{
@@ -2684,7 +2684,7 @@ void SwXMLTableContext::MakeTable()
pTableNode->GetTable().SetTableModel( !bHasSubTables );
const SfxItemSet *pAutoItemSet = 0;
- if( aStyleName.getLength() &&
+ if( !aStyleName.isEmpty() &&
rSwImport.FindAutomaticStyle(
XML_STYLE_FAMILY_TABLE_TABLE, aStyleName, &pAutoItemSet ) &&
pAutoItemSet )
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 2dc565c..c62bce3 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -165,7 +165,7 @@ void SwXMLTextParagraphExport::exportStyleContent(
sBuffer.append( GetXMLToken(eFunc) );
sBuffer.append( (sal_Unicode)'(' );
sBuffer.append( (sal_Unicode)')' );
- if( sVal.getLength() )
+ if( !sVal.isEmpty() )
{
sBuffer.append( (sal_Unicode)'=' );
sBuffer.append( sVal );
@@ -213,7 +213,7 @@ void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL(
const Reference < XPropertySet >& rPropSet,
OUString& rURL) const
{
- if( !rURL.getLength() )
+ if( rURL.isEmpty() )
return;
SwGrfNode *pGrfNd = GetNoTxtNode( rPropSet )->GetGrfNode();
@@ -473,7 +473,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
pStates++;
}
- if( sAutoStyle.getLength() )
+ if( !sAutoStyle.isEmpty() )
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE_NAME, sAutoStyle );
addTextFrameAttributes( rPropSet, sal_False );
@@ -561,12 +561,12 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
::rtl::OUString aStr;
Any aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase")) );
aAny2 >>= aStr;
- if (aStr.getLength() )
+ if (!aStr.isEmpty() )
lcl_addURL(rXMLExport, aStr);
aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletName")) );
aAny2 >>= aStr;
- if (aStr.getLength())
+ if (!aStr.isEmpty())
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_APPLET_NAME, aStr );
aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode")) );
@@ -612,7 +612,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginMimeType")) );
aAny2 >>= aStr;
- if (aStr.getLength())
+ if (!aStr.isEmpty())
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, aStr );
eElementName = XML_PLUGIN;
}
@@ -633,7 +633,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")) );
aAny2 >>= aStr;
- if (aStr.getLength())
+ if (!aStr.isEmpty())
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_FRAME_NAME, aStr );
eElementName = XML_FLOATING_FRAME;
}
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 926f423..4b77b18 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -240,7 +240,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
OUString aObjName( rHRef.copy( nPos+1) );
- if( !aObjName.getLength() )
+ if( aObjName.isEmpty() )
return xPropSet;
uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
@@ -378,7 +378,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
if( pDoc->GetDrawModel() )
SwXFrame::GetOrCreateSdrObject(
static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order
- if( rTblName.getLength() )
+ if( !rTblName.isEmpty() )
{
const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx();
@@ -457,7 +457,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
sal_Int64 nDrawAspect = 0;
const XMLPropStyleContext *pStyle = 0;
sal_Bool bHasSizeProps = sal_False;
- if( rStyleName.getLength() )
+ if( !rStyleName.isEmpty() )
{
pStyle = FindAutoFrameStyle( rStyleName );
if( pStyle )
@@ -569,7 +569,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
// We'll need a (valid) URL. If we don't have do not insert the link and return early.
// Copy URL into URL oject on the way.
INetURLObject aURLObj;
- bool bValidURL = rHRef.getLength() != 0 &&
+ bool bValidURL = !rHRef.isEmpty() &&
aURLObj.SetURL( URIHelper::SmartRel2Abs(
INetURLObject( GetXMLImport().GetBaseURL() ), rHRef ) );
if( !bValidURL )
@@ -654,7 +654,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet(
SwApplet_Impl aAppletImpl ( aItemSet );
String sCodeBase;
- if( rHRef.getLength() )
+ if( !rHRef.isEmpty() )
sCodeBase = GetXMLImport().GetAbsoluteReference( rHRef );
aAppletImpl.CreateApplet ( rCode, rName, bMayScript, sCodeBase, GetXMLImport().GetDocumentBase() );
@@ -701,9 +701,9 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
// on the way.
INetURLObject aURLObj;
- bool bValidURL = rHRef.getLength() != 0 &&
+ bool bValidURL = !rHRef.isEmpty() &&
aURLObj.SetURL( URIHelper::SmartRel2Abs( INetURLObject( GetXMLImport().GetBaseURL() ), rHRef ) );
- bool bValidMimeType = rMimeType.getLength() != 0;
+ bool bValidMimeType = !rMimeType.isEmpty();
if( !bValidURL && !bValidMimeType )
return xPropSet;
@@ -783,7 +783,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
sal_Bool bIsBorderSet = sal_False;
Size aMargin( SIZE_NOT_SET, SIZE_NOT_SET );
const XMLPropStyleContext *pStyle = 0;
- if( rStyleName.getLength() )
+ if( !rStyleName.isEmpty() )
{
pStyle = FindAutoFrameStyle( rStyleName );
if( pStyle )
@@ -1029,7 +1029,7 @@ void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor(
sal_Bool bStart)
{
OUString rId = GetOpenRedlineId();
- if ((NULL != pRedlineHelper) && (rId.getLength() > 0))
+ if ((NULL != pRedlineHelper) && !rId.isEmpty())
{
uno::Reference<XTextRange> xTextRange( GetCursor()->getStart() );
pRedlineHelper->AdjustStartNodeCursor(rId, bStart, xTextRange );
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 48dc2c5..74bd20e 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -321,7 +321,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
xStyles->getByName( pNameItem->GetValue() ) >>= xInfo;
::rtl::OUString aUIName;
xInfo->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName")) ) >>= aUIName;
- if ( aUIName.getLength() )
+ if ( !aUIName.isEmpty() )
rReq.AppendItem( SfxStringItem( SID_STYLE_APPLY, aUIName ) );
}
catch (const uno::Exception&)
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 3040979..14a9bc4 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -271,7 +271,7 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet)
sal_Bool SwCharURLPage::FillItemSet(SfxItemSet& rSet)
{
::rtl::OUString sURL = aURLED.GetText();
- if(sURL.getLength())
+ if(!sURL.isEmpty())
{
sURL = URIHelper::SmartRel2Abs(INetURLObject(), sURL, Link(), false );
// #i100683# file URLs should be normalized in the UI
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index f423f01..d4ab549 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -382,7 +382,7 @@ void SwTestAccountSettingsDialog::Test()
uno::Reference<XAuthenticator> xAuthenticator;
if(m_pParent->m_pConfigItem->IsAuthentication() &&
!m_pParent->m_pConfigItem->IsSMTPAfterPOP() &&
- m_pParent->m_pConfigItem->GetMailUserName().getLength())
+ !m_pParent->m_pConfigItem->GetMailUserName().isEmpty())
xAuthenticator =
new SwAuthenticator(
m_pParent->m_pConfigItem->GetMailUserName(),
diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx
index af6d328..8470b95 100644
--- a/sw/source/ui/config/modcfg.cxx
+++ b/sw/source/ui/config/modcfg.cxx
@@ -1121,7 +1121,7 @@ void SwInsertConfig::Load()
//#i61007# initialize caption order, right now only HUNGARIAN seems to need a different order
SvtSysLocaleOptions aSysLocaleOptions;
OUString sLang = aSysLocaleOptions.GetLocaleConfigString();
- bCaptionOrderNumberingFirst = ( sLang.getLength() && sLang.matchAsciiL( "hu", 2 )) ? sal_True : sal_False;
+ bCaptionOrderNumberingFirst = ( !sLang.isEmpty() && sLang.matchAsciiL( "hu", 2 )) ? sal_True : sal_False;
}
}
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 6261904..9fc6496 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -349,7 +349,7 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet )
if ( sName.equals( USER_ENTRY ) )
sNewEntry = m_sUserEntry;
- else if ( pObjShell && sName.getLength() > 0 )
+ else if ( pObjShell && !sName.isEmpty() )
{
SfxFilterContainer* pFacCont = pObjShell->GetFactory().GetFilterContainer();
const SfxFilter* pFilter = pFacCont->GetFilter4FilterName( sName );
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index af18564..e0d3ddb 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -257,7 +257,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) :
{
m_xDBContext->getByName(pNames[nName]) >>= xSourceProperties;
pUserData->sURL = lcl_getFlatURL( xSourceProperties );
- bEnableEdit = pUserData->sURL.getLength() > 0 &&
+ bEnableEdit = !pUserData->sURL.isEmpty() &&
SWUnoHelper::UCB_IsFile( pUserData->sURL ) && //#i97577#
!SWUnoHelper::UCB_IsReadOnlyFileName( pUserData->sURL );
}
@@ -324,7 +324,7 @@ IMPL_LINK(SwAddressListDialog, FilterHdl_Impl, PushButton*, EMPTYARG)
::rtl::OUString sQuery;
xRowProperties->getPropertyValue(C2U("ActiveCommand"))>>= sQuery;
xComposer->setQuery(sQuery);
- if(pUserData->sFilter.getLength())
+ if(!pUserData->sFilter.isEmpty())
xComposer->setFilter(pUserData->sFilter);
aFirst.Value <<= xComposer;
@@ -458,7 +458,7 @@ IMPL_LINK(SwAddressListDialog, EditHdl_Impl, PushButton*, pButton)
{
SvLBoxEntry* pEntry = m_aListLB.FirstSelected();
AddressUserData_Impl* pUserData = pEntry ? static_cast<AddressUserData_Impl*>(pEntry->GetUserData()) : 0;
- if(pUserData && pUserData->sURL.getLength())
+ if(pUserData && !pUserData->sURL.isEmpty())
{
if(pUserData->xResultSet.is())
{
@@ -543,7 +543,7 @@ IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvLBoxEntry*,
if(sTable == pThis->m_sConnecting)
pThis->m_aListLB.SetEntryText(String(), pSelect, ITEMID_TABLE - 1);
}
- pThis->m_aEditPB.Enable(pUserData && pUserData->sURL.getLength() &&
+ pThis->m_aEditPB.Enable(pUserData && !pUserData->sURL.isEmpty() &&
SWUnoHelper::UCB_IsFile( pUserData->sURL ) && //#i97577#
!SWUnoHelper::UCB_IsReadOnlyFileName( pUserData->sURL ) );
pThis->m_bInSelectHdl = false;
@@ -622,7 +622,7 @@ void SwAddressListDialog::DetectTablesAndQueries(
}
}
}
- if ( m_aDBData.sCommand.getLength() )
+ if ( !m_aDBData.sCommand.isEmpty() )
{
uno::Reference<beans::XPropertySet> xSourceProperties;
m_xDBContext->getByName(m_aDBData.sDataSource) >>= xSourceProperties;
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index e7e6c92..8f6e0e2 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -227,7 +227,7 @@ SwAddRenameEntryDialog::~SwAddRenameEntryDialog()
IMPL_LINK(SwAddRenameEntryDialog, ModifyHdl_Impl, Edit*, pEdit)
{
::rtl::OUString sEntry = pEdit->GetText();
- sal_Bool bFound = sEntry.getLength() ? sal_False : sal_True;
+ sal_Bool bFound = sEntry.isEmpty();
if(!bFound)
{
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 47fa529..5a7f3dc 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -818,7 +818,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox )
if( pBox == &aLbDbFmtFromUsr )
{
- if( aSrch.sColumn.getLength() )
+ if( !aSrch.sColumn.isEmpty() )
{
aOldNumFmtLnk.Call( pBox );
aDBColumns[ nFndPos ]->nUsrNumFmt = aLbDbFmtFromUsr.GetFormat();
@@ -829,7 +829,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox )
// set the selected FieldName at the FormatGroupBox, so that
// it's clear what field is configured by the format!
String sTxt( aFlFormat.GetText().Copy( 0, nGBFmtLen ));
- if( !aSrch.sColumn.getLength() )
+ if( aSrch.sColumn.isEmpty() )
{
aRbDbFmtFromDb.Enable( sal_False );
aRbDbFmtFromUsr.Enable( sal_False );
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 9b184c8..c309595 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -345,7 +345,7 @@ sal_Bool SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
if ( rMergeDesc.rDescriptor.has(daConnection) )
rMergeDesc.rDescriptor[daConnection] >>= xConnection;
- if(!aData.sDataSource.getLength() || !aData.sCommand.getLength() || !xResSet.is())
+ if(aData.sDataSource.isEmpty() || aData.sCommand.isEmpty() || !xResSet.is())
{
return sal_False;
}
@@ -621,7 +621,7 @@ sal_Bool SwNewDBMgr::GetTableNames(ListBox* pListBox, const String& rDBName)
else
{
rtl::OUString sDBName(rDBName);
- if ( sDBName.getLength() )
+ if ( !sDBName.isEmpty() )
xConnection = RegisterConnection( sDBName );
}
if(xConnection.is())
@@ -2411,7 +2411,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
if ( aDescriptor.has(daConnection) )
aDescriptor[daConnection] >>= xConnection;
- if(!sDataSource.getLength() || !sDataTableOrQuery.getLength())
+ if(sDataSource.isEmpty() || sDataTableOrQuery.isEmpty())
{
OSL_FAIL("PropertyValues missing or unset");
return;
@@ -2574,7 +2574,7 @@ void SwNewDBMgr::InsertText(SwWrtShell& rSh,
else if(pValues[nPos].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cActiveConnection)))
pValues[nPos].Value >>= xConnection;
}
- if(!sDataSource.getLength() || !sDataTableOrQuery.getLength() || !xResSet.is())
+ if(sDataSource.isEmpty() || sDataTableOrQuery.isEmpty() || !xResSet.is())
{
OSL_FAIL("PropertyValues missing or unset");
return;
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index f76e1dd..326679f 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -242,7 +242,7 @@ void SwMailDispatcherListener_Impl::DeleteAttachments( uno::Reference< mail::XMa
{
::rtl::OUString sURL;
xTransferableProperties->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ) >>= sURL;
- if(sURL.getLength())
+ if(!sURL.isEmpty())
SWUnoHelper::UCB_DeleteFile( sURL );
}
}
@@ -579,7 +579,7 @@ void SwSendMailDialog::IterateMails()
pMessage->addRecipient( pCurrentMailDescriptor->sEMail );
pMessage->SetSenderName( m_pConfigItem->GetMailDisplayName() );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list