mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RTF import: support shapes inside tables

Browse Source 
This is a better fix for fdo#47802, now that shape import is no longer
buffered.

Change-Id: Idce6d11e6774d1fe7fc04b6a52d5b77a3879381e
This commit is contained in:
Miklos Vajna
2013-06-28 16:47:49 +02:00
parent 7a8f720cc0
commit 818d80eb0c
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View File

@@ -1197,6 +1197,10 @@ void RTFDocumentImpl::replayBuffer(RTFBuffer_t& rBuffer)
Mapper().endCharacterGroup();
else if (aPair.first == BUFFER_PAR)
parBreak();
else if (aPair.first == BUFFER_STARTSHAPE)
m_pSdrImport->resolve(aPair.second->getShape(), false);
else if (aPair.first == BUFFER_ENDSHAPE)
m_pSdrImport->close();
else
SAL_WARN("writerfilter", "should not happen");
}
@@ -1313,11 +1317,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
m_aStates.top().nDestinationState = DESTINATION_SHAPE;
break;
case RTF_SHPINST:
// Don't try to support shapes inside tables for now.
if (m_aStates.top().pCurrentBuffer != &m_aTableBuffer)
m_aStates.top().nDestinationState = DESTINATION_SHAPEINSTRUCTION;
else
m_aStates.top().nDestinationState = DESTINATION_SKIP;
m_aStates.top().nDestinationState = DESTINATION_SHAPEINSTRUCTION;
break;
case RTF_NESTTABLEPROPS:
// Don't try to support nested tables having table styles for now.
@@ -1445,7 +1445,15 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
dispatchFlag(RTF_PARD);
m_bNeedPap = true;
if (nKeyword == RTF_SHPTXT)
m_pSdrImport->resolve(m_aStates.top().aShape, false);
{
if (!m_aStates.top().pCurrentBuffer)
m_pSdrImport->resolve(m_aStates.top().aShape, false);
else
{
RTFValue::Pointer_t pValue(new RTFValue(m_aStates.top().aShape));
m_aStates.top().pCurrentBuffer->push_back(make_pair(BUFFER_STARTSHAPE, pValue));
}
}
break;
case RTF_FORMFIELD:
if (m_aStates.top().nDestinationState == DESTINATION_FIELDINSTRUCTION)
@@ -4602,7 +4610,10 @@ int RTFDocumentImpl::popState()
if (m_aStates.top().nDestinationState != DESTINATION_SHAPETEXT && !m_aStates.top().aDrawingObject.bHadShapeText)
{
m_aStates.top().bHadShapeText = true;
m_pSdrImport->close();
if (!m_aStates.top().pCurrentBuffer)
m_pSdrImport->close();
else
m_aStates.top().pCurrentBuffer->push_back(make_pair(BUFFER_ENDSHAPE, RTFValue::Pointer_t()));
}
break;
default:

4
writerfilter/source/rtftok/rtfdocumentimpl.hxx
View File

@@ -195,7 +195,9 @@ namespace writerfilter {
BUFFER_TEXT,
BUFFER_UTEXT,
BUFFER_ENDRUN,
BUFFER_PAR
BUFFER_PAR,
BUFFER_STARTSHAPE,
BUFFER_ENDSHAPE
};
/// Form field types