strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RTF_CELL: emit table cell sprms/attributes

Browse source
This commit is contained in:
Miklos Vajna 2011-06-17 11:23:57 +02:00
parent 0d1867d379
commit ec5e23267a
3 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View file

@ -549,6 +549,15 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
break;
case RTF_CELL:
{
RTFSprms_t& rAttributes = *m_aStates.top().aTableCellsAttributes.front();
RTFSprms_t& rSprms = *m_aStates.top().aTableCellsSprms.front();
writerfilter::Reference<Properties>::Pointer_t const pTableCellProperties(
new RTFReferenceProperties(rAttributes, rSprms)
);
Mapper().props(pTableCellProperties);
m_aStates.top().aTableCellsAttributes.pop_front();
m_aStates.top().aTableCellsSprms.pop_front();
sal_uInt8 sCellEnd[] = { 0x7 };
Mapper().text(sCellEnd, 1);
Mapper().endParagraphGroup();
@ -1159,6 +1168,16 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
/* Here we could send nCellx as NS_ooxml::LN_CT_TcPrBase_tcW, but that's not supported by dmapper.
int nCellx = nParam - m_aStates.top().nCellX;
m_aStates.top().nCellX += nParam;*/
RTFSprms::Pointer_t pTableCellAttributes(new RTFSprms_t());
m_aStates.top().aTableCellsAttributes.push_back(pTableCellAttributes);
RTFSprms::Pointer_t pTableCellSprms(new RTFSprms_t());
m_aStates.top().aTableCellsSprms.push_back(pTableCellSprms);
RTFSprms_t aAttributes;
RTFSprms_t aSprms;
RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms));
m_aStates.top().aTableCellsSprms.back()->push_back(make_pair(NS_ooxml::LN_CT_TcPrBase_tcBorders, pValue));
}
break;
default:
@ -1757,7 +1776,9 @@ RTFParserState::RTFParserState()
nPictureScaleX(0),
nPictureScaleY(0),
aShapeProperties(),
nCellX(0)
nCellX(0),
aTableCellsSprms(),
aTableCellsAttributes()
{
}

2
writerfilter/source/rtftok/rtfdocumentimpl.hxx
View file

@ -135,6 +135,8 @@ namespace writerfilter {
/// Current cellx value.
int nCellX;
std::deque<RTFSprms::Pointer_t> aTableCellsSprms;
std::deque<RTFSprms::Pointer_t> aTableCellsAttributes;
};
/// Implementation of the RTFDocument interface.

3
writerfilter/source/rtftok/rtfsprm.hxx
View file

@ -10,6 +10,9 @@ namespace writerfilter {
namespace rtftok {
/// A list of RTFSprm
typedef std::vector<std::pair<Id, RTFValue::Pointer_t>> RTFSprms_t;
namespace RTFSprms {
typedef ::boost::shared_ptr<RTFSprms_t> Pointer_t;
}
/// RTF keyword with a parameter
class RTFSprm
: public Sprm