summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjp <jp@openoffice.org>2000-11-30 21:37:02 +0000
committerjp <jp@openoffice.org>2000-11-30 21:37:02 +0000
commitd4da90fc7f1ecacbad59d88496299196d5ebffc4 (patch)
treeed39b0226345671738bb4f9232c38d47460d7d73
parenta17d38186e35f3defabdd282e6fffd4d581edfb4 (diff)
SwView CTOR: call LeaveRegistration if the timer is startet
-rw-r--r--sw/source/ui/uiview/view.cxx11
1 files changed, 8 insertions, 3 deletions
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index c267ad0c3ea0..967dfe24ef6a 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: view.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: jp $ $Date: 2000-11-28 11:37:33 $
+ * last change: $Author: jp $ $Date: 2000-11-30 22:37:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -984,7 +984,12 @@ SwView::SwView( SfxViewFrame *pFrame, SfxViewShell* pOldSh )
pFrame->GetFrame()->GetFrameInterface()->setComponent( aTmpRef,
pViewImpl->GetUNOObject_Impl());
- aTimer.Stop();
+ if( aTimer.IsActive() )
+ {
+ if( bAttrChgNotifiedWithRegistrations )
+ GetViewFrame()->GetBindings().LEAVEREGISTRATIONS();
+ aTimer.Stop();
+ }
aTimer.SetTimeoutHdl(LINK(this, SwView, TimeoutHdl));
bAttrChgNotified = bAttrChgNotifiedWithRegistrations = sal_False;
}