Skip to content

C
core
Kaydet (Commit) 544fa45e authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

indentation fixes 

Change-Id: Iacdaf8bcae8df6ba380a9fb6d78db22f51a4d6f9
üst 9199f35f
Hide whitespace changes
Inline Side-by-side
Showing with 479 additions and 481 deletions
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Dosyayı görüntüle @ 544fa45e
...@@ -1151,9 +1151,7 @@ void RTFDocumentImpl::text(OUString& rString) ...@@ -1151,9 +1151,7 @@ void RTFDocumentImpl::text(OUString& rString)
m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_Style_styleId, pValue); m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_Style_styleId, pValue);
m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Style_name, pValue); m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Style_name, pValue);
writerfilter::Reference<Properties>::Pointer_t const pProp( writerfilter::Reference<Properties>::Pointer_t const pProp(createStyleProperties());
createStyleProperties()
);
m_aStyleTableEntries.insert(make_pair(m_nCurrentStyleIndex, pProp)); m_aStyleTableEntries.insert(make_pair(m_nCurrentStyleIndex, pProp));
} }
else else
...@@ -1441,530 +1439,530 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) ...@@ -1441,530 +1439,530 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
checkUnicode(/*bUnicode =*/ true, /*bHex =*/ true); checkUnicode(/*bUnicode =*/ true, /*bHex =*/ true);
RTFSkipDestination aSkip(*this); RTFSkipDestination aSkip(*this);
// special case \upr: ignore everything except nested \ud // special case \upr: ignore everything except nested \ud
if (DESTINATION_UPR == m_aStates.top().nDestinationState if (DESTINATION_UPR == m_aStates.top().nDestinationState && RTF_UD != nKeyword)
&& RTF_UD != nKeyword)
{ {
m_aStates.top().nDestinationState = DESTINATION_SKIP; m_aStates.top().nDestinationState = DESTINATION_SKIP;
aSkip.setParsed(false); aSkip.setParsed(false);
} }
else switch (nKeyword) else
{ switch (nKeyword)
case RTF_RTF:
break;
case RTF_FONTTBL:
m_aStates.top().nDestinationState = DESTINATION_FONTTABLE;
break;
case RTF_COLORTBL:
m_aStates.top().nDestinationState = DESTINATION_COLORTABLE;
break;
case RTF_STYLESHEET:
m_aStates.top().nDestinationState = DESTINATION_STYLESHEET;
break;
case RTF_FIELD:
m_aStates.top().nDestinationState = DESTINATION_FIELD;
break;
case RTF_FLDINST:
{
// Look for the field type
sal_Size nPos = Strm().Tell();
OStringBuffer aBuf;
char ch = 0;
bool bFoundCode = false;
bool bInKeyword = false;
while (!bFoundCode && ch != '}')
{ {
Strm().ReadChar(ch); case RTF_RTF:
if ('\\' == ch) break;
bInKeyword = true; case RTF_FONTTBL:
if (!bInKeyword && isalnum(ch)) m_aStates.top().nDestinationState = DESTINATION_FONTTABLE;
aBuf.append(ch); break;
else if (bInKeyword && isspace(ch)) case RTF_COLORTBL:
bInKeyword = false; m_aStates.top().nDestinationState = DESTINATION_COLORTABLE;
if (!aBuf.isEmpty() && !isalnum(ch)) break;
bFoundCode = true; case RTF_STYLESHEET:
} m_aStates.top().nDestinationState = DESTINATION_STYLESHEET;
Strm().Seek(nPos); break;
case RTF_FIELD:
// Form data should be handled only for form fields if any m_aStates.top().nDestinationState = DESTINATION_FIELD;
if (aBuf.toString().indexOf(OString("FORM")) != -1) break;
m_bFormField = true; case RTF_FLDINST:
singleChar(0x13);
m_aStates.top().nDestinationState = DESTINATION_FIELDINSTRUCTION;
}
break;
case RTF_FLDRSLT:
m_aStates.top().nDestinationState = DESTINATION_FIELDRESULT;
break;
case RTF_LISTTABLE:
m_aStates.top().nDestinationState = DESTINATION_LISTTABLE;
break;
case RTF_LISTPICTURE:
m_aStates.top().nDestinationState = DESTINATION_LISTPICTURE;
m_aStates.top().bInListpicture = true;
break;
case RTF_LIST:
m_aStates.top().nDestinationState = DESTINATION_LISTENTRY;
break;
case RTF_LISTNAME:
m_aStates.top().nDestinationState = DESTINATION_LISTNAME;
break;
case RTF_LFOLEVEL:
m_aStates.top().nDestinationState = DESTINATION_LFOLEVEL;
m_aStates.top().aTableSprms.clear();
break;
case RTF_LISTOVERRIDETABLE:
m_aStates.top().nDestinationState = DESTINATION_LISTOVERRIDETABLE;
break;
case RTF_LISTOVERRIDE:
m_aStates.top().nDestinationState = DESTINATION_LISTOVERRIDEENTRY;
break;
case RTF_LISTLEVEL:
m_aStates.top().nDestinationState = DESTINATION_LISTLEVEL;
break;
case RTF_LEVELTEXT:
m_aStates.top().nDestinationState = DESTINATION_LEVELTEXT;
break;
case RTF_LEVELNUMBERS:
m_aStates.top().nDestinationState = DESTINATION_LEVELNUMBERS;
break;
case RTF_SHPPICT:
m_aStates.top().resetFrame();
m_aStates.top().nDestinationState = DESTINATION_SHPPICT;
break;
case RTF_PICT:
if (m_aStates.top().nDestinationState != DESTINATION_SHAPEPROPERTYVALUE)
m_aStates.top().nDestinationState = DESTINATION_PICT; // as character
else
m_aStates.top().nDestinationState = DESTINATION_SHAPEPROPERTYVALUEPICT; // anchored inside a shape
break;
case RTF_PICPROP:
m_aStates.top().nDestinationState = DESTINATION_PICPROP;
break;
case RTF_SP:
m_aStates.top().nDestinationState = DESTINATION_SHAPEPROPERTY;
break;
case RTF_SN:
m_aStates.top().nDestinationState = DESTINATION_SHAPEPROPERTYNAME;
break;
case RTF_SV:
m_aStates.top().nDestinationState = DESTINATION_SHAPEPROPERTYVALUE;
break;
case RTF_SHP:
m_bNeedCrOrig = m_bNeedCr;
m_aStates.top().nDestinationState = DESTINATION_SHAPE;
m_aStates.top().bInShape = true;
break;
case RTF_SHPINST:
m_aStates.top().nDestinationState = DESTINATION_SHAPEINSTRUCTION;
break;
case RTF_NESTTABLEPROPS:
// do not set any properties of outer table at nested table!
m_aStates.top().aTableCellSprms = m_aDefaultState.aTableCellSprms;
m_aStates.top().aTableCellAttributes =
m_aDefaultState.aTableCellAttributes;
m_aNestedTableCellsSprms.clear();
m_aNestedTableCellsAttributes.clear();
m_nNestedCells = 0;
m_aStates.top().nDestinationState = DESTINATION_NESTEDTABLEPROPERTIES;
break;
case RTF_HEADER:
case RTF_FOOTER:
case RTF_HEADERL:
case RTF_HEADERR:
case RTF_HEADERF:
case RTF_FOOTERL:
case RTF_FOOTERR:
case RTF_FOOTERF:
if (!m_pSuperstream)
{ {
Id nId = 0; // Look for the field type
sal_Size nPos = m_nGroupStartPos - 1; sal_Size nPos = Strm().Tell();
switch (nKeyword) OStringBuffer aBuf;
char ch = 0;
bool bFoundCode = false;
bool bInKeyword = false;
while (!bFoundCode && ch != '}')
{ {
case RTF_HEADER: Strm().ReadChar(ch);
nId = NS_ooxml::LN_headerr; if ('\\' == ch)
break; bInKeyword = true;
case RTF_FOOTER: if (!bInKeyword && isalnum(ch))
nId = NS_ooxml::LN_footerr; aBuf.append(ch);
break; else if (bInKeyword && isspace(ch))
case RTF_HEADERL: bInKeyword = false;
nId = NS_ooxml::LN_headerl; if (!aBuf.isEmpty() && !isalnum(ch))
break; bFoundCode = true;
case RTF_HEADERR:
nId = NS_ooxml::LN_headerr;
break;
case RTF_HEADERF:
nId = NS_ooxml::LN_headerf;
break;
case RTF_FOOTERL:
nId = NS_ooxml::LN_footerl;
break;
case RTF_FOOTERR:
nId = NS_ooxml::LN_footerr;
break;
case RTF_FOOTERF:
nId = NS_ooxml::LN_footerf;
break;
default:
break;
} }
m_nHeaderFooterPositions.push(make_pair(nId, nPos)); Strm().Seek(nPos);
m_aStates.top().nDestinationState = DESTINATION_SKIP;
// Form data should be handled only for form fields if any
if (aBuf.toString().indexOf(OString("FORM")) != -1)
m_bFormField = true;
singleChar(0x13);
m_aStates.top().nDestinationState = DESTINATION_FIELDINSTRUCTION;
} }
break; break;
case RTF_FOOTNOTE: case RTF_FLDRSLT:
if (!m_pSuperstream) m_aStates.top().nDestinationState = DESTINATION_FIELDRESULT;
{ break;
Id nId = NS_ooxml::LN_footnote; case RTF_LISTTABLE:
m_aStates.top().nDestinationState = DESTINATION_LISTTABLE;
// Check if this is an endnote. break;
OStringBuffer aBuf; case RTF_LISTPICTURE:
char ch; m_aStates.top().nDestinationState = DESTINATION_LISTPICTURE;
for (int i = 0; i < 7; ++i) m_aStates.top().bInListpicture = true;
break;
case RTF_LIST:
m_aStates.top().nDestinationState = DESTINATION_LISTENTRY;
break;
case RTF_LISTNAME:
m_aStates.top().nDestinationState = DESTINATION_LISTNAME;
break;
case RTF_LFOLEVEL:
m_aStates.top().nDestinationState = DESTINATION_LFOLEVEL;
m_aStates.top().aTableSprms.clear();
break;
case RTF_LISTOVERRIDETABLE:
m_aStates.top().nDestinationState = DESTINATION_LISTOVERRIDETABLE;
break;
case RTF_LISTOVERRIDE:
m_aStates.top().nDestinationState = DESTINATION_LISTOVERRIDEENTRY;
break;
case RTF_LISTLEVEL:
m_aStates.top().nDestinationState = DESTINATION_LISTLEVEL;
break;
case RTF_LEVELTEXT:
m_aStates.top().nDestinationState = DESTINATION_LEVELTEXT;
break;
case RTF_LEVELNUMBERS:
m_aStates.top().nDestinationState = DESTINATION_LEVELNUMBERS;
break;
case RTF_SHPPICT:
m_aStates.top().resetFrame();
m_aStates.top().nDestinationState = DESTINATION_SHPPICT;
break;
case RTF_PICT:
if (m_aStates.top().nDestinationState != DESTINATION_SHAPEPROPERTYVALUE)
m_aStates.top().nDestinationState = DESTINATION_PICT; // as character
else
m_aStates.top().nDestinationState = DESTINATION_SHAPEPROPERTYVALUEPICT; // anchored inside a shape
break;
case RTF_PICPROP:
m_aStates.top().nDestinationState = DESTINATION_PICPROP;
break;
case RTF_SP:
m_aStates.top().nDestinationState = DESTINATION_SHAPEPROPERTY;
break;
case RTF_SN:
m_aStates.top().nDestinationState = DESTINATION_SHAPEPROPERTYNAME;
break;
case RTF_SV:
m_aStates.top().nDestinationState = DESTINATION_SHAPEPROPERTYVALUE;
break;
case RTF_SHP:
m_bNeedCrOrig = m_bNeedCr;
m_aStates.top().nDestinationState = DESTINATION_SHAPE;
m_aStates.top().bInShape = true;
break;
case RTF_SHPINST:
m_aStates.top().nDestinationState = DESTINATION_SHAPEINSTRUCTION;
break;
case RTF_NESTTABLEPROPS:
// do not set any properties of outer table at nested table!
m_aStates.top().aTableCellSprms = m_aDefaultState.aTableCellSprms;
m_aStates.top().aTableCellAttributes =
m_aDefaultState.aTableCellAttributes;
m_aNestedTableCellsSprms.clear();
m_aNestedTableCellsAttributes.clear();
m_nNestedCells = 0;
m_aStates.top().nDestinationState = DESTINATION_NESTEDTABLEPROPERTIES;
break;
case RTF_HEADER:
case RTF_FOOTER:
case RTF_HEADERL:
case RTF_HEADERR:
case RTF_HEADERF:
case RTF_FOOTERL:
case RTF_FOOTERR:
case RTF_FOOTERF:
if (!m_pSuperstream)
{ {
Strm().ReadChar(ch); Id nId = 0;
aBuf.append(ch); sal_Size nPos = m_nGroupStartPos - 1;
switch (nKeyword)
{
case RTF_HEADER:
nId = NS_ooxml::LN_headerr;
break;
case RTF_FOOTER:
nId = NS_ooxml::LN_footerr;
break;
case RTF_HEADERL:
nId = NS_ooxml::LN_headerl;
break;
case RTF_HEADERR:
nId = NS_ooxml::LN_headerr;
break;
case RTF_HEADERF:
nId = NS_ooxml::LN_headerf;
break;
case RTF_FOOTERL:
nId = NS_ooxml::LN_footerl;
break;
case RTF_FOOTERR:
nId = NS_ooxml::LN_footerr;
break;
case RTF_FOOTERF:
nId = NS_ooxml::LN_footerf;
break;
default:
break;
}
m_nHeaderFooterPositions.push(make_pair(nId, nPos));
m_aStates.top().nDestinationState = DESTINATION_SKIP;
} }
OString aKeyword = aBuf.makeStringAndClear(); break;
if (aKeyword.equals("\\ftnalt")) case RTF_FOOTNOTE:
nId = NS_ooxml::LN_endnote; if (!m_pSuperstream)
m_bHasFootnote = true;
if (m_aStates.top().pCurrentBuffer == &m_aSuperBuffer)
m_aStates.top().pCurrentBuffer = 0;
bool bCustomMark = false;
OUString aCustomMark;
while (m_aSuperBuffer.size())
{ {
Buf_t aTuple = m_aSuperBuffer.front(); Id nId = NS_ooxml::LN_footnote;
m_aSuperBuffer.pop_front();
if (boost::get<0>(aTuple) == BUFFER_UTEXT) // Check if this is an endnote.
OStringBuffer aBuf;
char ch;
for (int i = 0; i < 7; ++i)
{ {
aCustomMark = boost::get<1>(aTuple)->getString(); Strm().ReadChar(ch);
bCustomMark = true; aBuf.append(ch);
} }
OString aKeyword = aBuf.makeStringAndClear();
if (aKeyword.equals("\\ftnalt"))
nId = NS_ooxml::LN_endnote;
m_bHasFootnote = true;
if (m_aStates.top().pCurrentBuffer == &m_aSuperBuffer)
m_aStates.top().pCurrentBuffer = 0;
bool bCustomMark = false;
OUString aCustomMark;
while (m_aSuperBuffer.size())
{
Buf_t aTuple = m_aSuperBuffer.front();
m_aSuperBuffer.pop_front();
if (boost::get<0>(aTuple) == BUFFER_UTEXT)
{
aCustomMark = boost::get<1>(aTuple)->getString();
bCustomMark = true;
}
}
m_aStates.top().nDestinationState = DESTINATION_FOOTNOTE;
if (bCustomMark)
Mapper().startCharacterGroup();
resolveSubstream(m_nGroupStartPos - 1, nId, aCustomMark);
if (bCustomMark)
{
m_aStates.top().aCharacterAttributes.clear();
m_aStates.top().aCharacterSprms.clear();
RTFValue::Pointer_t pValue(new RTFValue(1));
m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_FtnEdnRef_customMarkFollows, pValue);
text(aCustomMark);
Mapper().endCharacterGroup();
}
m_aStates.top().nDestinationState = DESTINATION_SKIP;
} }
m_aStates.top().nDestinationState = DESTINATION_FOOTNOTE; break;
if (bCustomMark) case RTF_BKMKSTART:
Mapper().startCharacterGroup(); m_aStates.top().nDestinationState = DESTINATION_BOOKMARKSTART;
resolveSubstream(m_nGroupStartPos - 1, nId, aCustomMark); break;
if (bCustomMark) case RTF_BKMKEND:
m_aStates.top().nDestinationState = DESTINATION_BOOKMARKEND;
break;
case RTF_REVTBL:
m_aStates.top().nDestinationState = DESTINATION_REVISIONTABLE;
break;
case RTF_ANNOTATION:
if (!m_pSuperstream)
{ {
m_aStates.top().aCharacterAttributes.clear(); resolveSubstream(m_nGroupStartPos - 1, NS_ooxml::LN_annotation);
m_aStates.top().aCharacterSprms.clear(); m_aStates.top().nDestinationState = DESTINATION_SKIP;
RTFValue::Pointer_t pValue(new RTFValue(1));
m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_FtnEdnRef_customMarkFollows, pValue);
text(aCustomMark);
Mapper().endCharacterGroup();
} }
m_aStates.top().nDestinationState = DESTINATION_SKIP; else
} {
break; // If there is an author set, emit it now.
case RTF_BKMKSTART: if (!m_aAuthor.isEmpty() || !m_aAuthorInitials.isEmpty())
m_aStates.top().nDestinationState = DESTINATION_BOOKMARKSTART; {
break; RTFSprms aAttributes;
case RTF_BKMKEND: if (!m_aAuthor.isEmpty())
m_aStates.top().nDestinationState = DESTINATION_BOOKMARKEND; {
break; RTFValue::Pointer_t pValue(new RTFValue(m_aAuthor));
case RTF_REVTBL: aAttributes.set(NS_ooxml::LN_CT_TrackChange_author, pValue);
m_aStates.top().nDestinationState = DESTINATION_REVISIONTABLE; }
break; if (!m_aAuthorInitials.isEmpty())
case RTF_ANNOTATION: {
if (!m_pSuperstream) RTFValue::Pointer_t pValue(new RTFValue(m_aAuthorInitials));
{ aAttributes.set(NS_ooxml::LN_CT_Comment_initials, pValue);
resolveSubstream(m_nGroupStartPos - 1, NS_ooxml::LN_annotation); }
m_aStates.top().nDestinationState = DESTINATION_SKIP; writerfilter::Reference<Properties>::Pointer_t const pProperties(new RTFReferenceProperties(aAttributes));
} Mapper().props(pProperties);
else }
}
break;
case RTF_SHPTXT:
case RTF_DPTXBXTEXT:
{ {
// If there is an author set, emit it now. bool bPictureFrame = false;
if (!m_aAuthor.isEmpty() || !m_aAuthorInitials.isEmpty()) for (size_t i = 0; i < m_aStates.top().aShape.aProperties.size(); ++i)
{ {
RTFSprms aAttributes; std::pair<OUString, OUString>& rProperty = m_aStates.top().aShape.aProperties[i];
if (!m_aAuthor.isEmpty()) if (rProperty.first == "shapeType" && rProperty.second == OUString::number(ESCHER_ShpInst_PictureFrame))
{ {
RTFValue::Pointer_t pValue(new RTFValue(m_aAuthor)); bPictureFrame = true;
aAttributes.set(NS_ooxml::LN_CT_TrackChange_author, pValue); break;
} }
if (!m_aAuthorInitials.isEmpty()) }
if (bPictureFrame)
// Skip text on picture frames.
m_aStates.top().nDestinationState = DESTINATION_SKIP;
else
{
m_aStates.top().nDestinationState = DESTINATION_SHAPETEXT;
checkFirstRun();
dispatchFlag(RTF_PARD);
m_bNeedPap = true;
if (nKeyword == RTF_SHPTXT)
{ {
RTFValue::Pointer_t pValue(new RTFValue(m_aAuthorInitials)); if (!m_aStates.top().pCurrentBuffer)
aAttributes.set(NS_ooxml::LN_CT_Comment_initials, pValue); m_pSdrImport->resolve(m_aStates.top().aShape, false, RTFSdrImport::SHAPE);
else
{
RTFValue::Pointer_t pValue(new RTFValue(m_aStates.top().aShape));
m_aStates.top().pCurrentBuffer->push_back(
Buf_t(BUFFER_STARTSHAPE, pValue));
}
} }
writerfilter::Reference<Properties>::Pointer_t const pProperties(new RTFReferenceProperties(aAttributes));
Mapper().props(pProperties);
} }
} }
break; break;
case RTF_SHPTXT: case RTF_FORMFIELD:
case RTF_DPTXBXTEXT: if (m_aStates.top().nDestinationState == DESTINATION_FIELDINSTRUCTION)
{ m_aStates.top().nDestinationState = DESTINATION_FORMFIELD;
bool bPictureFrame = false; break;
for (size_t i = 0; i < m_aStates.top().aShape.aProperties.size(); ++i) case RTF_FFNAME:
m_aStates.top().nDestinationState = DESTINATION_FORMFIELDNAME;
break;
case RTF_FFL:
m_aStates.top().nDestinationState = DESTINATION_FORMFIELDLIST;
break;
case RTF_DATAFIELD:
m_aStates.top().nDestinationState = DESTINATION_DATAFIELD;
break;
case RTF_INFO:
m_aStates.top().nDestinationState = DESTINATION_INFO;
break;
case RTF_CREATIM:
m_aStates.top().nDestinationState = DESTINATION_CREATIONTIME;
break;
case RTF_REVTIM:
m_aStates.top().nDestinationState = DESTINATION_REVISIONTIME;
break;
case RTF_PRINTIM:
m_aStates.top().nDestinationState = DESTINATION_PRINTTIME;
break;
case RTF_AUTHOR:
m_aStates.top().nDestinationState = DESTINATION_AUTHOR;
break;
case RTF_KEYWORDS:
m_aStates.top().nDestinationState = DESTINATION_KEYWORDS;
break;
case RTF_OPERATOR:
m_aStates.top().nDestinationState = DESTINATION_OPERATOR;
break;
case RTF_COMPANY:
m_aStates.top().nDestinationState = DESTINATION_COMPANY;
break;
case RTF_COMMENT:
m_aStates.top().nDestinationState = DESTINATION_COMMENT;
break;
case RTF_OBJECT:
{ {
std::pair<OUString, OUString>& rProperty = m_aStates.top().aShape.aProperties[i]; // beginning of an OLE Object
if (rProperty.first == "shapeType" && rProperty.second == OUString::number(ESCHER_ShpInst_PictureFrame)) m_aStates.top().nDestinationState = DESTINATION_OBJECT;
// check if the object is in a special container (e.g. a table)
if (!m_aStates.top().pCurrentBuffer)
{ {
bPictureFrame = true; // the object is in a table or another container.
break; // Don't try to treate it as an OLE object (fdo#53594).
// Use the \result (RTF_RESULT) element of the object instead,
// the result element contain picture representing the OLE Object.
m_bObject = true;
} }
} }
if (bPictureFrame) break;
// Skip text on picture frames. case RTF_OBJDATA:
// check if the object is in a special container (e.g. a table)
if (m_aStates.top().pCurrentBuffer)
{
// the object is in a table or another container.
// Use the \result (RTF_RESULT) element of the object instead,
// of the \objdata.
m_aStates.top().nDestinationState = DESTINATION_SKIP;
}
else
{
m_aStates.top().nDestinationState = DESTINATION_OBJDATA;
}
break;
case RTF_RESULT:
m_aStates.top().nDestinationState = DESTINATION_RESULT;
break;
case RTF_ATNDATE:
m_aStates.top().nDestinationState = DESTINATION_ANNOTATIONDATE;
break;
case RTF_ATNAUTHOR:
m_aStates.top().nDestinationState = DESTINATION_ANNOTATIONAUTHOR;
break;
case RTF_ATNREF:
m_aStates.top().nDestinationState = DESTINATION_ANNOTATIONREFERENCE;
break;
case RTF_FALT:
m_aStates.top().nDestinationState = DESTINATION_FALT;
break;
case RTF_FLYMAINCNT:
m_aStates.top().nDestinationState = DESTINATION_FLYMAINCONTENT;
break;
case RTF_LISTTEXT:
// Should be ignored by any reader that understands Word 97 through Word 2007 numbering.
case RTF_NONESTTABLES:
// This destination should be ignored by readers that support nested tables.
m_aStates.top().nDestinationState = DESTINATION_SKIP; m_aStates.top().nDestinationState = DESTINATION_SKIP;
else break;
case RTF_DO:
m_aStates.top().nDestinationState = DESTINATION_DRAWINGOBJECT;
break;
case RTF_PN:
m_aStates.top().nDestinationState = DESTINATION_PARAGRAPHNUMBERING;
break;
case RTF_PNTEXT:
// This destination should be ignored by readers that support paragraph numbering.
m_aStates.top().nDestinationState = DESTINATION_SKIP;
break;
case RTF_PNTXTA:
m_aStates.top().nDestinationState = DESTINATION_PARAGRAPHNUMBERING_TEXTAFTER;
break;
case RTF_PNTXTB:
m_aStates.top().nDestinationState = DESTINATION_PARAGRAPHNUMBERING_TEXTBEFORE;
break;
case RTF_TITLE:
m_aStates.top().nDestinationState = DESTINATION_TITLE;
break;
case RTF_SUBJECT:
m_aStates.top().nDestinationState = DESTINATION_SUBJECT;
break;
case RTF_DOCCOMM:
m_aStates.top().nDestinationState = DESTINATION_DOCCOMM;
break;
case RTF_ATRFSTART:
m_aStates.top().nDestinationState = DESTINATION_ANNOTATIONREFERENCESTART;
break;
case RTF_ATRFEND:
m_aStates.top().nDestinationState = DESTINATION_ANNOTATIONREFERENCEEND;
break;
case RTF_ATNID:
m_aStates.top().nDestinationState = DESTINATION_ATNID;
break;
case RTF_MMATH:
case RTF_MOMATHPARA:
// Nothing to do here (just enter the destination) till RTF_MMATHPR is implemented.
break;
case RTF_MR:
m_aStates.top().nDestinationState = DESTINATION_MR;
break;
case RTF_MCHR:
m_aStates.top().nDestinationState = DESTINATION_MCHR;
break;
case RTF_MPOS:
m_aStates.top().nDestinationState = DESTINATION_MPOS;
break;
case RTF_MVERTJC:
m_aStates.top().nDestinationState = DESTINATION_MVERTJC;
break;
case RTF_MSTRIKEH:
m_aStates.top().nDestinationState = DESTINATION_MSTRIKEH;
break;
case RTF_MDEGHIDE:
m_aStates.top().nDestinationState = DESTINATION_MDEGHIDE;
break;
case RTF_MTYPE:
m_aStates.top().nDestinationState = DESTINATION_MTYPE;
break;
case RTF_MGROW:
m_aStates.top().nDestinationState = DESTINATION_MGROW;
break;
case RTF_MHIDETOP:
case RTF_MHIDEBOT:
case RTF_MHIDELEFT:
case RTF_MHIDERIGHT:
// SmOoxmlImport::handleBorderBox will ignore these anyway, so silently ignore for now.
m_aStates.top().nDestinationState = DESTINATION_SKIP;
break;
case RTF_MSUBHIDE:
m_aStates.top().nDestinationState = DESTINATION_MSUBHIDE;
break;
case RTF_MSUPHIDE:
m_aStates.top().nDestinationState = DESTINATION_MSUPHIDE;
break;
case RTF_MBEGCHR:
m_aStates.top().nDestinationState = DESTINATION_MBEGCHR;
break;
case RTF_MSEPCHR:
m_aStates.top().nDestinationState = DESTINATION_MSEPCHR;
break;
case RTF_MENDCHR:
m_aStates.top().nDestinationState = DESTINATION_MENDCHR;
break;
case RTF_UPR:
m_aStates.top().nDestinationState = DESTINATION_UPR;
break;
case RTF_UD:
// Anything inside \ud is just normal Unicode content.
m_aStates.top().nDestinationState = DESTINATION_NORMAL;
break;
case RTF_BACKGROUND:
m_aStates.top().nDestinationState = DESTINATION_BACKGROUND;
m_aStates.top().bInBackground = true;
break;
case RTF_SHPGRP:
{ {
m_aStates.top().nDestinationState = DESTINATION_SHAPETEXT; RTFLookahead aLookahead(Strm(), m_pTokenizer->getGroupStart());
checkFirstRun(); if (!aLookahead.hasTable())
dispatchFlag(RTF_PARD);
m_bNeedPap = true;
if (nKeyword == RTF_SHPTXT)
{ {
if (!m_aStates.top().pCurrentBuffer) uno::Reference<drawing::XShapes> xGroupShape(m_xModelFactory->createInstance("com.sun.star.drawing.GroupShape"), uno::UNO_QUERY);
m_pSdrImport->resolve(m_aStates.top().aShape, false, RTFSdrImport::SHAPE); uno::Reference<drawing::XDrawPageSupplier> xDrawSupplier(m_xDstDoc, uno::UNO_QUERY);
else if (xDrawSupplier.is())
{ {
RTFValue::Pointer_t pValue(new RTFValue(m_aStates.top().aShape)); uno::Reference<drawing::XShape> xShape(xGroupShape, uno::UNO_QUERY);
m_aStates.top().pCurrentBuffer->push_back( xDrawSupplier->getDrawPage()->add(xShape);
Buf_t(BUFFER_STARTSHAPE, pValue));
} }
m_pSdrImport->pushParent(xGroupShape);
m_aStates.top().bCreatedShapeGroup = true;
} }
m_aStates.top().nDestinationState = DESTINATION_SHAPEGROUP;
m_aStates.top().bInShapeGroup = true;
} }
}
break;
case RTF_FORMFIELD:
if (m_aStates.top().nDestinationState == DESTINATION_FIELDINSTRUCTION)
m_aStates.top().nDestinationState = DESTINATION_FORMFIELD;
break;
case RTF_FFNAME:
m_aStates.top().nDestinationState = DESTINATION_FORMFIELDNAME;
break;
case RTF_FFL:
m_aStates.top().nDestinationState = DESTINATION_FORMFIELDLIST;
break;
case RTF_DATAFIELD:
m_aStates.top().nDestinationState = DESTINATION_DATAFIELD;
break;
case RTF_INFO:
m_aStates.top().nDestinationState = DESTINATION_INFO;
break;
case RTF_CREATIM:
m_aStates.top().nDestinationState = DESTINATION_CREATIONTIME;
break;
case RTF_REVTIM:
m_aStates.top().nDestinationState = DESTINATION_REVISIONTIME;
break;
case RTF_PRINTIM:
m_aStates.top().nDestinationState = DESTINATION_PRINTTIME;
break;
case RTF_AUTHOR:
m_aStates.top().nDestinationState = DESTINATION_AUTHOR;
break;
case RTF_KEYWORDS:
m_aStates.top().nDestinationState = DESTINATION_KEYWORDS;
break;
case RTF_OPERATOR:
m_aStates.top().nDestinationState = DESTINATION_OPERATOR;
break;
case RTF_COMPANY:
m_aStates.top().nDestinationState = DESTINATION_COMPANY;
break;
case RTF_COMMENT:
m_aStates.top().nDestinationState = DESTINATION_COMMENT;
break;
case RTF_OBJECT:
{
// beginning of an OLE Object
m_aStates.top().nDestinationState = DESTINATION_OBJECT;
// check if the object is in a special container (e.g. a table)
if (!m_aStates.top().pCurrentBuffer)
{
// the object is in a table or another container.
// Don't try to treate it as an OLE object (fdo#53594).
// Use the \result (RTF_RESULT) element of the object instead,
// the result element contain picture representing the OLE Object.
m_bObject = true;
}
}
break;
case RTF_OBJDATA:
// check if the object is in a special container (e.g. a table)
if (m_aStates.top().pCurrentBuffer)
{
// the object is in a table or another container.
// Use the \result (RTF_RESULT) element of the object instead,
// of the \objdata.
m_aStates.top().nDestinationState = DESTINATION_SKIP;
}
else
{
m_aStates.top().nDestinationState = DESTINATION_OBJDATA;
}
break;
case RTF_RESULT:
m_aStates.top().nDestinationState = DESTINATION_RESULT;
break;
case RTF_ATNDATE:
m_aStates.top().nDestinationState = DESTINATION_ANNOTATIONDATE;
break;
case RTF_ATNAUTHOR:
m_aStates.top().nDestinationState = DESTINATION_ANNOTATIONAUTHOR;
break;
case RTF_ATNREF:
m_aStates.top().nDestinationState = DESTINATION_ANNOTATIONREFERENCE;
break;
case RTF_FALT:
m_aStates.top().nDestinationState = DESTINATION_FALT;
break;
case RTF_FLYMAINCNT:
m_aStates.top().nDestinationState = DESTINATION_FLYMAINCONTENT;
break;
case RTF_LISTTEXT:
// Should be ignored by any reader that understands Word 97 through Word 2007 numbering.
case RTF_NONESTTABLES:
// This destination should be ignored by readers that support nested tables.
m_aStates.top().nDestinationState = DESTINATION_SKIP;
break;
case RTF_DO:
m_aStates.top().nDestinationState = DESTINATION_DRAWINGOBJECT;
break;
case RTF_PN:
m_aStates.top().nDestinationState = DESTINATION_PARAGRAPHNUMBERING;
break;
case RTF_PNTEXT:
// This destination should be ignored by readers that support paragraph numbering.
m_aStates.top().nDestinationState = DESTINATION_SKIP;
break;
case RTF_PNTXTA:
m_aStates.top().nDestinationState = DESTINATION_PARAGRAPHNUMBERING_TEXTAFTER;
break;
case RTF_PNTXTB:
m_aStates.top().nDestinationState = DESTINATION_PARAGRAPHNUMBERING_TEXTBEFORE;
break;
case RTF_TITLE:
m_aStates.top().nDestinationState = DESTINATION_TITLE;
break;
case RTF_SUBJECT:
m_aStates.top().nDestinationState = DESTINATION_SUBJECT;
break;
case RTF_DOCCOMM:
m_aStates.top().nDestinationState = DESTINATION_DOCCOMM;
break;
case RTF_ATRFSTART:
m_aStates.top().nDestinationState = DESTINATION_ANNOTATIONREFERENCESTART;
break;
case RTF_ATRFEND:
m_aStates.top().nDestinationState = DESTINATION_ANNOTATIONREFERENCEEND;
break;
case RTF_ATNID:
m_aStates.top().nDestinationState = DESTINATION_ATNID;
break;
case RTF_MMATH:
case RTF_MOMATHPARA:
// Nothing to do here (just enter the destination) till RTF_MMATHPR is implemented.
break;
case RTF_MR:
m_aStates.top().nDestinationState = DESTINATION_MR;
break;
case RTF_MCHR:
m_aStates.top().nDestinationState = DESTINATION_MCHR;
break; break;
case RTF_MPOS: case RTF_FTNSEP:
m_aStates.top().nDestinationState = DESTINATION_MPOS; m_aStates.top().nDestinationState = DESTINATION_FOOTNOTESEPARATOR;
break; m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_FtnEdn_type, RTFValue::Pointer_t(new RTFValue(NS_ooxml::LN_Value_wordprocessingml_ST_FtnEdn_separator)));
case RTF_MVERTJC: break;
m_aStates.top().nDestinationState = DESTINATION_MVERTJC; default:
break;
case RTF_MSTRIKEH:
m_aStates.top().nDestinationState = DESTINATION_MSTRIKEH;
break;
case RTF_MDEGHIDE:
m_aStates.top().nDestinationState = DESTINATION_MDEGHIDE;
break;
case RTF_MTYPE:
m_aStates.top().nDestinationState = DESTINATION_MTYPE;
break;
case RTF_MGROW:
m_aStates.top().nDestinationState = DESTINATION_MGROW;
break;
case RTF_MHIDETOP:
case RTF_MHIDEBOT:
case RTF_MHIDELEFT:
case RTF_MHIDERIGHT:
// SmOoxmlImport::handleBorderBox will ignore these anyway, so silently ignore for now.
m_aStates.top().nDestinationState = DESTINATION_SKIP;
break;
case RTF_MSUBHIDE:
m_aStates.top().nDestinationState = DESTINATION_MSUBHIDE;
break;
case RTF_MSUPHIDE:
m_aStates.top().nDestinationState = DESTINATION_MSUPHIDE;
break;
case RTF_MBEGCHR:
m_aStates.top().nDestinationState = DESTINATION_MBEGCHR;
break;
case RTF_MSEPCHR:
m_aStates.top().nDestinationState = DESTINATION_MSEPCHR;
break;
case RTF_MENDCHR:
m_aStates.top().nDestinationState = DESTINATION_MENDCHR;
break;
case RTF_UPR:
m_aStates.top().nDestinationState = DESTINATION_UPR;
break;
case RTF_UD:
// Anything inside \ud is just normal Unicode content.
m_aStates.top().nDestinationState = DESTINATION_NORMAL;
break;
case RTF_BACKGROUND:
m_aStates.top().nDestinationState = DESTINATION_BACKGROUND;
m_aStates.top().bInBackground = true;
break;
case RTF_SHPGRP:
{
RTFLookahead aLookahead(Strm(), m_pTokenizer->getGroupStart());
if (!aLookahead.hasTable())
{ {
uno::Reference<drawing::XShapes> xGroupShape(m_xModelFactory->createInstance("com.sun.star.drawing.GroupShape"), uno::UNO_QUERY); // Check if it's a math token.
uno::Reference<drawing::XDrawPageSupplier> xDrawSupplier(m_xDstDoc, uno::UNO_QUERY); RTFMathSymbol aSymbol;
if (xDrawSupplier.is()) aSymbol.eKeyword = nKeyword;
if (RTFTokenizer::lookupMathKeyword(aSymbol))
{ {
uno::Reference<drawing::XShape> xShape(xGroupShape, uno::UNO_QUERY); m_aMathBuffer.appendOpeningTag(aSymbol.nToken);
xDrawSupplier->getDrawPage()->add(xShape); m_aStates.top().nDestinationState = aSymbol.eDestination;
return 0;
} }
m_pSdrImport->pushParent(xGroupShape);
m_aStates.top().bCreatedShapeGroup = true; SAL_INFO("writerfilter", "TODO handle destination '" << lcl_RtfToString(nKeyword) << "'");
// Make sure we skip destinations (even without \*) till we don't handle them
m_aStates.top().nDestinationState = DESTINATION_SKIP;
aSkip.setParsed(false);
} }
m_aStates.top().nDestinationState = DESTINATION_SHAPEGROUP;
m_aStates.top().bInShapeGroup = true;
}
break;
case RTF_FTNSEP:
m_aStates.top().nDestinationState = DESTINATION_FOOTNOTESEPARATOR;
m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_FtnEdn_type, RTFValue::Pointer_t(new RTFValue(NS_ooxml::LN_Value_wordprocessingml_ST_FtnEdn_separator)));
break; break;
default:
{
// Check if it's a math token.
RTFMathSymbol aSymbol;
aSymbol.eKeyword = nKeyword;
if (RTFTokenizer::lookupMathKeyword(aSymbol))
{
m_aMathBuffer.appendOpeningTag(aSymbol.nToken);
m_aStates.top().nDestinationState = aSymbol.eDestination;
return 0;
} }
SAL_INFO("writerfilter", "TODO handle destination '" << lcl_RtfToString(nKeyword) << "'");
// Make sure we skip destinations (even without \*) till we don't handle them
m_aStates.top().nDestinationState = DESTINATION_SKIP;
aSkip.setParsed(false);
}
break;
}
// new destination => use new destination text // new destination => use new destination text
m_aStates.top().pDestinationText = &m_aStates.top().aDestinationText; m_aStates.top().pDestinationText = &m_aStates.top().aDestinationText;
......
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