diff options
author | Oliver Bolte <obo@openoffice.org> | 2006-01-19 12:00:19 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2006-01-19 12:00:19 +0000 |
commit | 3716e85f8e1267b967bfc929461b40feffc41c82 (patch) | |
tree | aa9d3b4edb5a8054f1ecbfa6d3c924f99af3b035 /svx/source/svdraw/svdopage.cxx | |
parent | c46f43847eaa23e3bf8e8224d61daf0be34f487c (diff) |
INTEGRATION: CWS impress78 (1.18.190); FILE MERGED
2005/12/12 14:52:00 af 1.18.190.1: #i58769# Do not call ActionChanged() from PageInDestruction().
Diffstat (limited to 'svx/source/svdraw/svdopage.cxx')
-rw-r--r-- | svx/source/svdraw/svdopage.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 34ed4cb4e391..d77fded323f3 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdopage.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: rt $ $Date: 2005-09-09 00:34:48 $ + * last change: $Author: obo $ $Date: 2006-01-19 13:00:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -86,7 +86,10 @@ void SdrPageObj::PageInDestruction(const SdrPage& rPage) { if(mpShownPage && mpShownPage == &rPage) { - ActionChanged(); + // #i58769# Do not call ActionChanged() here, because that would + // lead to the construction of a view contact object for a page that + // is being destroyed. + mpShownPage = 0L; } } |