-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Please find attached a partial fix for Easy Hack FDO43460
Part XXIII
Modules
lotuswordpro
- --
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJO+hCvAAoJEJp3R7nH3vLxm+UH/jWzn34Tk3M/+kmwrHBz9sLU
DJZ6gVvtmAumUw2/+wWrjj4SbYlOt3Nm/+uT4uMhvpCiEKw7UTq4OhCznjzsFavL
2KTOQhYmfHz38ubYLzdHuLqgyo2e3iS4ZjUfmyXQZqsTJeuW2IYjXFkdRPyk05qq
xFbcEYYNG4jXvBGq0ruvbA9iU3NikFYkfYUfdIN7k8nKZ1qaKZnVF/fEt+DWCeIM
TJklbyWLH6xaZO7QCt8rGSsYBnA32TXdLaONi4ZhYH/CF7//u6KD70mukuRh7ZeD
jgxXB8VI1fhBV4OVZBmnKWFs7ikCAHsCdG25EXGGe4z5CUCv/ZF1xybtjREspzQ=
=3GKE
-----END PGP SIGNATURE-----
From ad63da7681f34f261066152e8fcc44b9e55b7cb0 Mon Sep 17 00:00:00 2001
From: Olivier Hallot <olivier.hallot@alta.org.br>
Date: Tue, 27 Dec 2011 16:32:55 -0200
Subject: [PATCH] Fix for fdo43460 Part XXIV getLength() to isEmpty()
Part XXIV
Modules
lotuswordpro
---
lotuswordpro/source/filter/lwpdoc.cxx | 2 +-
lotuswordpro/source/filter/lwpfont.cxx | 2 +-
lotuswordpro/source/filter/lwpfootnote.cxx | 6 +++---
lotuswordpro/source/filter/lwpframelayout.cxx | 4 ++--
lotuswordpro/source/filter/lwpfrib.cxx | 2 +-
lotuswordpro/source/filter/lwpfribframe.cxx | 6 +++---
lotuswordpro/source/filter/lwpfribmark.cxx | 8 ++++----
lotuswordpro/source/filter/lwpfribptr.cxx | 4 ++--
lotuswordpro/source/filter/lwpfribtable.cxx | 6 +++---
lotuswordpro/source/filter/lwpfribtext.cxx | 4 ++--
lotuswordpro/source/filter/lwpgrfobj.cxx | 2 +-
lotuswordpro/source/filter/lwpmarker.cxx | 2 +-
lotuswordpro/source/filter/lwppara.cxx | 16 ++++++++--------
lotuswordpro/source/filter/lwpproplist.cxx | 2 +-
lotuswordpro/source/filter/lwpsilverbullet.cxx | 2 +-
lotuswordpro/source/filter/lwptablelayout.cxx | 2 +-
.../source/filter/xfilter/xfannotation.hxx | 4 ++--
.../source/filter/xfilter/xfarrowstyle.hxx | 2 +-
lotuswordpro/source/filter/xfilter/xfborders.cxx | 16 ++++++++--------
lotuswordpro/source/filter/xfilter/xfcell.cxx | 4 ++--
lotuswordpro/source/filter/xfilter/xfcellstyle.cxx | 8 ++++----
lotuswordpro/source/filter/xfilter/xfchange.cxx | 10 +++++-----
lotuswordpro/source/filter/xfilter/xfdate.cxx | 6 +++---
lotuswordpro/source/filter/xfilter/xfdocfield.cxx | 12 ++++++------
lotuswordpro/source/filter/xfilter/xfdrawline.cxx | 8 ++++----
lotuswordpro/source/filter/xfilter/xfdrawobj.cxx | 8 ++++----
lotuswordpro/source/filter/xfilter/xfdrawpath.cxx | 2 +-
lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx | 10 +++++-----
lotuswordpro/source/filter/xfilter/xfdropcap.hxx | 2 +-
lotuswordpro/source/filter/xfilter/xfendnote.hxx | 4 ++--
lotuswordpro/source/filter/xfilter/xfentry.cxx | 2 +-
lotuswordpro/source/filter/xfilter/xffootnote.hxx | 4 ++--
.../source/filter/xfilter/xffootnoteconfig.hxx | 18 +++++++++---------
lotuswordpro/source/filter/xfilter/xfframe.cxx | 8 ++++----
lotuswordpro/source/filter/xfilter/xfhyperlink.hxx | 6 +++---
lotuswordpro/source/filter/xfilter/xfimage.cxx | 6 +++---
.../source/filter/xfilter/xfimagestyle.cxx | 6 +++---
lotuswordpro/source/filter/xfilter/xfindex.cxx | 16 ++++++++--------
.../source/filter/xfilter/xflinenumberconfig.hxx | 2 +-
lotuswordpro/source/filter/xfilter/xflist.cxx | 4 ++--
lotuswordpro/source/filter/xfilter/xflistitem.hxx | 2 +-
lotuswordpro/source/filter/xfilter/xfliststyle.cxx | 4 ++--
.../source/filter/xfilter/xfnumberstyle.cxx | 18 +++++++++---------
lotuswordpro/source/filter/xfilter/xfnumfmt.hxx | 10 +++++-----
lotuswordpro/source/filter/xfilter/xfparagraph.cxx | 2 +-
lotuswordpro/source/filter/xfilter/xfparastyle.cxx | 6 +++---
.../source/filter/xfilter/xfplaceholder.hxx | 4 ++--
lotuswordpro/source/filter/xfilter/xfrow.cxx | 2 +-
lotuswordpro/source/filter/xfilter/xfrowstyle.cxx | 2 +-
lotuswordpro/source/filter/xfilter/xfruby.hxx | 6 +++---
lotuswordpro/source/filter/xfilter/xfrubystyle.hxx | 6 +++---
lotuswordpro/source/filter/xfilter/xfsection.cxx | 8 ++++----
lotuswordpro/source/filter/xfilter/xfstylecont.cxx | 4 ++--
.../source/filter/xfilter/xfstylemanager.cxx | 4 ++--
lotuswordpro/source/filter/xfilter/xftable.cxx | 6 +++---
.../source/filter/xfilter/xftablestyle.cxx | 2 +-
lotuswordpro/source/filter/xfilter/xftabstyle.cxx | 2 +-
.../source/filter/xfilter/xftextboxstyle.cxx | 2 +-
lotuswordpro/source/filter/xfilter/xftextspan.cxx | 4 ++--
lotuswordpro/source/filter/xfilter/xftextstyle.cxx | 4 ++--
lotuswordpro/source/filter/xfilter/xftimestyle.cxx | 2 +-
61 files changed, 169 insertions(+), 169 deletions(-)
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index 1a4b466..0f29eb4 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -175,7 +175,7 @@ sal_Bool LwpDocument::IsSkippedDivision()
if (pDiv == NULL)
return sal_True;
sDivName = pDiv->GetDivName();
- if (sDivName.getLength()>0 && !pDiv->IsGotoable())//including toa,scripts division
+ if (!sDivName.isEmpty() && !pDiv->IsGotoable())//including toa,scripts division
return sal_True;
//skip endnote division
OUString strClassName = pDiv->GetClassName();
diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx
index 01b1e2d..f0809f0 100644
--- a/lotuswordpro/source/filter/lwpfont.cxx
+++ b/lotuswordpro/source/filter/lwpfont.cxx
@@ -234,7 +234,7 @@ OUString LwpFontTableEntry::GetFaceName()
void LwpFontTableEntry::RegisterFontDecl()
{
- if(m_FaceName.str().getLength()==0) return;
+ if(m_FaceName.str().isEmpty()) return;
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
XFFontDecl aFontDecl1( m_FaceName.str(), m_FaceName.str(), false );
pXFStyleManager->AddFontDecl(aFontDecl1);
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx
index dd399c2..9e2d143 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -364,7 +364,7 @@ LwpEnSuperTableLayout* LwpFootnote::FindFootnoteTableLayout()
LwpFoundry* pFoundry = pDivision->GetFoundry();
OUString strClassName = GetTableClass();
- if(strClassName.getLength() ==0 )
+ if(strClassName.isEmpty() )
return NULL;
LwpContent* pContent = NULL;
@@ -511,13 +511,13 @@ void LwpFootnoteOptions::RegisterEndnoteStyle()
XFEndnoteConfig* pEndnoteConfig = new XFEndnoteConfig();
pEndnoteConfig->SetStartValue(m_EndnoteDocNumbering.GetStartingNumber() -1);
OUString message = m_EndnoteDocNumbering.GetLeadingText();
- if(message.getLength() == 0)
+ if(message.isEmpty())
{
message = A2OUSTR("[");//default prefix
}
pEndnoteConfig->SetNumPrefix(message);
message = m_EndnoteDocNumbering.GetTrailingText();
- if(message.getLength() == 0)
+ if(message.isEmpty())
{
message = A2OUSTR("]");//default suffix
}
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx
b/lotuswordpro/source/filter/lwpframelayout.cxx
index dcbe10d..6f9a0a7 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -126,7 +126,7 @@ void LwpFrame::RegisterStyle(XFFrameStyle* pFrameStyle)
//Set frame Name
OUString aFrameName = m_pLayout->GetName()->str();
- if(aFrameName.getLength())
+ if(!aFrameName.isEmpty())
{
//cause the bug of SODC, the linkframe name can not be "Frame1", so I change the frame name
/*if(aFrameName.equals(A2OUSTR("Frame1")))
@@ -891,7 +891,7 @@ OUString LwpFrameLayout::GetNextLinkName()
if (pHolder)
aName = pHolder->str();
//for division name confict
- if(pLayout->GetStyleName().getLength() > 0)
+ if(!pLayout->GetStyleName().isEmpty())
aName = pLayout->GetStyleName();
}
}
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx
index a283416..f7b800d 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -318,7 +318,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
{
pStyle = new XFTextStyle();
- if (m_StyleName.getLength()>0)
+ if (!m_StyleName.isEmpty())
{
XFTextStyle* pOldStyle = pXFStyleManager->FindTextStyle(m_StyleName);
*pStyle = *pOldStyle;
diff --git a/lotuswordpro/source/filter/lwpfribframe.cxx
b/lotuswordpro/source/filter/lwpfribframe.cxx
index 3e617da..3ce3070 100644
--- a/lotuswordpro/source/filter/lwpfribframe.cxx
+++ b/lotuswordpro/source/filter/lwpfribframe.cxx
@@ -116,7 +116,7 @@ void LwpFribFrame::RegisterStyle(LwpFoundry* pFoundry)
&& HasNextFrib())
{
XFParaStyle* pOldStyle = m_pPara->GetXFParaStyle();
- if (pOldStyle->GetMasterPage().getLength() == 0)
+ if (pOldStyle->GetMasterPage().isEmpty())
m_StyleName = pOldStyle->GetStyleName();
else
{
@@ -176,7 +176,7 @@ void LwpFribFrame::XFConvert(XFContentContainer* pCont)
LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance();
LwpChangeMgr* pChangeMgr = pGlobal->GetLwpChangeMgr();
sChangeID = pChangeMgr->GetChangeID(this);
- if (sChangeID.getLength())
+ if (!sChangeID.isEmpty())
{
XFChangeStart* pChangeStart = new XFChangeStart;
pChangeStart->SetChangeID(sChangeID);
@@ -188,7 +188,7 @@ void LwpFribFrame::XFConvert(XFContentContainer* pCont)
if(m_bRevisionFlag)
{
- if (sChangeID.getLength())
+ if (!sChangeID.isEmpty())
{
XFChangeEnd* pChangeEnd = new XFChangeEnd;
pChangeEnd->SetChangeID(sChangeID);
diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx
index c278081..65f9b7c 100644
--- a/lotuswordpro/source/filter/lwpfribmark.cxx
+++ b/lotuswordpro/source/filter/lwpfribmark.cxx
@@ -279,7 +279,7 @@ void LwpFribField::XFConvert(XFContentContainer* pXFPara)
ConvertDocFieldEnd(pXFPara,pFieldMark);
}
}
- if(pFieldMark->GetRevisionFlag() && sChangeID.getLength())
+ if(pFieldMark->GetRevisionFlag() && !sChangeID.isEmpty())
{
XFChangeEnd* pChangeEnd = new XFChangeEnd;
pChangeEnd->SetChangeID(sChangeID);
@@ -290,7 +290,7 @@ void LwpFribField::XFConvert(XFContentContainer* pXFPara)
}
//start marker
- if(pFieldMark->GetRevisionFlag() && sChangeID.getLength())
+ if(pFieldMark->GetRevisionFlag() && !sChangeID.isEmpty())
{
XFChangeStart* pChangeStart = new XFChangeStart;
pChangeStart->SetChangeID(sChangeID);
@@ -301,7 +301,7 @@ void LwpFribField::XFConvert(XFContentContainer* pXFPara)
{
OUString sKey1,sKey2;
pFieldMark->ParseIndex(sKey1,sKey2);
- if (sKey1.getLength()>0)
+ if (!sKey1.isEmpty())
{
XFEntry* pEntry = new XFEntry;
pEntry->SetEntryType(enumXFEntryAlphabetical);
@@ -313,7 +313,7 @@ void LwpFribField::XFConvert(XFContentContainer* pXFPara)
{
OUString sLevel,sText;
pFieldMark->ParseTOC(sLevel,sText);
- if (sLevel.getLength()>0 && sText.getLength()>0)
+ if (!sLevel.isEmpty() && !sText.isEmpty())
{
XFEntry* pEntry = new XFEntry;
pEntry->SetEntryType(enumXFEntryTOC);
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx
index ac6bb89..239df17 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -167,7 +167,7 @@ void LwpFribPtr::XFConvert()
LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance();
LwpChangeMgr* pChangeMgr = pGlobal->GetLwpChangeMgr();
sChangeID = pChangeMgr->GetChangeID(pFrib);
- if (sChangeID.getLength())
+ if (!sChangeID.isEmpty())
{
/// if (nRevisionType == LwpFrib::REV_INSERT)
/// {
@@ -363,7 +363,7 @@ void LwpFribPtr::XFConvert()
if (nFribType!= FRIB_TAG_TABLE && nFribType != FRIB_TAG_FIELD
&& nFribType != FRIB_TAG_FRAME)
{
- if (sChangeID.getLength())
+ if (!sChangeID.isEmpty())
{
XFChangeEnd* pChangeEnd = new XFChangeEnd;
pChangeEnd->SetChangeID(sChangeID);
diff --git a/lotuswordpro/source/filter/lwpfribtable.cxx
b/lotuswordpro/source/filter/lwpfribtable.cxx
index 33e3cfe..86b81c3 100644
--- a/lotuswordpro/source/filter/lwpfribtable.cxx
+++ b/lotuswordpro/source/filter/lwpfribtable.cxx
@@ -82,7 +82,7 @@ void LwpFribTable::RegisterNewStyle()
XFParaStyle* pOldStyle = m_pPara->GetXFParaStyle();
if(HasNextFrib())
{
- if (pOldStyle->GetMasterPage().getLength() == 0)
+ if (pOldStyle->GetMasterPage().isEmpty())
m_StyleName = pOldStyle->GetStyleName();
else
{
@@ -138,7 +138,7 @@ void LwpFribTable::XFConvert(XFContentContainer* pCont)
LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance();
LwpChangeMgr* pChangeMgr = pGlobal->GetLwpChangeMgr();
sChangeID = pChangeMgr->GetChangeID(this);
- if (sChangeID.getLength())
+ if (!sChangeID.isEmpty())
{
XFChangeStart* pChangeStart = new XFChangeStart;
pChangeStart->SetChangeID(sChangeID);
@@ -149,7 +149,7 @@ void LwpFribTable::XFConvert(XFContentContainer* pCont)
if(m_bRevisionFlag)
{
- if (sChangeID.getLength())
+ if (!sChangeID.isEmpty())
{
XFChangeEnd* pChangeEnd = new XFChangeEnd;
pChangeEnd->SetChangeID(sChangeID);
diff --git a/lotuswordpro/source/filter/lwpfribtext.cxx b/lotuswordpro/source/filter/lwpfribtext.cxx
index d1c6f12..9430f1b 100644
--- a/lotuswordpro/source/filter/lwpfribtext.cxx
+++ b/lotuswordpro/source/filter/lwpfribtext.cxx
@@ -473,7 +473,7 @@ void LwpFribPageNumber::XFConvert(XFContentContainer* pXFPara)
break;
}
OUString styleName = GetStyleName();
- if (m_aBefText.str().getLength()>0)
+ if (!m_aBefText.str().isEmpty())
{
OUString textStr = m_aBefText.str();
XFTextSpan *pBef = new XFTextSpan(textStr,styleName);
@@ -488,7 +488,7 @@ void LwpFribPageNumber::XFConvert(XFContentContainer* pXFPara)
}
else
pXFPara->Add(pNum);
- if (m_aAfterText.str().getLength()>0)
+ if (!m_aAfterText.str().isEmpty())
{
OUString textStr = m_aAfterText.str();
XFTextSpan *pAfter = new XFTextSpan(textStr,styleName);
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index d77dbcb..8971860 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -676,7 +676,7 @@ void LwpGraphicObject::CreateGrafObject()
// set object name
LwpAtomHolder* pHolder = this->GetName();
- if ( pHolder && pHolder->str().getLength() )
+ if ( pHolder && !pHolder->str().isEmpty() )
{
pImage->SetName(pHolder->str());
}
diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx
index 6ab8c21..74176b7 100644
--- a/lotuswordpro/source/filter/lwpmarker.cxx
+++ b/lotuswordpro/source/filter/lwpmarker.cxx
@@ -301,7 +301,7 @@ void LwpCHBlkMarker::EnumAllKeywords()
LwpPropList* pProp = GetPropList();
if (!pProp)
return;
- while(name2.getLength()>0)
+ while(!name2.isEmpty())
{
name2 = pProp->EnumNamedProperty(name1,value1);
if ( name1.match(A2OUSTR("LIST"),0) )
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index 6c185b8..0059f59 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -273,7 +273,7 @@ void LwpPara::XFConvert(XFContentContainer* pCont)
XFParagraph *pPara = new XFParagraph;
pPara->SetStyleName(m_StyleName);
- if(m_SectionStyleName.getLength()>0)
+ if(!m_SectionStyleName.isEmpty())
{
XFSection* pSection = CreateXFSection();
if (pStory)
@@ -330,7 +330,7 @@ sal_Bool LwpPara::RegisterMasterPage(XFParaStyle* pBaseStyle)
*pOverStyle = *pBaseStyle;
pOverStyle->SetStyleName( A2OUSTR(""));
pOverStyle->SetMasterPage(pLayout->GetStyleName());
- if (m_ParentStyleName.getLength())
+ if (!m_ParentStyleName.isEmpty())
pOverStyle->SetParentStyleName(m_ParentStyleName);
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
m_StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName();
@@ -508,7 +508,7 @@ void LwpPara::RegisterStyle()
OverrideIndent(NULL,m_pIndentOverride,pOverStyle);
}
}
- if (m_ParentStyleName.getLength())
+ if (!m_ParentStyleName.isEmpty())
pOverStyle->SetParentStyleName(m_ParentStyleName);
m_StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName();
@@ -522,7 +522,7 @@ void LwpPara::RegisterStyle()
pOverStyle = new XFParaStyle;
*pOverStyle = *pBaseStyle;
OverrideIndent(NULL,m_pIndentOverride,pOverStyle);
- if (m_ParentStyleName.getLength())
+ if (!m_ParentStyleName.isEmpty())
pOverStyle->SetParentStyleName(m_ParentStyleName);
m_StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName();
}
@@ -537,7 +537,7 @@ void LwpPara::RegisterStyle()
pOverStyle = new XFParaStyle;
*pOverStyle = *pOldStyle;
pOverStyle->SetAlignType(enumXFAlignStart);
- if (m_ParentStyleName.getLength())
+ if (!m_ParentStyleName.isEmpty())
pOverStyle->SetParentStyleName(m_ParentStyleName);
m_StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName();
}
@@ -753,7 +753,7 @@ void LwpPara::RegisterStyle()
*pOverStyle = *GetXFParaStyle();
XFMargins* pMargin = &pOverStyle->GetMargins();
pMargin->SetTop(pMargin->GetTop()+pPrePara->GetBelowSpacing());
- if (m_ParentStyleName.getLength())
+ if (!m_ParentStyleName.isEmpty())
pOverStyle->SetParentStyleName(m_ParentStyleName);
m_StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName();
}
@@ -766,7 +766,7 @@ void LwpPara::RegisterStyle()
*pParaStyle = *GetXFParaStyle();
//pOverStyle->SetStyleName(A2OUSTR(""));
this->RegisterTabStyle(pParaStyle);
- if (m_ParentStyleName.getLength())
+ if (!m_ParentStyleName.isEmpty())
pParaStyle->SetParentStyleName(m_ParentStyleName);
m_StyleName = pXFStyleManager->AddStyle(pParaStyle)->GetStyleName();
}
@@ -784,7 +784,7 @@ void LwpPara::RegisterStyle()
XFParaStyle* pStyle = new XFParaStyle;
*pStyle = *GetXFParaStyle();
pStyle->SetDropCap(m_nChars-1,m_nLines);
- if (m_ParentStyleName.getLength())
+ if (!m_ParentStyleName.isEmpty())
pStyle->SetParentStyleName(m_ParentStyleName);
m_StyleName = pXFStyleManager->AddStyle(pStyle)->GetStyleName();
}
diff --git a/lotuswordpro/source/filter/lwpproplist.cxx b/lotuswordpro/source/filter/lwpproplist.cxx
index b9d80ec..436e300 100644
--- a/lotuswordpro/source/filter/lwpproplist.cxx
+++ b/lotuswordpro/source/filter/lwpproplist.cxx
@@ -123,7 +123,7 @@ LwpPropListElement* LwpPropList::GetFirst()
OUString LwpPropList::EnumNamedProperty(OUString& name,OUString& value)
{
LwpPropListElement* pElement;
- if (name.getLength()==0)
+ if (name.isEmpty())
{
pElement = GetFirst();
if (pElement)
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx
b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index 1b16cdb..1417af5 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -464,7 +464,7 @@ sal_Bool LwpSilverBullet::HasName()
LwpAtomHolder* pName = this->GetName();
if (pName)
{
- return (sal_Bool)(pName->str().getLength() != 0);
+ return (sal_Bool)(!pName->str().isEmpty());
}
else
{
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx
b/lotuswordpro/source/filter/lwptablelayout.cxx
index f092720..5f9ae7e 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1193,7 +1193,7 @@ void LwpTableLayout::PostProcessParagraph(XFCell *pCell, sal_uInt16 nRowID,
sal_
sal_Bool bColorMod = sal_False;
XFNumberStyle* pNumStyle = NULL;
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
- if (sNumfmt.getLength())
+ if (!sNumfmt.isEmpty())
{
pNumStyle = (XFNumberStyle*)pXFStyleManager->FindStyle( sNumfmt);
aColor = pNumStyle->GetColor();
diff --git a/lotuswordpro/source/filter/xfilter/xfannotation.hxx
b/lotuswordpro/source/filter/xfilter/xfannotation.hxx
index bfd3d56..a32c1b1 100644
--- a/lotuswordpro/source/filter/xfilter/xfannotation.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfannotation.hxx
@@ -101,9 +101,9 @@ inline void XFAnnotation::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if( m_strDate.getLength() )
+ if( !m_strDate.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("office:create-date"), m_strDate );
- if( m_strAuthor.getLength() )
+ if( !m_strAuthor.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("office:author"), m_strAuthor);
pStrm->StartElement( A2OUSTR("office:annotation") );
diff --git a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
b/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
index 23df2c9..4c3698a 100644
--- a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
@@ -113,7 +113,7 @@ inline void XFArrowStyle::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if( m_strName.getLength()>0 )
+ if( !m_strName.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("draw:name"), m_strName );
else
pAttrList->AddAttribute( A2OUSTR("draw:name"), GetStyleName() );
diff --git a/lotuswordpro/source/filter/xfilter/xfborders.cxx
b/lotuswordpro/source/filter/xfilter/xfborders.cxx
index 202b8b0..465d783 100644
--- a/lotuswordpro/source/filter/xfilter/xfborders.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfborders.cxx
@@ -336,31 +336,31 @@ void XFBorders::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
- if( m_aBorderLeft.GetLineWidth().getLength() )
+ if( !m_aBorderLeft.GetLineWidth().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("style:border-line-width-left"),
m_aBorderLeft.GetLineWidth() );
- if( m_aBorderRight.GetLineWidth().getLength() )
+ if( !m_aBorderRight.GetLineWidth().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("style:border-line-width-right"),
m_aBorderRight.GetLineWidth() );
- if( m_aBorderTop.GetLineWidth().getLength() )
+ if( !m_aBorderTop.GetLineWidth().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("style:border-line-width-top"),
m_aBorderTop.GetLineWidth() );
- if( m_aBorderBottom.GetLineWidth().getLength() )
+ if( !m_aBorderBottom.GetLineWidth().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("style:border-line-width-bottom"),
m_aBorderBottom.GetLineWidth() );
- if( m_aBorderLeft.ToString().getLength() )
+ if( !m_aBorderLeft.ToString().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("fo:border-left"), m_aBorderLeft.ToString() );
else
pAttrList->AddAttribute( A2OUSTR("fo:border-left"), A2OUSTR("none") );
- if( m_aBorderRight.ToString().getLength() )
+ if( !m_aBorderRight.ToString().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("fo:border-right"), m_aBorderRight.ToString() );
else
pAttrList->AddAttribute( A2OUSTR("fo:border-right"), A2OUSTR("none") );
- if( m_aBorderTop.ToString().getLength() )
+ if( !m_aBorderTop.ToString().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("fo:border-top"), m_aBorderTop.ToString() );
else
pAttrList->AddAttribute( A2OUSTR("fo:border-top"), A2OUSTR("none") );
- if( m_aBorderBottom.ToString().getLength() )
+ if( !m_aBorderBottom.ToString().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("fo:border-bottom"), m_aBorderBottom.ToString() );
else
pAttrList->AddAttribute( A2OUSTR("fo:border-bottom"), A2OUSTR("none") );
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx
b/lotuswordpro/source/filter/xfilter/xfcell.cxx
index 25830c6..462014c 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx
@@ -201,7 +201,7 @@ void XFCell::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if( GetStyleName().getLength() )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("table:style-name"), GetStyleName() );
if( m_nColSpaned>1 )
pAttrList->AddAttribute( A2OUSTR("table:number-columns-spanned"),
Int32ToOUString(m_nColSpaned) );
@@ -212,7 +212,7 @@ void XFCell::ToXml(IXFStream *pStrm)
pAttrList->AddAttribute( A2OUSTR("table:value-type"), GetValueType(m_eValueType) );
pAttrList->AddAttribute( A2OUSTR("table:value"), m_strValue );
}
- if( m_strFormula.getLength() > 0 )
+ if( !m_strFormula.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("table:formula"), m_strFormula );
if( m_bProtect )
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
index 3e6c54a..5c4781f 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
@@ -205,15 +205,15 @@ void XFCellStyle::ToXml(IXFStream *pStrm)
rtl::OUString style = GetStyleName();
pAttrList->Clear();
- if( style.getLength() )
+ if( !style.isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:name"),GetStyleName());
- if( GetParentStyleName().getLength() > 0 )
+ if( !GetParentStyleName().isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),GetParentStyleName());
pAttrList->AddAttribute(A2OUSTR("style:family"), A2OUSTR("table-cell"));
- if( m_strParentStyleName.getLength() > 0 )
+ if( !m_strParentStyleName.isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),m_strParentStyleName);
- if( m_strDataStyle.getLength()>0 )
+ if( !m_strDataStyle.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("style:data-style-name"), m_strDataStyle );
pStrm->StartElement(A2OUSTR("style:style"));
diff --git a/lotuswordpro/source/filter/xfilter/xfchange.cxx
b/lotuswordpro/source/filter/xfilter/xfchange.cxx
index 59a90a7..1be00d4 100644
--- a/lotuswordpro/source/filter/xfilter/xfchange.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfchange.cxx
@@ -85,7 +85,7 @@ void XFChangeInsert::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if(m_sID.getLength() == 0)
+ if(m_sID.isEmpty())
return;
pAttrList->AddAttribute( A2OUSTR("text:id"),m_sID);
@@ -105,7 +105,7 @@ void XFChangeDelete::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if(m_sID.getLength() == 0)
+ if(m_sID.isEmpty())
return;
pAttrList->AddAttribute( A2OUSTR("text:id"),m_sID);
@@ -126,7 +126,7 @@ void XFChange::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if(m_sID.getLength() == 0)
+ if(m_sID.isEmpty())
return;
pAttrList->AddAttribute( A2OUSTR("text:change-id"),m_sID);
@@ -139,7 +139,7 @@ void XFChangeStart::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if(m_sID.getLength() == 0)
+ if(m_sID.isEmpty())
return;
pAttrList->AddAttribute( A2OUSTR("text:change-id"),m_sID);
@@ -152,7 +152,7 @@ void XFChangeEnd::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if(m_sID.getLength() == 0)
+ if(m_sID.isEmpty())
return;
pAttrList->AddAttribute( A2OUSTR("text:change-id"),m_sID);
diff --git a/lotuswordpro/source/filter/xfilter/xfdate.cxx
b/lotuswordpro/source/filter/xfilter/xfdate.cxx
index 69abe16..2935392 100644
--- a/lotuswordpro/source/filter/xfilter/xfdate.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdate.cxx
@@ -76,7 +76,7 @@ void XFDate::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if( GetStyleName().getLength() > 0 )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("style:data-style-name"), GetStyleName() );
if (m_bValued)
pAttrList->AddAttribute( A2OUSTR("text:date-value"), m_strDate );
@@ -85,7 +85,7 @@ void XFDate::ToXml(IXFStream *pStrm)
pAttrList->AddAttribute( A2OUSTR("text:fixed"), A2OUSTR("true") );
pStrm->StartElement( A2OUSTR("text:date") );
- if (m_strText.getLength()>0)
+ if (!m_strText.isEmpty())
pStrm->Characters(m_strText);
pStrm->EndElement( A2OUSTR("text:date") );
}
@@ -95,7 +95,7 @@ void XFDateStart::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if( GetStyleName().getLength() > 0 )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("style:data-style-name"), GetStyleName() );
/* if (m_bValued)
pAttrList->AddAttribute( A2OUSTR("text:date-value"), DateTimeToOUString(m_aDateTime) );
diff --git a/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
b/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
index ea1a030..f62fb86 100644
--- a/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
@@ -159,7 +159,7 @@ void XFTotalEditTime::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if (m_strStyleName.getLength()>0)
+ if (!m_strStyleName.isEmpty())
pAttrList->AddAttribute( A2OUSTR("style:data-style-name"), m_strStyleName );
pStrm->StartElement( A2OUSTR("text:editing-duration" ) );
pStrm->EndElement( A2OUSTR("text:editing-duration") );
@@ -168,7 +168,7 @@ void XFTotalEditTimeStart::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if (m_strStyleName.getLength()>0)
+ if (!m_strStyleName.isEmpty())
pAttrList->AddAttribute( A2OUSTR("style:data-style-name"), m_strStyleName );
pStrm->StartElement( A2OUSTR("text:editing-duration" ) );
}
@@ -180,7 +180,7 @@ void XFCreateTime::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if (m_strStyleName.getLength()>0)
+ if (!m_strStyleName.isEmpty())
pAttrList->AddAttribute( A2OUSTR("style:data-style-name"), m_strStyleName );
pStrm->StartElement( A2OUSTR("text:creation-time") );
pStrm->EndElement( A2OUSTR("text:creation-time") );
@@ -189,7 +189,7 @@ void XFLastEditTime::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if (m_strStyleName.getLength()>0)
+ if (!m_strStyleName.isEmpty())
pAttrList->AddAttribute( A2OUSTR("style:data-style-name"), m_strStyleName );
pStrm->StartElement( A2OUSTR("text:modification-time") );
pStrm->EndElement( A2OUSTR("text:modification-time") );
@@ -199,7 +199,7 @@ void XFCreateTimeStart::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if (m_strStyleName.getLength()>0)
+ if (!m_strStyleName.isEmpty())
pAttrList->AddAttribute( A2OUSTR("style:data-style-name"), m_strStyleName );
pStrm->StartElement( A2OUSTR("text:creation-time") );
}
@@ -208,7 +208,7 @@ void XFLastEditTimeStart::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if (m_strStyleName.getLength()>0)
+ if (!m_strStyleName.isEmpty())
pAttrList->AddAttribute( A2OUSTR("style:data-style-name"), m_strStyleName );
pStrm->StartElement( A2OUSTR("text:modification-time") );
}
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
index c09b9d1..62641b5 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
@@ -67,11 +67,11 @@ void XFDrawLine::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
- if( GetStyleName().getLength() )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("draw:style-name"), GetStyleName() );
- assert(m_strName.getLength()>0); //name should not be null.
- if( m_strName.getLength() )
+ assert(!m_strName.isEmpty()); //name should not be null.
+ if( !m_strName.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("draw:name"), m_strName );
//anchor type:
switch( m_eAnchor )
@@ -113,7 +113,7 @@ void XFDrawLine::ToXml(IXFStream *pStrm)
strTransform += A2OUSTR("skewY (") + DoubleToOUString(m_fSkewY) + A2OUSTR(" ");
strTransform = strTransform.trim();
- if( strTransform.getLength() > 0 )
+ if( !strTransform.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("draw:transform"), strTransform );
pStrm->StartElement( A2OUSTR("draw:line") );
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
index d340f1e..a2ba28b 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
@@ -79,11 +79,11 @@ void XFDrawObject::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
- if( GetStyleName().getLength() )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("draw:style-name"), GetStyleName() );
- assert(m_strName.getLength()>0); //name should not be null.
- if( m_strName.getLength() )
+ assert(!m_strName.isEmpty()); //name should not be null.
+ if( !m_strName.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("draw:name"), m_strName );
//anchor type:
switch( m_eAnchor )
@@ -127,7 +127,7 @@ void XFDrawObject::ToXml(IXFStream *pStrm)
strTransform += A2OUSTR("skewY (") + DoubleToOUString(m_fSkewY) + A2OUSTR(" ");
strTransform = strTransform.trim();
- if( strTransform.getLength() > 0 )
+ if( !strTransform.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("draw:transform"), strTransform );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
index 5306ed1..f0950a0 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
@@ -65,7 +65,7 @@ XFSvgPathEntry::XFSvgPathEntry()
rtl::OUString XFSvgPathEntry::ToString()
{
- assert(m_strCommand.getLength()>0);
+ assert(!m_strCommand.isEmpty());
rtl::OUString str = m_strCommand;
std::vector<XFPoint>::iterator it;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
index d0f5c09..5a6bf90 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
@@ -250,14 +250,14 @@ void XFDrawStyle::ToXml(IXFStream *pStrm)
else
pAttrList->AddAttribute( A2OUSTR("draw:fill"), A2OUSTR("none") );
- if( m_strArrowStart.getLength()>0 )
+ if( !m_strArrowStart.isEmpty() )
{
pAttrList->AddAttribute( A2OUSTR("draw:marker-start"), m_strArrowStart );
pAttrList->AddAttribute( A2OUSTR("draw:marker-start-width"),
DoubleToOUString(m_fArrowStartSize)+A2OUSTR("cm") );
if( m_bArrowStartCenter )
pAttrList->AddAttribute( A2OUSTR("draw:draw:marker-start-center"), A2OUSTR("true") );
}
- if( m_strArrowEnd.getLength()>0 )
+ if( !m_strArrowEnd.isEmpty() )
{
pAttrList->AddAttribute( A2OUSTR("draw:marker-end"), m_strArrowEnd );
pAttrList->AddAttribute( A2OUSTR("draw:marker-end-width"),
DoubleToOUString(m_fArrowEndSize)+A2OUSTR("cm") );
@@ -286,7 +286,7 @@ void XFDrawStyle::ToXml(IXFStream *pStrm)
aStr = A2OUSTR("slant-y");
break;
}
- if (aStr.getLength() > 0)
+ if (!aStr.isEmpty())
{
pAttrList->AddAttribute(A2OUSTR("draw:fontwork-style"), aStr);
}
@@ -309,7 +309,7 @@ void XFDrawStyle::ToXml(IXFStream *pStrm)
aStr = A2OUSTR("right");
break;
}
- if (aStr.getLength() > 0)
+ if (!aStr.isEmpty())
{
pAttrList->AddAttribute(A2OUSTR("draw:fontwork-adjust"), aStr);
}
@@ -328,7 +328,7 @@ void XFDrawStyle::ToXml(IXFStream *pStrm)
aStr = A2OUSTR("bottom-arc");
break;
}
- if (aStr.getLength() > 0)
+ if (!aStr.isEmpty())
{
pAttrList->AddAttribute(A2OUSTR("draw:fontwork-form"), aStr);
}
diff --git a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
index 6e3cf3b..cdb1188b 100644
--- a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
@@ -125,7 +125,7 @@ inline void XFDropcap::ToXml(IXFStream *pStrm)
pAttrList->AddAttribute(A2OUSTR("style:length"), Int32ToOUString(m_nCharCount) );
pAttrList->AddAttribute(A2OUSTR("style:lines"), Int32ToOUString(m_nLines) );
pAttrList->AddAttribute(A2OUSTR("style:distance"), DoubleToOUString(m_fDistance) +
A2OUSTR("cm") );
- if( m_strStyleName.getLength() )
+ if( !m_strStyleName.isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:style-name"), m_strStyleName );
pStrm->StartElement( A2OUSTR("style:drop-cap") );
pStrm->EndElement( A2OUSTR("style:drop-cap") );
diff --git a/lotuswordpro/source/filter/xfilter/xfendnote.hxx
b/lotuswordpro/source/filter/xfilter/xfendnote.hxx
index 187519e..8f45d80 100644
--- a/lotuswordpro/source/filter/xfilter/xfendnote.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfendnote.hxx
@@ -107,10 +107,10 @@ inline void XFEndNote::ToXml(IXFStream *pStrm)
pStrm->StartElement( A2OUSTR("text:endnote") );
pAttrList->Clear();
- if( m_strLabel.getLength() )
+ if( !m_strLabel.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:label"), m_strLabel );
pStrm->StartElement( A2OUSTR("text:endnote-citation") );
- if( m_strLabel.getLength())
+ if( !m_strLabel.isEmpty())
pStrm->Characters(m_strLabel);
pStrm->EndElement( A2OUSTR("text:endnote-citation") );
diff --git a/lotuswordpro/source/filter/xfilter/xfentry.cxx
b/lotuswordpro/source/filter/xfilter/xfentry.cxx
index 6b0506c..9ee0f4c 100644
--- a/lotuswordpro/source/filter/xfilter/xfentry.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfentry.cxx
@@ -83,7 +83,7 @@ void XFEntry::ToXml(IXFStream *pStrm)
else if( m_eType == enumXFEntryAlphabetical )
{
pAttrList->AddAttribute( A2OUSTR("text:key1"), m_strKey1 );
- if( m_strKey2.getLength()>0 )
+ if( !m_strKey2.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:key2"), m_strKey2 );
if( m_bMainEntry )
diff --git a/lotuswordpro/source/filter/xfilter/xffootnote.hxx
b/lotuswordpro/source/filter/xfilter/xffootnote.hxx
index fd254aa..0e30711 100644
--- a/lotuswordpro/source/filter/xfilter/xffootnote.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffootnote.hxx
@@ -107,10 +107,10 @@ inline void XFFootNote::ToXml(IXFStream *pStrm)
pStrm->StartElement( A2OUSTR("text:footnote") );
pAttrList->Clear();
- if( m_strLabel.getLength() )
+ if( !m_strLabel.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:label"), m_strLabel );
pStrm->StartElement( A2OUSTR("text:footnote-citation") );
- if( m_strLabel.getLength() )
+ if( !m_strLabel.isEmpty() )
pStrm->Characters(m_strLabel);
pStrm->EndElement( A2OUSTR("text:footnote-citation") );
diff --git a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
index 55cede3..5fc18fb 100644
--- a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
@@ -197,25 +197,25 @@ inline void XFFootnoteConfig::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if( m_strCitationStyle.getLength()>0 )
+ if( !m_strCitationStyle.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:citation-style-name"), m_strCitationStyle);
- if( m_strBodyStyle.getLength()>0 )
+ if( !m_strBodyStyle.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:citation-body-style-name"), m_strBodyStyle);
- if( m_strNumPrefix.getLength()>0 )
+ if( !m_strNumPrefix.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("style:num-prefix"), m_strNumPrefix);
- if( m_strNumSuffix.getLength()>0 )
+ if( !m_strNumSuffix.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("style:num-suffix"), m_strNumSuffix);
- if( m_strNumFmt.getLength()>0 )
+ if( !m_strNumFmt.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("style:num-format"), m_strNumFmt);
- if( m_strDefaultStyle.getLength()>0 )
+ if( !m_strDefaultStyle.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:default-style-name"), m_strDefaultStyle);
- if( m_strMasterPage.getLength()>0 )
+ if( !m_strMasterPage.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:master-page-name"), m_strMasterPage);
@@ -239,14 +239,14 @@ inline void XFFootnoteConfig::ToXml(IXFStream *pStrm)
if(m_bIsFootnote)
{
pStrm->StartElement( A2OUSTR("text:footnotes-configuration") );
- if( m_strMessageOn.getLength()>0 )
+ if( !m_strMessageOn.isEmpty() )
{
pStrm->StartElement( A2OUSTR("text:footnote-continuation-notice-forward") );
pStrm->Characters(m_strMessageOn);
pStrm->EndElement( A2OUSTR("text:footnote-continuation-notice-forward") );
}
- if( m_strMessageFrom.getLength()>0 )
+ if( !m_strMessageFrom.isEmpty() )
{
pStrm->StartElement( A2OUSTR("text:footnote-continuation-notice-backward") );
pStrm->Characters(m_strMessageFrom);
diff --git a/lotuswordpro/source/filter/xfilter/xfframe.cxx
b/lotuswordpro/source/filter/xfilter/xfframe.cxx
index 8270c9a..a6e0755 100644
--- a/lotuswordpro/source/filter/xfilter/xfframe.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfframe.cxx
@@ -136,11 +136,11 @@ void XFFrame::StartFrame(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
- if( GetStyleName().getLength() )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("draw:style-name"), GetStyleName() );
- assert(m_strName.getLength()>0); //name should not be null.
- if( m_strName.getLength()&&m_isTextBox == sal_False)
+ assert(!m_strName.isEmpty()); //name should not be null.
+ if( !m_strName.isEmpty() && m_isTextBox == sal_False)
pAttrList->AddAttribute( A2OUSTR("draw:name"), m_strName );
//anchor type:
switch( m_eAnchor )
@@ -178,7 +178,7 @@ void XFFrame::StartFrame(IXFStream *pStrm)
pAttrList->AddAttribute( A2OUSTR("draw:z-index"), Int32ToOUString(m_nZIndex) );
- if( m_strNextLink.getLength() > 0 )
+ if( !m_strNextLink.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("draw:chain-next-name"), m_strNextLink );
pStrm->StartElement( A2OUSTR("draw:text-box") );
diff --git a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
b/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
index f512bfa..85c7b83 100644
--- a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
@@ -115,17 +115,17 @@ inline void XFHyperlink::ToXml(IXFStream *pStrm)
pAttrList->AddAttribute( A2OUSTR("xlink:type"), A2OUSTR("simple") );
pAttrList->AddAttribute( A2OUSTR("xlink:href"), m_strHRef );
- if( m_strName.getLength() > 0 )
+ if( !m_strName.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("office:name"), m_strName );
pAttrList->AddAttribute( A2OUSTR("office:target-frame-name"), m_strFrame );
pAttrList->AddAttribute( A2OUSTR("xlink:show"), A2OUSTR("replace") );
pStrm->StartElement( A2OUSTR("text:a") );
pAttrList->Clear();
- if( GetStyleName().getLength()>0 )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:style-name"), GetStyleName() );
pStrm->StartElement( A2OUSTR("text:span") );
- if( m_strText.getLength() )
+ if( !m_strText.isEmpty() )
pStrm->Characters(m_strText);
else
pStrm->Characters(m_strHRef);
diff --git a/lotuswordpro/source/filter/xfilter/xfimage.cxx
b/lotuswordpro/source/filter/xfilter/xfimage.cxx
index 1bf7c11..0085a77 100644
--- a/lotuswordpro/source/filter/xfilter/xfimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimage.cxx
@@ -90,11 +90,11 @@ void XFImage::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
- if( GetStyleName().getLength() )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("draw:style-name"), GetStyleName() );
- assert(m_strName.getLength()>0); //name should not be null.
- if( m_strName.getLength() )
+ assert(!m_strName.isEmpty()); //name should not be null.
+ if( !m_strName.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("draw:name"), m_strName );
//anchor type:
switch( m_eAnchor )
diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
index dfebaf3..4eb5ba6 100644
--- a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
@@ -85,7 +85,7 @@ void XFImageStyle::ToXml(IXFStream *pStrm)
pAttrList->Clear();
pAttrList->AddAttribute( A2OUSTR("style:name"), GetStyleName() );
- if( GetParentStyleName().getLength() > 0 )
+ if( !GetParentStyleName().isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),GetParentStyleName());
pAttrList->AddAttribute( A2OUSTR("style:family"), A2OUSTR("graphics") );
//parent style name ignore now.
@@ -169,13 +169,13 @@ void XFImageStyle::ToXml(IXFStream *pStrm)
protect += A2OUSTR("content");
if( m_bProtectSize )
{
- if( protect.getLength()>0 )
+ if( !protect.isEmpty() )
protect += A2OUSTR(" ");
protect += A2OUSTR("size");
}
if( m_bProtectPos )
{
- if( protect.getLength()>0 )
+ if( !protect.isEmpty() )
protect += A2OUSTR(" ");
protect += A2OUSTR("position");
}
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx
b/lotuswordpro/source/filter/xfilter/xfindex.cxx
index 19cdee2..01034db 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx
@@ -167,7 +167,7 @@ void XFIndex::ToXml(IXFStream *pStrm)
strTplName = A2OUSTR("text:table-index-entry-template");
}
- if( GetStyleName().getLength() > 0 )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:style-name"), GetStyleName() );
if( m_bProtect )
pAttrList->AddAttribute( A2OUSTR("text:protected"), A2OUSTR("true") );
@@ -239,7 +239,7 @@ void XFIndex::ToXml(IXFStream *pStrm)
pAttrList->Clear();
pStrm->StartElement( A2OUSTR("text:index-body") );
//index-title:
- if(m_strTitle.getLength())
+ if(!m_strTitle.isEmpty())
{
pAttrList->AddAttribute( A2OUSTR("text:name"), m_strTitle + A2OUSTR("_Head") );
pStrm->StartElement( A2OUSTR("text:index-title") );
@@ -262,7 +262,7 @@ void XFIndexTemplate::ToXml(IXFStream *pStrm)
pAttrList->AddAttribute( A2OUSTR("text:outline-level"), m_nLevel );
pAttrList->AddAttribute( A2OUSTR("text:style-name"), m_strStyle );
- if( m_strTagName.getLength() == 0 )
+ if( m_strTagName.isEmpty() )
m_strTagName = A2OUSTR("text:table-of-content-entry-template");
pStrm->StartElement( m_strTagName );
@@ -273,14 +273,14 @@ void XFIndexTemplate::ToXml(IXFStream *pStrm)
switch( m_aEntries[i].first )
{
case enumXFIndexTemplateChapter:
- if(m_aEntries[i].second.getLength() > 0)
+ if(!m_aEntries[i].second.isEmpty())
pAttrList->AddAttribute( A2OUSTR("text:style-name"), m_aEntries[i].second );
pStrm->StartElement( A2OUSTR("text:index-entry-chapter-number") );
pStrm->EndElement( A2OUSTR("text:index-entry-chapter-number") );
break;
case enumXFIndexTemplateText:
- if(m_aEntries[i].second.getLength() > 0)
+ if(!m_aEntries[i].second.isEmpty())
pAttrList->AddAttribute( A2OUSTR("text:style-name"), m_aEntries[i].second );
pStrm->StartElement( A2OUSTR("text:index-entry-text") );
@@ -290,7 +290,7 @@ void XFIndexTemplate::ToXml(IXFStream *pStrm)
if( m_eTabType != enumXFTabRight )
pAttrList->AddAttribute( A2OUSTR("style:position"), DoubleToOUString(m_fTabLength)
+ A2OUSTR("cm") );
- if(m_aEntries[i].second.getLength() > 0)
+ if(!m_aEntries[i].second.isEmpty())
pAttrList->AddAttribute( A2OUSTR("text:style-name"), m_aEntries[i].second );
switch(m_eTabType)
@@ -314,14 +314,14 @@ void XFIndexTemplate::ToXml(IXFStream *pStrm)
if( m_eTabType == enumXFTabChar )
pAttrList->AddAttribute( A2OUSTR("style:char"), m_strTabDelimiter );
//leader char:
- if( m_strTabLeader.getLength() )
+ if( !m_strTabLeader.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("style:leader-char"), m_strTabLeader );
pStrm->StartElement( A2OUSTR("text:index-entry-tab-stop") );
pStrm->EndElement( A2OUSTR("text:index-entry-tab-stop") );
break;
case enumXFIndexTemplatePage:
- if(m_aEntries[i].second.getLength() > 0)
+ if(!m_aEntries[i].second.isEmpty())
pAttrList->AddAttribute( A2OUSTR("text:style-name"), m_aEntries[i].second );
pStrm->StartElement( A2OUSTR("text:index-entry-page-number") );
diff --git a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
index 21597f0..cdc052d 100644
--- a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
@@ -161,7 +161,7 @@ inline void XFLineNumberConfig::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
- if( m_strTextStyle.getLength() > 0 )
+ if( !m_strTextStyle.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:style-name"), m_strTextStyle );
pAttrList->AddAttribute( A2OUSTR("text:offset"), DoubleToOUString(m_fOffset) + A2OUSTR("cm") );
pAttrList->AddAttribute( A2OUSTR("style:num-format"), m_strNumFmt );
diff --git a/lotuswordpro/source/filter/xfilter/xflist.cxx
b/lotuswordpro/source/filter/xfilter/xflist.cxx
index cbfa2b1..f2444c3 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.cxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.cxx
@@ -79,7 +79,7 @@ void XFList::ToXml(IXFStream *pStrm)
assert(NULL!=pAttrList);
pAttrList->Clear();
- if( GetStyleName().getLength() )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:style-name"), GetStyleName() );
if( m_bContinueNumber )
pAttrList->AddAttribute( A2OUSTR("text:continue-numbering"), A2OUSTR("true") );
@@ -107,7 +107,7 @@ void XFList::StartList(IXFStream *pStrm, sal_Bool bContinueNumber)
assert(NULL!=pAttrList);
pAttrList->Clear();
- if( GetStyleName().getLength() )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:style-name"), GetStyleName() );
if( bContinueNumber )
pAttrList->AddAttribute( A2OUSTR("text:continue-numbering"), A2OUSTR("true") );
diff --git a/lotuswordpro/source/filter/xfilter/xflistitem.hxx
b/lotuswordpro/source/filter/xfilter/xflistitem.hxx
index 1de72a0..1b680e5 100644
--- a/lotuswordpro/source/filter/xfilter/xflistitem.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflistitem.hxx
@@ -93,7 +93,7 @@ inline void XFListItem::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if( GetStyleName().getLength() > 0 )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:style-name"), GetStyleName() );
if( !m_bIsHeader )
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
index 169e500..24bc2b7 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
@@ -143,7 +143,7 @@ void XFListLevelBullet::ToXml(IXFStream *pStrm)
pAttrList->AddAttribute( A2OUSTR("fo:text-align"), GetAlignName(m_eAlign) );
- if( m_strFontName.getLength() > 0 )
+ if( !m_strFontName.isEmpty() )
{
pAttrList->AddAttribute( A2OUSTR("style:font-name"), m_strFontName );
}
@@ -322,7 +322,7 @@ void XFListStyle::ToXml(IXFStream *pStrm)
pAttrList->Clear();
pAttrList->AddAttribute( A2OUSTR("style:name"), GetStyleName() );
- if( GetParentStyleName().getLength() > 0 )
+ if( !GetParentStyleName().isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),GetParentStyleName());
pStrm->StartElement( A2OUSTR("text:list-style") );
diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
index 354dc0e..084a23f 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
@@ -152,7 +152,7 @@ void XFNumberStyle::ToXml_StartElement(IXFStream *pStrm)
pAttrList->Clear();
pAttrList->AddAttribute( A2OUSTR("style:name"), GetStyleName() );
- if( GetParentStyleName().getLength() > 0 )
+ if( !GetParentStyleName().isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),GetParentStyleName());
pAttrList->AddAttribute( A2OUSTR("style:family"), A2OUSTR("data-style") );
@@ -263,7 +263,7 @@ void XFNumberStyle::ToXml_Content(IXFStream *pStrm, sal_Bool nagetive)
if( !nagetive )
{
- if( m_strPrefix.getLength()>0 )
+ if( !m_strPrefix.isEmpty() )
{
pStrm->StartElement( A2OUSTR("number:text") );
pStrm->Characters(m_strPrefix);
@@ -272,9 +272,9 @@ void XFNumberStyle::ToXml_Content(IXFStream *pStrm, sal_Bool nagetive)
}
else
{
- if( m_strNegativePrefix.getLength() == 0 )
+ if( m_strNegativePrefix.isEmpty() )
m_strNegativePrefix = m_strPrefix;
- if( m_strNegativePrefix.getLength()>0 )
+ if( !m_strNegativePrefix.isEmpty() )
{
pStrm->StartElement( A2OUSTR("number:text") );
// pStrm->Characters(m_strNegativePrefix);
@@ -291,7 +291,7 @@ void XFNumberStyle::ToXml_Content(IXFStream *pStrm, sal_Bool nagetive)
if( m_eType == enuMXFNumberCurrency && !m_bCurrencySymbolPost )
{
- if( m_strCurrencySymbol.getLength() > 0 )
+ if( !m_strCurrencySymbol.isEmpty() )
{
pStrm->StartElement( A2OUSTR("number:currency-symbol") );
pStrm->Characters(m_strCurrencySymbol);
@@ -326,7 +326,7 @@ void XFNumberStyle::ToXml_Content(IXFStream *pStrm, sal_Bool nagetive)
if( m_eType == enuMXFNumberCurrency && m_bCurrencySymbolPost )
{
- if( m_strCurrencySymbol.getLength()>0 )
+ if( !m_strCurrencySymbol.isEmpty() )
{
pStrm->StartElement( A2OUSTR("number:currency-symbol") );
pStrm->Characters(m_strCurrencySymbol);
@@ -336,7 +336,7 @@ void XFNumberStyle::ToXml_Content(IXFStream *pStrm, sal_Bool nagetive)
if( !nagetive )
{
- if( m_strSuffix.getLength()>0 )
+ if( !m_strSuffix.isEmpty() )
{
pStrm->StartElement( A2OUSTR("number:text") );
pStrm->Characters(m_strSuffix);
@@ -354,9 +354,9 @@ void XFNumberStyle::ToXml_Content(IXFStream *pStrm, sal_Bool nagetive)
}
else
{
- if( m_strNegativeSuffix.getLength() == 0 )
+ if( m_strNegativeSuffix.isEmpty() )
m_strNegativeSuffix = m_strSuffix;
- if( m_strNegativeSuffix.getLength()>0 )
+ if( !m_strNegativeSuffix.isEmpty() )
{
pStrm->StartElement( A2OUSTR("number:text") );
pStrm->Characters(m_strNegativeSuffix);
diff --git a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
b/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
index d9729dc..282a5e2 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
@@ -106,11 +106,11 @@ public:
or if you set the format to 'a', then the output would be:
a item1
b item2
- some sepecial, if you set the format to a sequence,ie. "Ò»,¶þ,Èý,..."
+ some sepecial, if you set the format to a sequence,ie. "һ,��,��,..."
the output would be:
Ò» item1
- ¶þ item2
- Èý item3
+ �� item2
+ �� item3
Of cource, for unordered-list, you can also set the format to
be a bullet char,ie:
@@ -131,9 +131,9 @@ public:
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
- if( m_strPrefix.getLength() > 0 )
+ if( !m_strPrefix.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("style:num-prefix"), m_strPrefix );
- if( m_strSuffix.getLength() > 0 )
+ if( !m_strSuffix.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("style:num-suffix"), m_strSuffix );
pAttrList->AddAttribute( A2OUSTR("style:num-format"), m_strFormat );
if( m_nStartValue != 0 )
diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
index cdb0012..5930a5a 100644
--- a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
@@ -91,7 +91,7 @@ void XFParagraph::ToXml(IXFStream *pStrm)
assert(pAttrList);
pAttrList->Clear();
- if( GetStyleName().getLength() > 0 )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:style-name"), GetStyleName() );
pStrm->StartElement( A2OUSTR("text:p") );
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
index 6a2fbae..0909f29 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
@@ -399,13 +399,13 @@ void XFParaStyle::ToXml(IXFStream *pStrm)
rtl::OUString style = GetStyleName();
pAttrList->Clear();
- if( style.getLength() )
+ if( !style.isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:name"),GetStyleName());
pAttrList->AddAttribute(A2OUSTR("style:family"), A2OUSTR("paragraph"));
- if( GetParentStyleName().getLength() > 0 )
+ if( !GetParentStyleName().isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),GetParentStyleName());
- if( m_strMasterPage.getLength() > 0 )
+ if( !m_strMasterPage.isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:master-page-name"),m_strMasterPage);
pStrm->StartElement(A2OUSTR("style:style"));
diff --git a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
b/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
index d6af250..ec59705 100644
--- a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
@@ -109,10 +109,10 @@ inline void XFHolderStart::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
pAttrList->AddAttribute( A2OUSTR("text:placeholder-type"),m_strType);
- if (m_strDesc.getLength()>0)
+ if (!m_strDesc.isEmpty())
pAttrList->AddAttribute( A2OUSTR("text:description"), m_strDesc);
pStrm->StartElement( A2OUSTR("text:placeholder") );
- if( m_strText.getLength()>0)
+ if( !m_strText.isEmpty())
pStrm->Characters(m_strText);
}
diff --git a/lotuswordpro/source/filter/xfilter/xfrow.cxx
b/lotuswordpro/source/filter/xfilter/xfrow.cxx
index fe13925..56ac9df 100644
--- a/lotuswordpro/source/filter/xfilter/xfrow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfrow.cxx
@@ -147,7 +147,7 @@ void XFRow::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if( GetStyleName().getLength() )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("table:style-name"), GetStyleName() );
if( m_nRepeat )
pAttrList->AddAttribute( A2OUSTR("table:number-rows-repeated"), Int32ToOUString(m_nRepeat)
);
diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
index 5027c7a..fa40000 100644
--- a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
@@ -78,7 +78,7 @@ void XFRowStyle::ToXml(IXFStream *pStrm)
pAttrList->Clear();
pAttrList->AddAttribute( A2OUSTR("style:name"), GetStyleName() );
- if( GetParentStyleName().getLength() > 0 )
+ if( !GetParentStyleName().isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),GetParentStyleName());
pAttrList->AddAttribute( A2OUSTR("style:family"), A2OUSTR("table-row") );
diff --git a/lotuswordpro/source/filter/xfilter/xfruby.hxx
b/lotuswordpro/source/filter/xfilter/xfruby.hxx
index 4676488..4b7f93a 100644
--- a/lotuswordpro/source/filter/xfilter/xfruby.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfruby.hxx
@@ -81,7 +81,7 @@ void XFRubyStart::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if( GetStyleName().getLength())
+ if( !GetStyleName().isEmpty())
pAttrList->AddAttribute( A2OUSTR("text:style-name"), GetStyleName());
pStrm->StartElement( A2OUSTR("text:ruby") );
pAttrList->Clear();
@@ -98,10 +98,10 @@ void XFRubyEnd::ToXml(IXFStream *pStrm)
pStrm->EndElement( A2OUSTR("text:ruby-base") );
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- if( GetStyleName().getLength())
+ if( !GetStyleName().isEmpty())
pAttrList->AddAttribute( A2OUSTR("text:style-name"), GetStyleName());
pStrm->StartElement( A2OUSTR("text:ruby-text") );
- if( m_strText.getLength() )
+ if( !m_strText.isEmpty() )
pStrm->Characters(m_strText);
pStrm->EndElement( A2OUSTR("text:ruby-text") );
pStrm->EndElement( A2OUSTR("text:ruby") );
diff --git a/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
b/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
index bec8024..64d09a6 100644
--- a/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
@@ -97,7 +97,7 @@ void XFRubyStyle::ToXml(IXFStream *pStrm)
rtl::OUString style = GetStyleName();
pAttrList->Clear();
- if( style.getLength() )
+ if( !style.isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:name"),GetStyleName());
pAttrList->AddAttribute(A2OUSTR("style:family"), A2OUSTR("ruby"));
pStrm->StartElement(A2OUSTR("style:style"));
@@ -117,7 +117,7 @@ void XFRubyStyle::ToXml(IXFStream *pStrm)
{
sPos = A2OUSTR("center");
}
- if (sPos.getLength()>0)
+ if (!sPos.isEmpty())
pAttrList->AddAttribute(A2OUSTR("style:ruby-align"),sPos);
OUString sAlign;
@@ -129,7 +129,7 @@ void XFRubyStyle::ToXml(IXFStream *pStrm)
{
sAlign = A2OUSTR("below");
}
- if (sAlign.getLength()>0)
+ if (!sAlign.isEmpty())
pAttrList->AddAttribute(A2OUSTR("style:ruby-position"),sAlign);
pStrm->StartElement(A2OUSTR("style:properties"));
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.cxx
b/lotuswordpro/source/filter/xfilter/xfsection.cxx
index 11371d6..3f422a1 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.cxx
@@ -72,16 +72,16 @@ XFSection::~XFSection()
void XFSection::ToXml(IXFStream *pStrm)
{
- assert(m_strSectionName.getLength() > 0 );
+ assert(!m_strSectionName.isEmpty() );
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
rtl::OUString style = GetStyleName();
- if( style.getLength() )
+ if( !style.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:style-name"), style);
//section name
- if( m_strSectionName.getLength() )
+ if( !m_strSectionName.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:name"), m_strSectionName);
if( m_bProtected )
pAttrList->AddAttribute( A2OUSTR("text:protected"), A2OUSTR("true") );
@@ -89,7 +89,7 @@ void XFSection::ToXml(IXFStream *pStrm)
pAttrList->AddAttribute( A2OUSTR("text:display"), A2OUSTR("none") );
pStrm->StartElement( A2OUSTR("text:section") );
- if( m_strSourceLink.getLength() )
+ if( !m_strSourceLink.isEmpty() )
{
pAttrList->Clear();
pAttrList->AddAttribute( A2OUSTR("xlink:href"), m_strSourceLink);
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
index 5cef25b..055b440 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
@@ -118,7 +118,7 @@ IXFStyle* XFStyleContainer::AddStyle(IXFStyle *pStyle)
//no matter we want to delete the style or not,XFFont obejct should be saved first.
ManageStyleFont(pStyle);
- if( pStyle->GetStyleName().getLength()==0 )
+ if( pStyle->GetStyleName().isEmpty() )
pConStyle = FindSameStyle(pStyle);
if( pConStyle )//such a style has exist:
@@ -128,7 +128,7 @@ IXFStyle* XFStyleContainer::AddStyle(IXFStyle *pStyle)
}
else
{
- if( pStyle->GetStyleName().getLength() == 0 )
+ if( pStyle->GetStyleName().isEmpty() )
{
name = m_strStyleNamePrefix + Int32ToOUString(m_aStyles.size()+1);
pStyle->SetStyleName(name);
diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
index 67d77b4..ef20781 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
@@ -116,7 +116,7 @@ IXFStyle* XFStyleManager::AddStyle(IXFStyle *pStyle)
if( pStyle->GetStyleFamily() == enumXFStyleText )
{
- if( name.getLength() )
+ if( !name.isEmpty() )
{
pStyleRet = s_aStdTextStyles.AddStyle(pStyle);
}
@@ -125,7 +125,7 @@ IXFStyle* XFStyleManager::AddStyle(IXFStyle *pStyle)
}
else if( pStyle->GetStyleFamily() == enumXFStylePara )
{
- if( name.getLength() )
+ if( !name.isEmpty() )
{
pStyleRet = s_aStdParaStyles.AddStyle(pStyle);
}
diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx
b/lotuswordpro/source/filter/xfilter/xftable.cxx
index 3c1a460..c3fc14c 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.cxx
@@ -217,7 +217,7 @@ void XFTable::ToXml(IXFStream *pStrm)
if( !m_bSubTable )
pAttrList->AddAttribute( A2OUSTR("table:name"), m_strName);
- if( GetStyleName().getLength() )
+ if( !GetStyleName().isEmpty() )
pAttrList->AddAttribute( A2OUSTR("table:style-name"), GetStyleName() );
if( m_bSubTable )
@@ -242,7 +242,7 @@ void XFTable::ToXml(IXFStream *pStrm)
{
if( col > lastCol + 2 )
{
- if( m_strDefColStyle.getLength() > 0 )
+ if( !m_strDefColStyle.isEmpty() )
{
pAttrList->AddAttribute( A2OUSTR("table:style-name"), m_strDefColStyle );
}
@@ -252,7 +252,7 @@ void XFTable::ToXml(IXFStream *pStrm)
pStrm->EndElement( A2OUSTR("table:table-column") );
}
- if( style.getLength() > 0 )
+ if( !style.isEmpty() )
{
pAttrList->AddAttribute( A2OUSTR("table:style-name"), style );
}
diff --git a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
index f926136..65ee0d9 100644
--- a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
@@ -92,7 +92,7 @@ void XFTableStyle::ToXml(IXFStream *pStrm)
pAttrList->Clear();
pAttrList->AddAttribute( A2OUSTR("style:name"), GetStyleName() );
- if( GetParentStyleName().getLength() > 0 )
+ if( !GetParentStyleName().isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),GetParentStyleName());
pAttrList->AddAttribute( A2OUSTR("style:family"), A2OUSTR("table") );
pStrm->StartElement( A2OUSTR("style:style") );
diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
b/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
index 1189fc4..79a54c9 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
@@ -92,7 +92,7 @@ void XFTabStyle::ToXml(IXFStream *pStrm)
if( m_eType == enumXFTabChar )
pAttrList->AddAttribute( A2OUSTR("style:char"), m_strDelimiter );
//leader char:
- if( m_strLeader.getLength() )
+ if( !m_strLeader.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("style:leader-char"), m_strLeader );
pStrm->StartElement( A2OUSTR("style:tab-stop") );
diff --git a/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
b/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
index ca66a08..0b451c6 100644
--- a/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
@@ -78,7 +78,7 @@ void XFTextBoxStyle::ToXml(IXFStream *pStrm)
pAttrList->Clear();
pAttrList->AddAttribute( A2OUSTR("style:name"), GetStyleName() );
- if( GetParentStyleName().getLength() > 0 )
+ if( !GetParentStyleName().isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),GetParentStyleName());
pAttrList->AddAttribute( A2OUSTR("style:family"), A2OUSTR("graphics") );
//parent style name ignore now.
diff --git a/lotuswordpro/source/filter/xfilter/xftextspan.cxx
b/lotuswordpro/source/filter/xfilter/xftextspan.cxx
index 5000d72..0b338d6 100644
--- a/lotuswordpro/source/filter/xfilter/xftextspan.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextspan.cxx
@@ -113,7 +113,7 @@ void XFTextSpan::ToXml(IXFStream *pStrm)
assert(pAttrList);
pAttrList->Clear();
- if( style.getLength() )
+ if( !style.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:style-name"), GetStyleName() );
pStrm->StartElement( A2OUSTR("text:span") );
@@ -136,7 +136,7 @@ void XFTextSpanStart::ToXml(IXFStream *pStrm)
assert(pAttrList);
pAttrList->Clear();
- if( style.getLength() )
+ if( !style.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:style-name"), GetStyleName() );
pStrm->StartElement( A2OUSTR("text:span") );
diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
index 4b9551a..80b99ba 100644
--- a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
@@ -115,9 +115,9 @@ void XFTextStyle::ToXml(IXFStream *strm)
rtl::OUString style = GetStyleName();
pAttrList->Clear();
- if( style.getLength() )
+ if( !style.isEmpty() )
pAttrList->AddAttribute(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("style:name")),GetStyleName());
- if( GetParentStyleName().getLength() > 0 )
+ if( !GetParentStyleName().isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),GetParentStyleName());
pAttrList->AddAttribute(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("style:family")),A2OUSTR("text")
);
diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
index 9b10d18..4e66cb9 100644
--- a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx
@@ -129,7 +129,7 @@ void XFTimeStyle::ToXml(IXFStream *pStrm)
pAttrList->Clear();
pAttrList->AddAttribute( A2OUSTR("style:name"), GetStyleName() );
- if( GetParentStyleName().getLength() > 0 )
+ if( !GetParentStyleName().isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),GetParentStyleName());
pAttrList->AddAttribute( A2OUSTR("style:family"), A2OUSTR("data-style") );
if (!m_bTruncate)
--
1.7.5.4
Context
- [Libreoffice] [PATCH] Fix for fdo43460 Part XXIV getLength() to isEmpty() · Olivier Hallot
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.