[Libreoffice-commits] core.git: lotuswordpro/source
Norbert Thiebaud
nthiebaud at gmail.com
Sat Mar 8 23:16:32 PST 2014
lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 2
lotuswordpro/source/filter/lwpnumericfmt.hxx | 80 +++++++++---------
lotuswordpro/source/filter/lwpsilverbullet.cxx | 2
lotuswordpro/source/filter/lwptools.cxx | 4
lotuswordpro/source/filter/xfilter/xfsection.cxx | 20 ++--
lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx | 20 ++--
lotuswordpro/source/filter/xfilter/xfshadow.cxx | 12 +-
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 | 2
lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx | 34 +++----
lotuswordpro/source/filter/xfilter/xftextcontent.cxx | 4
14 files changed, 139 insertions(+), 139 deletions(-)
New commits:
commit 64a96febfe6877a504d8b9f049ce6c02a1b6310f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 9 01:16:02 2014 -0600
lotuswordpro: cleanup OUString() usage
Change-Id: Ib0a8c9843a6cdb3704115eca5b967b4e31fa34bd
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index f1889d1..6b1114b 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -232,7 +232,7 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverrid
}
pListStyle->SetListBullet(nPos, LwpSilverBullet::GetNumCharByStyleID(pParaNumber).toChar(),
- OUString("Times New Roman"), aPrefix, aSuffix);
+ "Times New Roman", aPrefix, aSuffix);
}
pListStyle->SetListPosition(nPos, 0.0, 0.635, 0.0);
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx
index 599af74..134e398 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.hxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx
@@ -196,50 +196,50 @@ private:
void InitCurrencySymbol()
{
sal_uInt16 nC=FMT_ARGENTINEANPESO;
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("A")); //FMT_ARGENTINEANPESO = 1,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("A$")); //FMT_AUSTRALIANDOLLAR = 2,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("oS"),sal_True, sal_True);//FMT_AUSTRIANSCHILLING = 3,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("BF"),sal_True, sal_True);//FMT_BELGIANFRANC = 4,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("R$"),sal_False, sal_True);//FMT_BRAZILIANCRUZEIRO = 5,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("A"); //FMT_ARGENTINEANPESO = 1,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("A$"); //FMT_AUSTRALIANDOLLAR = 2,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("oS",sal_True, sal_True);//FMT_AUSTRIANSCHILLING = 3,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("BF",sal_True, sal_True);//FMT_BELGIANFRANC = 4,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("R$",sal_False, sal_True);//FMT_BRAZILIANCRUZEIRO = 5,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString(RTL_CONSTUTF8_USTRINGPARAM("\357\277\241"))); //FMT_BRITISHPOUND = 6,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("C$")); //FMT_CANADIANDOLLAR = 7,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("C$"); //FMT_CANADIANDOLLAR = 7,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString(RTL_CONSTUTF8_USTRINGPARAM("PRC\357\277\245")),sal_False,sal_True); //FMT_CHINESEYUAN = 8,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Kc"),sal_True, sal_True);//FMT_CZECHKORUNA = 9,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Dkr"),sal_False, sal_True);//FMT_DANISHKRONE = 10,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("ECU"),sal_True, sal_True);//FMT_ECU = 11,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("mk"),sal_True, sal_True);//FMT_FINNISHMARKKA = 12,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("F"),sal_True, sal_True);//FMT_FRENCHFRANC = 13,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("DM"),sal_True, sal_True);//FMT_GERMANMARK = 14,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Dr"),sal_True, sal_True);//FMT_GREEKDRACHMA = 15,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("HK$")); //FMT_HONGKONGDOLLAR = 16,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Ft"),sal_True, sal_True);//FMT_HUNGARIANFORINT = 17,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Rs"),sal_False, sal_True);//FMT_INDIANRUPEE = 18,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Rp"),sal_False, sal_True);//FMT_INDONESIANRUPIAH = 19,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Kc",sal_True, sal_True);//FMT_CZECHKORUNA = 9,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Dkr",sal_False, sal_True);//FMT_DANISHKRONE = 10,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("ECU",sal_True, sal_True);//FMT_ECU = 11,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("mk",sal_True, sal_True);//FMT_FINNISHMARKKA = 12,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("F",sal_True, sal_True);//FMT_FRENCHFRANC = 13,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("DM",sal_True, sal_True);//FMT_GERMANMARK = 14,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Dr",sal_True, sal_True);//FMT_GREEKDRACHMA = 15,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("HK$"); //FMT_HONGKONGDOLLAR = 16,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Ft",sal_True, sal_True);//FMT_HUNGARIANFORINT = 17,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rs",sal_False, sal_True);//FMT_INDIANRUPEE = 18,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rp",sal_False, sal_True);//FMT_INDONESIANRUPIAH = 19,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString(RTL_CONSTUTF8_USTRINGPARAM("IR\357\277\241"))); //FMT_IRISHPUNT = 20,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("L."),sal_False, sal_True);//FMT_ITALIANLIRA = 21,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("L.",sal_False, sal_True);//FMT_ITALIANLIRA = 21,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString(RTL_CONSTUTF8_USTRINGPARAM("\357\277\245"))); //FMT_JAPANESEYEN = 22,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("LF"),sal_True, sal_True);//FMT_LUXEMBOURGFRANC = 23,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Rm"),sal_False, sal_True);//FMT_MALAYSIANRINGGIT = 24,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Mex$")); //FMT_MEXICANPESO = 25,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("F"),sal_False, sal_True);//FMT_NETHERLANDSGUILDER = 26,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("NZ$")); //FMT_NEWZEALANDDOLLAR = 27,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Nkr"),sal_False, sal_True);//FMT_NORWEGIANKRONE = 28,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Zl"),sal_True, sal_True);//FMT_POLISHZLOTY = 29,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Esc."),sal_True, sal_True);//FMT_PORTUGUESEESCUDO = 30,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Leu"),sal_True, sal_True);//FMT_ROMANIANLEI = 31,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("R"),sal_True, sal_True);//FMT_RUSSIANRUBLE = 32,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("S$")); //FMT_SINGAPOREDOLLAR = 33,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Sk"),sal_True, sal_True);//FMT_SLOVAKIANKORUNA = 34,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("SIT"),sal_False, sal_True);//FMT_SLOVENIANTHOLAR = 35,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("R")); //FMT_SOUTHAFRICANRAND = 36,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("W")); //FMT_SOUTHKOREANWON = 37,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Pts"),sal_True, sal_True);//FMT_SPANISHPESETA = 38,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Skr"),sal_True, sal_True);//FMT_SWEDISHKRONA = 39,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("SFr"),sal_False, sal_True);//FMT_SWISSFRANC = 40,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("NT$")); //FMT_TAIWANDOLLAR = 41,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Bt"),sal_True, sal_True);//FMT_THAIBAHT = 42,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("$")); //FMT_USDOLLAR = 43,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("OTH"),sal_False, sal_True);//FMT_OTHERCURRENCY = 44,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("LF",sal_True, sal_True);//FMT_LUXEMBOURGFRANC = 23,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Rm",sal_False, sal_True);//FMT_MALAYSIANRINGGIT = 24,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Mex$"); //FMT_MEXICANPESO = 25,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("F",sal_False, sal_True);//FMT_NETHERLANDSGUILDER = 26,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("NZ$"); //FMT_NEWZEALANDDOLLAR = 27,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Nkr",sal_False, sal_True);//FMT_NORWEGIANKRONE = 28,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Zl",sal_True, sal_True);//FMT_POLISHZLOTY = 29,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Esc.",sal_True, sal_True);//FMT_PORTUGUESEESCUDO = 30,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Leu",sal_True, sal_True);//FMT_ROMANIANLEI = 31,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("R",sal_True, sal_True);//FMT_RUSSIANRUBLE = 32,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("S$"); //FMT_SINGAPOREDOLLAR = 33,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Sk",sal_True, sal_True);//FMT_SLOVAKIANKORUNA = 34,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("SIT",sal_False, sal_True);//FMT_SLOVENIANTHOLAR = 35,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("R"); //FMT_SOUTHAFRICANRAND = 36,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("W"); //FMT_SOUTHKOREANWON = 37,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Pts",sal_True, sal_True);//FMT_SPANISHPESETA = 38,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Skr",sal_True, sal_True);//FMT_SWEDISHKRONA = 39,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("SFr",sal_False, sal_True);//FMT_SWISSFRANC = 40,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("NT$"); //FMT_TAIWANDOLLAR = 41,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("Bt",sal_True, sal_True);//FMT_THAIBAHT = 42,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("$"); //FMT_USDOLLAR = 43,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo("OTH",sal_False, sal_True);//FMT_OTHERCURRENCY = 44,
m_aCurrencyInfo[FMT_EURO]=LwpCurrencyInfo(OUString(RTL_CONSTUTF8_USTRINGPARAM("\342\202\254"))); //FMT_EURO = 52
}
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index 8c2f0a2..91c6936 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -172,7 +172,7 @@ void LwpSilverBullet::RegisterStyle()
}
pListStyle->SetListBullet(nPos, this->GetNumCharByStyleID(pParaNumber).toChar(),
- OUString("Times New Roman"), aPrefix, aSuffix);
+ "Times New Roman", aPrefix, aSuffix);
}
pListStyle->SetListPosition(nPos, 0.0, 0.635, 0.0);
diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx
index 1b6437c..ce39144 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -599,7 +599,7 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
}
case '"':
{
- pDateStyle->AddText(OUString("'"));
+ pDateStyle->AddText("'");
break;
}
default:
@@ -819,7 +819,7 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
}
case '"':
{
- pTimeStyle->AddText(OUString("'"));
+ pTimeStyle->AddText("'");
break;
}
default:
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.cxx b/lotuswordpro/source/filter/xfilter/xfsection.cxx
index a764359..131224f 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.cxx
@@ -79,28 +79,28 @@ void XFSection::ToXml(IXFStream *pStrm)
pAttrList->Clear();
OUString style = GetStyleName();
if( !style.isEmpty() )
- pAttrList->AddAttribute( OUString("text:style-name"), style);
+ pAttrList->AddAttribute( "text:style-name", style);
//section name
if( !m_strSectionName.isEmpty() )
- pAttrList->AddAttribute( OUString("text:name"), m_strSectionName);
+ pAttrList->AddAttribute( "text:name", m_strSectionName);
if( m_bProtected )
- pAttrList->AddAttribute( OUString("text:protected"), OUString("true") );
+ pAttrList->AddAttribute( "text:protected", "true" );
if( m_bHiden )
- pAttrList->AddAttribute( OUString("text:display"), OUString("none") );
+ pAttrList->AddAttribute( "text:display", "none" );
- pStrm->StartElement( OUString("text:section") );
+ pStrm->StartElement( "text:section" );
if( !m_strSourceLink.isEmpty() )
{
pAttrList->Clear();
- pAttrList->AddAttribute( OUString("xlink:href"), m_strSourceLink);
- pAttrList->AddAttribute( OUString("text:filter-name"), OUString("wordpro"));
- pStrm->StartElement( OUString("text:section-source") );
- pStrm->EndElement( OUString("text:section-source") );
+ pAttrList->AddAttribute( "xlink:href", m_strSourceLink);
+ pAttrList->AddAttribute( "text:filter-name", "wordpro");
+ pStrm->StartElement( "text:section-source" );
+ pStrm->EndElement( "text:section-source" );
}
XFContentContainer::ToXml(pStrm);
- pStrm->EndElement( OUString("text:section") );
+ pStrm->EndElement( "text:section" );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
index 2790e5b..dd04e86 100644
--- a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
@@ -103,39 +103,39 @@ void XFSectionStyle::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- pAttrList->AddAttribute( OUString("style:name"), GetStyleName() );
- pAttrList->AddAttribute( OUString("style:family"), OUString("section") );
+ pAttrList->AddAttribute( "style:name", GetStyleName() );
+ pAttrList->AddAttribute( "style:family", "section" );
- pStrm->StartElement( OUString("style:style") );
+ pStrm->StartElement( "style:style" );
pAttrList->Clear();
if( m_fMarginLeft != 0 )
{
- pAttrList->AddAttribute( OUString("fo:margin-left"), OUString::number(m_fMarginLeft) + OUString("cm") );
+ pAttrList->AddAttribute( "fo:margin-left", OUString::number(m_fMarginLeft) + "cm" );
}
if( m_fMarginRight != 0 )
{
- pAttrList->AddAttribute( OUString("fo:margin-right"), OUString::number(m_fMarginRight) + OUString("cm") );
+ pAttrList->AddAttribute( "fo:margin-right", OUString::number(m_fMarginRight) + "cm" );
}
if( m_aBackColor.IsValid() && !m_pBackImage )
{
- pAttrList->AddAttribute( OUString("fo:background-color"), m_aBackColor.ToString() );
+ pAttrList->AddAttribute( "fo:background-color", m_aBackColor.ToString() );
}
else
{
- pAttrList->AddAttribute( OUString("fo:background-color"), OUString("transparent") );
+ pAttrList->AddAttribute( "fo:background-color", "transparent" );
}
- pStrm->StartElement( OUString("style:properties") );
+ pStrm->StartElement( "style:properties" );
if( m_pColumns )
m_pColumns->ToXml(pStrm);
if( m_pBackImage )
m_pBackImage->ToXml(pStrm);
- pStrm->EndElement( OUString("style:properties") );
+ pStrm->EndElement( "style:properties" );
- pStrm->EndElement( OUString("style:style") );
+ pStrm->EndElement( "style:style" );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.cxx b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
index a7e69de..daa85c0 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
@@ -74,22 +74,22 @@ OUString XFShadow::ToString()
OUString buf;
OUString strOff = OUString::number(m_fOffset);
- buf = m_aColor.ToString();
switch(m_ePosition)
{
case enumXFShadowRightBottom:
- buf += OUString(" ") + strOff + OUString("cm") + OUString(" ") + strOff + OUString("cm");
+ buf = m_aColor.ToString() + " " + strOff + "cm" + " " + strOff + "cm";
break;
case enumXFShadowRightTop:
- buf += OUString(" ") + strOff + OUString("cm") + OUString(" -") + strOff + OUString("cm");
+ buf = m_aColor.ToString() + " " + strOff + "cm" + " -" + strOff + "cm";
break;
case enumXFShadowLeftBottom:
- buf += OUString(" -") + strOff + OUString("cm") + OUString(" ") + strOff + OUString("cm");
+ buf = m_aColor.ToString() + " -" + strOff + "cm" + " " + strOff + "cm";
break;
case enumXFShadowLeftTop:
- buf += OUString(" -") + strOff + OUString("cm") + OUString(" -") + strOff + OUString("cm");
+ buf = m_aColor.ToString() + " -" + strOff + "cm" + " -" + strOff + "cm";
break;
default:
+ buf = m_aColor.ToString();
break;
}
@@ -102,7 +102,7 @@ void XFShadow::ToXml(IXFStream *pStrm)
if( m_ePosition == enumXFShadowNone )
return;
else
- pAttrList->AddAttribute( OUString("style:shadow"), ToString() );
+ pAttrList->AddAttribute( "style:shadow", ToString() );
}
sal_Bool operator==(XFShadow& s1, XFShadow& s2)
diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
index ba3d5f2..2d9d6c2 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
@@ -60,11 +60,11 @@
#include "xfstylemanager.hxx"
#include "ixfstyle.hxx"
-XFStyleManager::XFStyleManager() : s_aStdArrowStyles( OUString("arrow") ), s_aTextStyles( OUString("T") ),
- s_aParaStyles( OUString("P") ),s_aListStyles( OUString("L") ),s_aSectionStyles( OUString("Sect") ),
- s_aPageMasters( OUString("PM") ),s_aMasterpages( OUString("MP") ),s_aDateStyles( OUString("N") ),
- s_aGraphicsStyles( OUString("fr") ),s_aTableStyles( OUString("table") ),s_aTableCellStyles( OUString("cell") ),
- s_aTableRowStyles( OUString("row") ),s_aTableColStyles( OUString("col") ),s_pOutlineStyle(NULL)
+XFStyleManager::XFStyleManager() : s_aStdArrowStyles( "arrow" ), s_aTextStyles( "T" ),
+ s_aParaStyles( "P" ),s_aListStyles( "L" ),s_aSectionStyles( "Sect" ),
+ s_aPageMasters( "PM" ),s_aMasterpages( "MP" ),s_aDateStyles( "N" ),
+ s_aGraphicsStyles( "fr" ),s_aTableStyles( "table" ),s_aTableCellStyles( "cell" ),
+ s_aTableRowStyles( "row" ),s_aTableColStyles( "col" ),s_pOutlineStyle(NULL)
{
}
@@ -311,7 +311,7 @@ void XFStyleManager::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- pStrm->StartElement( OUString("office:font-decls") );
+ pStrm->StartElement( "office:font-decls" );
//font declarations:
for( itDecl = s_aFontDecls.begin(); itDecl != s_aFontDecls.end(); ++itDecl )
@@ -319,21 +319,21 @@ void XFStyleManager::ToXml(IXFStream *pStrm)
XFFontDecl &f = *itDecl;
pAttrList->Clear();
- pAttrList->AddAttribute( OUString("style:name"), f.GetFontName() );
- pAttrList->AddAttribute( OUString("fo:font-family"), f.GetFontFamily() );
+ pAttrList->AddAttribute( "style:name", f.GetFontName() );
+ pAttrList->AddAttribute( "fo:font-family", f.GetFontFamily() );
if( f.GetFontPitchFixed() )
- pAttrList->AddAttribute( OUString("style:font-pitch"), OUString("fixed") );
+ pAttrList->AddAttribute( "style:font-pitch", "fixed" );
else
- pAttrList->AddAttribute( OUString("style:font-pitch"), OUString("variable") );
- pStrm->StartElement( OUString("style:font-decl") );
- pStrm->EndElement( OUString("style:font-decl") );
+ pAttrList->AddAttribute( "style:font-pitch", "variable" );
+ pStrm->StartElement( "style:font-decl" );
+ pStrm->EndElement( "style:font-decl" );
}
- pStrm->EndElement( OUString("office:font-decls") );
+ pStrm->EndElement( "office:font-decls" );
//office:styles:
pAttrList->Clear();
- pStrm->StartElement( OUString("office:styles") );
+ pStrm->StartElement( "office:styles" );
s_aStdParaStyles.ToXml(pStrm);
s_aStdTextStyles.ToXml(pStrm);
@@ -349,11 +349,11 @@ void XFStyleManager::ToXml(IXFStream *pStrm)
if( s_pOutlineStyle )
s_pOutlineStyle->ToXml(pStrm);
- pStrm->EndElement( OUString("office:styles") );
+ pStrm->EndElement( "office:styles" );
//automatic styles:
pAttrList->Clear();
- pStrm->StartElement( OUString("office:automatic-styles") );
+ pStrm->StartElement( "office:automatic-styles" );
s_aTableStyles.ToXml(pStrm);
s_aTableCellStyles.ToXml(pStrm);
@@ -367,15 +367,15 @@ void XFStyleManager::ToXml(IXFStream *pStrm)
//graphics:
s_aGraphicsStyles.ToXml(pStrm);
- pStrm->EndElement( OUString("office:automatic-styles") );
+ pStrm->EndElement( "office:automatic-styles" );
//master:styles
pAttrList->Clear();
- pStrm->StartElement( OUString("office:master-styles") );
+ pStrm->StartElement( "office:master-styles" );
//masters pages:
s_aMasterpages.ToXml(pStrm);
- pStrm->EndElement( OUString("office:master-styles") );
+ pStrm->EndElement( "office:master-styles" );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx
index 89e40c68..f2da0c6 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.cxx
@@ -206,15 +206,15 @@ void XFTable::ToXml(IXFStream *pStrm)
pAttrList->Clear();
//sub table shouldn't use table name.
if( !m_bSubTable )
- pAttrList->AddAttribute( OUString("table:name"), m_strName);
+ pAttrList->AddAttribute( "table:name", m_strName);
if( !GetStyleName().isEmpty() )
- pAttrList->AddAttribute( OUString("table:style-name"), GetStyleName() );
+ pAttrList->AddAttribute( "table:style-name", GetStyleName() );
if( m_bSubTable )
- pStrm->StartElement( OUString("table:sub-table") );
+ pStrm->StartElement( "table:sub-table" );
else
- pStrm->StartElement( OUString("table:table") );
+ pStrm->StartElement( "table:table" );
//output columns:
{
@@ -232,29 +232,29 @@ void XFTable::ToXml(IXFStream *pStrm)
{
if( !m_strDefColStyle.isEmpty() )
{
- pAttrList->AddAttribute( OUString("table:style-name"), m_strDefColStyle );
+ pAttrList->AddAttribute( "table:style-name", m_strDefColStyle );
}
- pAttrList->AddAttribute( OUString("table:number-columns-repeated"), OUString::number(col-lastCol-1) );
+ pAttrList->AddAttribute( "table:number-columns-repeated", OUString::number(col-lastCol-1) );
}
- pStrm->StartElement( OUString("table:table-column") );
- pStrm->EndElement( OUString("table:table-column") );
+ pStrm->StartElement( "table:table-column" );
+ pStrm->EndElement( "table:table-column" );
}
if( !style.isEmpty() )
{
- pAttrList->AddAttribute( OUString("table:style-name"), style );
+ pAttrList->AddAttribute( "table:style-name", style );
}
- pStrm->StartElement( OUString("table:table-column") );
- pStrm->EndElement( OUString("table:table-column") );
+ pStrm->StartElement( "table:table-column" );
+ pStrm->EndElement( "table:table-column" );
lastCol = col;
}
}
if( m_aHeaderRows.GetCount()>0 )
{
- pStrm->StartElement( OUString("table:table-header-rows") );
+ pStrm->StartElement( "table:table-header-rows" );
m_aHeaderRows.ToXml(pStrm);
- pStrm->EndElement( OUString("table:table-header-rows") );
+ pStrm->EndElement( "table:table-header-rows" );
}
//output rows:
{
@@ -284,8 +284,8 @@ void XFTable::ToXml(IXFStream *pStrm)
}
if( m_bSubTable )
- pStrm->EndElement( OUString("table:sub-table") );
+ pStrm->EndElement( "table:sub-table" );
else
- pStrm->EndElement( OUString("table:table") );
+ pStrm->EndElement( "table:table" );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
index cd78d71..0fc87b2 100644
--- a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
@@ -91,34 +91,34 @@ void XFTableStyle::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- pAttrList->AddAttribute( OUString("style:name"), GetStyleName() );
+ pAttrList->AddAttribute( "style:name", GetStyleName() );
if( !GetParentStyleName().isEmpty() )
- pAttrList->AddAttribute(OUString("style:parent-style-name"),GetParentStyleName());
- pAttrList->AddAttribute( OUString("style:family"), OUString("table") );
- pStrm->StartElement( OUString("style:style") );
+ pAttrList->AddAttribute("style:parent-style-name",GetParentStyleName());
+ pAttrList->AddAttribute( "style:family", "table" );
+ pStrm->StartElement( "style:style" );
pAttrList->Clear();
- pAttrList->AddAttribute( OUString("style:width"), OUString::number(m_fWidth) + OUString("cm") );
+ pAttrList->AddAttribute( "style:width", OUString::number(m_fWidth) + "cm" );
//text align:
if( m_eAlign == enumXFAlignStart )
{
- pAttrList->AddAttribute(OUString("table:align"),OUString("left"));
+ pAttrList->AddAttribute("table:align","left");
}
else if( m_eAlign == enumXFAlignCenter )
{
- pAttrList->AddAttribute(OUString("table:align"),OUString("center"));
+ pAttrList->AddAttribute("table:align","center");
}
else if( m_eAlign == enumXFAlignEnd )
{
- pAttrList->AddAttribute(OUString("table:align"),OUString("right"));
+ pAttrList->AddAttribute("table:align","right");
}
else if( m_eAlign == enumXFALignMargins )
{
- pAttrList->AddAttribute(OUString("table:align"),OUString("margins"));
+ pAttrList->AddAttribute("table:align","margins");
}
//background color:
if( m_aBackColor.IsValid() && !m_pBGImage )
- pAttrList->AddAttribute(OUString("fo:background-color"), m_aBackColor.ToString() );
+ pAttrList->AddAttribute("fo:background-color", m_aBackColor.ToString() );
//shadow:
m_aShadow.ToXml(pStrm);
//margin:
@@ -126,12 +126,12 @@ void XFTableStyle::ToXml(IXFStream *pStrm)
//breaks:
m_aBreaks.ToXml(pStrm);
- pStrm->StartElement( OUString("style:properties") );
+ pStrm->StartElement( "style:properties" );
if( m_pBGImage )
m_pBGImage->ToXml(pStrm);
- pStrm->EndElement( OUString("style:properties") );
+ pStrm->EndElement( "style:properties" );
- pStrm->EndElement( OUString("style:style") );
+ pStrm->EndElement( "style:style" );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xftabstop.hxx b/lotuswordpro/source/filter/xfilter/xftabstop.hxx
index 693189a..963a01e 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstop.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstop.hxx
@@ -74,8 +74,8 @@ inline void XFTabStop::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- pStrm->StartElement( OUString("text:tab-stop") );
- pStrm->EndElement( OUString("text:tab-stop") );
+ pStrm->StartElement( "text:tab-stop" );
+ pStrm->EndElement( "text:tab-stop" );
}
#endif
diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.cxx b/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
index 2c825f2..ccef2e8 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstyle.cxx
@@ -70,7 +70,7 @@ void XFTabStyle::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- pAttrList->AddAttribute( "style:position", OUString::number(m_fLength) + OUString("cm") );
+ pAttrList->AddAttribute( "style:position", OUString::number(m_fLength) + "cm" );
switch(m_eType)
{
case enumXFTabLeft:
diff --git a/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx b/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
index 93aff77..bbd8948 100644
--- a/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx
@@ -77,28 +77,28 @@ void XFTextBoxStyle::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- pAttrList->AddAttribute( OUString("style:name"), GetStyleName() );
+ pAttrList->AddAttribute( "style:name", GetStyleName() );
if( !GetParentStyleName().isEmpty() )
- pAttrList->AddAttribute(OUString("style:parent-style-name"),GetParentStyleName());
- pAttrList->AddAttribute( OUString("style:family"), OUString("graphics") );
+ pAttrList->AddAttribute("style:parent-style-name",GetParentStyleName());
+ pAttrList->AddAttribute( "style:family", "graphics" );
//parent style name ignore now.
- pStrm->StartElement( OUString("style:style") );
+ pStrm->StartElement( "style:style" );
pAttrList->Clear();
- pAttrList->AddAttribute( OUString("draw:stroke"), OUString("none") );
- pAttrList->AddAttribute( OUString("svg:stroke-color"), OUString("#000000") );
- pAttrList->AddAttribute( OUString("draw:fill"), OUString("none") );
- pAttrList->AddAttribute( OUString("draw:fill-color"), OUString("#ffffff") );
- pAttrList->AddAttribute( OUString("draw:auto-grow-height"), OUString("true") );
- pAttrList->AddAttribute( OUString("style:run-through"), OUString("foreground") );
- pAttrList->AddAttribute( OUString("style:wrap"), OUString("run-through") );
- pAttrList->AddAttribute( OUString("style:wrap"), OUString("run-through") );
- pAttrList->AddAttribute( OUString("style:number-wrapped-paragraphs"), OUString("no-limit") );
- pAttrList->AddAttribute( OUString("style:wrap-contour"), OUString("false") );
+ pAttrList->AddAttribute( "draw:stroke", "none" );
+ pAttrList->AddAttribute( "svg:stroke-color", "#000000" );
+ pAttrList->AddAttribute( "draw:fill", "none" );
+ pAttrList->AddAttribute( "draw:fill-color", "#ffffff" );
+ pAttrList->AddAttribute( "draw:auto-grow-height", "true" );
+ pAttrList->AddAttribute( "style:run-through", "foreground" );
+ pAttrList->AddAttribute( "style:wrap", "run-through" );
+ pAttrList->AddAttribute( "style:wrap", "run-through" );
+ pAttrList->AddAttribute( "style:number-wrapped-paragraphs", "no-limit" );
+ pAttrList->AddAttribute( "style:wrap-contour", "false" );
- pStrm->StartElement( OUString("style:properties") );
- pStrm->EndElement( OUString("style:properties") );
+ pStrm->StartElement( "style:properties" );
+ pStrm->EndElement( "style:properties" );
- pStrm->EndElement( OUString("style:style") );
+ pStrm->EndElement( "style:style" );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
index baca854..7d47ea7 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
@@ -107,8 +107,8 @@ void XFTextContent::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
pAttrList->AddAttribute( "text:c", OUString::number(j-nIndex) );
- pStrm->StartElement( OUString("text:s") );
- pStrm->EndElement( OUString("text:s") );
+ pStrm->StartElement( "text:s" );
+ pStrm->EndElement( "text:s" );
i+=j;
}
More information about the Libreoffice-commits
mailing list