From 6549993b17feb1423c76b5237f086e6f35346a2c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 5 Jul 2017 15:40:00 +0100 Subject: ensure safe GlobalEditData release of xForbiddenCharsTable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ensure that when the editeng GlobalEditData dtor is called that the vtable of the xForbiddenCharsTable shared_ptr will point to functions that are callable from editeng. otherwise a shared_ptr created in the sw uwriter cppunit test, but now belonging to GlobalEditData, will have deleter entries pointing to functions in uwriter that have been unloaded and are not available anymore Change-Id: I375a84156c0b1a0f8b24194fc07f0c512f556dbc Reviewed-on: https://gerrit.libreoffice.org/39605 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sd/source/core/drawdoc.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index a22e60f0ff8d..0977fa5f1d9b 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -260,7 +260,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) if( xHyphenator.is() ) rOutliner.SetHyphenator( xHyphenator ); - SetForbiddenCharsTable(std::make_shared(::comphelper::getProcessComponentContext())); + SetForbiddenCharsTable(SvxForbiddenCharactersTable::makeForbiddenCharactersTable(::comphelper::getProcessComponentContext())); } catch(...) { -- cgit