diff options
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/inc/DrawViewShell.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 23 |
2 files changed, 2 insertions, 23 deletions
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index e8ab1fa99343..e1182207fb5b 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -382,14 +382,12 @@ protected: sal_Bool mbZoomOnPage; sal_Bool mbIsRulerDrag; sal_uLong mnLockCount; - Timer maCloseTimer; sal_Bool mbReadOnly; sal_uInt16* mpSlotArray; static sal_Bool mbPipette; DECL_LINK( ClipboardChanged, TransferableDataHelper* ); - DECL_LINK( CloseHdl, Timer* pTimer ); DECL_LINK( TabSplitHdl, TabBar * ); DECL_LINK( NameObjectHdl, AbstractSvxNameDialog* ); DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog* ); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index de43b57ae7da..9b93ec1dbe44 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -298,9 +298,7 @@ bool DrawViewShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing ) if ( !ViewShell::PrepareClose(bUI, bForBrowsing) ) return false; - bool bRet = true; - - if( bRet && HasCurrentFunction() ) + if( HasCurrentFunction() ) { sal_uInt16 nID = GetCurrentFunction()->GetSlotID(); if (nID == SID_TEXTEDIT || nID == SID_ATTR_CHAR) @@ -308,14 +306,8 @@ bool DrawViewShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing ) mpDrawView->SdrEndTextEdit(); } } - else if( !bRet ) - { - maCloseTimer.SetTimeoutHdl( LINK( this, DrawViewShell, CloseHdl ) ); - maCloseTimer.SetTimeout( 20 ); - maCloseTimer.Start(); - } - return bRet; + return true; } /** @@ -1224,17 +1216,6 @@ void DrawViewShell::ResetActualLayer() } /** - * Execute a delayed close - */ - -IMPL_LINK( DrawViewShell, CloseHdl, Timer*, pTimer ) -{ - pTimer->Stop(); - GetViewFrame()->GetBindings().Execute( SID_CLOSEWIN ); - return 0L; -} - -/** * AcceptDrop */ |