diff options
| author | Paul Trojahn <paul.trojahn@gmail.com> | 2017-06-06 23:05:10 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-06-21 23:04:13 +0200 |
| commit | 814dbf3624b9e8608882b003d96dfb51fa3634fc (patch) | |
| tree | f27a508a696eb5811e860ab38c3ab45adbca58b3 /oox | |
| parent | fb7f91acecb6a3fa7adbe59603cdfdbc36a6b891 (diff) | |
tdf#89064 Fix import of pages with comments and notes
importSlide removes the shapes on the page. It was used to import
the comments and authors, which resulted in an empty notes page.
Change-Id: I7d68085b482e5497d46e92328c413c87440714a0
Reviewed-on: https://gerrit.libreoffice.org/38648
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit c2da33ead8b093b12ebb9a0ea9c06d156c41a3e6)
Reviewed-on: https://gerrit.libreoffice.org/39043
Reviewed-by: Paul Trojahn <paul.trojahn@gmail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/presentationfragmenthandler.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index 8dc1392bed81..30f9af5e1301 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -301,7 +301,7 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, bool bFirstPage pCommentAuthorsPersistPtr, Slide ) ); - importSlide( xCommentAuthorsFragmentHandler, pCommentAuthorsPersistPtr ); + getFilter().importFragment( xCommentAuthorsFragmentHandler ); maAuthorList.setValues( pCommentAuthorsPersistPtr->getCommentAuthors() ); } if( !aCommentFragmentPath.isEmpty() ) @@ -323,7 +323,7 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, bool bFirstPage pCommentsPersistPtr, Slide ) ); pCommentsPersistPtr->getCommentsList().cmLst.clear(); - importSlide( xCommentsFragmentHandler, pCommentsPersistPtr ); + getFilter().importFragment( xCommentsFragmentHandler ); if (!pCommentsPersistPtr->getCommentsList().cmLst.empty()) { |