diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 13:28:59 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 13:28:59 +0000 |
| commit | 135f6f62fcb843a498e02b0f40d4d1bc88a73b6a (patch) | |
| tree | d4c2dc643c59cc1796f0ae3da5654ca32cfc053b | |
| parent | ce692a101a7389755afc5fa6c66291ef52114853 (diff) | |
INTEGRATION: CWS sj12 (1.5.156); FILE MERGED
2004/11/18 15:45:46 sj 1.5.156.1: #i35972# preventing recursive call of objchange for sdrpageobj
| -rw-r--r-- | svx/source/sdr/contact/viewcontactofpageobj.cxx | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/svx/source/sdr/contact/viewcontactofpageobj.cxx b/svx/source/sdr/contact/viewcontactofpageobj.cxx index 4e948e7fc4bf..b5e3b089a0b2 100644 --- a/svx/source/sdr/contact/viewcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewcontactofpageobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewcontactofpageobj.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2004-07-13 13:32:20 $ + * last change: $Author: rt $ $Date: 2004-11-26 14:28:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -382,7 +382,8 @@ namespace sdr ViewContactOfPageObj::ViewContactOfPageObj(SdrPageObj& rPageObj) : ViewContactOfSdrObj(rPageObj), mpPagePainter(0L), - mbIsPainting(sal_False) + mbIsPainting(sal_False), + mbIsInActionChange(sal_False) { } @@ -436,6 +437,22 @@ namespace sdr return bRetval; } + + // #i35972# React on changes of the object of this ViewContact + void ViewContactOfPageObj::ActionChanged() + { + if(!mbIsInActionChange) + { + // set recursion flag, see description in *.hxx + mbIsInActionChange = sal_True; + + // call parent + ViewContactOfSdrObj::ActionChanged(); + + // reset recursion flag, see description in *.hxx + mbIsInActionChange = sal_False; + } + } } // end of namespace contact } // end of namespace sdr |