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

enter RTF_FLYMAINCNT

Browse source
This commit is contained in:
Miklos Vajna 2011-08-18 00:38:48 +02:00
parent 32ebb1e830
commit a5d694abef
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
writerfilter/source/rtftok/rtfcontrolwords.cxx
View file

@ -1844,6 +1844,7 @@ RTFSymbol aRTFControlWords[] = {
{"zwj", CONTROL_SYMBOL, RTF_ZWJ},
{"zwnbo", CONTROL_SYMBOL, RTF_ZWNBO},
{"zwnj", CONTROL_SYMBOL, RTF_ZWNJ},
{"flymaincnt", CONTROL_DESTINATION, RTF_FLYMAINCNT},
};
int nRTFControlWords = SAL_N_ELEMENTS(aRTFControlWords);

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

@ -1843,7 +1843,8 @@ enum RTFKeyword
RTF_ZWBO,
RTF_ZWJ,
RTF_ZWNBO,
RTF_ZWNJ
RTF_ZWNJ,
RTF_FLYMAINCNT
};
/// Types of an RTF Control Word

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

@ -58,6 +58,7 @@
#include <rtfsprm.hxx>
#include <rtfreferenceproperties.hxx>
#include <rtfskipdestination.hxx>
#include <rtffly.hxx>
#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
@ -1212,6 +1213,9 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
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:

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

@ -112,7 +112,8 @@ namespace writerfilter {
DESTINATION_RESULT,
DESTINATION_ANNOTATIONDATE,
DESTINATION_ANNOTATIONAUTHOR,
DESTINATION_FALT
DESTINATION_FALT,
DESTINATION_FLYMAINCONTENT
};
enum RTFBorderState