Skip to content

C
core
Kaydet (Commit) 02db0f95 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

sw: whitespace fixes in docxtablestyleexport 

Change-Id: I8a1b1dc0e7e6a5ab149c43028a539b636bd87afc
üst f4db3ac5
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 32 deletions
sw/source/filter/ww8/docxtablestyleexport.cxx
Dosyayı görüntüle @ 02db0f95
...@@ -116,9 +116,9 @@ void DocxTableStyleExport::Impl::tableStyleTblCellMar(uno::Sequence<beans::Prope ...@@ -116,9 +116,9 @@ void DocxTableStyleExport::Impl::tableStyleTblCellMar(uno::Sequence<beans::Prope
{ {
comphelper::SequenceAsHashMap aMap(rTblCellMar[i].Value.get< uno::Sequence<beans::PropertyValue> >()); comphelper::SequenceAsHashMap aMap(rTblCellMar[i].Value.get< uno::Sequence<beans::PropertyValue> >());
m_pSerializer->singleElementNS(XML_w, nToken, m_pSerializer->singleElementNS(XML_w, nToken,
FSNS(XML_w, XML_w), OString::number(aMap["w"].get<sal_Int32>()), FSNS(XML_w, XML_w), OString::number(aMap["w"].get<sal_Int32>()),
FSNS(XML_w, XML_type), OUStringToOString(aMap["type"].get<OUString>(), RTL_TEXTENCODING_UTF8).getStr(), FSNS(XML_w, XML_type), OUStringToOString(aMap["type"].get<OUString>(), RTL_TEXTENCODING_UTF8).getStr(),
FSEND); FSEND);
} }
} }
m_pSerializer->endElementNS(XML_w, nType); m_pSerializer->endElementNS(XML_w, nType);
...@@ -376,7 +376,8 @@ void DocxTableStyleExport::Impl::tableStyleRPr(uno::Sequence<beans::PropertyValu ...@@ -376,7 +376,8 @@ void DocxTableStyleExport::Impl::tableStyleRPr(uno::Sequence<beans::PropertyValu
{ {
aSpacing = rRPr[i].Value.get<OUString>(); aSpacing = rRPr[i].Value.get<OUString>();
} }
else { else
{
aSpacingSequence = rRPr[i].Value.get< uno::Sequence<beans::PropertyValue> >() ; aSpacingSequence = rRPr[i].Value.get< uno::Sequence<beans::PropertyValue> >() ;
bSequenceFlag = true ; // set the uno::Sequence flag. bSequenceFlag = true ; // set the uno::Sequence flag.
} }
...@@ -390,24 +391,24 @@ void DocxTableStyleExport::Impl::tableStyleRPr(uno::Sequence<beans::PropertyValu ...@@ -390,24 +391,24 @@ void DocxTableStyleExport::Impl::tableStyleRPr(uno::Sequence<beans::PropertyValu
handleBoolean(aCaps, XML_caps); handleBoolean(aCaps, XML_caps);
handleBoolean(aSmallCaps, XML_smallCaps); handleBoolean(aSmallCaps, XML_smallCaps);
tableStyleRColor(aColor); tableStyleRColor(aColor);
if(bSequenceFlag) if (bSequenceFlag)
{ {
m_pSerializer->singleElementNS(XML_w, XML_spacing, m_pSerializer->singleElementNS(XML_w, XML_spacing,
FSNS(XML_w, XML_val),OUStringToOString(aSpacingSequence[0].Value.get<OUString>(), RTL_TEXTENCODING_UTF8).getStr(), FSNS(XML_w, XML_val),OUStringToOString(aSpacingSequence[0].Value.get<OUString>(), RTL_TEXTENCODING_UTF8).getStr(),
FSEND); FSEND);
} }
if (!aSpacing.isEmpty()) if (!aSpacing.isEmpty())
m_pSerializer->singleElementNS(XML_w, XML_spacing, m_pSerializer->singleElementNS(XML_w, XML_spacing,
FSNS(XML_w, XML_val), OUStringToOString(aSpacing, RTL_TEXTENCODING_UTF8).getStr(), FSNS(XML_w, XML_val), OUStringToOString(aSpacing, RTL_TEXTENCODING_UTF8).getStr(),
FSEND); FSEND);
if (!aSz.isEmpty()) if (!aSz.isEmpty())
m_pSerializer->singleElementNS(XML_w, XML_sz, m_pSerializer->singleElementNS(XML_w, XML_sz,
FSNS(XML_w, XML_val), OUStringToOString(aSz, RTL_TEXTENCODING_UTF8).getStr(), FSNS(XML_w, XML_val), OUStringToOString(aSz, RTL_TEXTENCODING_UTF8).getStr(),
FSEND); FSEND);
if (!aSzCs.isEmpty()) if (!aSzCs.isEmpty())
m_pSerializer->singleElementNS(XML_w, XML_szCs, m_pSerializer->singleElementNS(XML_w, XML_szCs,
FSNS(XML_w, XML_val), OUStringToOString(aSzCs, RTL_TEXTENCODING_UTF8).getStr(), FSNS(XML_w, XML_val), OUStringToOString(aSzCs, RTL_TEXTENCODING_UTF8).getStr(),
FSEND); FSEND);
m_pSerializer->endElementNS(XML_w, XML_rPr); m_pSerializer->endElementNS(XML_w, XML_rPr);
} }
...@@ -442,8 +443,8 @@ void DocxTableStyleExport::Impl::tableStylePPr(uno::Sequence<beans::PropertyValu ...@@ -442,8 +443,8 @@ void DocxTableStyleExport::Impl::tableStylePPr(uno::Sequence<beans::PropertyValu
tableStylePSpacing(aSpacing); tableStylePSpacing(aSpacing);
if (!aJc.isEmpty()) if (!aJc.isEmpty())
m_pSerializer->singleElementNS(XML_w, XML_jc, m_pSerializer->singleElementNS(XML_w, XML_jc,
FSNS(XML_w, XML_val), OUStringToOString(aJc, RTL_TEXTENCODING_UTF8).getStr(), FSNS(XML_w, XML_val), OUStringToOString(aJc, RTL_TEXTENCODING_UTF8).getStr(),
FSEND); FSEND);
m_pSerializer->endElementNS(XML_w, XML_pPr); m_pSerializer->endElementNS(XML_w, XML_pPr);
} }
...@@ -472,12 +473,12 @@ void DocxTableStyleExport::Impl::tableStyleTblPr(uno::Sequence<beans::PropertyVa ...@@ -472,12 +473,12 @@ void DocxTableStyleExport::Impl::tableStyleTblPr(uno::Sequence<beans::PropertyVa
} }
if (oTblStyleRowBandSize) if (oTblStyleRowBandSize)
m_pSerializer->singleElementNS(XML_w, XML_tblStyleRowBandSize, m_pSerializer->singleElementNS(XML_w, XML_tblStyleRowBandSize,
FSNS(XML_w, XML_val), OString::number(oTblStyleRowBandSize.get()), FSNS(XML_w, XML_val), OString::number(oTblStyleRowBandSize.get()),
FSEND); FSEND);
if (oTblStyleColBandSize) if (oTblStyleColBandSize)
m_pSerializer->singleElementNS(XML_w, XML_tblStyleColBandSize, m_pSerializer->singleElementNS(XML_w, XML_tblStyleColBandSize,
FSNS(XML_w, XML_val), OString::number(oTblStyleColBandSize.get()), FSNS(XML_w, XML_val), OString::number(oTblStyleColBandSize.get()),
FSEND); FSEND);
tableStyleTblInd(aTblInd); tableStyleTblInd(aTblInd);
tableStyleTcBorders(aTblBorders, XML_tblBorders); tableStyleTcBorders(aTblBorders, XML_tblBorders);
tableStyleTblCellMar(aTblCellMar); tableStyleTblCellMar(aTblCellMar);
...@@ -510,8 +511,8 @@ void DocxTableStyleExport::Impl::tableStyleTcPr(uno::Sequence<beans::PropertyVal ...@@ -510,8 +511,8 @@ void DocxTableStyleExport::Impl::tableStyleTcPr(uno::Sequence<beans::PropertyVal
tableStyleShd(aShd); tableStyleShd(aShd);
if (!aVAlign.isEmpty()) if (!aVAlign.isEmpty())
m_pSerializer->singleElementNS(XML_w, XML_vAlign, m_pSerializer->singleElementNS(XML_w, XML_vAlign,
FSNS(XML_w, XML_val), OUStringToOString(aVAlign, RTL_TEXTENCODING_UTF8).getStr(), FSNS(XML_w, XML_val), OUStringToOString(aVAlign, RTL_TEXTENCODING_UTF8).getStr(),
FSEND); FSEND);
m_pSerializer->endElementNS(XML_w, XML_tcPr); m_pSerializer->endElementNS(XML_w, XML_tcPr);
} }
...@@ -538,8 +539,8 @@ void DocxTableStyleExport::Impl::tableStyleTblStylePr(uno::Sequence<beans::Prope ...@@ -538,8 +539,8 @@ void DocxTableStyleExport::Impl::tableStyleTblStylePr(uno::Sequence<beans::Prope
} }
m_pSerializer->startElementNS(XML_w, XML_tblStylePr, m_pSerializer->startElementNS(XML_w, XML_tblStylePr,
FSNS(XML_w, XML_type), OUStringToOString(aType, RTL_TEXTENCODING_UTF8).getStr(), FSNS(XML_w, XML_type), OUStringToOString(aType, RTL_TEXTENCODING_UTF8).getStr(),
FSEND); FSEND);
tableStylePPr(aPPr); tableStylePPr(aPPr);
tableStyleRPr(aRPr); tableStyleRPr(aRPr);
...@@ -607,16 +608,16 @@ void DocxTableStyleExport::Impl::TableStyle(uno::Sequence<beans::PropertyValue>& ...@@ -607,16 +608,16 @@ void DocxTableStyleExport::Impl::TableStyle(uno::Sequence<beans::PropertyValue>&
m_pSerializer->startElementNS(XML_w, XML_style, xAttributeList); m_pSerializer->startElementNS(XML_w, XML_style, xAttributeList);
m_pSerializer->singleElementNS(XML_w, XML_name, m_pSerializer->singleElementNS(XML_w, XML_name,
FSNS(XML_w, XML_val), OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr(), FSNS(XML_w, XML_val), OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr(),
FSEND); FSEND);
if (!aBasedOn.isEmpty()) if (!aBasedOn.isEmpty())
m_pSerializer->singleElementNS(XML_w, XML_basedOn, m_pSerializer->singleElementNS(XML_w, XML_basedOn,
FSNS(XML_w, XML_val), OUStringToOString(aBasedOn, RTL_TEXTENCODING_UTF8).getStr(), FSNS(XML_w, XML_val), OUStringToOString(aBasedOn, RTL_TEXTENCODING_UTF8).getStr(),
FSEND); FSEND);
if (!aUiPriority.isEmpty()) if (!aUiPriority.isEmpty())
m_pSerializer->singleElementNS(XML_w, XML_uiPriority, m_pSerializer->singleElementNS(XML_w, XML_uiPriority,
FSNS(XML_w, XML_val), OUStringToOString(aUiPriority, RTL_TEXTENCODING_UTF8).getStr(), FSNS(XML_w, XML_val), OUStringToOString(aUiPriority, RTL_TEXTENCODING_UTF8).getStr(),
FSEND); FSEND);
if (bQFormat) if (bQFormat)
m_pSerializer->singleElementNS(XML_w, XML_qFormat, FSEND); m_pSerializer->singleElementNS(XML_w, XML_qFormat, FSEND);
if (bSemiHidden) if (bSemiHidden)
...@@ -625,8 +626,8 @@ void DocxTableStyleExport::Impl::TableStyle(uno::Sequence<beans::PropertyValue>& ...@@ -625,8 +626,8 @@ void DocxTableStyleExport::Impl::TableStyle(uno::Sequence<beans::PropertyValue>&
m_pSerializer->singleElementNS(XML_w, XML_unhideWhenUsed, FSEND); m_pSerializer->singleElementNS(XML_w, XML_unhideWhenUsed, FSEND);
if (!aRsid.isEmpty()) if (!aRsid.isEmpty())
m_pSerializer->singleElementNS(XML_w, XML_rsid, m_pSerializer->singleElementNS(XML_w, XML_rsid,
FSNS(XML_w, XML_val), OUStringToOString(aRsid, RTL_TEXTENCODING_UTF8).getStr(), FSNS(XML_w, XML_val), OUStringToOString(aRsid, RTL_TEXTENCODING_UTF8).getStr(),
FSEND); FSEND);
tableStylePPr(aPPr); tableStylePPr(aPPr);
tableStyleRPr(aRPr); tableStyleRPr(aRPr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment