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

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

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