This commit is contained in:
ElenaSubbotina
2017-01-24 18:44:46 +03:00
parent c6ed59a742
commit dd1b9ca9be
43 changed files with 155 additions and 209 deletions

View File

@ -776,7 +776,7 @@ public:
case g_tabtype_clear: sVal=_T("clear"); break;
default: sVal=_T("left"); break;
}
pCStringWriter->WriteString(L"<w:tab w:val=\"%ls\" w:pos=\"" + std::to_wstring(nTab) + L"\"/>");
pCStringWriter->WriteString(L"<w:tab w:val=\"" + sVal + L"\" w:pos=\"" + std::to_wstring(nTab) + L"\"/>");
}
pCStringWriter->WriteString(std::wstring(_T("</w:tabs>")));
}
@ -785,11 +785,7 @@ public:
{
std::wstring sStyleName(m_oBufferedStream.GetString3(length));
sStyleName = XmlUtils::EncodeXmlString(sStyleName);
std::wstring sStyle;
sStyle += L"<w:pStyle w:val=\"";
sStyle += sStyleName;
sStyle += L"\" />";
pCStringWriter->WriteString(sStyle);
pCStringWriter->WriteString(L"<w:pStyle w:val=\"" + sStyleName + L"\" />");
}break;
case c_oSerProp_pPrType::numPr:
{

View File

@ -126,10 +126,7 @@ namespace Writers
BYTE cElem = pFontInfo->m_aPanose[i];
if(0 != cElem)
bUsePanose = true;
if(cElem > 0xF)
sPanose += XmlUtils::IntToString(cElem, L"%X");
else
sPanose+= XmlUtils::IntToString(cElem, L"0%X");
sPanose += XmlUtils::IntToString(cElem, L"%02X");
}
}