Commit b45e772a authored by Sergey Konovalov's avatar Sergey Konovalov

remove stub for hyperlink without link

parent fdb7716a
...@@ -3744,7 +3744,6 @@ namespace BinDocxRW ...@@ -3744,7 +3744,6 @@ namespace BinDocxRW
void WriteHyperlink(OOX::Logic::CHyperlink* pHyperlink) void WriteHyperlink(OOX::Logic::CHyperlink* pHyperlink)
{ {
int nCurPos = 0; int nCurPos = 0;
std::wstring sField;
std::wstring sLink; std::wstring sLink;
if(pHyperlink->m_oId.IsInit()) if(pHyperlink->m_oId.IsInit())
{ {
...@@ -3757,24 +3756,20 @@ namespace BinDocxRW ...@@ -3757,24 +3756,20 @@ namespace BinDocxRW
} }
} }
if(!sLink.empty()) nCurPos = m_oBcw.WriteItemStart(c_oSerParType::Hyperlink);
{ WriteHyperlinkContent(sLink, pHyperlink);
nCurPos = m_oBcw.WriteItemStart(c_oSerParType::Hyperlink); m_oBcw.WriteItemWithLengthEnd(nCurPos);
WriteHyperlinkContent(sLink, pHyperlink);
m_oBcw.WriteItemWithLengthEnd(nCurPos);
}
else
{
WriteParagraphContent(pHyperlink->m_arrItems, true);
}
} }
void WriteHyperlinkContent(std::wstring& sLink, OOX::Logic::CHyperlink* pHyperlink) void WriteHyperlinkContent(std::wstring& sLink, OOX::Logic::CHyperlink* pHyperlink)
{ {
int nCurPos = 0; int nCurPos = 0;
//Link //Link
nCurPos = m_oBcw.WriteItemStart(c_oSer_HyperlinkType::Link); if(!sLink.empty())
m_oBcw.m_oStream.WriteStringW3(sLink); {
m_oBcw.WriteItemWithLengthEnd(nCurPos); nCurPos = m_oBcw.WriteItemStart(c_oSer_HyperlinkType::Link);
m_oBcw.m_oStream.WriteStringW3(sLink);
m_oBcw.WriteItemWithLengthEnd(nCurPos);
}
//Anchor //Anchor
if(pHyperlink->m_sAnchor.IsInit()) if(pHyperlink->m_sAnchor.IsInit())
{ {
......
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