[Libreoffice-commits] core.git: 2 commits - hwpfilter/source linguistic/source lotuswordpro/source oox/source package/source
Noel (via logerrit)
logerrit at kemper.freedesktop.org
Tue Feb 16 06:52:54 UTC 2021
hwpfilter/source/formula.cxx | 52 +-
hwpfilter/source/hwpreader.cxx | 384 +++++++++----------
linguistic/source/convdiclist.cxx | 2
linguistic/source/dlistimp.cxx | 6
lotuswordpro/source/filter/lwppara.cxx | 2
lotuswordpro/source/filter/lwptablelayout.cxx | 6
lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx | 2
oox/source/core/contexthandler2.cxx | 2
oox/source/core/recordparser.cxx | 5
oox/source/core/xmlfilterbase.cxx | 10
oox/source/export/drawingml.cxx | 2
oox/source/ppt/backgroundproperties.cxx | 2
package/source/zipapi/ZipFile.cxx | 6
package/source/zipapi/blowfishcontext.cxx | 2
package/source/zipapi/sha1context.cxx | 2
package/source/zippackage/ZipPackage.cxx | 2
16 files changed, 242 insertions(+), 245 deletions(-)
New commits:
commit 51558d2215a4cf881e357eda7da20688ac61e780
Author: Noel <noel.grandin at collabora.co.uk>
AuthorDate: Mon Feb 15 20:00:01 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Feb 16 07:52:11 2021 +0100
loplugin:referencecasting in hwpfilter..lotuswordpro
Change-Id: Ib4a1ae456c44638386425e690a089360e991b26c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110949
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/hwpfilter/source/formula.cxx b/hwpfilter/source/formula.cxx
index a5ba8a040854..f9ab4566668f 100644
--- a/hwpfilter/source/formula.cxx
+++ b/hwpfilter/source/formula.cxx
@@ -52,9 +52,9 @@ void Formula::makeMathML(Node *res)
fprintf(stderr,"<math:math xmlns:math=\"http://www.w3.org/1998/Math/MathML\">\n");
#else
padd("xmlns:math", "CDATA", "http://www.w3.org/1998/Math/MathML");
- rstartEl("math:math", mxList.get());
+ rstartEl("math:math", mxList);
mxList->clear();
- rstartEl("math:semantics", mxList.get());
+ rstartEl("math:semantics", mxList);
#endif
if( tmp->child )
makeLines( tmp->child );
@@ -92,7 +92,7 @@ void Formula::makeLine(Node *res)
#ifdef DEBUG
inds; fprintf(stderr,"<math:mrow>\n");
#else
- rstartEl("math:mrow", mxList.get());
+ rstartEl("math:mrow", mxList);
#endif
if( res->child )
makeExprList( res->child );
@@ -131,7 +131,7 @@ void Formula::makeExpr(Node *res)
inds;
fprintf(stderr,"<math:mrow>\n");
#else
- rstartEl("math:mrow", mxList.get());
+ rstartEl("math:mrow", mxList);
#endif
}
@@ -194,7 +194,7 @@ void Formula::makeIdentifier(Node *res)
fprintf(stderr,"<math:mi>%s</math:mi>\n",tmp->value);
indo;
#else
- rstartEl("math:mi", mxList.get());
+ rstartEl("math:mi", mxList);
rchars(OUString::createFromAscii(tmp->value));
rendEl("math:mi");
#endif
@@ -203,7 +203,7 @@ void Formula::makeIdentifier(Node *res)
{
#ifdef DEBUG
#else
- rstartEl("math:mi", mxList.get());
+ rstartEl("math:mi", mxList);
reucstr(tmp->value, strlen(tmp->value));
rendEl("math:mi");
#endif
@@ -216,7 +216,7 @@ void Formula::makeIdentifier(Node *res)
getMathMLEntity(tmp->value).c_str());
indo;
#else
- rstartEl("math:mi", mxList.get());
+ rstartEl("math:mi", mxList);
runistr(fromHcharStringToOUString(getMathMLEntity(tmp->value)));
rendEl("math:mi");
#endif
@@ -227,7 +227,7 @@ void Formula::makeIdentifier(Node *res)
fprintf(stderr,"<math:mn>%s</math:mn>\n",tmp->value);
indo;
#else
- rstartEl("math:mn", mxList.get());
+ rstartEl("math:mn", mxList);
rchars(OUString::createFromAscii(tmp->value));
rendEl("math:mn");
#endif
@@ -238,7 +238,7 @@ void Formula::makeIdentifier(Node *res)
#ifdef DEBUG
inds; fprintf(stderr,"<math:mo>%s</math:mo>\n",tmp->value); indo;
#else
- rstartEl("math:mo", mxList.get());
+ rstartEl("math:mo", mxList);
runistr(fromHcharStringToOUString(getMathMLEntity(tmp->value)));
rendEl("math:mo");
#endif
@@ -278,11 +278,11 @@ void Formula::makeSubSup(Node *res)
fprintf(stderr,"<math:msubsup>\n");
#else
if( res->id == ID_SUBEXPR )
- rstartEl("math:msub", mxList.get());
+ rstartEl("math:msub", mxList);
else if( res->id == ID_SUPEXPR )
- rstartEl("math:msup", mxList.get());
+ rstartEl("math:msup", mxList);
else
- rstartEl("math:msubsup", mxList.get());
+ rstartEl("math:msubsup", mxList);
#endif
tmp = tmp->child;
@@ -323,7 +323,7 @@ void Formula::makeFraction(Node *res)
inds;
fprintf(stderr,"<math:mfrac>\n");
#else
- rstartEl("math:mfrac", mxList.get());
+ rstartEl("math:mfrac", mxList);
#endif
tmp = tmp->child;
@@ -331,7 +331,7 @@ void Formula::makeFraction(Node *res)
inds;
fprintf(stderr,"<math:mrow>\n");
#else
- rstartEl("math:mrow", mxList.get());
+ rstartEl("math:mrow", mxList);
#endif
if( res->id == ID_FRACTIONEXPR )
@@ -346,7 +346,7 @@ void Formula::makeFraction(Node *res)
fprintf(stderr,"<math:mrow>\n");
#else
rendEl("math:mrow");
- rstartEl("math:mrow", mxList.get());
+ rstartEl("math:mrow", mxList);
#endif
if( res->id == ID_FRACTIONEXPR )
@@ -382,11 +382,11 @@ void Formula::makeDecoration(Node *res)
/* FIXME: no idea when 'accent' is true or false. */
if( isover ){
padd("accent","CDATA","true");
- rstartEl("math:mover", mxList.get());
+ rstartEl("math:mover", mxList);
}
else{
padd("accentunder","CDATA","true");
- rstartEl("math:munder", mxList.get());
+ rstartEl("math:munder", mxList);
}
mxList->clear();
#endif
@@ -399,7 +399,7 @@ void Formula::makeDecoration(Node *res)
getMathMLEntity(tmp->value).c_str());
indo;
#else
- rstartEl("math:mo", mxList.get());
+ rstartEl("math:mo", mxList);
runistr(fromHcharStringToOUString(getMathMLEntity(tmp->value)));
rendEl("math:mo");
#endif
@@ -430,9 +430,9 @@ void Formula::makeRoot(Node *res)
fprintf(stderr,"<math:mroot>\n");
#else
if( tmp->id == ID_SQRTEXPR )
- rstartEl("math:msqrt", mxList.get());
+ rstartEl("math:msqrt", mxList);
else
- rstartEl("math:mroot", mxList.get());
+ rstartEl("math:mroot", mxList);
#endif
if( tmp->id == ID_SQRTEXPR ){
@@ -476,14 +476,14 @@ void Formula::makeParenth(Node *res)
indo; inds;
fprintf(stderr,"<math:mrow>\n");
#else
- rstartEl("math:mrow", mxList.get());
- rstartEl("math:mo", mxList.get());
+ rstartEl("math:mrow", mxList);
+ rstartEl("math:mo", mxList);
if( tmp->id == ID_PARENTH )
rchars("(");
else
rchars("|");
rendEl("math:mo");
- rstartEl("math:mrow", mxList.get());
+ rstartEl("math:mrow", mxList);
#endif
if( tmp->child )
@@ -502,7 +502,7 @@ void Formula::makeParenth(Node *res)
fprintf(stderr,"</math:mrow>\n");
#else
rendEl("math:mrow");
- rstartEl("math:mo", mxList.get());
+ rstartEl("math:mo", mxList);
if( tmp->id == ID_PARENTH )
rchars(")");
else
@@ -525,7 +525,7 @@ void Formula::makeFence(Node *res)
OUString(reinterpret_cast<sal_Unicode const *>(getMathMLEntity(tmp->value).c_str())));
padd("close", "CDATA",
OUString(reinterpret_cast<sal_Unicode const *>(getMathMLEntity(tmp->next->next->value).c_str())));
- rstartEl("math:mfenced", mxList.get());
+ rstartEl("math:mfenced", mxList);
mxList->clear();
#endif
@@ -550,7 +550,7 @@ void Formula::makeBlock(Node *res)
inds;
fprintf(stderr,"<math:mrow>\n");
#else
- rstartEl("math:mrow", mxList.get());
+ rstartEl("math:mrow", mxList);
#endif
if( res->child )
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 4cf69e28603f..d6c34fcb2354 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -55,13 +55,13 @@
#define sXML_CDATA "CDATA"
#define STARTP padd( "text:style-name", "CDATA", ascii(getPStyleName((para->GetParaShape()).index,buf))); \
- rstartEl( "text:p",mxList.get() ); \
+ rstartEl( "text:p",mxList ); \
mxList->clear(); \
pstart = true
#define STARTT \
curr = para->GetCharShape(n > 0 ? n-1 : 0)->index; \
padd( "text:style-name", "CDATA" , ascii( getTStyleName(curr, buf) ) ); \
- rstartEl( "text:span",mxList.get() ); \
+ rstartEl( "text:span",mxList ); \
mxList->clear(); \
tstart = true
#define ENDP \
@@ -189,7 +189,7 @@ sal_Bool HwpReader::filter(const Sequence< PropertyValue >& rDescriptor)
padd("xmlns:form", "CDATA", "http://openoffice.org/2000/form");
padd("xmlns:script", "CDATA", "http://openoffice.org/2000/script");
- rstartEl("office:document", mxList.get());
+ rstartEl("office:document", mxList);
mxList->clear();
makeMeta();
@@ -211,7 +211,7 @@ sal_Bool HwpReader::filter(const Sequence< PropertyValue >& rDescriptor)
*/
void HwpReader::makeBody()
{
- rstartEl("office:body", mxList.get());
+ rstartEl("office:body", mxList);
makeTextDecls();
HWPPara *hwppara = hwpfile.GetFirstPara();
d->bInBody = true;
@@ -226,25 +226,25 @@ void HwpReader::makeBody()
*/
void HwpReader::makeTextDecls()
{
- rstartEl("text:sequence-decls", mxList.get());
+ rstartEl("text:sequence-decls", mxList);
padd("text:display-outline-level", sXML_CDATA, "0");
padd("text:name", sXML_CDATA, "Illustration");
- rstartEl("text:sequence-decl", mxList.get());
+ rstartEl("text:sequence-decl", mxList);
mxList->clear();
rendEl("text:sequence-decl");
padd("text:display-outline-level", sXML_CDATA, "0");
padd("text:name", sXML_CDATA, "Table");
- rstartEl("text:sequence-decl", mxList.get());
+ rstartEl("text:sequence-decl", mxList);
mxList->clear();
rendEl("text:sequence-decl");
padd("text:display-outline-level", sXML_CDATA, "0");
padd("text:name", sXML_CDATA, "Text");
- rstartEl("text:sequence-decl", mxList.get());
+ rstartEl("text:sequence-decl", mxList);
mxList->clear();
rendEl("text:sequence-decl");
padd("text:display-outline-level", sXML_CDATA, "0");
padd("text:name", sXML_CDATA, "Drawing");
- rstartEl("text:sequence-decl", mxList.get());
+ rstartEl("text:sequence-decl", mxList);
mxList->clear();
rendEl("text:sequence-decl");
rendEl("text:sequence-decls");
@@ -260,25 +260,25 @@ void HwpReader::makeMeta()
{
HWPInfo& hwpinfo = hwpfile.GetHWPInfo();
- rstartEl("office:meta", mxList.get());
+ rstartEl("office:meta", mxList);
if (hwpinfo.summary.title[0])
{
- rstartEl("dc:title", mxList.get());
+ rstartEl("dc:title", mxList);
rchars(fromHcharStringToOUString(hstr2ucsstr(hwpinfo.summary.title)));
rendEl("dc:title");
}
if (hwpinfo.summary.subject[0])
{
- rstartEl("dc:subject", mxList.get());
+ rstartEl("dc:subject", mxList);
rchars(fromHcharStringToOUString(hstr2ucsstr(hwpinfo.summary.subject)));
rendEl("dc:subject");
}
if (hwpinfo.summary.author[0])
{
- rstartEl("meta:initial-creator", mxList.get());
+ rstartEl("meta:initial-creator", mxList);
rchars(fromHcharStringToOUString(hstr2ucsstr(hwpinfo.summary.author)));
rendEl("meta:initial-creator");
}
@@ -342,41 +342,41 @@ void HwpReader::makeMeta()
}
sprintf(buf,"%d-%02d-%02dT%02d:%02d:00",year,month,day,hour,minute);
- rstartEl( "meta:creation-date", mxList.get() );
+ rstartEl( "meta:creation-date", mxList );
rchars( ascii(buf));
rendEl( "meta:creation-date" );
}
if (hwpinfo.summary.keyword[0][0] || hwpinfo.summary.etc[0][0])
{
- rstartEl("meta:keywords", mxList.get());
+ rstartEl("meta:keywords", mxList);
if (hwpinfo.summary.keyword[0][0])
{
- rstartEl("meta:keyword", mxList.get());
+ rstartEl("meta:keyword", mxList);
rchars(fromHcharStringToOUString(hstr2ucsstr(hwpinfo.summary.keyword[0])));
rendEl("meta:keyword");
}
if (hwpinfo.summary.keyword[1][0])
{
- rstartEl("meta:keyword", mxList.get());
+ rstartEl("meta:keyword", mxList);
rchars(fromHcharStringToOUString(hstr2ucsstr(hwpinfo.summary.keyword[1])));
rendEl("meta:keyword");
}
if (hwpinfo.summary.etc[0][0])
{
- rstartEl("meta:keyword", mxList.get());
+ rstartEl("meta:keyword", mxList);
rchars(fromHcharStringToOUString(hstr2ucsstr(hwpinfo.summary.etc[0])));
rendEl("meta:keyword");
}
if (hwpinfo.summary.etc[1][0])
{
- rstartEl("meta:keyword", mxList.get());
+ rstartEl("meta:keyword", mxList);
rchars(fromHcharStringToOUString(hstr2ucsstr(hwpinfo.summary.etc[1])));
rendEl("meta:keyword");
}
if (hwpinfo.summary.etc[2][0])
{
- rstartEl("meta:keyword", mxList.get());
+ rstartEl("meta:keyword", mxList);
rchars(fromHcharStringToOUString(hstr2ucsstr(hwpinfo.summary.etc[2])));
rendEl("meta:keyword");
}
@@ -451,7 +451,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
padd( "draw:dots2-length", sXML_CDATA, Double2Str( LineStyle[prop->line_pstyle].dots2 * WTMM(prop->line_width)) + "cm");
}
padd( "draw:distance", sXML_CDATA, Double2Str( LineStyle[prop->line_pstyle].distance * WTMM(prop->line_width)) + "cm");
- rstartEl( "draw:stroke-dash", mxList.get());
+ rstartEl( "draw:stroke-dash", mxList);
mxList->clear();
rendEl( "draw:stroke-dash" );
}
@@ -479,7 +479,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
padd("svg:viewBox", sXML_CDATA, "0 0 30 30");
padd("svg:d", sXML_CDATA, "m0 0h30v30h-30z");
}
- rstartEl("draw:marker", mxList.get());
+ rstartEl("draw:marker", mxList);
mxList->clear();
rendEl("draw:marker");
}
@@ -503,7 +503,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
padd("svg:viewBox", sXML_CDATA, "0 0 20 20");
padd("svg:d", sXML_CDATA, "m0 0h20v20h-20z");
}
- rstartEl("draw:marker", mxList.get());
+ rstartEl("draw:marker", mxList);
mxList->clear();
rendEl("draw:marker");
}
@@ -568,7 +568,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
padd( "xlink:show", sXML_CDATA, "embed");
padd( "xlink:actuate", sXML_CDATA, "onLoad");
- rstartEl( "draw:fill-image", mxList.get());
+ rstartEl( "draw:fill-image", mxList);
mxList->clear();
rendEl( "draw:fill-image");
}
@@ -650,7 +650,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
padd( "draw:angle", sXML_CDATA,
ascii(Int2Str( angle, "%d", buf)));
}
- rstartEl( "draw:gradient", mxList.get() );
+ rstartEl( "draw:gradient", mxList );
mxList->clear();
rendEl( "draw:gradient");
}
@@ -687,7 +687,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
padd( "draw:rotation", sXML_CDATA, "450");
break;
}
- rstartEl( "draw:hatch", mxList.get());
+ rstartEl( "draw:hatch", mxList);
mxList->clear();
rendEl( "draw:hatch");
}
@@ -701,7 +701,7 @@ void HwpReader::makeStyles()
{
HWPStyle& hwpstyle = hwpfile.GetHWPStyle();
- rstartEl("office:styles", mxList.get());
+ rstartEl("office:styles", mxList);
int i;
for (i = 0; i < hwpfile.getFBoxStyleCount(); i++)
@@ -715,20 +715,20 @@ void HwpReader::makeStyles()
padd("style:name", sXML_CDATA, "Standard");
padd("style:family", sXML_CDATA, "paragraph");
padd("style:class", sXML_CDATA, "text");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
padd("fo:line-height", sXML_CDATA, "160%");
padd("fo:text-align", sXML_CDATA, "justify");
- rstartEl("style:properties", mxList.get());
+ rstartEl("style:properties", mxList);
mxList->clear();
- rstartEl("style:tab-stops", mxList.get());
+ rstartEl("style:tab-stops", mxList);
for( i = 1 ; i < 40 ; i++)
{
padd("style:position", sXML_CDATA,
Double2Str( WTI(1000 * i)) + "inch");
- rstartEl("style:tab-stop", mxList.get());
+ rstartEl("style:tab-stop", mxList);
mxList->clear();
rendEl("style:tab-stop");
}
@@ -744,14 +744,14 @@ void HwpReader::makeStyles()
padd("style:family", sXML_CDATA, "paragraph");
padd("style:parent-style-name", sXML_CDATA, "Standard");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
parseCharShape(hwpstyle.GetCharShape(ii));
parseParaShape(hwpstyle.GetParaShape(ii));
- rstartEl("style:properties", mxList.get());
+ rstartEl("style:properties", mxList);
mxList->clear();
rendEl("style:properties");
@@ -763,7 +763,7 @@ void HwpReader::makeStyles()
padd( "style:family", sXML_CDATA, "paragraph");
padd( "style:parent-style-name", sXML_CDATA, "Standard");
padd( "style:class", sXML_CDATA, "extra");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
rendEl("style:style");
}
@@ -773,7 +773,7 @@ void HwpReader::makeStyles()
padd( "style:family", sXML_CDATA, "paragraph");
padd( "style:parent-style-name", sXML_CDATA, "Standard");
padd( "style:class", sXML_CDATA, "extra");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
rendEl("style:style");
@@ -785,7 +785,7 @@ void HwpReader::makeStyles()
padd( "style:family", sXML_CDATA, "paragraph");
padd( "style:parent-style-name", sXML_CDATA, "Standard");
padd( "style:class", sXML_CDATA, "html");
- rstartEl( "style:style", mxList.get());
+ rstartEl( "style:style", mxList);
mxList->clear();
padd( "fo:font-size", sXML_CDATA, "6pt");
padd( "fo:margin-top", sXML_CDATA, "0cm");
@@ -796,7 +796,7 @@ void HwpReader::makeStyles()
padd( "text:number-lines", sXML_CDATA, "false");
padd( "text:line-number", sXML_CDATA, "0");
padd("fo:line-height", sXML_CDATA, "100%");
- rstartEl( "style:properties", mxList.get());
+ rstartEl( "style:properties", mxList);
mxList->clear();
rendEl( "style:properties");
rendEl( "style:style");
@@ -808,7 +808,7 @@ void HwpReader::makeStyles()
padd("text:num-format", sXML_CDATA, "1");
if( hwpinfo.beginfnnum != 1)
padd("text:offset", sXML_CDATA, ascii(Int2Str(hwpinfo.beginfnnum -1, "%d", buf)));
- rstartEl("text:footnotes-configuration", mxList.get());
+ rstartEl("text:footnotes-configuration", mxList);
mxList->clear();
rendEl("text:footnotes-configuration");
@@ -825,7 +825,7 @@ void HwpReader::makeAutoStyles()
{
int i;
- rstartEl("office:automatic-styles", mxList.get());
+ rstartEl("office:automatic-styles", mxList);
for (i = 0; i < hwpfile.getParaShapeCount(); i++)
makePStyle(hwpfile.getParaShape(i));
@@ -879,7 +879,7 @@ void HwpReader::makeAutoStyles()
ascii(Int2Str(i,"PNPara%d", buf)));
padd("style:family", sXML_CDATA, "paragraph");
padd("style:parent-style-name", sXML_CDATA, "Standard");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
if( i == 1 )
padd("fo:text-align", sXML_CDATA, "start");
@@ -887,14 +887,14 @@ void HwpReader::makeAutoStyles()
padd("fo:text-align", sXML_CDATA, "center");
else if ( i == 3 )
padd("fo:text-align", sXML_CDATA, "end");
- rstartEl("style:properties", mxList.get());
+ rstartEl("style:properties", mxList);
mxList->clear();
rendEl( "style:properties");
rendEl( "style:style");
padd("style:name", sXML_CDATA, ascii(Int2Str(i,"PNBox%d",buf)));
padd("style:family", sXML_CDATA, "graphics");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
padd("fo:margin-top", sXML_CDATA, "0cm");
@@ -912,7 +912,7 @@ void HwpReader::makeAutoStyles()
padd("style:horizontal-rel", sXML_CDATA, "paragraph");
padd("fo:padding", sXML_CDATA, "0cm");
padd("stylefamily", sXML_CDATA, "graphics");
- rstartEl("style:properties", mxList.get());
+ rstartEl("style:properties", mxList);
mxList->clear();
rendEl("style:properties");
rendEl("style:style");
@@ -955,7 +955,7 @@ struct PageSetting
void HwpReader::makeMasterStyles()
{
- rstartEl("office:master-styles", mxList.get());
+ rstartEl("office:master-styles", mxList);
int i;
int nMax = hwpfile.getMaxSettedPage();
@@ -1048,7 +1048,7 @@ void HwpReader::makeMasterStyles()
ascii(Int2Str(i+1, "p%d", buf)));
padd("draw:style-name", sXML_CDATA,
ascii(Int2Str(i, "master%d", buf)));
- rstartEl("style:master-page", mxList.get());
+ rstartEl("style:master-page", mxList);
mxList->clear();
if( aSet[i].bIsSet ) /* If you've changed the current setting */
@@ -1099,16 +1099,16 @@ void HwpReader::makeMasterStyles()
}
else /* If the previous settings doesn't exist, set to the default settings */
{
- rstartEl("style:header", mxList.get());
+ rstartEl("style:header", mxList);
padd("text:style-name", sXML_CDATA, "Standard");
- rstartEl("text:p", mxList.get());
+ rstartEl("text:p", mxList);
mxList->clear();
rendEl("text:p");
rendEl("style:header");
- rstartEl("style:footer", mxList.get());
+ rstartEl("style:footer", mxList);
padd("text:style-name", sXML_CDATA, "Standard");
- rstartEl("text:p", mxList.get());
+ rstartEl("text:p", mxList);
mxList->clear();
rendEl("text:p");
rendEl("style:footer");
@@ -1120,7 +1120,7 @@ void HwpReader::makeMasterStyles()
// header
if( pPage->header )
{
- rstartEl("style:header", mxList.get());
+ rstartEl("style:header", mxList);
if( pPage->pagenumber && pPage->pagenumber->where < 4 )
{
d->bInHeader = true;
@@ -1133,7 +1133,7 @@ void HwpReader::makeMasterStyles()
}
if( pPage->header_even )
{
- rstartEl("style:header", mxList.get());
+ rstartEl("style:header", mxList);
if( pPage->pagenumber && ( pPage->pagenumber->where < 4
|| pPage->pagenumber->where == 7 ) )
{
@@ -1150,9 +1150,9 @@ void HwpReader::makeMasterStyles()
/* Will be the default. */
else if (pPage->header_odd)
{
- rstartEl("style:header", mxList.get());
+ rstartEl("style:header", mxList);
padd("text:style-name", sXML_CDATA, "Standard");
- rstartEl("text:p", mxList.get());
+ rstartEl("text:p", mxList);
mxList->clear();
if( pPage->pagenumber && ( pPage->pagenumber->where < 4 ||
pPage->pagenumber->where == 7 ) )
@@ -1168,7 +1168,7 @@ void HwpReader::makeMasterStyles()
}
if( pPage->header_odd )
{
- rstartEl("style:header-left", mxList.get());
+ rstartEl("style:header-left", mxList);
if( pPage->pagenumber && ( pPage->pagenumber->where < 4
|| pPage->pagenumber->where == 7 ) )
{
@@ -1185,9 +1185,9 @@ void HwpReader::makeMasterStyles()
/* Will be the default. */
else if (pPage->header_even)
{
- rstartEl("style:header-left", mxList.get());
+ rstartEl("style:header-left", mxList);
padd("text:style-name", sXML_CDATA, "Standard");
- rstartEl("text:p", mxList.get());
+ rstartEl("text:p", mxList);
mxList->clear();
if( pPage->pagenumber && ( pPage->pagenumber->where < 4 ||
pPage->pagenumber->where == 7 ) )
@@ -1203,9 +1203,9 @@ void HwpReader::makeMasterStyles()
}
if( !pPage->header && !pPage->header_even && !pPage->header_odd )
{
- rstartEl("style:header", mxList.get());
+ rstartEl("style:header", mxList);
padd("text:style-name", sXML_CDATA, "Standard");
- rstartEl("text:p", mxList.get());
+ rstartEl("text:p", mxList);
mxList->clear();
if( pPage->pagenumber && (pPage->pagenumber->where < 4 ||
pPage->pagenumber->where == 7 ) )
@@ -1220,7 +1220,7 @@ void HwpReader::makeMasterStyles()
// footer
if( pPage->footer )
{
- rstartEl("style:footer", mxList.get());
+ rstartEl("style:footer", mxList);
if( pPage->pagenumber && pPage->pagenumber->where >= 4
&& pPage->pagenumber->where != 7 )
{
@@ -1234,7 +1234,7 @@ void HwpReader::makeMasterStyles()
}
if( pPage->footer_even )
{
- rstartEl("style:footer", mxList.get());
+ rstartEl("style:footer", mxList);
if( pPage->pagenumber && pPage->pagenumber->where >= 4
&& pPage->pagenumber->where != 7 )
{
@@ -1251,9 +1251,9 @@ void HwpReader::makeMasterStyles()
/* Will be the default. */
else if (pPage->footer_odd)
{
- rstartEl("style:footer", mxList.get());
+ rstartEl("style:footer", mxList);
padd("text:style-name", sXML_CDATA, "Standard");
- rstartEl("text:p", mxList.get());
+ rstartEl("text:p", mxList);
mxList->clear();
if( pPage->pagenumber && pPage->pagenumber->where >= 4
&& pPage->pagenumber->where != 7 )
@@ -1269,7 +1269,7 @@ void HwpReader::makeMasterStyles()
}
if( pPage->footer_odd )
{
- rstartEl("style:footer-left", mxList.get());
+ rstartEl("style:footer-left", mxList);
if( pPage->pagenumber && pPage->pagenumber->where >= 4
&& pPage->pagenumber->where != 7 )
{
@@ -1286,9 +1286,9 @@ void HwpReader::makeMasterStyles()
/* Will be the default. */
else if (pPage->footer_even)
{
- rstartEl("style:footer-left", mxList.get());
+ rstartEl("style:footer-left", mxList);
padd("text:style-name", sXML_CDATA, "Standard");
- rstartEl("text:p", mxList.get());
+ rstartEl("text:p", mxList);
mxList->clear();
if( pPage->pagenumber && pPage->pagenumber->where >= 4
&& pPage->pagenumber->where != 7 )
@@ -1304,9 +1304,9 @@ void HwpReader::makeMasterStyles()
}
if( !pPage->footer && !pPage->footer_even && !pPage->footer_odd )
{
- rstartEl("style:footer", mxList.get());
+ rstartEl("style:footer", mxList);
padd("text:style-name", sXML_CDATA, "Standard");
- rstartEl("text:p", mxList.get());
+ rstartEl("text:p", mxList);
mxList->clear();
if( pPage->pagenumber && pPage->pagenumber->where >= 4
&& pPage->pagenumber->where != 7 )
@@ -1480,17 +1480,17 @@ void HwpReader::makePStyle(ParaShape const * pshape)
padd("style:name", sXML_CDATA,
ascii(Int2Str(pshape->index, "P%d", buf)));
padd("style:family", sXML_CDATA, "paragraph");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
parseParaShape(pshape);
parseCharShape(pshape->cshape.get());
- rstartEl("style:properties", mxList.get());
+ rstartEl("style:properties", mxList);
mxList->clear();
if( nscount )
{
unsigned char tf = 0;
- rstartEl("style:tab-stops",mxList.get());
+ rstartEl("style:tab-stops",mxList);
int tab_margin = pshape->left_margin + pshape->indent;
if( tab_margin < 0 )
@@ -1525,7 +1525,7 @@ void HwpReader::makePStyle(ParaShape const * pshape)
tf = 1;
padd("style:leader-char", sXML_CDATA, ".");
}
- rstartEl( "style:tab-stop", mxList.get());
+ rstartEl( "style:tab-stop", mxList);
mxList->clear();
rendEl( "style:tab-stop" );
@@ -1552,7 +1552,7 @@ void HwpReader::makePageStyle()
for( int i = 0 ; i < pmCount ; i++ ){
padd("style:name", sXML_CDATA, ascii(Int2Str(i + 1, "pm%d", buf)));
- rstartEl("style:page-master",mxList.get());
+ rstartEl("style:page-master",mxList);
mxList->clear();
@@ -1716,7 +1716,7 @@ void HwpReader::makePageStyle()
}
}
- rstartEl("style:properties",mxList.get());
+ rstartEl("style:properties",mxList);
mxList->clear();
/* background image */
@@ -1739,10 +1739,10 @@ void HwpReader::makePageStyle()
padd("style:repeat", sXML_CDATA, "no-repeat");
padd("style:position", sXML_CDATA, "center");
}
- rstartEl("style:background-image",mxList.get());
+ rstartEl("style:background-image",mxList);
if( hwpinfo.back_info.type == 2 ){
- rstartEl("office:binary-data", mxList.get());
+ rstartEl("office:binary-data", mxList);
mxList->clear();
std::shared_ptr<char> pStr(base64_encode_string(reinterpret_cast<unsigned char *>(hwpinfo.back_info.data.data()), hwpinfo.back_info.size ), Free<char>());
rchars(ascii(pStr.get()));
@@ -1756,34 +1756,34 @@ void HwpReader::makePageStyle()
rendEl("style:properties");
/* header style */
- rstartEl("style:header-style", mxList.get());
+ rstartEl("style:header-style", mxList);
padd("svg:height", sXML_CDATA,
Double2Str(WTI(hwpinfo.paper.header_length)) + "inch");
padd("fo:margin-bottom", sXML_CDATA, "0mm");
- rstartEl("style:properties",mxList.get());
+ rstartEl("style:properties",mxList);
mxList->clear();
rendEl("style:properties");
rendEl("style:header-style");
/* footer style */
- rstartEl("style:footer-style", mxList.get());
+ rstartEl("style:footer-style", mxList);
padd("svg:height", sXML_CDATA,
Double2Str(WTI(hwpinfo.paper.footer_length)) + "inch");
padd("fo:margin-top", sXML_CDATA, "0mm");
- rstartEl("style:properties",mxList.get());
+ rstartEl("style:properties",mxList);
mxList->clear();
rendEl("style:properties");
rendEl("style:footer-style");
/* Footnote style */
- rstartEl("style:page-layout-properties", mxList.get());
+ rstartEl("style:page-layout-properties", mxList);
padd("style:distance-before-sep", sXML_CDATA,
Double2Str(WTI(hwpinfo.splinetext)) + "inch");
padd("style:distance-after-sep", sXML_CDATA,
Double2Str(WTI(hwpinfo.splinefn)) + "inch");
- rstartEl("style:properties",mxList.get());
+ rstartEl("style:properties",mxList);
mxList->clear();
rendEl("style:properties");
if ( hwpinfo.fnlinetype == 2 )
@@ -1795,7 +1795,7 @@ void HwpReader::makePageStyle()
else
padd("style:width", sXML_CDATA, "5cm");
- rstartEl("style:footnote-sep",mxList.get());
+ rstartEl("style:footnote-sep",mxList);
mxList->clear();
rendEl("style:footnote-sep");
@@ -1809,7 +1809,7 @@ void HwpReader::makeColumns(ColumnDef const *coldef)
{
if( !coldef ) return;
padd("fo:column-count", sXML_CDATA, ascii(Int2Str(coldef->ncols, "%d", buf)));
- rstartEl("style:columns",mxList.get());
+ rstartEl("style:columns",mxList);
mxList->clear();
if( coldef->separator != 0 )
{
@@ -1831,7 +1831,7 @@ void HwpReader::makeColumns(ColumnDef const *coldef)
padd("style:style", sXML_CDATA, "none");
break;
}
- rstartEl("style:column-sep",mxList.get());
+ rstartEl("style:column-sep",mxList);
mxList->clear();
rendEl("style:column-sep");
}
@@ -1848,7 +1848,7 @@ void HwpReader::makeColumns(ColumnDef const *coldef)
else
padd("fo:margin-right", sXML_CDATA,
Double2Str( spacing) + "inch");
- rstartEl("style:column",mxList.get());
+ rstartEl("style:column",mxList);
mxList->clear();
rendEl("style:column");
}
@@ -1860,10 +1860,10 @@ void HwpReader::makeTStyle(CharShape const * cshape)
padd("style:name", sXML_CDATA,
ascii(Int2Str(cshape->index, "T%d", buf)));
padd("style:family", sXML_CDATA, "text");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
parseCharShape(cshape);
- rstartEl("style:properties", mxList.get());
+ rstartEl("style:properties", mxList);
mxList->clear();
rendEl("style:properties");
rendEl("style:style");
@@ -1878,13 +1878,13 @@ void HwpReader::makeTableStyle(Table *tbl)
padd("style:name", sXML_CDATA,
ascii(Int2Str(hbox->style.boxnum, "Table%d", buf)));
padd("style:family", sXML_CDATA,"table");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
padd("style:width", sXML_CDATA,
Double2Str(WTMM(hbox->box_xs)) + "mm");
padd("table:align", sXML_CDATA,"left");
padd("fo:keep-with-next", sXML_CDATA,"false");
- rstartEl("style:properties", mxList.get());
+ rstartEl("style:properties", mxList);
mxList->clear();
rendEl("style:properties");
rendEl("style:style");
@@ -1895,11 +1895,11 @@ void HwpReader::makeTableStyle(Table *tbl)
sprintf(buf,"Table%d.%c",hbox->style.boxnum, static_cast<char>('A'+i));
padd("style:name", sXML_CDATA, ascii( buf ));
padd("style:family", sXML_CDATA,"table-column");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
padd("style:column-width", sXML_CDATA,
Double2Str(WTMM(tbl->columns.data[i+1] - tbl->columns.data[i])) + "mm");
- rstartEl("style:properties", mxList.get());
+ rstartEl("style:properties", mxList);
mxList->clear();
rendEl("style:properties");
rendEl("style:style");
@@ -1911,11 +1911,11 @@ void HwpReader::makeTableStyle(Table *tbl)
sprintf(buf,"Table%d.row%" SAL_PRI_SIZET "u",hbox->style.boxnum, i + 1);
padd("style:name", sXML_CDATA, ascii( buf ));
padd("style:family", sXML_CDATA,"table-row");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
padd("style:row-height", sXML_CDATA,
Double2Str(WTMM(tbl->rows.data[i+1] - tbl->rows.data[i])) + "mm");
- rstartEl("style:properties", mxList.get());
+ rstartEl("style:properties", mxList);
mxList->clear();
rendEl("style:properties");
rendEl("style:style");
@@ -1927,7 +1927,7 @@ void HwpReader::makeTableStyle(Table *tbl)
sprintf(buf,"Table%d.%c%d",hbox->style.boxnum, 'A'+ tcell->nColumnIndex, tcell->nRowIndex +1);
padd("style:name", sXML_CDATA, ascii( buf ));
padd("style:family", sXML_CDATA,"table-cell");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
Cell *cl = tcell->pCell;
if( cl->ver_align == 1 )
@@ -2015,7 +2015,7 @@ void HwpReader::makeTableStyle(Table *tbl)
ascii(hcolor2str(sal::static_int_cast<uchar>(cl->color),
sal::static_int_cast<uchar>(cl->shade), buf)));
- rstartEl("style:properties", mxList.get());
+ rstartEl("style:properties", mxList);
mxList->clear();
rendEl("style:properties");
@@ -2032,7 +2032,7 @@ void HwpReader::makeDrawStyle( HWPDrawingObject * hdo, FBoxStyle * fstyle)
ascii(Int2Str(hdo->index, "Draw%d", buf)));
padd("style:family", sXML_CDATA, "graphics");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
switch (fstyle->txtflow)
@@ -2199,7 +2199,7 @@ void HwpReader::makeDrawStyle( HWPDrawingObject * hdo, FBoxStyle * fstyle)
padd("style:vertical-rel", sXML_CDATA, "baseline");
}
- rstartEl("style:properties", mxList.get());
+ rstartEl("style:properties", mxList);
mxList->clear();
rendEl("style:properties");
rendEl("style:style");
@@ -2218,7 +2218,7 @@ void HwpReader::makeCaptionStyle(FBoxStyle * fstyle)
padd("style:name", sXML_CDATA,
ascii(Int2Str(fstyle->boxnum, "CapBox%d", buf)));
padd("style:family", sXML_CDATA, "graphics");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
padd("fo:margin-left", sXML_CDATA, "0cm");
padd("fo:margin-right", sXML_CDATA, "0cm");
@@ -2286,7 +2286,7 @@ void HwpReader::makeCaptionStyle(FBoxStyle * fstyle)
padd("style:horizontal-rel", sXML_CDATA, "page-content");
}
}
- rstartEl("style:properties", mxList.get());
+ rstartEl("style:properties", mxList);
mxList->clear();
rendEl("style:properties");
rendEl("style:style");
@@ -2302,7 +2302,7 @@ void HwpReader::makeCaptionStyle(FBoxStyle * fstyle)
}
padd("style:family", sXML_CDATA, "graphics");
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
padd("fo:margin-left", sXML_CDATA, "0cm");
@@ -2418,7 +2418,7 @@ void HwpReader::makeCaptionStyle(FBoxStyle * fstyle)
sal::static_int_cast<uchar>(cell->color),
sal::static_int_cast<uchar>(cell->shade), buf)));
}
- rstartEl("style:properties", mxList.get());
+ rstartEl("style:properties", mxList);
mxList->clear();
rendEl("style:properties");
rendEl("style:style");
@@ -2459,7 +2459,7 @@ void HwpReader::makeFStyle(FBoxStyle * fstyle)
break;
}
- rstartEl("style:style", mxList.get());
+ rstartEl("style:style", mxList);
mxList->clear();
if ( fstyle->boxtype == 'T')
@@ -2679,7 +2679,7 @@ void HwpReader::makeFStyle(FBoxStyle * fstyle)
padd("draw:color-mode", sXML_CDATA, "mono");
}
- rstartEl("style:properties", mxList.get());
+ rstartEl("style:properties", mxList);
mxList->clear();
rendEl("style:properties");
rendEl("style:style");
@@ -2719,7 +2719,7 @@ void HwpReader::make_text_p0(HWPPara * para, bool bParaStart)
{
padd("text:style-name", sXML_CDATA,
ascii(getPStyleName(para->GetParaShape().index, buf)));
- rstartEl("text:p", mxList.get());
+ rstartEl("text:p", mxList);
mxList->clear();
}
if( d->bFirstPara && d->bInBody )
@@ -2731,7 +2731,7 @@ void HwpReader::make_text_p0(HWPPara * para, bool bParaStart)
// U+C758 HANGUL SYLLABLE YI, U+CC98 HANGUL SYLLABLE CEO,
// U+C74C HANGUL SYLLABLE EUM: "Begin of Document"
padd("text:name", sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_UTF8));
- rstartEl("text:bookmark", mxList.get());
+ rstartEl("text:bookmark", mxList);
mxList->clear();
rendEl("text:bookmark");
d->bFirstPara = false;
@@ -2743,7 +2743,7 @@ void HwpReader::make_text_p0(HWPPara * para, bool bParaStart)
}
padd("text:style-name", sXML_CDATA,
ascii(getTStyleName(para->cshape->index, buf)));
- rstartEl("text:span", mxList.get());
+ rstartEl("text:span", mxList);
mxList->clear();
for (n = 0; n < para->nch && para->hhstr[n]->hh;
@@ -2752,7 +2752,7 @@ void HwpReader::make_text_p0(HWPPara * para, bool bParaStart)
if (para->hhstr[n]->hh == CH_SPACE && !firstspace)
{
makeChars(str);
- rstartEl("text:s", mxList.get());
+ rstartEl("text:s", mxList);
rendEl("text:s");
}
else if (para->hhstr[n]->hh == CH_END_PARA)
@@ -2794,7 +2794,7 @@ void HwpReader::make_text_p1(HWPPara * para,bool bParaStart)
{
padd("text:style-name", sXML_CDATA,
ascii(getPStyleName(para->GetParaShape().index, buf)));
- rstartEl("text:p", mxList.get());
+ rstartEl("text:p", mxList);
mxList->clear();
}
if( d->bFirstPara && d->bInBody )
@@ -2807,7 +2807,7 @@ void HwpReader::make_text_p1(HWPPara * para,bool bParaStart)
// U+C758 HANGUL SYLLABLE YI, U+CC98 HANGUL SYLLABLE CEO,
// U+C74C HANGUL SYLLABLE EUM: "Begin of Document"
padd("text:name", sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_UTF8));
- rstartEl("text:bookmark", mxList.get());
+ rstartEl("text:bookmark", mxList);
mxList->clear();
rendEl("text:bookmark");
d->bFirstPara = false;
@@ -2819,7 +2819,7 @@ void HwpReader::make_text_p1(HWPPara * para,bool bParaStart)
}
padd("text:style-name", sXML_CDATA,
ascii(getTStyleName(curr, buf)));
- rstartEl("text:span", mxList.get());
+ rstartEl("text:span", mxList);
mxList->clear();
for (n = 0; n < para->nch && para->hhstr[n]->hh;
@@ -2832,13 +2832,13 @@ void HwpReader::make_text_p1(HWPPara * para,bool bParaStart)
curr = para->GetCharShape(n)->index;
padd("text:style-name", sXML_CDATA,
ascii(getTStyleName(curr, buf)));
- rstartEl("text:span", mxList.get());
+ rstartEl("text:span", mxList);
mxList->clear();
}
if (para->hhstr[n]->hh == CH_SPACE && !firstspace)
{
makeChars(str);
- rstartEl("text:s", mxList.get());
+ rstartEl("text:s", mxList);
rendEl("text:s");
}
else if (para->hhstr[n]->hh == CH_END_PARA)
@@ -2891,7 +2891,7 @@ void HwpReader::make_text_p3(HWPPara * para,bool bParaStart)
// U+C758 HANGUL SYLLABLE YI, U+CC98 HANGUL SYLLABLE CEO,
// U+C74C HANGUL SYLLABLE EUM: "Begin of Document"
padd("text:name", sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_UTF8));
- rstartEl("text:bookmark", mxList.get());
+ rstartEl("text:bookmark", mxList);
mxList->clear();
rendEl("text:bookmark");
d->bFirstPara = false;
@@ -2926,7 +2926,7 @@ void HwpReader::make_text_p3(HWPPara * para,bool bParaStart)
if( !pstart ) {STARTP;}
if( !tstart ) {STARTT;}
makeChars(str);
- rstartEl("text:s", mxList.get());
+ rstartEl("text:s", mxList);
mxList->clear();
rendEl("text:s");
}
@@ -3144,7 +3144,7 @@ void HwpReader::makeFieldCode(hchar_string const & rStr, FieldCode const *hbox)
padd("text:placeholder-type", sXML_CDATA, "text");
if( field )
padd("text:description", sXML_CDATA, fromHcharStringToOUString(hstr2ucsstr(field)));
- rstartEl( "text:placeholder", mxList.get());
+ rstartEl( "text:placeholder", mxList);
mxList->clear();
rchars( fromHcharStringToOUString(rStr) );
rendEl( "text:placeholder" );
@@ -3154,25 +3154,25 @@ void HwpReader::makeFieldCode(hchar_string const & rStr, FieldCode const *hbox)
{
if (OUString(reinterpret_cast<sal_Unicode const *>(hconv(hbox->str3.get()))) == "title")
{
- rstartEl( "text:title", mxList.get() );
+ rstartEl( "text:title", mxList );
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:title" );
}
else if (OUString(reinterpret_cast<sal_Unicode const *>(hconv(hbox->str3.get()))) == "subject")
{
- rstartEl( "text:subject", mxList.get() );
+ rstartEl( "text:subject", mxList );
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:subject" );
}
else if (OUString(reinterpret_cast<sal_Unicode const *>(hconv(hbox->str3.get()))) == "author")
{
- rstartEl( "text:author-name", mxList.get() );
+ rstartEl( "text:author-name", mxList );
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:author-name" );
}
else if (OUString(reinterpret_cast<sal_Unicode const *>(hconv(hbox->str3.get()))) == "keywords")
{
- rstartEl( "text:keywords", mxList.get() );
+ rstartEl( "text:keywords", mxList );
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:keywords" );
}
@@ -3182,61 +3182,61 @@ void HwpReader::makeFieldCode(hchar_string const & rStr, FieldCode const *hbox)
{
if (OUString(reinterpret_cast<sal_Unicode const *>(hconv(hbox->str3.get()))) == "User")
{
- rstartEl( "text:sender-lastname", mxList.get() );
+ rstartEl( "text:sender-lastname", mxList );
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:sender-lastname" );
}
else if (OUString(reinterpret_cast<sal_Unicode const *>(hconv(hbox->str3.get()))) == "Company")
{
- rstartEl( "text:sender-company", mxList.get() );
+ rstartEl( "text:sender-company", mxList );
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:sender-company" );
}
else if (OUString(reinterpret_cast<sal_Unicode const *>(hconv(hbox->str3.get()))) == "Position")
{
- rstartEl( "text:sender-title", mxList.get() );
+ rstartEl( "text:sender-title", mxList );
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:sender-title" );
}
else if (OUString(reinterpret_cast<sal_Unicode const *>(hconv(hbox->str3.get()))) == "Division")
{
- rstartEl( "text:sender-position", mxList.get() );
+ rstartEl( "text:sender-position", mxList );
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:sender-position" );
}
else if (OUString(reinterpret_cast<sal_Unicode const *>(hconv(hbox->str3.get()))) == "Fax")
{
- rstartEl( "text:sender-fax", mxList.get() );
+ rstartEl( "text:sender-fax", mxList );
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:sender-fax" );
}
else if (OUString(reinterpret_cast<sal_Unicode const *>(hconv(hbox->str3.get()))) == "Pager")
{
- rstartEl( "text:phone-private", mxList.get() );
+ rstartEl( "text:phone-private", mxList );
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:phone-private" );
}
else if (OUString(reinterpret_cast<sal_Unicode const *>(hconv(hbox->str3.get()))) == "E-mail")
{
- rstartEl( "text:sender-email", mxList.get() );
+ rstartEl( "text:sender-email", mxList );
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:sender-email" );
}
else if (OUString(reinterpret_cast<sal_Unicode const *>(hconv(hbox->str3.get()))) == "Zipcode(office)")
{
- rstartEl( "text:sender-postal-code", mxList.get() );
+ rstartEl( "text:sender-postal-code", mxList );
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:sender-postal-code" );
}
else if (OUString(reinterpret_cast<sal_Unicode const *>(hconv(hbox->str3.get()))) == "Phone(office)")
{
- rstartEl( "text:sender-phone-work", mxList.get() );
+ rstartEl( "text:sender-phone-work", mxList );
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:sender-phone-work" );
}
else if (OUString(reinterpret_cast<sal_Unicode const *>(hconv(hbox->str3.get()))) == "Address(office)")
{
- rstartEl( "text:sender-street", mxList.get() );
+ rstartEl( "text:sender-street", mxList );
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:sender-street" );
}
@@ -3247,7 +3247,7 @@ void HwpReader::makeFieldCode(hchar_string const & rStr, FieldCode const *hbox)
if( hbox->m_pDate )
padd("style:data-style-name", sXML_CDATA,
ascii(Int2Str(hbox->m_pDate->key, "N%d", buf)));
- rstartEl( "text:creation-date", mxList.get() );
+ rstartEl( "text:creation-date", mxList );
mxList->clear();
rchars( fromHcharStringToOUString(hstr2ucsstr(hbox->str2.get())) );
rendEl( "text:creation-date" );
@@ -3264,21 +3264,21 @@ void HwpReader::makeBookmark(Bookmark const * hbox)
if (hbox->type == 0)
{
padd("text:name", sXML_CDATA, fromHcharStringToOUString(hstr2ucsstr(hbox->id)));
- rstartEl("text:bookmark", mxList.get());
+ rstartEl("text:bookmark", mxList);
mxList->clear();
rendEl("text:bookmark");
}
else if (hbox->type == 1) /* Block bookmarks days begin and end there if */
{
padd("text:name", sXML_CDATA, fromHcharStringToOUString(hstr2ucsstr(hbox->id)));
- rstartEl("text:bookmark-start", mxList.get());
+ rstartEl("text:bookmark-start", mxList);
mxList->clear();
rendEl("text:bookmark-start");
}
else if (hbox->type == 2)
{
padd("text:name", sXML_CDATA, fromHcharStringToOUString(hstr2ucsstr(hbox->id)));
- rstartEl("text:bookmark-end", mxList.get());
+ rstartEl("text:bookmark-end", mxList);
mxList->clear();
rendEl("text:bookmark-end");
}
@@ -3293,7 +3293,7 @@ void HwpReader::makeDateFormat(DateCode * hbox)
padd("number:language", sXML_CDATA,"ko");
padd("number:country", sXML_CDATA,"KR");
- rstartEl("number:date-style", mxList.get());
+ rstartEl("number:date-style", mxList);
mxList->clear();
bool add_zero = false;
@@ -3319,67 +3319,67 @@ void HwpReader::makeDateFormat(DateCode * hbox)
break;
case '1':
padd("number:style", sXML_CDATA, "long");
- rstartEl("number:year", mxList.get());
+ rstartEl("number:year", mxList);
mxList->clear();
rendEl("number:year");
break;
case '!':
- rstartEl("number:year", mxList.get());
+ rstartEl("number:year", mxList);
mxList->clear();
rendEl("number:year");
break;
case '2':
if( add_zero )
padd("number:style", sXML_CDATA, "long");
- rstartEl("number:month", mxList.get());
+ rstartEl("number:month", mxList);
mxList->clear();
rendEl("number:month");
break;
case '@':
padd("number:textual", sXML_CDATA, "true");
- rstartEl("number:month", mxList.get());
+ rstartEl("number:month", mxList);
mxList->clear();
rendEl("number:month");
break;
case '*':
padd("number:textual", sXML_CDATA, "true");
padd("number:style", sXML_CDATA, "long");
- rstartEl("number:month", mxList.get());
+ rstartEl("number:month", mxList);
mxList->clear();
rendEl("number:month");
break;
case '3':
if( add_zero )
padd("number:style", sXML_CDATA, "long");
- rstartEl("number:day", mxList.get());
+ rstartEl("number:day", mxList);
mxList->clear();
rendEl("number:day");
break;
case '#':
if( add_zero )
padd("number:style", sXML_CDATA, "long");
- rstartEl("number:day", mxList.get());
+ rstartEl("number:day", mxList);
mxList->clear();
rendEl("number:day");
switch( hbox->date[DateCode::DAY] % 10)
{
case 1:
- rstartEl("number:text", mxList.get());
+ rstartEl("number:text", mxList);
rchars("st");
rendEl("number:text");
break;
case 2:
- rstartEl("number:text", mxList.get());
+ rstartEl("number:text", mxList);
rchars("nd");
rendEl("number:text");
break;
case 3:
- rstartEl("number:text", mxList.get());
+ rstartEl("number:text", mxList);
rchars("rd");
rendEl("number:text");
break;
default:
- rstartEl("number:text", mxList.get());
+ rstartEl("number:text", mxList);
rchars("th");
rendEl("number:text");
break;
@@ -3389,7 +3389,7 @@ void HwpReader::makeDateFormat(DateCode * hbox)
case '$':
if( add_zero )
padd("number:style", sXML_CDATA, "long");
- rstartEl("number:hours", mxList.get());
+ rstartEl("number:hours", mxList);
mxList->clear();
rendEl("number:hours");
break;
@@ -3397,7 +3397,7 @@ void HwpReader::makeDateFormat(DateCode * hbox)
case '%':
if( add_zero )
padd("number:style", sXML_CDATA, "long");
- rstartEl("number:minutes", mxList.get());
+ rstartEl("number:minutes", mxList);
mxList->clear();
rendEl("number:minutes");
break;
@@ -3406,14 +3406,14 @@ void HwpReader::makeDateFormat(DateCode * hbox)
[[fallthrough]];
case '6':
case '^':
- rstartEl("number:day-of-week", mxList.get());
+ rstartEl("number:day-of-week", mxList);
mxList->clear();
rendEl("number:day-of-week");
break;
case '7':
case '&':
case '+':
- rstartEl("number:am-pm", mxList.get());
+ rstartEl("number:am-pm", mxList);
mxList->clear();
rendEl("number:am-pm");
break;
@@ -3423,7 +3423,7 @@ void HwpReader::makeDateFormat(DateCode * hbox)
hchar sbuf[2];
sbuf[0] = *fmt;
sbuf[1] = 0;
- rstartEl("number:text", mxList.get());
+ rstartEl("number:text", mxList);
rchars(fromHcharStringToOUString(hstr2ucsstr(sbuf)));
rendEl("number:text");
break;
@@ -3438,7 +3438,7 @@ void HwpReader::makeDateCode(DateCode * hbox)
{
padd("style:data-style-name", sXML_CDATA,
ascii(Int2Str(hbox->key, "N%d", buf)));
- rstartEl( "text:date", mxList.get() );
+ rstartEl( "text:date", mxList );
mxList->clear();
hchar_string const boxstr = hbox->GetString();
rchars(fromHcharStringToOUString(hstr2ucsstr(boxstr.c_str())));
@@ -3448,7 +3448,7 @@ void HwpReader::makeDateCode(DateCode * hbox)
void HwpReader::makeTab()
{
- rstartEl("text:tab-stop", mxList.get());
+ rstartEl("text:tab-stop", mxList);
rendEl("text:tab-stop");
}
@@ -3459,7 +3459,7 @@ void HwpReader::makeTable(TxtBox * hbox)
ascii(Int2Str(hbox->style.boxnum, "Table%d", buf)));
padd("table:style-name", sXML_CDATA,
ascii(Int2Str(hbox->style.boxnum, "Table%d", buf)));
- rstartEl("table:table", mxList.get());
+ rstartEl("table:table", mxList);
mxList->clear();
Table *tbl = hbox->m_pTable;
@@ -3468,7 +3468,7 @@ void HwpReader::makeTable(TxtBox * hbox)
{
sprintf(buf,"Table%d.%c",hbox->style.boxnum, static_cast<char>('A'+i));
padd("table:style-name", sXML_CDATA, ascii( buf ));
- rstartEl("table:table-column", mxList.get());
+ rstartEl("table:table-column", mxList);
mxList->clear();
rendEl("table:table-column");
}
@@ -3487,7 +3487,7 @@ void HwpReader::makeTable(TxtBox * hbox)
// row
sprintf(buf,"Table%d.row%d",hbox->style.boxnum, tcell->nRowIndex + 1);
padd("table:style-name", sXML_CDATA, ascii( buf ));
- rstartEl("table:table-row", mxList.get());
+ rstartEl("table:table-row", mxList);
mxList->clear();
j = tcell->nRowIndex;
}
@@ -3503,7 +3503,7 @@ void HwpReader::makeTable(TxtBox * hbox)
padd("table:value-type", sXML_CDATA,"string");
if( tcell->pCell->protect )
padd("table:protected", sXML_CDATA,"true");
- rstartEl("table:table-cell", mxList.get());
+ rstartEl("table:table-cell", mxList);
mxList->clear();
parsePara(hbox->plists[tcell->pCell->key].front().get());
rendEl("table:table-cell");
@@ -3557,14 +3557,14 @@ void HwpReader::makeTextBox(TxtBox * hbox)
Double2Str(WTMM(( hbox->box_xs + hbox->cap_xs) )) + "mm");
padd("fo:min-height", sXML_CDATA,
Double2Str(WTMM(( hbox->box_ys + hbox->cap_ys) )) + "mm");
- rstartEl("draw:text-box", mxList.get());
+ rstartEl("draw:text-box", mxList);
mxList->clear();
if( hbox->cap_pos % 2 ) /* The caption is on the top */
{
parsePara(hbox->caption.front().get());
}
padd( "text:style-name", sXML_CDATA, "Standard");
- rstartEl("text:p", mxList.get());
+ rstartEl("text:p", mxList);
mxList->clear();
}
else{
@@ -3624,7 +3624,7 @@ void HwpReader::makeTextBox(TxtBox * hbox)
if( hbox->type != EQU_TYPE )
{
- rstartEl("draw:text-box", mxList.get());
+ rstartEl("draw:text-box", mxList);
mxList->clear();
/* If captions are present and it is on the top */
if( hbox->style.cap_len > 0 && (hbox->cap_pos % 2) && hbox->type == TBL_TYPE )
@@ -3658,7 +3658,7 @@ void HwpReader::makeTextBox(TxtBox * hbox)
}
else // is Formula
{
- rstartEl("draw:object", mxList.get());
+ rstartEl("draw:object", mxList);
mxList->clear();
makeFormula(hbox);
rendEl("draw:object");
@@ -3755,7 +3755,7 @@ void HwpReader::makeHyperText(TxtBox * hbox)
padd("xlink:href", sXML_CDATA,
OUString(tmp.c_str(), tmp.size()+1, RTL_TEXTENCODING_EUC_KR));
}
- rstartEl("draw:a", mxList.get());
+ rstartEl("draw:a", mxList);
mxList->clear();
makeTextBox(hbox);
rendEl("draw:a");
@@ -3811,14 +3811,14 @@ void HwpReader::makePicture(Picture * hbox)
Double2Str(WTMM( hbox->box_xs + hbox->style.margin[1][0] + hbox->style.margin[1][1] )) + "mm");
padd("fo:min-height", sXML_CDATA,
Double2Str(WTMM( hbox->box_ys + hbox->style.margin[1][2] + hbox->style.margin[1][3] + hbox->cap_ys )) + "mm");
- rstartEl("draw:text-box", mxList.get());
+ rstartEl("draw:text-box", mxList);
mxList->clear();
if( hbox->cap_pos % 2 ) /* Caption is on the top */
{
parsePara(hbox->caption.front().get());
}
padd( "text:style-name", sXML_CDATA, "Standard");
- rstartEl("text:p", mxList.get());
+ rstartEl("text:p", mxList);
mxList->clear();
}
if( hbox->ishyper )
@@ -3837,7 +3837,7 @@ void HwpReader::makePicture(Picture * hbox)
padd("xlink:href", sXML_CDATA,
fromHcharStringToOUString(hstr2ucsstr(kstr2hstr(reinterpret_cast<uchar const *>(urltounix(reinterpret_cast<char *>(hbox->follow.data() + 5)).c_str())).c_str())));
#endif
- rstartEl("draw:a", mxList.get());
+ rstartEl("draw:a", mxList);
mxList->clear();
}
padd("draw:style-name", sXML_CDATA,
@@ -3898,13 +3898,13 @@ void HwpReader::makePicture(Picture * hbox)
}
if( hbox->pictype == PICTYPE_OLE )
- rstartEl("draw:object-ole", mxList.get());
+ rstartEl("draw:object-ole", mxList);
else
- rstartEl("draw:image", mxList.get());
+ rstartEl("draw:image", mxList);
mxList->clear();
if (hbox->pictype == PICTYPE_EMBED || hbox->pictype == PICTYPE_OLE)
{
- rstartEl("office:binary-data", mxList.get());
+ rstartEl("office:binary-data", mxList);
mxList->clear();
if( hbox->pictype == PICTYPE_EMBED ){
EmPicture *emp = hwpfile.GetEmPicture(hbox);
@@ -4015,7 +4015,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
if (drawobj->type == HWPDO_CONTAINER)
{
- rstartEl("draw:g", mxList.get());
+ rstartEl("draw:g", mxList);
mxList->clear();
makePictureDRAW(drawobj->child.get(), hbox);
rendEl("draw:g");
@@ -4127,7 +4127,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
Double2Str (WTMM(y + b + drawobj->offset2.y + drawobj->extent.h)) + "mm");
}
- rstartEl("draw:line", mxList.get());
+ rstartEl("draw:line", mxList);
mxList->clear();
rendEl("draw:line");
break;
@@ -4158,7 +4158,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
Double2Str (WTMM( value / 2)) + "mm");
}
- rstartEl("draw:rect", mxList.get());
+ rstartEl("draw:rect", mxList);
mxList->clear();
if( (drawobj->property.flag & HWPDO_FLAG_AS_TEXTBOX) &&
drawobj->property.pPara ) // As Textbox
@@ -4206,7 +4206,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
padd("draw:end-angle", sXML_CDATA, Double2Str(end_angle));
}
}
- rstartEl("draw:ellipse", mxList.get());
+ rstartEl("draw:ellipse", mxList);
mxList->clear();
if( drawobj->property.flag >> 19 & 0x01 &&
drawobj->property.pPara ) // As Textbox
@@ -4316,7 +4316,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
padd("draw:end-angle", sXML_CDATA, "180");
}
}
- rstartEl("draw:ellipse", mxList.get());
+ rstartEl("draw:ellipse", mxList);
mxList->clear();
if( drawobj->property.flag >> 19 & 0x01 &&
drawobj->property.pPara ) // As Textbox
@@ -4420,7 +4420,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
padd("svg:d", sXML_CDATA, oustr.makeStringAndClear());
- rstartEl("draw:path", mxList.get());
+ rstartEl("draw:path", mxList);
mxList->clear();
// As Textbox
if( drawobj->property.flag >> 19 & 0x01 && drawobj->property.pPara )
@@ -4483,7 +4483,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
if(bIsPolygon)
{
- rstartEl("draw:polygon", mxList.get());
+ rstartEl("draw:polygon", mxList);
mxList->clear();
if( drawobj->property.flag >> 19 & 0x01 &&
// As Textbox
@@ -4501,7 +4501,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
}
else
{
- rstartEl("draw:polyline", mxList.get());
+ rstartEl("draw:polyline", mxList);
mxList->clear();
if( drawobj->property.flag >> 19 & 0x01 &&
// As Textbox
@@ -4546,7 +4546,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
Double2Str (WTMM( value / 2)) + "mm");
}
- rstartEl("draw:text-box", mxList.get());
+ rstartEl("draw:text-box", mxList);
mxList->clear();
HWPPara *pPara = drawobj->u.textbox.h;
@@ -4570,7 +4570,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
void HwpReader::makeLine()
{
padd("text:style-name", sXML_CDATA, "Horizontal Line");
- rstartEl( "text:p", mxList.get());
+ rstartEl( "text:p", mxList);
mxList->clear();
}
@@ -4587,7 +4587,7 @@ void HwpReader::makeHidden(Hidden * hbox)
padd("text:condition", sXML_CDATA, "");
padd("text:string-value", sXML_CDATA, "");
- rstartEl("text:hidden-text", mxList.get());
+ rstartEl("text:hidden-text", mxList);
mxList->clear();
HWPPara *para = hbox->plist.front().get();
@@ -4618,15 +4618,15 @@ void HwpReader::makeFootnote(Footnote * hbox)
{
padd("text:id", sXML_CDATA,
ascii(Int2Str(hbox->number, "edn%d", buf)));
- rstartEl("text:endnote", mxList.get());
+ rstartEl("text:endnote", mxList);
mxList->clear();
padd("text:label", sXML_CDATA,
ascii(Int2Str(hbox->number, "%d", buf)));
- rstartEl("text:endnote-citation", mxList.get());
+ rstartEl("text:endnote-citation", mxList);
mxList->clear();
rchars(ascii(Int2Str(hbox->number, "%d", buf)));
rendEl("text:endnote-citation");
- rstartEl("text:endnote-body", mxList.get());
+ rstartEl("text:endnote-body", mxList);
parsePara(hbox->plist.front().get());
rendEl("text:endnote-body");
rendEl("text:endnote");
@@ -4635,15 +4635,15 @@ void HwpReader::makeFootnote(Footnote * hbox)
{
padd("text:id", sXML_CDATA,
ascii(Int2Str(hbox->number, "ftn%d", buf)));
- rstartEl("text:footnote", mxList.get());
+ rstartEl("text:footnote", mxList);
mxList->clear();
padd("text:label", sXML_CDATA,
ascii(Int2Str(hbox->number, "%d", buf)));
- rstartEl("text:footnote-citation", mxList.get());
+ rstartEl("text:footnote-citation", mxList);
mxList->clear();
rchars(ascii(Int2Str(hbox->number, "%d", buf)));
rendEl("text:footnote-citation");
- rstartEl("text:footnote-body", mxList.get());
+ rstartEl("text:footnote-body", mxList);
parsePara(hbox->plist.front().get());
rendEl("text:footnote-body");
rendEl("text:footnote");
@@ -4659,7 +4659,7 @@ void HwpReader::makeAutoNum(AutoNum const * hbox)
switch (hbox->type)
{
case PGNUM_AUTO:
- rstartEl("text:page-number", mxList.get());
+ rstartEl("text:page-number", mxList);
rchars(ascii(Int2Str(hbox->number, "%d", buf)));
rendEl("text:page-number");
break;
@@ -4673,7 +4673,7 @@ void HwpReader::makeAutoNum(AutoNum const * hbox)
ascii(Int2Str(hbox->number, "refIllustration%d", buf)));
padd("text:name",sXML_CDATA, "Illustration");
padd("style:num-format",sXML_CDATA, "1");
- rstartEl("text:sequence", mxList.get());
+ rstartEl("text:sequence", mxList);
rchars(ascii(Int2Str(hbox->number, "%d", buf)));
rendEl("text:sequence");
break;
@@ -4682,7 +4682,7 @@ void HwpReader::makeAutoNum(AutoNum const * hbox)
ascii(Int2Str(hbox->number, "refTable%d", buf)));
padd("text:name",sXML_CDATA, "Table");
padd("style:num-format",sXML_CDATA, "1");
- rstartEl("text:sequence", mxList.get());
+ rstartEl("text:sequence", mxList);
rchars(ascii(Int2Str(hbox->number, "%d", buf)));
rendEl("text:sequence");
break;
@@ -4716,12 +4716,12 @@ void HwpReader::makeShowPageNum()
padd("svg:y", sXML_CDATA, "0cm");
padd("svg:width", sXML_CDATA, "2.0cm");
padd("fo:min-height", sXML_CDATA, "0.5cm");
- rstartEl("draw:text-box", mxList.get());
+ rstartEl("draw:text-box", mxList);
mxList->clear();
padd("text:style-name", sXML_CDATA,
ascii(Int2Str(nPos, "PNPara%d", buf)));
- rstartEl("text:p", mxList.get());
+ rstartEl("text:p", mxList);
mxList->clear();
if( hbox->shape > 2 )
rchars("- ");
@@ -4732,7 +4732,7 @@ void HwpReader::makeShowPageNum()
else
padd("style:num-format", sXML_CDATA, "i");
padd("text:select-page", sXML_CDATA, "current");
- rstartEl("text:page-number", mxList.get());
+ rstartEl("text:page-number", mxList);
mxList->clear();
rchars("2");
rendEl("text:page-number");
@@ -4772,7 +4772,7 @@ void HwpReader::parsePara(HWPPara * para)
{
padd("text:style-name", sXML_CDATA,
ascii(getPStyleName(para->GetParaShape().index, buf)));
- rstartEl( "text:p",mxList.get());
+ rstartEl( "text:p",mxList);
mxList->clear();
}
if( d->bFirstPara && d->bInBody )
@@ -4786,7 +4786,7 @@ void HwpReader::parsePara(HWPPara * para)
// U+C758 HANGUL SYLLABLE YI, U+CC98 HANGUL SYLLABLE CEO,
// U+C74C HANGUL SYLLABLE EUM: "Begin of Document"
padd("text:name", sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_UTF8));
- rstartEl("text:bookmark", mxList.get());
+ rstartEl("text:bookmark", mxList);
mxList->clear();
rendEl("text:bookmark");
d->bFirstPara = false;
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index f5a7e8e34b9e..43d75141bc01 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -389,7 +389,7 @@ uno::Reference< container::XNameContainer > SAL_CALL ConvDicList::getDictionaryC
MutexGuard aGuard( GetLinguMutex() );
GetNameContainer();
DBG_ASSERT( mxNameContainer.is(), "missing name container" );
- return mxNameContainer.get();
+ return mxNameContainer;
}
uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary(
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index c0f5f800c688..eb48e7e5311b 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -396,7 +396,7 @@ sal_Bool SAL_CALL DicList::addDictionary(
bRes = true;
// add listener helper to the dictionaries listener lists
- xDictionary->addDictionaryEventListener( mxDicEvtLstnrHelper.get() );
+ xDictionary->addDictionaryEventListener( mxDicEvtLstnrHelper );
}
return bRes;
}
@@ -422,7 +422,7 @@ sal_Bool SAL_CALL
// deactivate dictionary if not already done
xDic->setActive( false );
- xDic->removeDictionaryEventListener( mxDicEvtLstnrHelper.get() );
+ xDic->removeDictionaryEventListener( mxDicEvtLstnrHelper );
}
// remove element at nPos
@@ -546,7 +546,7 @@ void SAL_CALL
// release references to (members of) this object hold by
// dictionaries
if (rDicList[i].is())
- rDicList[i]->removeDictionaryEventListener( mxDicEvtLstnrHelper.get() );
+ rDicList[i]->removeDictionaryEventListener( mxDicEvtLstnrHelper );
}
}
mxDicEvtLstnrHelper.clear();
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index 7788132793ff..4d6829cccf8a 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -213,7 +213,7 @@ void LwpPara::XFConvert(XFContentContainer* pCont)
rtl::Reference<XFSection> xSection(CreateXFSection());
if (pStory)
pStory->AddXFContent(xSection.get());
- m_xXFContainer.set(xSection.get());
+ m_xXFContainer = xSection;
}
if (m_bHasBullet && m_pSilverBullet)
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index f49c3f01dc68..4f2c4c8d30ca 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -856,7 +856,7 @@ sal_uInt16 LwpTableLayout::ConvertHeadingRow(
sal_uInt8 nCol = static_cast<sal_uInt8>(pTable->GetColumn());
rtl::Reference<XFTable> pTmpTable( new XFTable );
- ConvertTable(pTmpTable.get(),nStartHeadRow,nEndHeadRow,0,nCol);
+ ConvertTable(pTmpTable,nStartHeadRow,nEndHeadRow,0,nCol);
sal_uInt16 nRowNum = pTmpTable->GetRowCount();
std::vector<sal_uInt8> CellMark(nRowNum);
@@ -957,7 +957,7 @@ void LwpTableLayout::SplitRowToCells(XFTable* pTmpTable, rtl::Reference<XFTable>
}
xSubTable1->AddRow(xNewRow);
}
- ConvertColumn(xSubTable1.get(), 0, nFirstColSpann);//add column info
+ ConvertColumn(xSubTable1, 0, nFirstColSpann);//add column info
xXFCell1->Add(xSubTable1.get());
xXFCell1->SetColumnSpaned(nFirstColSpann);
@@ -976,7 +976,7 @@ void LwpTableLayout::SplitRowToCells(XFTable* pTmpTable, rtl::Reference<XFTable>
xSubTable2->AddRow(xNewRow);
}
- ConvertColumn(xSubTable2.get(), nFirstColSpann, nCol);//add column info
+ ConvertColumn(xSubTable2, nFirstColSpann, nCol);//add column info
xXFCell2->Add(xSubTable2.get());
xXFCell2->SetColumnSpaned(nCol-nFirstColSpann);
xXFRow->AddCell(xXFCell2);
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx
index 6a12bcfc6925..aa175d8490ff 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx
@@ -76,7 +76,7 @@ void XFSaxAttrList::Clear() { m_xSvAttrList->Clear(); }
css::uno::Reference<css::xml::sax::XAttributeList> XFSaxAttrList::GetAttributeList() const
{
- return m_xSvAttrList.get();
+ return m_xSvAttrList;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 99bc040b134c8cece576196fb338954ced7c0f24
Author: Noel <noel.grandin at collabora.co.uk>
AuthorDate: Mon Feb 15 20:02:09 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Feb 16 07:52:03 2021 +0100
loplugin:referencecasting in oox..package
Change-Id: I4276c6c45cb2478afbc0231a15c402ddcafd00a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110950
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index b7924cc9fa4a..8ce9784b99ef 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -92,7 +92,7 @@ Reference< XFastContextHandler > ContextHandler2Helper::implCreateChildContext(
// #i76091# process collected characters (calls onCharacters() if needed)
processCollectedChars();
ContextHandlerRef xContext = onCreateContext( nElement, AttributeList( rxAttribs ) );
- return Reference< XFastContextHandler >( xContext.get() );
+ return xContext;
}
void ContextHandler2Helper::implStartElement( sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs )
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index 6d9d7b4e6004..d6f35facaf65 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -131,7 +131,7 @@ ContextHandlerRef ContextStack::getCurrentContext() const
{
if( !maStack.empty() )
return maStack.back().second;
- return mxHandler.get();
+ return mxHandler;
}
void ContextStack::pushContext( const RecordInfo& rRecInfo, const ContextHandlerRef& rxContext )
@@ -241,8 +241,7 @@ void RecordParser::parseStream( const RecordInputSource& rInputSource )
throw SAXException();
// start the document
- Reference< XLocator > xLocator( mxLocator.get() );
- mxHandler->setDocumentLocator( xLocator );
+ mxHandler->setDocumentLocator( mxLocator );
mxHandler->startDocument();
// parse the stream
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index fd425f3940ba..bb63873f5540 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -374,8 +374,7 @@ bool XmlFilterBase::importFragment( const rtl::Reference<FragmentHandler>& rxHan
}
// get the XFastDocumentHandler interface from the fragment handler
- Reference< XFastDocumentHandler > xDocHandler( rxHandler.get() );
- if( !xDocHandler.is() )
+ if( !rxHandler.is() )
return false;
// try to import XML stream
@@ -403,7 +402,7 @@ bool XmlFilterBase::importFragment( const rtl::Reference<FragmentHandler>& rxHan
// own try/catch block for showing parser failure assertion with fragment path
if( xInStrm.is() ) try
{
- rParser.setDocumentHandler(xDocHandler);
+ rParser.setDocumentHandler(rxHandler);
rParser.parseStream(xInStrm, aFragmentPath);
return true;
}
@@ -456,14 +455,13 @@ Reference<XDocument> XmlFilterBase::importFragment( const OUString& aFragmentPat
bool XmlFilterBase::importFragment( const ::rtl::Reference< FragmentHandler >& rxHandler,
const Reference< XFastSAXSerializable >& rxSerializer )
{
- Reference< XFastDocumentHandler > xDocHandler( rxHandler.get() );
- if( !xDocHandler.is() )
+ if( !rxHandler.is() )
return false;
// try to import XML stream
try
{
- rxSerializer->fastSerialize( xDocHandler,
+ rxSerializer->fastSerialize( rxHandler,
mxImpl->maFastParser.getTokenHandler(),
Sequence< StringPair >(),
NamespaceIds::get() );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 86c57f86acc1..a6316cee1278 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -5016,7 +5016,7 @@ void DrawingML::WriteFromTo(const uno::Reference<css::drawing::XShape>& rXShape,
awt::Point aTopLeft = rXShape->getPosition();
awt::Size aSize = rXShape->getSize();
- SdrObject* pObj = SdrObject::getSdrObjectFromXShape(rXShape.get());
+ SdrObject* pObj = SdrObject::getSdrObjectFromXShape(rXShape);
if (pObj)
{
Degree100 nRotation = pObj->GetRotateAngle();
diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx
index 2ffde9e5e038..9fe25661205d 100644
--- a/oox/source/ppt/backgroundproperties.cxx
+++ b/oox/source/ppt/backgroundproperties.cxx
@@ -42,7 +42,7 @@ BackgroundPropertiesContext::BackgroundPropertiesContext( FragmentHandler2 const
return this;
}
- return ::oox::drawingml::FillPropertiesContext::createFillContext( *this, aElementToken, rAttribs, mrFillProperties ).get();
+ return ::oox::drawingml::FillPropertiesContext::createFillContext( *this, aElementToken, rAttribs, mrFillProperties );
}
}
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 2a76c7b750ed..6ee7bdc0d43d 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -647,15 +647,15 @@ uno::Reference< XInputStream > ZipFile::createStreamForZipEntry(
m_xContext, aMutexHolder, rEntry, xStream, rData, nStreamMode, bIsEncrypted, aMediaType, bRecoveryMode);
if (!bUseBufferedStream)
- return xSrcStream.get();
+ return xSrcStream;
uno::Reference<io::XInputStream> xBufStream;
static const sal_Int32 nThreadingThreshold = 10000;
if( xSrcStream->available() > nThreadingThreshold )
- xBufStream = new XBufferedThreadedStream(xSrcStream.get(), xSrcStream->getSize());
+ xBufStream = new XBufferedThreadedStream(xSrcStream, xSrcStream->getSize());
else
- xBufStream = new XBufferedStream(xSrcStream.get());
+ xBufStream = new XBufferedStream(xSrcStream);
return xBufStream;
}
diff --git a/package/source/zipapi/blowfishcontext.cxx b/package/source/zipapi/blowfishcontext.cxx
index 37e614581e36..506c6267aa28 100644
--- a/package/source/zipapi/blowfishcontext.cxx
+++ b/package/source/zipapi/blowfishcontext.cxx
@@ -48,7 +48,7 @@ uno::Reference< xml::crypto::XCipherContext > BlowfishCFB8CipherContext::Create(
xResult->m_bEncrypt = bEncrypt;
- return uno::Reference< xml::crypto::XCipherContext >( xResult.get() );
+ return xResult;
}
BlowfishCFB8CipherContext::~BlowfishCFB8CipherContext()
diff --git a/package/source/zipapi/sha1context.cxx b/package/source/zipapi/sha1context.cxx
index af3123e2dbd0..c036041a2d76 100644
--- a/package/source/zipapi/sha1context.cxx
+++ b/package/source/zipapi/sha1context.cxx
@@ -36,7 +36,7 @@ uno::Reference<xml::crypto::XDigestContext> StarOfficeSHA1DigestContext::Create(
if ( !xResult->m_pDigest )
throw uno::RuntimeException("Can not create cipher!" );
- return uno::Reference< xml::crypto::XDigestContext >( xResult.get() );
+ return xResult;
}
StarOfficeSHA1DigestContext::~StarOfficeSHA1DigestContext()
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index c65e63c5cf43..c91947992047 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -813,7 +813,7 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName )
if (aName == "/")
// root directory.
- return makeAny ( uno::Reference < XUnoTunnel > ( m_xRootFolder.get() ) );
+ return makeAny ( uno::Reference < XUnoTunnel > ( m_xRootFolder ) );
nStreamIndex = aName.lastIndexOf ( '/' );
bool bFolder = nStreamIndex == nIndex-1; // last character is '/'.
More information about the Libreoffice-commits
mailing list