diff options
| author | Rohit Deshmukh <rohit.deshmukh@synerzip.com> | 2014-07-01 21:24:24 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-03 13:36:26 +0000 |
| commit | 83d51e5e52688c4c9bc0ad70a511458bb06a242d (patch) | |
| tree | 3b0cea15ccebb5471c1dfbd784b3cb90a3156716 /sax | |
| parent | 5ccb510ef7dd6688b86038b37563583f64107936 (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 'sax')
| -rw-r--r-- | sax/source/tools/fastserializer.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx index 1eea16e99bf7..fbce18aa9ab0 100644 --- a/sax/source/tools/fastserializer.cxx +++ b/sax/source/tools/fastserializer.cxx @@ -291,7 +291,7 @@ namespace sax_fastparser { if ( maMarkStack.empty() ) return; - if ( maMarkStack.size() == 1 ) + if ( maMarkStack.size() == 1 && eMergeType != MERGE_MARKS_IGNORE) { mxOutputStream->writeBytes( maMarkStack.top()->getData() ); maMarkStack.pop(); @@ -306,6 +306,8 @@ namespace sax_fastparser { case MERGE_MARKS_APPEND: maMarkStack.top()->append( aMerge ); break; case MERGE_MARKS_PREPEND: maMarkStack.top()->prepend( aMerge ); break; case MERGE_MARKS_POSTPONE: maMarkStack.top()->postpone( aMerge ); break; + case MERGE_MARKS_IGNORE : break; + } } |