summaryrefslogtreecommitdiff
path: root/include/sax
diff options
context:
space:
mode:
authorRohit Deshmukh <rohit.deshmukh@synerzip.com>2014-07-01 21:24:24 +0530
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-07-03 13:36:26 +0000
commit83d51e5e52688c4c9bc0ad70a511458bb06a242d (patch)
tree3b0cea15ccebb5471c1dfbd784b3cb90a3156716 /include/sax
parent5ccb510ef7dd6688b86038b37563583f64107936 (diff)
fdo#80748: Fix for file corruption due to framePr
-For framePr Unit test is there in ooxmlexport.cxx -http://opengrok.libreoffice.org/xref/core/sw/qa/extras/ooxmlexport/ooxmlexport.cxx#3578 Change-Id: Ic1fd4c7a863d8ab57c6495e20bff6863eb941688 Reviewed-on: https://gerrit.libreoffice.org/10045 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include/sax')
-rw-r--r--include/sax/fshelper.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index e3d3f052e39a..8a9f1ccf3d12 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -62,7 +62,7 @@ const sal_Int32 FSEND_internal = -1; // same as XML_TOKEN_INVALID
namespace sax_fastparser {
-enum MergeMarksEnum { MERGE_MARKS_APPEND = 0, MERGE_MARKS_PREPEND = 1, MERGE_MARKS_POSTPONE = 2 };
+enum MergeMarksEnum { MERGE_MARKS_APPEND = 0, MERGE_MARKS_PREPEND = 1, MERGE_MARKS_POSTPONE = 2, MERGE_MARKS_IGNORE = 3 };
typedef ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList > XFastAttributeListRef;