Commit 9190b0c9 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander Trofimov

uppercase у гиперссылок через field

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@67634 954022d7-b5bf-4e40-9824-e11837661b57
parent 20c1099d
...@@ -2854,18 +2854,19 @@ namespace BinDocxRW ...@@ -2854,18 +2854,19 @@ namespace BinDocxRW
m_oBcw.WriteItemWithLengthEnd(nCurPos); m_oBcw.WriteItemWithLengthEnd(nCurPos);
}; };
FldStruct* ParseField(CString& sFld) FldStruct* ParseField(const CString& sFld)
{ {
sFld.Trim(); CString sFldCopy = sFld;
sFld.MakeUpper(); sFldCopy.Trim();
sFldCopy.MakeUpper();
FldStruct* pRes = NULL; FldStruct* pRes = NULL;
int nIndex = 0; int nIndex = 0;
if(-1 != (nIndex = sFld.Find(_T("TOC")))) if(-1 != (nIndex = sFldCopy.Find(_T("TOC"))))
pRes = new FldStruct(sFld, fieldstruct_toc); pRes = new FldStruct(sFldCopy, fieldstruct_toc);
else if(-1 != (nIndex = sFld.Find(_T("HYPERLINK")))) else if(-1 != (nIndex = sFldCopy.Find(_T("HYPERLINK"))))
pRes = new FldStruct(sFld, fieldstruct_hyperlink); pRes = new FldStruct(sFldCopy, fieldstruct_hyperlink);
else else
pRes = new FldStruct(sFld, fieldstruct_none); pRes = new FldStruct(sFldCopy, fieldstruct_none);
return pRes; return pRes;
} }
void WriteParagraphContent(const std::vector<OOX::WritingElement *>& Content, bool bHyperlink = false) void WriteParagraphContent(const std::vector<OOX::WritingElement *>& Content, bool bHyperlink = false)
......
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