diff options
| author | Armin Le Grand <alg@apache.org> | 2012-06-21 14:25:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-15 10:12:59 +0100 |
| commit | 1ba29be90f7141077f2d079d40dffc2efd4f1a2c (patch) | |
| tree | fb14188199683ece6c3f95520ef9ee921dce74ae /include/comphelper/embeddedobjectcontainer.hxx | |
| parent | 9c82c2734553690b38fa47afb7e026b6e38787c4 (diff) | |
Resolves: #i119941# Avoid crash when chart is removed in Writer...
by keeping it's storage and graphic stream.
Patch by: Clarence Guo, zhaoshzh
Review by: alg
Found by: Shan Zhu
(cherry picked from commit 0b71c735dc10202b26972cf91779954b6a96af9a)
Conflicts:
comphelper/inc/comphelper/embeddedobjectcontainer.hxx
comphelper/source/container/embeddedobjectcontainer.cxx
Change-Id: I6ec172644806309d0f06f8522eb8a2adb45899ed
Diffstat (limited to 'include/comphelper/embeddedobjectcontainer.hxx')
| -rw-r--r-- | include/comphelper/embeddedobjectcontainer.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx index 0347e12ba2c2..f60506651fca 100644 --- a/include/comphelper/embeddedobjectcontainer.hxx +++ b/include/comphelper/embeddedobjectcontainer.hxx @@ -125,8 +125,9 @@ public: sal_Bool MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString& ); // remove an embedded object from the container and from the storage; if object can't be closed - sal_Bool RemoveEmbeddedObject( const OUString& rName, sal_Bool bClose=sal_True ); - sal_Bool RemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, sal_Bool bClose=sal_True ); + // #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary storage+ + sal_Bool RemoveEmbeddedObject( const OUString& rName, sal_Bool bClose = sal_True, sal_Bool bKeepToTempStorage = sal_True ); + sal_Bool RemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, sal_Bool bClose = sal_True, sal_Bool bKeepToTempStorage = sal_True ); // close and remove an embedded object from the container without removing it from the storage sal_Bool CloseEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ); |