Commit 73ec35fe authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander Trofimov

add cellPr param textDirection

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@68233 954022d7-b5bf-4e40-9824-e11837661b57
parent b8c7c304
......@@ -1965,6 +1965,14 @@ public:
res = Read1(length, &Binary_tblPrReader::ReadTcPrChange, this, &tcPrChange);
tcPrChange.Write(pCStringWriter, _T("w:tcPrChange"));
}
else if( c_oSerProp_cellPrType::textDirection == type )
{
SimpleTypes::CTextDirection<> oTextDirection;
oTextDirection.SetValue((SimpleTypes::ETextDirection)m_oBufferedStream.GetUChar());
pCStringWriter->WriteString(CString(_T("<w:textDirection w:val=\"")));
pCStringWriter->WriteString(oTextDirection.ToString());
pCStringWriter->WriteString(CString(_T("\" />")));
}
else
res = c_oSerConstants::ReadUnknown;
return res;
......
......@@ -374,7 +374,8 @@ extern int g_nCurFormatVersion;
CellDel = 7,
CellIns = 8,
CellMerge = 9,
tcPrChange = 10
tcPrChange = 10,
textDirection = 11
};}
namespace c_oSerProp_secPrType{enum c_oSerProp_secPrType
{
......
......@@ -2010,6 +2010,12 @@ namespace BinDocxRW
WriteTcPrChange(cellPr.m_oTcPrChange.get());
m_oBcw.WriteItemWithLengthEnd(nCurPos);
}
if(cellPr.m_oTextDirection.IsInit() && cellPr.m_oTextDirection->m_oVal.IsInit())
{
m_oBcw.m_oStream.WriteBYTE(c_oSerProp_cellPrType::textDirection);
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
m_oBcw.m_oStream.WriteBYTE(cellPr.m_oTextDirection->m_oVal->GetValue());
}
};
void WriteCellMerge(const ComplexTypes::Word::CCellMergeTrackChange& cellMerge)
{
......
......@@ -5715,12 +5715,12 @@ namespace SimpleTypes
enum ETextDirection
{
textdirectionLr = 0,
textdirectionLrV = 1,
textdirectionRl = 2,
textdirectionRlV = 3,
textdirectionTb = 4,
textdirectionTbV = 5
textdirectionTb = 0,
textdirectionRl = 1,
textdirectionLr = 2,
textdirectionTbV = 3,
textdirectionRlV = 4,
textdirectionLrV = 5
};
template<ETextDirection eDefValue = textdirectionLr>
......
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