sd/source/core/stlsheet.cxx | 7 +++++++ 1 file changed, 7 insertions(+)
New commits: commit fdefb34fc82a8dea8e78130c95109e81816fcb9f Author: Michael Stahl <[email protected]> Date: Tue Jul 7 23:57:07 2015 +0200 sd: dispose SdStyleSheet properly If it's disposed during document destruction it still retained pointers to SfxItemSet and SfxStyleSheetBasePool. Change-Id: I7b986b4fe5ca466f0fa86a99b744f5e2f85e08be (cherry picked from commit 8904bf48e0cb4d5d0890684ce82dc2ff3252e41f) Reviewed-on: https://gerrit.libreoffice.org/16866 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index a3b018c..a9f6f27 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -773,6 +773,13 @@ void SAL_CALL SdStyleSheet::dispose( ) throw (RuntimeException, std::exception) void SdStyleSheet::disposing() { + SolarMutexGuard aGuard; + if (bMySet) + { + delete pSet; + } + pSet = nullptr; + pPool = nullptr; mxPool.clear(); }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
