[Libreoffice-commits] core.git: 5 commits - lotuswordpro/source sc/source sd/source sw/source
Norbert Thiebaud
nthiebaud at gmail.com
Fri Mar 7 23:21:52 PST 2014
lotuswordpro/source/filter/lwp9reader.cxx | 44 -
lotuswordpro/source/filter/lwparrowstyles.hxx | 24
lotuswordpro/source/filter/lwpbookmarkmgr.cxx | 4
lotuswordpro/source/filter/lwpchangemgr.cxx | 10
lotuswordpro/source/filter/lwpdivinfo.hxx | 2
lotuswordpro/source/filter/lwpdoc.cxx | 18
lotuswordpro/source/filter/lwpdocdata.cxx | 29
lotuswordpro/source/filter/lwpfootnote.cxx | 16
lotuswordpro/source/filter/lwpframelayout.cxx | 4
lotuswordpro/source/filter/lwpfrib.cxx | 4
lotuswordpro/source/filter/lwpfribbreaks.cxx | 4
lotuswordpro/source/filter/lwpfribmark.cxx | 462 +++++++-------
lotuswordpro/source/filter/lwpfribsection.cxx | 56 -
lotuswordpro/source/filter/lwpfribtext.cxx | 62 -
lotuswordpro/source/filter/lwpglobalmgr.cxx | 2
lotuswordpro/source/filter/lwpgrfobj.cxx | 2
lotuswordpro/source/filter/lwpmarker.cxx | 58 -
lotuswordpro/source/filter/lwpnotes.cxx | 2
lotuswordpro/source/filter/lwppagelayout.cxx | 2
lotuswordpro/source/filter/lwppara.cxx | 8
lotuswordpro/source/filter/lwpproplist.cxx | 6
lotuswordpro/source/filter/lwpstory.cxx | 14
lotuswordpro/source/filter/lwptablelayout.cxx | 2
lotuswordpro/source/filter/lwptoc.cxx | 16
lotuswordpro/source/filter/lwptools.cxx | 20
lotuswordpro/source/filter/xfilter/xfannotation.hxx | 8
lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx | 12
lotuswordpro/source/filter/xfilter/xfbgimage.cxx | 30
lotuswordpro/source/filter/xfilter/xfbookmark.hxx | 10
lotuswordpro/source/filter/xfilter/xfborders.cxx | 36 -
lotuswordpro/source/filter/xfilter/xfbreaks.hxx | 10
lotuswordpro/source/filter/xfilter/xfcell.cxx | 28
lotuswordpro/source/filter/xfilter/xfcellstyle.cxx | 28
lotuswordpro/source/filter/xfilter/xfchange.cxx | 60 -
lotuswordpro/source/filter/xfilter/xfcolstyle.cxx | 14
lotuswordpro/source/filter/xfilter/xfcolumns.cxx | 34 -
lotuswordpro/source/filter/xfilter/xfcrossref.cxx | 12
lotuswordpro/source/filter/xfilter/xfdate.cxx | 22
lotuswordpro/source/filter/xfilter/xfdatestyle.cxx | 78 +-
lotuswordpro/source/filter/xfilter/xfdocfield.cxx | 84 +-
lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx | 18
lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx | 4
lotuswordpro/source/filter/xfilter/xfdrawline.cxx | 38 -
lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx | 30
lotuswordpro/source/filter/xfilter/xfdrawobj.cxx | 36 -
lotuswordpro/source/filter/xfilter/xfdrawpath.cxx | 30
lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx | 14
lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx | 14
lotuswordpro/source/filter/xfilter/xfdrawrect.cxx | 6
lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx | 104 +--
lotuswordpro/source/filter/xfilter/xfdropcap.hxx | 14
lotuswordpro/source/filter/xfilter/xfendnote.hxx | 16
lotuswordpro/source/filter/xfilter/xfendnoteconfig.hxx | 8
lotuswordpro/source/filter/xfilter/xfentry.cxx | 26
lotuswordpro/source/filter/xfilter/xfentry.hxx | 4
lotuswordpro/source/filter/xfilter/xffont.cxx | 82 +-
lotuswordpro/source/filter/xfilter/xffooter.hxx | 4
lotuswordpro/source/filter/xfilter/xffootnote.hxx | 16
lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx | 52 -
lotuswordpro/source/filter/xfilter/xfframe.cxx | 36 -
lotuswordpro/source/filter/xfilter/xfframestyle.cxx | 62 -
lotuswordpro/source/filter/xfilter/xfglobal.cxx | 21
lotuswordpro/source/filter/xfilter/xfheader.hxx | 4
lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx | 22
lotuswordpro/source/filter/xfilter/xfhyperlink.hxx | 24
lotuswordpro/source/filter/xfilter/xfimage.cxx | 42 -
lotuswordpro/source/filter/xfilter/xfimagestyle.cxx | 90 +-
lotuswordpro/source/filter/xfilter/xfindex.cxx | 142 ++--
lotuswordpro/source/filter/xfilter/xfindex.hxx | 8
lotuswordpro/source/filter/xfilter/xfinputlist.hxx | 18
lotuswordpro/source/filter/xfilter/xflinebreak.hxx | 4
lotuswordpro/source/filter/xfilter/xflineheight.hxx | 8
lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx | 40 -
lotuswordpro/source/filter/xfilter/xflist.cxx | 24
lotuswordpro/source/filter/xfilter/xflistitem.hxx | 10
lotuswordpro/source/filter/xfilter/xfliststyle.cxx | 54 -
lotuswordpro/source/filter/xfilter/xfliststyle.hxx | 6
lotuswordpro/source/filter/xfilter/xfmargins.cxx | 8
lotuswordpro/source/filter/xfilter/xfmasterpage.cxx | 8
lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx | 114 +--
lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx | 4
lotuswordpro/source/filter/xfilter/xfnumfmt.hxx | 8
lotuswordpro/source/filter/xfilter/xfofficemeta.cxx | 40 -
lotuswordpro/source/filter/xfilter/xfpadding.hxx | 10
lotuswordpro/source/filter/xfilter/xfpagecount.hxx | 4
lotuswordpro/source/filter/xfilter/xfpagemaster.cxx | 46 -
lotuswordpro/source/filter/xfilter/xfpagenumber.hxx | 6
lotuswordpro/source/filter/xfilter/xfparagraph.cxx | 6
lotuswordpro/source/filter/xfilter/xfparastyle.cxx | 54 -
lotuswordpro/source/filter/xfilter/xfplaceholder.hxx | 8
lotuswordpro/source/filter/xfilter/xfrow.cxx | 8
lotuswordpro/source/filter/xfilter/xfrowstyle.cxx | 20
lotuswordpro/source/filter/xfilter/xfruby.hxx | 16
lotuswordpro/source/filter/xfilter/xfrubystyle.hxx | 26
lotuswordpro/source/filter/xfilter/xfsection.cxx | 20
lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx | 20
lotuswordpro/source/filter/xfilter/xfshadow.cxx | 10
lotuswordpro/source/filter/xfilter/xfstylecont.cxx | 4
lotuswordpro/source/filter/xfilter/xfstylemanager.cxx | 38 -
lotuswordpro/source/filter/xfilter/xftable.cxx | 30
lotuswordpro/source/filter/xfilter/xftablestyle.cxx | 26
lotuswordpro/source/filter/xfilter/xftabstop.hxx | 4
lotuswordpro/source/filter/xfilter/xftabstyle.cxx | 18
lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx | 34 -
lotuswordpro/source/filter/xfilter/xftextcontent.cxx | 6
lotuswordpro/source/filter/xfilter/xftextspan.cxx | 12
lotuswordpro/source/filter/xfilter/xftextstyle.cxx | 14
lotuswordpro/source/filter/xfilter/xftimestyle.cxx | 40 -
lotuswordpro/source/filter/xfilter/xfutil.cxx | 261 +++----
lotuswordpro/source/filter/xfilter/xfutil.hxx | 4
sc/source/ui/view/tabvwsh4.cxx | 6
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx | 2
sw/source/core/crsr/unocrsr.cxx | 2
113 files changed, 1681 insertions(+), 1724 deletions(-)
New commits:
commit d634ce9edb6f1df409547715a391ad2eeca99f0c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Mar 8 00:05:32 2014 -0600
use 'native' OUString api in lotuswordpro instead of macro and wrappers
Change-Id: Iccb78b59c3de9f29975d10fa4e34232cd3bf2cc3
diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx
index 43e8a34..b7d12f0 100644
--- a/lotuswordpro/source/filter/lwp9reader.cxx
+++ b/lotuswordpro/source/filter/lwp9reader.cxx
@@ -201,7 +201,7 @@ void Lwp9Reader::ParseDocument()
//Parse document content
m_pStream->GetAttrList()->Clear();
- m_pStream->StartElement( A2OUSTR("office:body") );
+ m_pStream->StartElement( "office:body" );
//Parse change list, add by
LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance();
@@ -209,7 +209,7 @@ void Lwp9Reader::ParseDocument()
pChangeMgr->ConvertAllChange(m_pStream);
doc->Parse(m_pStream);
- m_pStream->EndElement(OUString("office:body"));
+ m_pStream->EndElement("office:body");
WriteDocEnd();
}
@@ -223,29 +223,29 @@ void Lwp9Reader::WriteDocHeader()
IXFAttrList *pAttrList = m_pStream->GetAttrList();
- pAttrList->AddAttribute( A2OUSTR("xmlns:office"), A2OUSTR("http://openoffice.org/2000/office") );
- pAttrList->AddAttribute( A2OUSTR("xmlns:style"), A2OUSTR("http://openoffice.org/2000/style") );
- pAttrList->AddAttribute( A2OUSTR("xmlns:text"), A2OUSTR("http://openoffice.org/2000/text") );
- pAttrList->AddAttribute( A2OUSTR("xmlns:table"), A2OUSTR("http://openoffice.org/2000/table") );
- pAttrList->AddAttribute( A2OUSTR("xmlns:draw"), A2OUSTR("http://openoffice.org/2000/drawing") );
+ pAttrList->AddAttribute( "xmlns:office", "http://openoffice.org/2000/office" );
+ pAttrList->AddAttribute( "xmlns:style", "http://openoffice.org/2000/style" );
+ pAttrList->AddAttribute( "xmlns:text", "http://openoffice.org/2000/text" );
+ pAttrList->AddAttribute( "xmlns:table", "http://openoffice.org/2000/table" );
+ pAttrList->AddAttribute( "xmlns:draw", "http://openoffice.org/2000/drawing" );
- pAttrList->AddAttribute( A2OUSTR("xmlns:fo"), A2OUSTR("http://www.w3.org/1999/XSL/Format") );
- pAttrList->AddAttribute( A2OUSTR("xmlns:xlink"), A2OUSTR("http://www.w3.org/1999/xlink") );
- pAttrList->AddAttribute( A2OUSTR("xmlns:number"), A2OUSTR("http://openoffice.org/2000/datastyle") );
- pAttrList->AddAttribute( A2OUSTR("xmlns:svg"), A2OUSTR("http://www.w3.org/2000/svg") );
- pAttrList->AddAttribute( A2OUSTR("xmlns:chart"), A2OUSTR("http://openoffice.org/2000/chart") );
+ pAttrList->AddAttribute( "xmlns:fo", "http://www.w3.org/1999/XSL/Format" );
+ pAttrList->AddAttribute( "xmlns:xlink", "http://www.w3.org/1999/xlink" );
+ pAttrList->AddAttribute( "xmlns:number", "http://openoffice.org/2000/datastyle" );
+ pAttrList->AddAttribute( "xmlns:svg", "http://www.w3.org/2000/svg" );
+ pAttrList->AddAttribute( "xmlns:chart", "http://openoffice.org/2000/chart" );
- pAttrList->AddAttribute( A2OUSTR("xmlns:dr3d"), A2OUSTR("http://openoffice.org/2000/dr3d") );
- pAttrList->AddAttribute( A2OUSTR("xmlns:math"), A2OUSTR("http://www.w3.org/1998/Math/MathML") );
- pAttrList->AddAttribute( A2OUSTR("xmlns:form"), A2OUSTR("http://openoffice.org/2000/form") );
- pAttrList->AddAttribute( A2OUSTR("xmlns:script"), A2OUSTR("http://openoffice.org/2000/script") );
- pAttrList->AddAttribute( A2OUSTR("xmlns:dc"), A2OUSTR("http://purl.org/dc/elements/1.1/") );
+ pAttrList->AddAttribute( "xmlns:dr3d", "http://openoffice.org/2000/dr3d" );
+ pAttrList->AddAttribute( "xmlns:math", "http://www.w3.org/1998/Math/MathML" );
+ pAttrList->AddAttribute( "xmlns:form", "http://openoffice.org/2000/form" );
+ pAttrList->AddAttribute( "xmlns:script", "http://openoffice.org/2000/script" );
+ pAttrList->AddAttribute( "xmlns:dc", "http://purl.org/dc/elements/1.1/" );
- pAttrList->AddAttribute( A2OUSTR("xmlns:meta"), A2OUSTR("http://openoffice.org/2000/meta") );
- pAttrList->AddAttribute( A2OUSTR("office:class"), A2OUSTR("text"));
- pAttrList->AddAttribute( A2OUSTR("office:version"), A2OUSTR("1.0"));
+ pAttrList->AddAttribute( "xmlns:meta", "http://openoffice.org/2000/meta" );
+ pAttrList->AddAttribute( "office:class", "text");
+ pAttrList->AddAttribute( "office:version", "1.0");
- m_pStream->StartElement( OUString("office:document") );
+ m_pStream->StartElement( "office:document" );
pAttrList->Clear();
}
@@ -254,7 +254,7 @@ void Lwp9Reader::WriteDocHeader()
*/
void Lwp9Reader::WriteDocEnd()
{
- m_pStream->EndElement(OUString("office:document"));
+ m_pStream->EndElement("office:document");
m_pStream->EndDocument();
}
diff --git a/lotuswordpro/source/filter/lwparrowstyles.hxx b/lotuswordpro/source/filter/lwparrowstyles.hxx
index 4b34f00..32440d0 100644
--- a/lotuswordpro/source/filter/lwparrowstyles.hxx
+++ b/lotuswordpro/source/filter/lwparrowstyles.hxx
@@ -72,30 +72,30 @@ void RegisteArrowStyles()
return;
//reversed arrow:
XFArrowStyle *pArrowStyle100 = new XFArrowStyle();
- pArrowStyle100->SetArrowName( A2OUSTR("arrow100") );
- pArrowStyle100->SetViewbox(A2OUSTR("0 0 140 200"));
- pArrowStyle100->SetSVGPath(A2OUSTR("M0 180 L70 0 L140 180 L120 180 L70 30 L20 180 L0 180"));
+ pArrowStyle100->SetArrowName( "arrow100" );
+ pArrowStyle100->SetViewbox("0 0 140 200");
+ pArrowStyle100->SetSVGPath("M0 180 L70 0 L140 180 L120 180 L70 30 L20 180 L0 180");
pXFStyleManager->AddStyle(pArrowStyle100);
//reversed arrow:
XFArrowStyle *pArrowStyle1 = new XFArrowStyle();
- pArrowStyle1->SetArrowName( A2OUSTR("reverse arrow") );
- pArrowStyle1->SetViewbox(A2OUSTR("0 0 140 200"));
- pArrowStyle1->SetSVGPath(A2OUSTR("M0 0 L70 200 L140 0"));
+ pArrowStyle1->SetArrowName( "reverse arrow" );
+ pArrowStyle1->SetViewbox("0 0 140 200");
+ pArrowStyle1->SetSVGPath("M0 0 L70 200 L140 0");
pXFStyleManager->AddStyle(pArrowStyle1);
//reversed concave arrow
XFArrowStyle *pArrowStyle2 = new XFArrowStyle();
- pArrowStyle2->SetArrowName( A2OUSTR("reverse concave arrow") );
- pArrowStyle2->SetViewbox(A2OUSTR("0 0 140 200"));
- pArrowStyle2->SetSVGPath(A2OUSTR("M0 0 L80 200 L160 0 L80 100"));
+ pArrowStyle2->SetArrowName( "reverse concave arrow" );
+ pArrowStyle2->SetViewbox("0 0 140 200");
+ pArrowStyle2->SetSVGPath("M0 0 L80 200 L160 0 L80 100");
pXFStyleManager->AddStyle(pArrowStyle2);
//reversed line arrow
XFArrowStyle *pArrowStyle3 = new XFArrowStyle();
- pArrowStyle3->SetArrowName( A2OUSTR("reverse line arrow") );
- pArrowStyle3->SetViewbox(A2OUSTR("0 0 140 200"));
- pArrowStyle3->SetSVGPath(A2OUSTR("M0 0 L70 200 L140 0L110 0 L70 160 L20 0 L0 0"));
+ pArrowStyle3->SetArrowName( "reverse line arrow" );
+ pArrowStyle3->SetViewbox("0 0 140 200");
+ pArrowStyle3->SetSVGPath("M0 0 L70 200 L140 0L110 0 L70 160 L20 0 L0 0");
pXFStyleManager->AddStyle(pArrowStyle3);
}
diff --git a/lotuswordpro/source/filter/lwpbookmarkmgr.cxx b/lotuswordpro/source/filter/lwpbookmarkmgr.cxx
index 58aa0fe..e2c1f00 100644
--- a/lotuswordpro/source/filter/lwpbookmarkmgr.cxx
+++ b/lotuswordpro/source/filter/lwpbookmarkmgr.cxx
@@ -66,7 +66,7 @@ void LwpBookmarkMgr::AddXFBookmarkStart(OUString sName,XFBookmarkStart* pMark)
else //have exist the same bookmark name
{
XFBookmarkStart* pFind = iter->second;
- OUString totalName = pFind->GetDivision() + A2OUSTR(":");
+ OUString totalName = pFind->GetDivision() + ":";
totalName += pFind->GetName();
pFind->SetName(totalName);
m_MapStart[totalName] = pFind;
@@ -84,7 +84,7 @@ void LwpBookmarkMgr::AddXFBookmarkEnd(OUString sName,XFBookmarkEnd* pMark)
else //have exist the same bookmark name
{
XFBookmarkEnd* pFind = iter->second;
- OUString totalName = pFind->GetDivision() + A2OUSTR(":");
+ OUString totalName = pFind->GetDivision() + ":";
totalName += pFind->GetName();
pFind->SetName(totalName);
m_MapEnd[totalName] = pFind;
diff --git a/lotuswordpro/source/filter/lwpchangemgr.cxx b/lotuswordpro/source/filter/lwpchangemgr.cxx
index d9916f0..a1685b1 100644
--- a/lotuswordpro/source/filter/lwpchangemgr.cxx
+++ b/lotuswordpro/source/filter/lwpchangemgr.cxx
@@ -103,7 +103,7 @@ LwpChangeMgr::~LwpChangeMgr()
void LwpChangeMgr::AddChangeFrib(LwpFrib* pFrib)
{
m_nCounter++;
- OUString sID = A2OUSTR("ct")+ Int32ToOUString(m_nCounter);
+ OUString sID = "ct"+ OUString::number(m_nCounter);
m_pFribMap->insert(std::pair<LwpFrib*,OUString>(pFrib,sID));
}
@@ -112,7 +112,7 @@ OUString LwpChangeMgr::GetChangeID(LwpFrib* pFrib)
std::map<LwpFrib*,OUString>::iterator iter;
iter = m_pFribMap->find(pFrib);
if (iter == m_pFribMap->end())
- return A2OUSTR("");
+ return "";
else
return iter->second;
}
@@ -143,12 +143,12 @@ void LwpChangeMgr::ConvertAllChange(IXFStream* pStream)
if (m_ChangeList.empty())
return;
// Add for disable change tracking
- pStream->GetAttrList()->AddAttribute( A2OUSTR("text:track-changes"),A2OUSTR("false"));
- pStream->StartElement( A2OUSTR("text:tracked-changes") );
+ pStream->GetAttrList()->AddAttribute( "text:track-changes","false");
+ pStream->StartElement( "text:tracked-changes" );
for (iter1=m_ChangeList.begin();iter1 !=m_ChangeList.end();++iter1)
(*iter1)->ToXml(pStream);
- pStream->EndElement(A2OUSTR("text:tracked-changes"));
+ pStream->EndElement("text:tracked-changes");
for (iter1=m_ChangeList.begin();iter1 !=m_ChangeList.end();++iter1)
{
diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx
index 43a4978..4622e9f 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.hxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.hxx
@@ -144,7 +144,7 @@ inline sal_Bool LwpDivInfo::HasContents()
inline sal_Bool LwpDivInfo::IsOleDivision()
{
OUString strClassName = GetClassName();
- if (strClassName.equals(A2OUSTR(STR_OleDivisionClassName)))
+ if (strClassName == STR_OleDivisionClassName)
return sal_True;
return sal_False;
}
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index e9a2f72..5572985 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -177,9 +177,9 @@ sal_Bool LwpDocument::IsSkippedDivision()
return sal_True;
//skip endnote division
OUString strClassName = pDiv->GetClassName();
- if (strClassName.equals(A2OUSTR(STR_DivisionEndnote))
- || strClassName.equals(A2OUSTR(STR_DivisionGroupEndnote))
- || strClassName.equals(A2OUSTR(STR_DocumentEndnote)))
+ if ((strClassName == STR_DivisionEndnote)
+ || (strClassName == STR_DivisionGroupEndnote)
+ || (strClassName == STR_DocumentEndnote))
{
LwpPageLayout* pPageLayout = dynamic_cast<LwpPageLayout*>(pDiv->GetInitialLayoutID()->obj(VO_PAGELAYOUT));
if(pPageLayout)
@@ -342,7 +342,7 @@ void LwpDocument::RegisterFootnoteStyles()
LwpFootnoteOptions* pFootnoteOpts = dynamic_cast<LwpFootnoteOptions*>(m_FootnoteOpts.obj());
if (pFootnoteOpts)
{
- pFootnoteOpts->SetMasterPage(A2OUSTR("Endnote"));
+ pFootnoteOpts->SetMasterPage("Endnote");
pFootnoteOpts->RegisterStyle();
}
}
@@ -433,11 +433,11 @@ sal_uInt16 LwpDocument::GetEndnoteType()
if (!pDivInfo)
return FN_DONTCARE;
OUString strClassName = pDivInfo->GetClassName();
- if (strClassName.equals(A2OUSTR(STR_DivisionEndnote)))
+ if (strClassName == STR_DivisionEndnote)
return FN_DIVISION_SEPARATE;
- if (strClassName.equals(A2OUSTR(STR_DivisionGroupEndnote)))
+ if (strClassName == STR_DivisionGroupEndnote)
return FN_DIVISIONGROUP_SEPARATE;
- if (strClassName.equals(A2OUSTR(STR_DocumentEndnote)))
+ if (strClassName == STR_DocumentEndnote)
return FN_DOCUMENT_SEPARATE;
return FN_DONTCARE;
}
@@ -755,10 +755,10 @@ void LwpDocument::XFConvertFrameInPage(XFContentContainer * pCont)
void LwpDocument::ChangeStyleName()
{
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
- XFTextStyle* pStyle = dynamic_cast<XFTextStyle*>(pXFStyleManager->FindStyle(A2OUSTR("ClickHere")));
+ XFTextStyle* pStyle = dynamic_cast<XFTextStyle*>(pXFStyleManager->FindStyle("ClickHere"));
if (pStyle)
{
- pStyle->SetStyleName(A2OUSTR("Placeholder"));
+ pStyle->SetStyleName("Placeholder");
}
}
LwpDocSock::LwpDocSock(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
diff --git a/lotuswordpro/source/filter/lwpdocdata.cxx b/lotuswordpro/source/filter/lwpdocdata.cxx
index 27ad616..bf3c26d 100644
--- a/lotuswordpro/source/filter/lwpdocdata.cxx
+++ b/lotuswordpro/source/filter/lwpdocdata.cxx
@@ -293,36 +293,17 @@ void LwpDocData::Read()
}
OUString LwpDocData::DateTimeToOUString(LtTm& dt)
{
- OUStringBuffer buf;
- buf.append((sal_Int32)dt.tm_year);
- buf.append( A2OUSTR("-") );
- buf.append((sal_Int32)dt.tm_mon);
- buf.append( A2OUSTR("-") );
- buf.append((sal_Int32)dt.tm_mday);
- buf.append( A2OUSTR("T") );
- buf.append((sal_Int32)dt.tm_hour);
- buf.append( A2OUSTR(":") );
- buf.append((sal_Int32)dt.tm_min);
- buf.append( A2OUSTR(":") );
- buf.append((sal_Int32)dt.tm_sec);
- buf.append( A2OUSTR(".") );
- buf.append((sal_Int32)0);
+ OUString aResult = OUString::number(dt.tm_year) + "-" + OUString::number(dt.tm_mon) + "-" + OUString::number(dt.tm_mday) +
+ "T" + OUString::number(dt.tm_hour) + ":" + OUString::number(dt.tm_min) + ":" + OUString::number(dt.tm_sec) + ".0";
- return buf.makeStringAndClear();
+ return aResult;
}
OUString LwpDocData::TimeToOUString(LtTm& dt)
{
//PT3H43M44S
- OUStringBuffer buf;
- buf.append( A2OUSTR("PT") );
- buf.append((sal_Int32)dt.tm_hour);
- buf.append( A2OUSTR("H") );
- buf.append((sal_Int32)dt.tm_min);
- buf.append( A2OUSTR("M") );
- buf.append((sal_Int32)dt.tm_sec);
- buf.append( A2OUSTR("S") );
+ OUString aResult = "PT" + OUString::number(dt.tm_hour) + "H" + OUString::number(dt.tm_min) + "M" + OUString::number(dt.tm_sec) + "S";
- return buf.makeStringAndClear();
+ return aResult;
}
void LwpDocData::Parse(IXFStream *pOutputStream)
{
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx
index 0cd3216..91e18ae 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -332,22 +332,22 @@ OUString LwpFootnote::GetTableClass()
{
case FN_BASE_FOOTNOTE:
{
- strClassName = A2OUSTR(STR_DivisionFootnote);
+ strClassName = STR_DivisionFootnote;
break;
}
case FN_BASE_DOCUMENT:
{
- strClassName = A2OUSTR(STR_DocumentEndnote);
+ strClassName = STR_DocumentEndnote;
break;
}
case FN_BASE_DIVISION:
{
- strClassName = A2OUSTR(STR_DivisionEndnote);
+ strClassName = STR_DivisionEndnote;
break;
}
case FN_BASE_DIVISIONGROUP:
{
- strClassName = A2OUSTR(STR_DivisionGroupEndnote);
+ strClassName = STR_DivisionGroupEndnote;
break;
}
}
@@ -514,13 +514,13 @@ void LwpFootnoteOptions::RegisterEndnoteStyle()
OUString message = m_EndnoteDocNumbering.GetLeadingText();
if(message.isEmpty())
{
- message = A2OUSTR("[");//default prefix
+ message = "[";//default prefix
}
pEndnoteConfig->SetNumPrefix(message);
message = m_EndnoteDocNumbering.GetTrailingText();
if(message.isEmpty())
{
- message = A2OUSTR("]");//default suffix
+ message = "]";//default suffix
}
pEndnoteConfig->SetNumSuffix(message);
if(m_EndnoteDocNumbering.GetReset() == LwpFootnoteNumberOptions::RESET_PAGE)
@@ -544,7 +544,7 @@ OUString LwpFootnoteOptions::GetContinuedOnMessage()
return m_ContinuedOnMessage.str();
}
// else reture defauls message
- return A2OUSTR(STRID_FOOTCONTINUEDON);
+ return OUString(STRID_FOOTCONTINUEDON);
}
/**
@@ -557,7 +557,7 @@ OUString LwpFootnoteOptions::GetContinuedFromMessage()
return m_ContinuedFromMessage.str();
}
// else reture defauls message
- return A2OUSTR(STRID_FOOTCONTINUEDFROM);
+ return OUString(STRID_FOOTCONTINUEDFROM);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx
index 412f89f..a97267e 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -129,9 +129,9 @@ void LwpFrame::RegisterStyle(XFFrameStyle* pFrameStyle)
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")))
+ /*if(aFrameName.equals("Frame1"))
{
- aFrameName = A2OUSTR("Frame1_COPY");
+ aFrameName = "Frame1_COPY";
}
pXFFrame->SetName(aFrameName);*/
pXFFrame->SetName(m_StyleName);
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx
index 830dc86..d4bda55 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -244,7 +244,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
//note by ,1-27
XFFont* pFont;
XFTextStyle* pStyle = NULL;
- m_StyleName = A2OUSTR("");
+ m_StyleName = "";
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
if (m_pModifiers->HasCharStyle)
{
@@ -256,7 +256,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
*pStyle = *pNamedStyle;
LwpCharacterStyle* pCharStyle = static_cast<LwpCharacterStyle*>(m_pModifiers->CharStyleID.obj());
- pStyle->SetStyleName(A2OUSTR(""));
+ pStyle->SetStyleName("");
pFont = pFoundry->GetFontManger()->CreateOverrideFont(pCharStyle->GetFinalFontID(),m_pModifiers->FontID);
pStyle->SetFont(pFont);
IXFStyle *pNewStyle = pXFStyleManager->AddStyle(pStyle);
diff --git a/lotuswordpro/source/filter/lwpfribbreaks.cxx b/lotuswordpro/source/filter/lwpfribbreaks.cxx
index f23d8d9..4d33903 100644
--- a/lotuswordpro/source/filter/lwpfribbreaks.cxx
+++ b/lotuswordpro/source/filter/lwpfribbreaks.cxx
@@ -78,7 +78,7 @@ void LwpFribColumnBreak::RegisterBreakStyle(LwpPara * pPara)
XFParaStyle* pOverStyle = new XFParaStyle;
*pOverStyle = *pBaseStyle;
- pOverStyle->SetStyleName(A2OUSTR(""));
+ pOverStyle->SetStyleName("");
//Old code
//if (static_cast<LwpStory*>(pPara->GetStoryID()->obj())
@@ -139,7 +139,7 @@ void LwpFribPageBreak::RegisterBreakStyle(LwpPara* pPara)
XFParaStyle* pOverStyle = new XFParaStyle;
*pOverStyle = *pBaseStyle;
- pOverStyle->SetStyleName(A2OUSTR(""));
+ pOverStyle->SetStyleName("");
pOverStyle->SetMasterPage(pBaseStyle->GetMasterPage());
if (!GetNext() || GetNext()->GetType()==FRIB_TAG_EOP)
diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx
index 0fd7e9d..4ad8977 100644
--- a/lotuswordpro/source/filter/lwpfribmark.cxx
+++ b/lotuswordpro/source/filter/lwpfribmark.cxx
@@ -115,7 +115,7 @@ void LwpFribCHBlock::XFConvert(XFContentContainer* pXFPara,LwpStory* pStory)
if (pHyperlink)
{
pHyperlink->SetHyperlinkFlag(sal_True);
- pHyperlink->SetHyperlink(pMarker->GetNamedProperty(A2OUSTR("URL")));
+ pHyperlink->SetHyperlink(pMarker->GetNamedProperty("URL"));
}
}
else if (type == MARKER_END)//or none
@@ -266,7 +266,7 @@ void LwpFribField::XFConvert(XFContentContainer* pXFPara)
if (pFieldMark->IsFormulaInsert())
{
XFTextContent *pSpan = new XFTextContent();
- pSpan->SetText(A2OUSTR(">"));
+ pSpan->SetText(">");
pXFPara->Add(pSpan);
}
if (fieldType == LwpFieldMark::FLD_FIELD)
@@ -350,7 +350,7 @@ void LwpFribField::XFConvert(XFContentContainer* pXFPara)
if (pFieldMark->IsFormulaInsert())
{
XFTextContent *pSpan = new XFTextContent();
- pSpan->SetText(A2OUSTR("<"));
+ pSpan->SetText("<");
pXFPara->Add(pSpan);
}
@@ -385,7 +385,7 @@ void LwpFribField::RegisterStyle(LwpFoundry* pFoundry)
void LwpFribField::RegisterTimeField(LwpFieldMark* pFieldMark)
{
OUString sFormula = pFieldMark->GetFormula();//now bookmark maybe not all register to bookmarkmgr,
- if (sFormula == A2OUSTR("TotalEditingTime"))//so check field type now is not correct.
+ if (sFormula == "TotalEditingTime")//so check field type now is not correct.
RegisterTotalTimeStyle();
else
{
@@ -397,7 +397,7 @@ void LwpFribField::RegisterTimeField(LwpFieldMark* pFieldMark)
return;
tag = sFormula.copy(0,index);
- if (tag == A2OUSTR("Now()") || tag == A2OUSTR("CreateDate") || tag == A2OUSTR("EditDate"))
+ if (tag == "Now()" || tag == "CreateDate" || tag == "EditDate")
RegisterDateTimeStyle(sFormula.copy(index+1,sFormula.getLength()-index-1));
}
}
@@ -420,248 +420,248 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula)
return;
if (sFormula[1] == 'F')
{
- if (sFormula == A2OUSTR("%FLSystemShortDate"))
+ if (sFormula == "%FLSystemShortDate")
{
pDateStyle = LwpTools::GetSystemDateStyle(sal_False);
}
- else if (sFormula == A2OUSTR("%FLSystemLongDate"))
+ else if (sFormula == "%FLSystemLongDate")
{
pDateStyle = LwpTools::GetSystemDateStyle(sal_True);
}
- else if (sFormula == A2OUSTR("%FLISODate1") || sFormula == A2OUSTR("%FLYYYY/MM/DD") )
+ else if (sFormula == "%FLISODate1" || sFormula == "%FLYYYY/MM/DD" )
{
pDateStyle = new XFDateStyle;
pDateStyle->AddYear();
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddMonth();
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddMonthDay();
}
- else if (sFormula == A2OUSTR("%FLISODate2") || sFormula == A2OUSTR("%FLYYYY/MM/DD HH:mm:SS") )
+ else if (sFormula == "%FLISODate2" || sFormula == "%FLYYYY/MM/DD HH:mm:SS" )
{
pDateStyle = new XFDateStyle;
pDateStyle->AddYear();
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddMonth();
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddMonthDay();
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddHour();
- pDateStyle->AddText(A2OUSTR(":"));
+ pDateStyle->AddText(":");
pDateStyle->AddMinute();
- pDateStyle->AddText(A2OUSTR(":"));
+ pDateStyle->AddText(":");
pDateStyle->AddSecond(sal_True,0);
}
- else if (sFormula == A2OUSTR("%FLM/D/YY"))
+ else if (sFormula == "%FLM/D/YY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_False);
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddYear(sal_False);
}
- else if (sFormula == A2OUSTR("%FLMonth D, YYYY"))
+ else if (sFormula == "%FLMonth D, YYYY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%FLWeekday, Month D, YYYY"))
+ else if (sFormula == "%FLWeekday, Month D, YYYY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay();
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%FLMn D, YYYY"))
+ else if (sFormula == "%FLMn D, YYYY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_False,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%FLWday, Mn D, YYYY"))
+ else if (sFormula == "%FLWday, Mn D, YYYY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay(sal_False);
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddMonth(sal_False,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%FLMn D"))
+ else if (sFormula == "%FLMn D")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_False,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
}
- else if (sFormula == A2OUSTR("%FLWeekday, Mn D"))
+ else if (sFormula == "%FLWeekday, Mn D")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay();
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddMonth(sal_False,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
}
- else if (sFormula == A2OUSTR("%FLMn D, YY"))
+ else if (sFormula == "%FLMn D, YY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_False,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddYear(sal_False);
}
- else if (sFormula == A2OUSTR("%FLM/D"))
+ else if (sFormula == "%FLM/D")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_False);
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddMonthDay(sal_False);
}
- else if (sFormula == A2OUSTR("%FLM/YY"))
+ else if (sFormula == "%FLM/YY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_False);
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddYear(sal_False);
}
- else if (sFormula == A2OUSTR("%FLMn YY"))
+ else if (sFormula == "%FLMn YY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_False,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddYear(sal_False);
}
- else if (sFormula == A2OUSTR("%FLWeekday"))
+ else if (sFormula == "%FLWeekday")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay();
}
- else if (sFormula == A2OUSTR("%FLWday"))
+ else if (sFormula == "%FLWday")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay(sal_False);
}
- else if (sFormula == A2OUSTR("%FLMonth"))
+ else if (sFormula == "%FLMonth")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_True,sal_True);
}
- else if (sFormula == A2OUSTR("%FLMn"))
+ else if (sFormula == "%FLMn")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_False,sal_True);
}
- else if (sFormula == A2OUSTR("%FLD"))
+ else if (sFormula == "%FLD")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay(sal_False);
}
- else if (sFormula == A2OUSTR("%FLM"))
+ else if (sFormula == "%FLM")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_False);
}
- else if (sFormula == A2OUSTR("%FLYYYY") )
+ else if (sFormula == "%FLYYYY" )
{
pDateStyle = new XFDateStyle;
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%FLYY"))
+ else if (sFormula == "%FLYY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddYear(sal_False);
}
//chinese version begin
- else if (sFormula == A2OUSTR("%FLYY/M/D"))
+ else if (sFormula == "%FLYY/M/D")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddYear(sal_False);
- pDateStyle->AddText(A2OUSTR("-"));
+ pDateStyle->AddText("-");
pDateStyle->AddMonth(sal_False);
- pDateStyle->AddText(A2OUSTR("-"));
+ pDateStyle->AddText("-");
pDateStyle->AddMonthDay(sal_False);
}
- else if(sFormula == A2OUSTR("%FLYYYY Month D"))
+ else if(sFormula == "%FLYYYY Month D")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddYear();
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
}
- else if(sFormula == A2OUSTR("%FLWeekday, YYYY Month D"))
+ else if(sFormula == "%FLWeekday, YYYY Month D")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay();
- pDateStyle->AddText(A2OUSTR(","));
+ pDateStyle->AddText(",");
pDateStyle->AddYear();
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
}
- else if(sFormula == A2OUSTR("%FLYYYY Mn D"))
+ else if(sFormula == "%FLYYYY Mn D")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddYear();
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_False,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
}
- else if(sFormula == A2OUSTR("%FLWday, YYYY Mn D"))
+ else if(sFormula == "%FLWday, YYYY Mn D")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay(sal_False);
- pDateStyle->AddText(A2OUSTR(","));
+ pDateStyle->AddText(",");
pDateStyle->AddYear();
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
}
//next 2 are the same with english version
- else if (sFormula == A2OUSTR("%FLYY Mn D"))
+ else if (sFormula == "%FLYY Mn D")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddYear(sal_False);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_False,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
}
- else if (sFormula == A2OUSTR("%FLYY/M"))
+ else if (sFormula == "%FLYY/M")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_False);
- pDateStyle->AddText(A2OUSTR("-"));
+ pDateStyle->AddText("-");
pDateStyle->AddMonth(sal_False);
}
- else if (sFormula == A2OUSTR("%FLYY Mn"))
+ else if (sFormula == "%FLYY Mn")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_False);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_False,sal_True);
}
- else if (sFormula == A2OUSTR("%FLeeeeoa") || sFormula == A2OUSTR("%FLffffooaa") || sFormula == A2OUSTR("%FLEEEEOA"))
+ else if (sFormula == "%FLeeeeoa" || sFormula == "%FLffffooaa" || sFormula == "%FLEEEEOA")
{
pDateStyle = new XFDateStyle;
OUString sText;
@@ -675,7 +675,7 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula)
sText = OUString(0x65e5);
pDateStyle->AddText(sText);
}
- else if (sFormula == A2OUSTR("%FLoa") || sFormula == A2OUSTR("%FLooaa") || sFormula == A2OUSTR("%FLOA") )
+ else if (sFormula == "%FLoa" || sFormula == "%FLooaa" || sFormula == "%FLOA" )
{
pDateStyle = new XFDateStyle;
OUString sText;
@@ -686,289 +686,289 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula)
sText = OUString(0x65e5);
pDateStyle->AddText(sText);
}
- else if (sFormula == A2OUSTR("%FLYYYY/M/D") || sFormula == A2OUSTR("%FLGGGG/od/ad"))
+ else if (sFormula == "%FLYYYY/M/D" || sFormula == "%FLGGGG/od/ad")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddYear();
- pDateStyle->AddText(A2OUSTR("-"));
+ pDateStyle->AddText("-");
pDateStyle->AddMonth(sal_False);
- pDateStyle->AddText(A2OUSTR("-"));
+ pDateStyle->AddText("-");
pDateStyle->AddMonthDay(sal_False);
}
- else if (sFormula == A2OUSTR("%FLYY.M.D") )
+ else if (sFormula == "%FLYY.M.D" )
{
pDateStyle = new XFDateStyle;
pDateStyle->AddYear(sal_False);
- pDateStyle->AddText(A2OUSTR("."));
+ pDateStyle->AddText(".");
pDateStyle->AddMonth(sal_False);
- pDateStyle->AddText(A2OUSTR("."));
+ pDateStyle->AddText(".");
pDateStyle->AddMonthDay(sal_False);
}
//chinese version end
//other version begin
- else if (sFormula == A2OUSTR("%FLWeekday, Month DD, YYYY") )
+ else if (sFormula == "%FLWeekday, Month DD, YYYY" )
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay();
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay();
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%FLYYYY/MM/DD") )
+ else if (sFormula == "%FLYYYY/MM/DD" )
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay();
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay();
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%FLD/M/YY") )
+ else if (sFormula == "%FLD/M/YY" )
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddMonth(sal_False);
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddYear(sal_False);
}
- else if (sFormula == A2OUSTR("%FLD Month YYYY"))
+ else if (sFormula == "%FLD Month YYYY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%FLDD Month YYYY"))
+ else if (sFormula == "%FLDD Month YYYY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay();
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%FLWeekday, D Month YYYY"))
+ else if (sFormula == "%FLWeekday, D Month YYYY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay();
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%FLWeekday, DD Month YYYY"))
+ else if (sFormula == "%FLWeekday, DD Month YYYY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay();
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddMonthDay();
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%FLD Mn YYYY"))
+ else if (sFormula == "%FLD Mn YYYY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_False,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%FLWday, D Mn YYYY"))
+ else if (sFormula == "%FLWday, D Mn YYYY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay(sal_False);
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_False,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%FLWday, DD Mn YYYY"))
+ else if (sFormula == "%FLWday, DD Mn YYYY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay(sal_False);
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddMonthDay();
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_False,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%FLD Mn"))
+ else if (sFormula == "%FLD Mn")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_False,sal_True);
}
- else if (sFormula == A2OUSTR("%FLDD Mn"))
+ else if (sFormula == "%FLDD Mn")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay();
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_False,sal_True);
}
- else if (sFormula == A2OUSTR("%FLWeekday, D Mn"))
+ else if (sFormula == "%FLWeekday, D Mn")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay();
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_False,sal_True);
}
- else if (sFormula == A2OUSTR("%FLWeekday, DD Mn"))
+ else if (sFormula == "%FLWeekday, DD Mn")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay();
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddMonthDay();
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_False,sal_True);
}
- else if (sFormula == A2OUSTR("%FLD Mn YY"))
+ else if (sFormula == "%FLD Mn YY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_False,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddYear(sal_False);
}
- else if (sFormula == A2OUSTR("%FLDD Mn YY"))
+ else if (sFormula == "%FLDD Mn YY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay();
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_False,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddYear(sal_False);
}
- else if (sFormula == A2OUSTR("%FLD/M"))
+ else if (sFormula == "%FLD/M")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddMonth(sal_False);
}
- else if (sFormula == A2OUSTR("%FLDD/MM"))
+ else if (sFormula == "%FLDD/MM")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay();
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddMonth();
}
- else if(sFormula == A2OUSTR("%FLDD/MM/YY"))
+ else if(sFormula == "%FLDD/MM/YY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay();
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddMonth();
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddYear(sal_False);
}
- else if (sFormula == A2OUSTR("%FLMM/YY"))
+ else if (sFormula == "%FLMM/YY")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth();
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddYear(sal_False);
}
//other version end
//TIME
- else if (sFormula == A2OUSTR("%FLSystemTime"))
+ else if (sFormula == "%FLSystemTime")
{
pTimeStyle = LwpTools::GetSystemTimeStyle();
}
- else if (sFormula == A2OUSTR("%FLISOTime1") || sFormula == A2OUSTR("%FLH:mm:SS"))
+ else if (sFormula == "%FLISOTime1" || sFormula == "%FLH:mm:SS")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour();
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddMinute();
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddSecond(sal_True,0);
}
- else if (sFormula == A2OUSTR("%FLH:mm ampm"))
+ else if (sFormula == "%FLH:mm ampm")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour(sal_False);
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddMinute();
- pTimeStyle->AddText(A2OUSTR(" "));
+ pTimeStyle->AddText(" ");
pTimeStyle->SetAmPm(sal_True);
}
- else if (sFormula == A2OUSTR("%FLH:mm"))
+ else if (sFormula == "%FLH:mm")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour(sal_False);
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddMinute();
}
- else if (sFormula == A2OUSTR("%FLH:mm:SS ampm"))
+ else if (sFormula == "%FLH:mm:SS ampm")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour(sal_False);
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddMinute();
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddSecond(sal_True,0);
- pTimeStyle->AddText(A2OUSTR(" "));
+ pTimeStyle->AddText(" ");
pTimeStyle->SetAmPm(sal_True);
}
- else if (sFormula == A2OUSTR("%FLH:mm:SS"))
+ else if (sFormula == "%FLH:mm:SS")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour(sal_False);
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddMinute();
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddSecond(sal_True,0);
}
- else if (sFormula == A2OUSTR("%FLH ampm"))
+ else if (sFormula == "%FLH ampm")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour(sal_False);
- pTimeStyle->AddText(A2OUSTR(" "));
+ pTimeStyle->AddText(" ");
pTimeStyle->SetAmPm(sal_True);
}
- else if (sFormula == A2OUSTR("%FLH"))
+ else if (sFormula == "%FLH")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour(sal_False);
}
- else if (sFormula == A2OUSTR("%FLmm"))
+ else if (sFormula == "%FLmm")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddMinute();
}
- else if (sFormula == A2OUSTR("%FLSS"))
+ else if (sFormula == "%FLSS")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddSecond(sal_True,0);
}
- else if (sFormula == A2OUSTR("%FLampm"))
+ else if (sFormula == "%FLampm")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->SetAmPm(sal_True);
}
//chinese version begin
- else if (sFormula == A2OUSTR("%FLjF") || sFormula == A2OUSTR("%FLJFF")
- || sFormula == A2OUSTR("%FLjjF") || sFormula == A2OUSTR("%FLJJFF ") )
+ else if (sFormula == "%FLjF" || sFormula == "%FLJFF"
+ || sFormula == "%FLjjF" || sFormula == "%FLJJFF " )
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour(sal_False);
@@ -979,7 +979,7 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula)
sText = OUString(0x5206);
pTimeStyle->AddText(sText);
}
- else if (sFormula == A2OUSTR("%FLjjjF") || sFormula == A2OUSTR("%FLJJJFF") )
+ else if (sFormula == "%FLjjjF" || sFormula == "%FLJJJFF" )
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->SetAmPm(sal_True);
@@ -993,187 +993,187 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula)
}
//chinese version end
//other version begin
- else if (sFormula == A2OUSTR("%FLHH:mm ampm"))
+ else if (sFormula == "%FLHH:mm ampm")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour();
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddMinute();
- pTimeStyle->AddText(A2OUSTR(" "));
+ pTimeStyle->AddText(" ");
pTimeStyle->SetAmPm(sal_True);
}
- else if (sFormula == A2OUSTR("%FLHH ampm"))
+ else if (sFormula == "%FLHH ampm")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour();
- pTimeStyle->AddText(A2OUSTR(" "));
+ pTimeStyle->AddText(" ");
pTimeStyle->SetAmPm(sal_True);
}
- else if (sFormula == A2OUSTR("%FLHH:mm:SS ampm"))
+ else if (sFormula == "%FLHH:mm:SS ampm")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour();
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddMinute();
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddSecond(sal_True,0);
- pTimeStyle->AddText(A2OUSTR(" "));
+ pTimeStyle->AddText(" ");
pTimeStyle->SetAmPm(sal_True);
}
- else if (sFormula == A2OUSTR("%FLHH:mm"))
+ else if (sFormula == "%FLHH:mm")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour();
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddMinute();
}
- else if (sFormula == A2OUSTR("%FLHH:mm:SS"))
+ else if (sFormula == "%FLHH:mm:SS")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour();
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddMinute();
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddSecond(sal_True,0);
}
//other version end
}
else if(sFormula[1] == 'D')
{
- if (sFormula == A2OUSTR("%Da"))
+ if (sFormula == "%Da")
{
pDateStyle = LwpTools::GetSystemDateStyle(sal_False);
}
- else if (sFormula == A2OUSTR("%DB") || sFormula == A2OUSTR("%Db"))
+ else if (sFormula == "%DB" || sFormula == "%Db")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%Dc") || sFormula == A2OUSTR("%DC"))
+ else if (sFormula == "%Dc" || sFormula == "%DC")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%Dd") || sFormula == A2OUSTR("%DD"))
+ else if (sFormula == "%Dd" || sFormula == "%DD")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay();
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR(", "));
+ pDateStyle->AddText(", ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%DE") || sFormula == A2OUSTR("%De"))
+ else if (sFormula == "%DE" || sFormula == "%De")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
}
- else if (sFormula == A2OUSTR("%Df") || sFormula == A2OUSTR("%DF"))
+ else if (sFormula == "%Df" || sFormula == "%DF")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddWeekDay();
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
}
- else if (sFormula == A2OUSTR("%Dg"))
+ else if (sFormula == "%Dg")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_False);
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddMonthDay(sal_False);
}
- else if (sFormula == A2OUSTR("%Dh"))
+ else if (sFormula == "%Dh")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_False);
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%Di") || sFormula == A2OUSTR("%DI"))
+ else if (sFormula == "%Di" || sFormula == "%DI")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR("."));
+ pDateStyle->AddText(".");
pDateStyle->AddMonth(sal_True,sal_True);
}
- else if (sFormula == A2OUSTR("%Dj") || sFormula == A2OUSTR("%DJ"))
+ else if (sFormula == "%Dj" || sFormula == "%DJ")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay(sal_False);
- pDateStyle->AddText(A2OUSTR("."));
+ pDateStyle->AddText(".");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%Dk") || sFormula == A2OUSTR("%DK"))
+ else if (sFormula == "%Dk" || sFormula == "%DK")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddYear();
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(" "));
+ pDateStyle->AddText(" ");
pDateStyle->AddMonthDay(sal_False);
}
- else if (sFormula == A2OUSTR("%DL") || sFormula == A2OUSTR("%Dl"))
+ else if (sFormula == "%DL" || sFormula == "%Dl")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonth(sal_True,sal_True);
- pDateStyle->AddText(A2OUSTR(","));
+ pDateStyle->AddText(",");
pDateStyle->AddYear();
}
- else if (sFormula == A2OUSTR("%Dm"))
+ else if (sFormula == "%Dm")
{
pDateStyle = new XFDateStyle;
pDateStyle->AddMonthDay();
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddMonth();
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddYear();
}
}
else if (sFormula[1] == 'T')
{
- if (sFormula == A2OUSTR("%T1"))
+ if (sFormula == "%T1")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour();
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddMinute();
}
- else if (sFormula == A2OUSTR("%T2") || sFormula == A2OUSTR("%T6")
- || sFormula == A2OUSTR("%T4") || sFormula == A2OUSTR("%T8") )
+ else if (sFormula == "%T2" || sFormula == "%T6"
+ || sFormula == "%T4" || sFormula == "%T8" )
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour(sal_False);
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddMinute();
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->SetAmPm(sal_True);
}
- else if (sFormula == A2OUSTR("%T3") || sFormula == A2OUSTR("%T7")
- || sFormula == A2OUSTR("%T5") || sFormula == A2OUSTR("%T9"))
+ else if (sFormula == "%T3" || sFormula == "%T7"
+ || sFormula == "%T5" || sFormula == "%T9")
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour();
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->AddMinute();
- pTimeStyle->AddText(A2OUSTR(":"));
+ pTimeStyle->AddText(":");
pTimeStyle->SetAmPm(sal_True);
}
}
diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx
index 03804c7..e414e5c 100644
--- a/lotuswordpro/source/filter/lwpfribsection.cxx
+++ b/lotuswordpro/source/filter/lwpfribsection.cxx
@@ -180,7 +180,7 @@ void LwpFribSection::ParseSection()
bRunin = sal_True;
if (pIndexSection->IsFormatSeparator())
bSeparator = sal_True;
- pIndex->SetDefaultAlphaIndex(A2OUSTR(""),bRunin,bSeparator);
+ pIndex->SetDefaultAlphaIndex("",bRunin,bSeparator);
*/
SetDefaultAlphaIndex(pIndex);
@@ -198,50 +198,50 @@ void LwpFribSection::ParseSection()
void LwpFribSection::SetDefaultAlphaIndex(XFIndex * pXFIndex)
{
LwpFoundry* pFoundry = m_pPara->GetFoundry();
- OUString styleName = pFoundry->FindActuralStyleName(A2OUSTR("Separator"));
+ OUString styleName = pFoundry->FindActuralStyleName("Separator");
LwpIndexSection* pIndexSection = static_cast<LwpIndexSection*>(m_Section.obj());
XFIndexTemplate * pTemplateSep = new XFIndexTemplate();
if (pIndexSection->IsFormatSeparator())
{
pXFIndex->SetSeparator(sal_True);
- pTemplateSep->AddEntry(enumXFIndexTemplateText,A2OUSTR(""));
+ pTemplateSep->AddEntry(enumXFIndexTemplateText,"");
}
- //pXFIndex->AddTemplate(A2OUSTR("separator"),A2OUSTR("Separator"),pTemplateSep);
- pXFIndex->AddTemplate(A2OUSTR("separator"),styleName,pTemplateSep);
+ //pXFIndex->AddTemplate("separator","Separator",pTemplateSep);
+ pXFIndex->AddTemplate("separator",styleName,pTemplateSep);
- styleName = pFoundry->FindActuralStyleName(A2OUSTR("Primary"));
+ styleName = pFoundry->FindActuralStyleName("Primary");
XFIndexTemplate * pTemplate1 = new XFIndexTemplate();
- pTemplate1->AddEntry(enumXFIndexTemplateText,A2OUSTR(""));
- pTemplate1->AddEntry(enumXFIndexTemplateTab,A2OUSTR(""));
- pTemplate1->AddEntry(enumXFIndexTemplatePage,A2OUSTR(""));
- //pXFIndex->AddTemplate(Int32ToOUString(1),A2OUSTR("Primary"),pTemplate1);
- pXFIndex->AddTemplate(Int32ToOUString(1),styleName,pTemplate1);
+ pTemplate1->AddEntry(enumXFIndexTemplateText,"");
+ pTemplate1->AddEntry(enumXFIndexTemplateTab,"");
+ pTemplate1->AddEntry(enumXFIndexTemplatePage,"");
+ //pXFIndex->AddTemplate(OUString::number(1),"Primary",pTemplate1);
+ pXFIndex->AddTemplate(OUString::number(1),styleName,pTemplate1);
XFIndexTemplate * pTemplate2 = new XFIndexTemplate();
- pTemplate2->AddEntry(enumXFIndexTemplateText,A2OUSTR(""));
- pTemplate2->AddEntry(enumXFIndexTemplateTab,A2OUSTR(""));
- pTemplate2->AddEntry(enumXFIndexTemplatePage,A2OUSTR(""));
+ pTemplate2->AddEntry(enumXFIndexTemplateText,"");
+ pTemplate2->AddEntry(enumXFIndexTemplateTab,"");
+ pTemplate2->AddEntry(enumXFIndexTemplatePage,"");
XFIndexTemplate * pTemplate3 = new XFIndexTemplate();
- pTemplate3->AddEntry(enumXFIndexTemplateText,A2OUSTR(""));
- pTemplate3->AddEntry(enumXFIndexTemplateTab,A2OUSTR(""));
- pTemplate3->AddEntry(enumXFIndexTemplatePage,A2OUSTR(""));
+ pTemplate3->AddEntry(enumXFIndexTemplateText,"");
+ pTemplate3->AddEntry(enumXFIndexTemplateTab,"");
+ pTemplate3->AddEntry(enumXFIndexTemplatePage,"");
if (pIndexSection->IsFormatRunin())
{
- //pXFIndex->AddTemplate(Int32ToOUString(2),A2OUSTR("Primary"),pTemplate2);
- //pXFIndex->AddTemplate(Int32ToOUString(3),A2OUSTR("Primary"),pTemplate3);
- pXFIndex->AddTemplate(Int32ToOUString(2),styleName,pTemplate2);
- pXFIndex->AddTemplate(Int32ToOUString(3),styleName,pTemplate3);
+ //pXFIndex->AddTemplate(OUString::number(2),"Primary",pTemplate2);
+ //pXFIndex->AddTemplate(OUString::number(3),"Primary",pTemplate3);
+ pXFIndex->AddTemplate(OUString::number(2),styleName,pTemplate2);
+ pXFIndex->AddTemplate(OUString::number(3),styleName,pTemplate3);
}
else
{
- //pXFIndex->AddTemplate(Int32ToOUString(2),A2OUSTR("Secondary"),pTemplate2);
- //pXFIndex->AddTemplate(Int32ToOUString(3),A2OUSTR("Secondary"),pTemplate3);
- styleName = pFoundry->FindActuralStyleName(A2OUSTR("Secondary"));
- pXFIndex->AddTemplate(Int32ToOUString(2),styleName,pTemplate2);
- pXFIndex->AddTemplate(Int32ToOUString(3),styleName,pTemplate3);
+ //pXFIndex->AddTemplate(OUString::number(2),"Secondary",pTemplate2);
+ //pXFIndex->AddTemplate(OUString::number(3),"Secondary",pTemplate3);
+ styleName = pFoundry->FindActuralStyleName("Secondary");
+ pXFIndex->AddTemplate(OUString::number(2),styleName,pTemplate2);
+ pXFIndex->AddTemplate(OUString::number(3),styleName,pTemplate3);
}
}
@@ -270,7 +270,7 @@ sal_Bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib)
XFParaStyle* pOverStyle = new XFParaStyle;
*pOverStyle = *(m_pPara->GetXFParaStyle());
- pOverStyle->SetStyleName(A2OUSTR(""));
+ pOverStyle->SetStyleName("");
LwpLayout::UseWhenType eUserType = m_pLayout->GetUseWhenType();
switch(eUserType)
@@ -444,7 +444,7 @@ void LwpMasterPage::RegisterFillerPageStyle()
{
XFParaStyle* pPagebreakStyle = new XFParaStyle;
*pPagebreakStyle = *(m_pPara->GetXFParaStyle());
- pPagebreakStyle->SetStyleName(A2OUSTR(""));
+ pPagebreakStyle->SetStyleName("");
pPagebreakStyle->SetBreaks(enumXFBreakAftPage);
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
m_FillerPageStyleName= pXFStyleManager->AddStyle(pPagebreakStyle)->GetStyleName();
diff --git a/lotuswordpro/source/filter/lwpfribtext.cxx b/lotuswordpro/source/filter/lwpfribtext.cxx
index 9430f1b..db236b6 100644
--- a/lotuswordpro/source/filter/lwpfribtext.cxx
+++ b/lotuswordpro/source/filter/lwpfribtext.cxx
@@ -193,15 +193,15 @@ void LwpFribDocVar::RegisterDefaultTimeStyle()
XFDateStyle* pDateStyle = new XFDateStyle;//use the default format
pDateStyle->AddMonth();
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddMonthDay();
- pDateStyle->AddText(A2OUSTR("/"));
+ pDateStyle->AddText("/");
pDateStyle->AddYear();
- pDateStyle->AddText(A2OUSTR(","));
+ pDateStyle->AddText(",");
pDateStyle->AddHour();
- pDateStyle->AddText(A2OUSTR(":"));
+ pDateStyle->AddText(":");
pDateStyle->AddMinute();
- pDateStyle->AddText(A2OUSTR(":"));
+ pDateStyle->AddText(":");
pDateStyle->AddSecond(sal_True,0);
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
@@ -229,13 +229,13 @@ void LwpFribDocVar::XFConvert(XFContentContainer* pXFPara)
case FILENAME:
{
pContent = new XFFileName;
- static_cast<XFFileName*>(pContent)->SetType(A2OUSTR("FileName"));
+ static_cast<XFFileName*>(pContent)->SetType("FileName");
break;
}
case PATH:
{
pContent = new XFFileName;
- static_cast<XFFileName*>(pContent)->SetType(A2OUSTR("Path"));
+ static_cast<XFFileName*>(pContent)->SetType("Path");
break;
}
case DESCRIPTION:
@@ -278,109 +278,109 @@ void LwpFribDocVar::XFConvert(XFContentContainer* pXFPara)
{
/* pContent = new XFAnnotation;
XFTextContent* pSpan = new XFTextContent();
- pSpan->SetText(A2OUSTR("Document Size is Here"));
+ pSpan->SetText("Document Size is Here");
XFParagraph* pPara = new XFParagraph;
pPara->Add(pSpan);
static_cast<XFAnnotation*>(pContent)->Add(pPara);
break;
*/
- OUString text = A2OUSTR("<Document Size>");
+ OUString text = "<Document Size>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case SMARTMASTER:
{
- OUString text = A2OUSTR("<Smart master>");
+ OUString text = "<Smart master>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case DIVISIONNAME:
{
- OUString text = A2OUSTR("<Division name>");
+ OUString text = "<Division name>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case SECTIONNAME:
{
- OUString text = A2OUSTR("<Section name>");
+ OUString text = "<Section name>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case VERSIONCREATEBY:
{
- OUString text = A2OUSTR("<Version Creat by>");
+ OUString text = "<Version Creat by>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case VERSIONCREATEDATE:
{
- OUString text = A2OUSTR("<Version Creat date>");
+ OUString text = "<Version Creat date>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case VERSIONOTHEREDITORS:
{
- OUString text = A2OUSTR("<Version other Editors>");
+ OUString text = "<Version other Editors>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case VERSIONNAME:
{
- OUString text = A2OUSTR("<Version Name>");
+ OUString text = "<Version Name>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case VERSIONNUMBER:
{
- OUString text = A2OUSTR("<Version Numbers>");
+ OUString text = "<Version Numbers>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case ALLVERSIONNAME:
{
- OUString text = A2OUSTR("<All Version Name>");
+ OUString text = "<All Version Name>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case VERSIONREMARK:
{
- OUString text = A2OUSTR("<Version Remark>");
+ OUString text = "<Version Remark>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case DOCUMENTCATEGORY:
{
- OUString text = A2OUSTR("<Document Category>");
+ OUString text = "<Document Category>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case VERSIONLASTDATE:
{
- OUString text = A2OUSTR("<Version Last Modify Date>");
+ OUString text = "<Version Last Modify Date>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case VERSIONLASTEDITOR:
{
- OUString text = A2OUSTR("<Version Last Editor>");
+ OUString text = "<Version Last Editor>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case LASTEDIT:
{
- OUString text = A2OUSTR("<Last Editor>");
+ OUString text = "<Last Editor>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case OTHEREDITORS:
{
- OUString text = A2OUSTR("<Other Editors>");
+ OUString text = "<Other Editors>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
case NUMOFREVISION:
{
- OUString text = A2OUSTR("<Number of Revision>");
+ OUString text = "<Number of Revision>";
LwpFrib::ConvertChars(pXFPara,text);
return;
}
@@ -453,23 +453,23 @@ void LwpFribPageNumber::XFConvert(XFContentContainer* pXFPara)
if (m_nNumStyle == 0x0)
return;
XFPageNumber* pNum = new XFPageNumber;
-// pNum->SetSelect(A2OUSTR("current"));
+// pNum->SetSelect("current");
switch(m_nNumStyle)
{
case 0x01:
- pNum->SetNumFmt(A2OUSTR("1"));
+ pNum->SetNumFmt("1");
break;
case 0x02:
- pNum->SetNumFmt(A2OUSTR("A"));
+ pNum->SetNumFmt("A");
break;
case 0x03:
- pNum->SetNumFmt(A2OUSTR("a"));
+ pNum->SetNumFmt("a");
break;
case 0x04:
- pNum->SetNumFmt(A2OUSTR("I"));
+ pNum->SetNumFmt("I");
break;
case 0x05:
- pNum->SetNumFmt(A2OUSTR("i"));
+ pNum->SetNumFmt("i");
break;
}
OUString styleName = GetStyleName();
diff --git a/lotuswordpro/source/filter/lwpglobalmgr.cxx b/lotuswordpro/source/filter/lwpglobalmgr.cxx
index dfded6b..2d84c8a 100644
--- a/lotuswordpro/source/filter/lwpglobalmgr.cxx
+++ b/lotuswordpro/source/filter/lwpglobalmgr.cxx
@@ -143,7 +143,7 @@ OUString LwpGlobalMgr::GetEditorName(sal_uInt8 nID)
iter = m_EditorAttrMap.find(nID);
if (iter != m_EditorAttrMap.end())
return iter->second->cName.str();
- return A2OUSTR("");
+ return OUString("");
}
XFColor LwpGlobalMgr::GetHighlightColor(sal_uInt8 nID)
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 171ab2c..cdb5489 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -675,7 +675,7 @@ void LwpGraphicObject::XFConvertEquation(XFContentContainer * pCont)
{
//convert equation
XFParagraph* pXFPara = new XFParagraph;
- pXFPara->Add(A2OUSTR("Formula:"));
+ pXFPara->Add("Formula:");
//add notes
XFAnnotation* pXFNote = new XFAnnotation;
//add equation to comment notes
diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx
index b6d9221..bde11c2 100644
--- a/lotuswordpro/source/filter/lwpmarker.cxx
+++ b/lotuswordpro/source/filter/lwpmarker.cxx
@@ -97,7 +97,7 @@ OUString LwpMarker::GetNamedProperty(OUString name)
if (pProp)
return pProp->GetNamedProperty(name);
else
- return OUString(A2OUSTR(""));
+ return OUString("");
}
LwpStoryMarker::LwpStoryMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
@@ -150,7 +150,7 @@ OUString LwpCHBlkMarker::GetPromptText()
pStory = dynamic_cast<LwpStory*>(m_objPromptStory.obj());
if (pStory)
return pStory->GetContentText();
- return A2OUSTR("");
+ return OUString("");
}
void LwpCHBlkMarker::ConvertCHBlock(XFContentContainer* pXFPara, sal_uInt8 nType)
@@ -197,16 +197,16 @@ void LwpCHBlkMarker::ProcessPlaceHolder(XFContentContainer* pXFPara,sal_uInt16 n
switch(nAction)
{
case CLICKHERE_CHBEHAVIORTEXT:
- pHolder->SetType(A2OUSTR("text"));
+ pHolder->SetType("text");
break;
case CLICKHERE_CHBEHAVIORTABLE:
- pHolder->SetType(A2OUSTR("table"));
+ pHolder->SetType("table");
break;
case CLICKHERE_CHBEHAVIORPICTURE:
- pHolder->SetType(A2OUSTR("image"));
+ pHolder->SetType("image");
break;
case CLICKHERE_CHBEHAVIOROLEOBJECT:
- pHolder->SetType(A2OUSTR("object"));
+ pHolder->SetType("object");
break;
default:
break;
@@ -234,7 +234,7 @@ void LwpCHBlkMarker::ProcessOtherCHB(XFContentContainer* pXFPara,sal_uInt8 nType
if (nType == MARKER_START)
{
XFHolderStart* pHolder= new XFHolderStart;
- pHolder->SetType(A2OUSTR("text"));
+ pHolder->SetType("text");
if (bHelpFlag)
pHolder->SetDesc(m_Help.str());
pHolder->SetPrompt(GetPromptText());
@@ -279,7 +279,7 @@ void LwpCHBlkMarker::ProcessKeylist(XFContentContainer* pXFPara,sal_uInt8 nType)
pXFPara->Add(pList);
XFHolderStart* pHolder= new XFHolderStart;
- pHolder->SetType(A2OUSTR("text"));
+ pHolder->SetType("text");
pHolder->SetPrompt(GetPromptText());
pXFPara->Add(pHolder);
}
@@ -305,16 +305,16 @@ sal_Bool LwpCHBlkMarker::IsBubbleHelp()
void LwpCHBlkMarker::EnumAllKeywords()
{
- OUString name1(A2OUSTR(""));
- OUString value1(A2OUSTR(""));
- OUString name2(A2OUSTR("start"));
+ OUString name1("");
+ OUString value1("");
+ OUString name2("start");
LwpPropList* pProp = GetPropList();
if (!pProp)
return;
while(!name2.isEmpty())
{
name2 = pProp->EnumNamedProperty(name1,value1);
- if ( name1.match(A2OUSTR("LIST"),0) )
+ if ( name1.match("LIST",0) )
{
m_Keylist.push_back(value1);
}
@@ -354,7 +354,7 @@ OUString LwpBookMark::GetName()
if (LwpDLNFVList::GetName())
return LwpDLNFVList::GetName()->str();
else
- return OUString(A2OUSTR(""));
+ return OUString("");
}
LwpFieldMark::LwpFieldMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
@@ -394,11 +394,11 @@ void LwpFieldMark::ParseIndex(OUString& sKey1,OUString& sKey2)
if (index[0]>=0 && index[1]>=0)
sKey1 = sFormula.copy(index[0]+1,index[1]-index[0]-1);
else
- sKey1 = A2OUSTR("");
+ sKey1 = "";
if (index[2]>=0 && index[3]>=0)
sKey2 = sFormula.copy(index[2]+1,index[3]-index[2]-1);
else
- sKey2 = A2OUSTR("");
+ sKey2 = "";
}
void LwpFieldMark::ParseTOC(OUString& sLevel,OUString& sText)
@@ -416,11 +416,11 @@ void LwpFieldMark::ParseTOC(OUString& sLevel,OUString& sText)
if (index[0]>=0 && index[1]>=0)
sLevel = sFormula.copy(index[0]+1,index[1]-index[0]-1);
else
- sLevel = A2OUSTR("");
+ sLevel = "";
if (index[2]>=0 && index[3]>=0)
sText = sFormula.copy(index[2]+1,index[3]-index[2]-1);
else
- sText = A2OUSTR("");
+ sText = "";
}
sal_Bool LwpFieldMark::IsFormulaInsert()
@@ -440,7 +440,7 @@ sal_Bool LwpFieldMark::IsDateTimeField(sal_uInt8& type,OUString& formula)
index = sFormula.indexOf(ch1,0);
if (index < 0)
{
- if (sFormula == A2OUSTR("TotalEditingTime"))
+ if (sFormula == "TotalEditingTime")
{
type = DATETIME_TOTALTIME;
return sal_True;
@@ -449,26 +449,26 @@ sal_Bool LwpFieldMark::IsDateTimeField(sal_uInt8& type,OUString& formula)
}
tag = sFormula.copy(0,index);
- if (tag == A2OUSTR("Now()"))
+ if (tag == "Now()")
{
type = DATETIME_NOW;
formula = sFormula.copy(index+1,sFormula.getLength()-index-1);
return sal_True;
}
- else if (tag == A2OUSTR("CreateDate"))
+ else if (tag == "CreateDate")
{
type = DATETIME_CREATE;
formula = sFormula.copy(index+1,sFormula.getLength()-index-1);
return sal_True;
}
- else if (tag == A2OUSTR("EditDate"))
+ else if (tag == "EditDate")
{
type = DATETIME_LASTEDIT;
formula = sFormula.copy(index+1,sFormula.getLength()-index-1);
return sal_True;
}
- else if (tag == A2OUSTR("YesterdaysDate") || tag == A2OUSTR("TomorrowsDate")
- || tag == A2OUSTR("TodaysDate"))
+ else if (tag == "YesterdaysDate" || tag == "TomorrowsDate"
+ || tag == "TodaysDate")
{
type = DATETIME_SKIP;
return sal_True;
@@ -500,13 +500,13 @@ sal_Bool LwpFieldMark::IsCrossRefField(sal_uInt8& nType, OUString& sMarkName)
}
tag = sFormula.copy(0,index);
- if (tag == A2OUSTR("PageRef"))
+ if (tag == "PageRef")
{
sMarkName = sFormula.copy(index+1,sFormula.getLength()-index-1);
nType = CROSSREF_PAGE;
return sal_True;
}
- else if (tag == A2OUSTR("ParaRef"))
+ else if (tag == "ParaRef")
{
sMarkName = sFormula.copy(index+1,sFormula.getLength()-index-1);
nType = CROSSREF_PARANUMBER;
@@ -520,22 +520,22 @@ sal_Bool LwpFieldMark::IsDocPowerField(sal_uInt8& nType,OUString& sFormula)
{
sFormula = m_Formula.str();
- if (sFormula == A2OUSTR("Description"))
+ if (sFormula == "Description")
{
nType = DOC_DESCRIPTION;
return sal_True;
}
- else if (sFormula == A2OUSTR("NumPages"))
+ else if (sFormula == "NumPages")
{
nType = DOC_NUMPAGES;
return sal_True;
}
- else if (sFormula == A2OUSTR("NumChars"))
+ else if (sFormula == "NumChars")
{
nType = DOC_NUMCHARS;
return sal_True;
}
- else if (sFormula == A2OUSTR("NumWords"))
+ else if (sFormula == "NumWords")
{
nType = DOC_NUMWORDS;
return sal_True;
diff --git a/lotuswordpro/source/filter/lwpnotes.cxx b/lotuswordpro/source/filter/lwpnotes.cxx
index 5c7d916..cc72a46 100644
--- a/lotuswordpro/source/filter/lwpnotes.cxx
+++ b/lotuswordpro/source/filter/lwpnotes.cxx
@@ -208,7 +208,7 @@ OUString LwpNoteLayout::GetAuthor()
{
if(m_UserName.HasValue())
{
- if(m_UserName.str() != A2OUSTR(" "))
+ if(m_UserName.str() != OUString(" "))
{
return m_UserName.str();
}
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx
index c9cedac..69a657e 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -402,7 +402,7 @@ OUString LwpPageLayout::RegisterEndnoteStyle()
//Add master page
XFMasterPage* mp1 = new XFMasterPage();
- mp1->SetStyleName(A2OUSTR("Endnote"));
+ mp1->SetStyleName("Endnote");
mp1->SetPageMaster(pmname);
//Set footer style
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index 3596f8d..de58aa6 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -332,7 +332,7 @@ sal_Bool LwpPara::RegisterMasterPage(XFParaStyle* pBaseStyle)
//register master page style
XFParaStyle* pOverStyle = new XFParaStyle();
*pOverStyle = *pBaseStyle;
- pOverStyle->SetStyleName( A2OUSTR(""));
+ pOverStyle->SetStyleName( "");
pOverStyle->SetMasterPage(pLayout->GetStyleName());
if (!m_ParentStyleName.isEmpty())
pOverStyle->SetParentStyleName(m_ParentStyleName);
@@ -374,7 +374,7 @@ void LwpPara::RegisterStyle()
{
pOverStyle = new XFParaStyle;
*pOverStyle = *pBaseStyle;
- pOverStyle->SetStyleName(A2OUSTR(""));
+ pOverStyle->SetStyleName("");
LwpParaProperty* pProps = m_pProps;
sal_uInt32 PropType;
LwpParaStyle* pParaStyle = dynamic_cast<LwpParaStyle*>(m_ParaStyle.obj());
@@ -768,7 +768,7 @@ void LwpPara::RegisterStyle()
{
XFParaStyle* pParaStyle = new XFParaStyle;
*pParaStyle = *GetXFParaStyle();
- //pOverStyle->SetStyleName(A2OUSTR(""));
+ //pOverStyle->SetStyleName("");
this->RegisterTabStyle(pParaStyle);
if (!m_ParentStyleName.isEmpty())
pParaStyle->SetParentStyleName(m_ParentStyleName);
@@ -816,7 +816,7 @@ XFSection* LwpPara::CreateXFSection()
{
XFSection* pXFSection = new XFSection();
pXFSection->SetStyleName(m_SectionStyleName);
- m_SectionStyleName = A2OUSTR("");
+ m_SectionStyleName = "";
return pXFSection;
}
diff --git a/lotuswordpro/source/filter/lwpproplist.cxx b/lotuswordpro/source/filter/lwpproplist.cxx
index 436e300..01646b2 100644
--- a/lotuswordpro/source/filter/lwpproplist.cxx
+++ b/lotuswordpro/source/filter/lwpproplist.cxx
@@ -94,7 +94,7 @@ OUString LwpPropList::GetNamedProperty(OUString name)
{
return pProp->GetValue().str();
}
- return OUString(A2OUSTR(""));
+ return OUString("");
}
LwpPropListElement* LwpPropList::FindPropByName(OUString name)
@@ -134,7 +134,7 @@ OUString LwpPropList::EnumNamedProperty(OUString& name,OUString& value)
return pElement->GetName().str();
}
else
- return A2OUSTR("");
+ return OUString("");
}
else
@@ -147,7 +147,7 @@ OUString LwpPropList::EnumNamedProperty(OUString& name,OUString& value)
if(pElement)
return pElement->GetName().str();
}
- return A2OUSTR("");
+ return OUString("");
}
}
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index d33d8b5..cb22273 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1220,7 +1220,7 @@ void LwpTableLayout::PostProcessParagraph(XFCell *pCell, sal_uInt16 nRowID, sal_
}
}
- pOverStyle->SetStyleName(A2OUSTR(""));
+ pOverStyle->SetStyleName("");
OUString StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName();
pXFPara->SetStyleName(StyleName);
diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx
index 8e802a6..3c411af 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -153,7 +153,7 @@ void LwpTocSuperLayout::XFConvert(XFContentContainer* pCont)
if(!pLevel)
{
// add an blank template so that SODC won't add default style to this level
- pToc->AddTemplate(Int32ToOUString(i), OUString(), pTemplate);
+ pToc->AddTemplate(OUString::number(i), OUString(), pTemplate);
continue;
}
@@ -163,7 +163,7 @@ void LwpTocSuperLayout::XFConvert(XFContentContainer* pCont)
// One level has 1 template
if (!bInserted)
{
- pTemplate->SetLevel(Int32ToOUString(i));
+ pTemplate->SetLevel(OUString::number(i));
if(pLevel->GetUseLeadingText())
{
pTemplate->AddEntry(enumXFIndexTemplateChapter, pLevel->GetSearchStyle());
@@ -199,24 +199,24 @@ void LwpTocSuperLayout::XFConvert(XFContentContainer* pCont)
}
else
{
- char sSep[8];
+ OUString sSep;
switch(nLeaderType)
{
default: // go through
case NONE: // no leaders
- strcpy(sSep, " ");
+ sSep = " ";
break;
case SEPARATORCOMMA:
- strcpy(sSep, ", ");
+ sSep = ", ";
break;
case SEPARATORDOTS:
- strcpy(sSep, "...");
+ sSep = "...";
break;
}
- pTemplate->AddTextEntry(A2OUSTR(sSep), m_TabStyleName);
+ pTemplate->AddTextEntry(sSep, m_TabStyleName);
}
//"TOC Page Number Text Style" style always exists in Word Pro file
- pTemplate->AddEntry(enumXFIndexTemplatePage, A2OUSTR("TOC Page Number Text Style"));
+ pTemplate->AddEntry(enumXFIndexTemplatePage, "TOC Page Number Text Style");
}
pToc->AddTemplate(Int16ToOUString(i), m_pFoundry->FindActuralStyleName(pLevel->GetSearchStyle()), pTemplate);
diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx
index a87fb16..1b6437c 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -236,20 +236,10 @@ OUString LwpTools::convertToFileUrl(const OString &fileName)
OUString LwpTools::DateTimeToOUString(LtTm & dt)
{
- OUStringBuffer buf;
- buf.append(dt.tm_year);
- buf.append( A2OUSTR("-") );
- buf.append(dt.tm_mon);
- buf.append( A2OUSTR("-") );
- buf.append(dt.tm_mday);
- buf.append( A2OUSTR("T") );
- buf.append(dt.tm_hour);
- buf.append( A2OUSTR(":") );
- buf.append(dt.tm_min);
- buf.append( A2OUSTR(":") );
- buf.append(dt.tm_sec);
+ OUString aResult = OUString::number(dt.tm_year) + "-" + OUString::number(dt.tm_mon) + "-" + OUString::number(dt.tm_mday) +
+ "T" + OUString::number(dt.tm_hour) + ":" + OUString::number(dt.tm_min) + ":" + OUString::number(dt.tm_sec);
- return buf.makeStringAndClear();
+ return aResult;
}
/**
@@ -609,7 +599,7 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
}
case '"':
{
- pDateStyle->AddText(OUString(A2OUSTR("'")));
+ pDateStyle->AddText(OUString("'"));
break;
}
default:
@@ -829,7 +819,7 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
}
case '"':
{
- pTimeStyle->AddText(OUString(A2OUSTR("'")));
+ pTimeStyle->AddText(OUString("'"));
break;
}
default:
diff --git a/lotuswordpro/source/filter/xfilter/xfannotation.hxx b/lotuswordpro/source/filter/xfilter/xfannotation.hxx
index 5c88f41..47a1de8 100644
--- a/lotuswordpro/source/filter/xfilter/xfannotation.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfannotation.hxx
@@ -94,14 +94,14 @@ inline void XFAnnotation::ToXml(IXFStream *pStrm)
pAttrList->Clear();
if( !m_strDate.isEmpty() )
- pAttrList->AddAttribute( A2OUSTR("office:create-date"), m_strDate );
+ pAttrList->AddAttribute( "office:create-date", m_strDate );
if( !m_strAuthor.isEmpty() )
- pAttrList->AddAttribute( A2OUSTR("office:author"), m_strAuthor);
- pStrm->StartElement( A2OUSTR("office:annotation") );
+ pAttrList->AddAttribute( "office:author", m_strAuthor);
+ pStrm->StartElement( "office:annotation" );
XFContentContainer::ToXml(pStrm);
- pStrm->EndElement( A2OUSTR("office:annotation") );
+ pStrm->EndElement( "office:annotation" );
}
#endif
diff --git a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx b/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
index 186d89c..961c1a4 100644
--- a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
@@ -114,14 +114,14 @@ inline void XFArrowStyle::ToXml(IXFStream *pStrm)
pAttrList->Clear();
if( !m_strName.isEmpty() )
- pAttrList->AddAttribute( A2OUSTR("draw:name"), m_strName );
+ pAttrList->AddAttribute( "draw:name", m_strName );
else
- pAttrList->AddAttribute( A2OUSTR("draw:name"), GetStyleName() );
+ pAttrList->AddAttribute( "draw:name", GetStyleName() );
- pAttrList->AddAttribute( A2OUSTR("svg:viewBox"), m_strViewBox );
- pAttrList->AddAttribute( A2OUSTR("svg:d"), m_strPath );
- pStrm->StartElement(A2OUSTR("draw:marker"));
- pStrm->EndElement(A2OUSTR("draw:marker"));
+ pAttrList->AddAttribute( "svg:viewBox", m_strViewBox );
+ pAttrList->AddAttribute( "svg:d", m_strPath );
+ pStrm->StartElement("draw:marker");
+ pStrm->EndElement("draw:marker");
}
#endif
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
index 0919553..1f0f7c5 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
@@ -88,41 +88,41 @@ void XFBGImage::ToXml(IXFStream *pStrm)
if( m_bUserFileLink )
{
- pAttrList->AddAttribute( A2OUSTR("xlink:href"), m_strFileName);
+ pAttrList->AddAttribute( "xlink:href", m_strFileName);
}
- pAttrList->AddAttribute( A2OUSTR("xlink:type"), A2OUSTR("simple") );
- pAttrList->AddAttribute( A2OUSTR("xlink:actuate"), A2OUSTR("onLoad"));
+ pAttrList->AddAttribute( "xlink:type", "simple" );
+ pAttrList->AddAttribute( "xlink:actuate", "onLoad");
if( m_bPosition )
{
- OUString str = GetAlignName(m_eVertAlign) + A2OUSTR(" ");
+ OUString str = GetAlignName(m_eVertAlign) + " ";
if( m_eHoriAlign == enumXFAlignStart )
- str += A2OUSTR("left");
+ str += "left";
else if( m_eHoriAlign == enumXFAlignCenter )
- str += A2OUSTR("center");
+ str += "center";
else if( m_eHoriAlign == enumXFAlignEnd )
- str += A2OUSTR("right");
+ str += "right";
- pAttrList->AddAttribute( A2OUSTR("style:position"), str );
- pAttrList->AddAttribute( A2OUSTR("style:repeat"), A2OUSTR("no-repeat") );
+ pAttrList->AddAttribute( "style:position", str );
+ pAttrList->AddAttribute( "style:repeat", "no-repeat" );
}
else if( m_bRepeate )
- pAttrList->AddAttribute( A2OUSTR("style:repeat"), A2OUSTR("repeat") );
+ pAttrList->AddAttribute( "style:repeat", "repeat" );
else if( m_bStretch )
- pAttrList->AddAttribute( A2OUSTR("style:repeat"), A2OUSTR("stretch") );
+ pAttrList->AddAttribute( "style:repeat", "stretch" );
- pStrm->StartElement( A2OUSTR("style:background-image") );
+ pStrm->StartElement( "style:background-image" );
if( !m_bUserFileLink )
{
pAttrList->Clear();
- pStrm->StartElement( A2OUSTR("office:binary-data") );
+ pStrm->StartElement( "office:binary-data" );
pStrm->Characters(m_strData);
- pStrm->EndElement( A2OUSTR("office:binary-data") );
+ pStrm->EndElement( "office:binary-data" );
}
- pStrm->EndElement( A2OUSTR("style:background-image") );
+ pStrm->EndElement( "style:background-image" );
}
bool operator==(XFBGImage& img1, XFBGImage& img2)
diff --git a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
index 9a212e1..e9c03cd2 100644
--- a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
@@ -92,16 +92,16 @@ public:
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- pAttrList->AddAttribute( A2OUSTR("text:name"), m_strName );
+ pAttrList->AddAttribute( "text:name", m_strName );
if( m_bStart )
{
- pStrm->StartElement( A2OUSTR("text:bookmark-start") );
- pStrm->EndElement( A2OUSTR("text:bookmark-start") );
+ pStrm->StartElement( "text:bookmark-start" );
+ pStrm->EndElement( "text:bookmark-start" );
}
else
{
- pStrm->StartElement( A2OUSTR("text:bookmark-end") );
- pStrm->EndElement( A2OUSTR("text:bookmark-end") );
+ pStrm->StartElement( "text:bookmark-end" );
+ pStrm->EndElement( "text:bookmark-end" );
}
}
diff --git a/lotuswordpro/source/filter/xfilter/xfborders.cxx b/lotuswordpro/source/filter/xfilter/xfborders.cxx
index 8ffc255..7da56e5 100644
--- a/lotuswordpro/source/filter/xfilter/xfborders.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfborders.cxx
@@ -120,8 +120,8 @@ OUString XFBorder::GetLineWidth()
if( m_bDouble )
{
str = FloatToOUString(m_fWidthInner);
- str += A2OUSTR("cm ") + DoubleToOUString(m_fWidthSpace);
- str += A2OUSTR("cm ") + DoubleToOUString(m_fWidthOuter) + A2OUSTR("cm");
+ str += "cm " + DoubleToOUString(m_fWidthSpace);
+ str += "cm " + DoubleToOUString(m_fWidthOuter) + "cm";
}
return str;
}
@@ -138,8 +138,8 @@ OUString XFBorder::ToString()
return str;
}
- str = DoubleToOUString(width) + A2OUSTR("cm");
- str += A2OUSTR(" double ") + m_aColor.ToString();
+ str = DoubleToOUString(width) + "cm";
+ str += " double " + m_aColor.ToString();
}
else
{
@@ -148,8 +148,8 @@ OUString XFBorder::ToString()
{
return str;
}
- str = DoubleToOUString(width) + A2OUSTR("cm");
- str += A2OUSTR(" solid ") + m_aColor.ToString();
+ str = DoubleToOUString(width) + "cm";
+ str += " solid " + m_aColor.ToString();
}
return str;
}
@@ -336,33 +336,33 @@ void XFBorders::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
if( !m_aBorderLeft.GetLineWidth().isEmpty() )
- pAttrList->AddAttribute( A2OUSTR("style:border-line-width-left"), m_aBorderLeft.GetLineWidth() );
+ pAttrList->AddAttribute( "style:border-line-width-left", m_aBorderLeft.GetLineWidth() );
if( !m_aBorderRight.GetLineWidth().isEmpty() )
- pAttrList->AddAttribute( A2OUSTR("style:border-line-width-right"), m_aBorderRight.GetLineWidth() );
+ pAttrList->AddAttribute( "style:border-line-width-right", m_aBorderRight.GetLineWidth() );
if( !m_aBorderTop.GetLineWidth().isEmpty() )
- pAttrList->AddAttribute( A2OUSTR("style:border-line-width-top"), m_aBorderTop.GetLineWidth() );
+ pAttrList->AddAttribute( "style:border-line-width-top", m_aBorderTop.GetLineWidth() );
if( !m_aBorderBottom.GetLineWidth().isEmpty() )
- pAttrList->AddAttribute( A2OUSTR("style:border-line-width-bottom"), m_aBorderBottom.GetLineWidth() );
+ pAttrList->AddAttribute( "style:border-line-width-bottom", m_aBorderBottom.GetLineWidth() );
if( !m_aBorderLeft.ToString().isEmpty() )
- pAttrList->AddAttribute( A2OUSTR("fo:border-left"), m_aBorderLeft.ToString() );
+ pAttrList->AddAttribute( "fo:border-left", m_aBorderLeft.ToString() );
else
- pAttrList->AddAttribute( A2OUSTR("fo:border-left"), A2OUSTR("none") );
+ pAttrList->AddAttribute( "fo:border-left", "none" );
if( !m_aBorderRight.ToString().isEmpty() )
- pAttrList->AddAttribute( A2OUSTR("fo:border-right"), m_aBorderRight.ToString() );
+ pAttrList->AddAttribute( "fo:border-right", m_aBorderRight.ToString() );
else
- pAttrList->AddAttribute( A2OUSTR("fo:border-right"), A2OUSTR("none") );
+ pAttrList->AddAttribute( "fo:border-right", "none" );
if( !m_aBorderTop.ToString().isEmpty() )
- pAttrList->AddAttribute( A2OUSTR("fo:border-top"), m_aBorderTop.ToString() );
+ pAttrList->AddAttribute( "fo:border-top", m_aBorderTop.ToString() );
else
- pAttrList->AddAttribute( A2OUSTR("fo:border-top"), A2OUSTR("none") );
+ pAttrList->AddAttribute( "fo:border-top", "none" );
if( !m_aBorderBottom.ToString().isEmpty() )
- pAttrList->AddAttribute( A2OUSTR("fo:border-bottom"), m_aBorderBottom.ToString() );
+ pAttrList->AddAttribute( "fo:border-bottom", m_aBorderBottom.ToString() );
else
- pAttrList->AddAttribute( A2OUSTR("fo:border-bottom"), A2OUSTR("none") );
+ pAttrList->AddAttribute( "fo:border-bottom", "none" );
}
diff --git a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx b/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
index b18bdc7..a7cea32 100644
--- a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
@@ -113,19 +113,19 @@ inline void XFBreaks::ToXml(IXFStream *pStrm)
case enumXFBreakAuto:
break;
case enumXFBreakBefPage:
- pAttrList->AddAttribute( A2OUSTR("fo:break-before"), A2OUSTR("page") );
+ pAttrList->AddAttribute( "fo:break-before", "page" );
break;
case enumXFBreakBefColumn:
- pAttrList->AddAttribute( A2OUSTR("fo:break-before"), A2OUSTR("column") );
+ pAttrList->AddAttribute( "fo:break-before", "column" );
break;
case enumXFBreakAftPage:
- pAttrList->AddAttribute( A2OUSTR("fo:break-after"), A2OUSTR("page") );
+ pAttrList->AddAttribute( "fo:break-after", "page" );
break;
case enumXFBreakAftColumn:
- pAttrList->AddAttribute( A2OUSTR("fo:break-after"), A2OUSTR("column") );
+ pAttrList->AddAttribute( "fo:break-after", "column" );
break;
case enumXFBreakKeepWithNext:
- pAttrList->AddAttribute( A2OUSTR("fo:keep-with-next"), A2OUSTR("true") );
+ pAttrList->AddAttribute( "fo:keep-with-next", "true" );
break;
}
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list