Skip to content

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

pictures in fly frames are already handled

üst 8807969e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Dosyayı görüntüle @ 49f5d94f
...@@ -1032,6 +1032,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) ...@@ -1032,6 +1032,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
m_aStates.top().nDestinationState = DESTINATION_LEVELNUMBERS; m_aStates.top().nDestinationState = DESTINATION_LEVELNUMBERS;
break; break;
case RTF_SHPPICT: case RTF_SHPPICT:
m_aStates.top().aFrame = RTFFrame();
m_aStates.top().nDestinationState = DESTINATION_SHPPICT; m_aStates.top().nDestinationState = DESTINATION_SHPPICT;
break; break;
case RTF_PICT: case RTF_PICT:
...@@ -2992,7 +2993,8 @@ int RTFDocumentImpl::popState() ...@@ -2992,7 +2993,8 @@ int RTFDocumentImpl::popState()
aSprms = m_aStates.top().aTableSprms; aSprms = m_aStates.top().aTableSprms;
bFaltEnd = true; bFaltEnd = true;
} }
else if (m_aStates.top().nDestinationState == DESTINATION_FLYMAINCONTENT) else if (m_aStates.top().nDestinationState == DESTINATION_FLYMAINCONTENT
|| m_aStates.top().nDestinationState == DESTINATION_SHPPICT)
{ {
aFrame = m_aStates.top().aFrame; aFrame = m_aStates.top().aFrame;
bPopFrame = true; bPopFrame = true;
......
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