Commit 0941203a authored by konovalovsergey's avatar konovalovsergey Committed by Alexander Trofimov

Bug #32152 - Теряется символ неразрывного дефиса после сборки файла.

parent 72c43c3e
......@@ -5717,9 +5717,9 @@ public:
{
GetRunStringWriter().WriteString(CString(_T("<w:cr/>")));
}
else if (c_oSerRunType::nonBreakHyphen == type)
else if (c_oSerRunType::noBreakHyphen == type)
{
GetRunStringWriter().WriteString(CString(_T("<w:nonBreakHyphen/>")));
GetRunStringWriter().WriteString(CString(_T("<w:noBreakHyphen/>")));
}
else if (c_oSerRunType::softHyphen == type)
{
......
......@@ -454,7 +454,7 @@ extern int g_nCurFormatVersion;
ins = 17,
columnbreak = 18,
cr = 19,
nonBreakHyphen = 20,
noBreakHyphen = 20,
softHyphen = 21
};}
namespace c_oSerImageType{enum c_oSerImageType
......
......@@ -4911,9 +4911,9 @@ namespace BinDocxRW
}
}
break;
case OOX::et_w_nonBreakHyphen:
case OOX::et_w_noBreakHyphen:
{
m_oBcw.m_oStream.WriteBYTE(c_oSerRunType::nonBreakHyphen);
m_oBcw.m_oStream.WriteBYTE(c_oSerRunType::noBreakHyphen);
m_oBcw.m_oStream.WriteLONG(c_oSerPropLenType::Null);
break;
}
......
......@@ -474,7 +474,7 @@ namespace OOX
}
virtual CString toXML() const
{
return _T("<w:nonBreakHyphen />");
return _T("<w:noBreakHyphen />");
}
virtual EElementType getType() const
......
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