[Libreoffice-commits] core.git: sd/source

[Stephan Bergmann]

 sd/source/ui/inc/DrawViewShell.hxx |    2 --
 sd/source/ui/view/drviews1.cxx     |   23 ++---------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

New commits:
commit 54e65393e70c32b4b787c717e259de416ce7f46e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 14 10:05:39 2014 +0100

    Dead code
    
    ...since a5a5e61fd9a32b3d881f42c39d789ed4bc5d4122 "INTEGRATION: CWS
    presentationengine01" in 2004.
    
    Change-Id: Iad72fa7af037d97583621afb114243ac6a45b8ce

diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index e8ab1fa..e118220 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 de43b57..9b93ec1 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
  */