[Libreoffice-commits] .: svtools/source

Joseph Powers jpowers at kemper.freedesktop.org
Sat Jul 23 06:34:58 PDT 2011


 svtools/source/contnr/imivctl.hxx  |    2 --
 svtools/source/contnr/imivctl1.cxx |   11 -----------
 2 files changed, 13 deletions(-)

New commits:
commit 13722b687f59bfcc21b7cc0d739a090091072d94
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Sat Jul 23 06:03:16 2011 -0700

    Remove DragDrop code from class SvxIconChoiceCtrl_Impl
    
    It wasn' used so no one should miss it.

diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 18b34b7..74bce9b 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -219,7 +219,6 @@ class SvxIconChoiceCtrl_Impl
     LocalFocus              aFocus;                             // Data for focusrect
     ::svt::AccessibleFactoryAccess aAccFactory;
 
-    List*                   pDraggedSelection;
     SvxIconChoiceCtrlEntry* pCurEditedEntry;
     SvxIconChoiceCtrlTextMode eTextMode;
     SelectionMode           eSelectionMode;
@@ -228,7 +227,6 @@ class SvxIconChoiceCtrl_Impl
     sal_Bool                bBoundRectsDirty;
     sal_Bool                bUpdateMode;
     sal_Bool                bEntryEditingEnabled;
-    sal_Bool                bInDragDrop;
 
     void                ShowCursor( sal_Bool bShow );
 
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 83b7ca4..084d2c3 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -120,14 +120,12 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
     pCurHighlightFrame = 0;
     pEdit = 0;
     pAnchor = 0;
-    pDraggedSelection = 0;
     pPrevDropTarget = 0;
     pHdlEntry = 0;
     pHead = NULL;
     pCursor = NULL;
     bUpdateMode = sal_True;
     bEntryEditingEnabled = sal_False;
-    bInDragDrop = sal_False;
     bHighlightFramePressed = sal_False;
     eSelectionMode = MULTIPLE_SELECTION;
     pView = pCurView;
@@ -186,7 +184,6 @@ SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl()
     delete pDDDev;
     delete pDDBufDev;
     delete pDDTempDev;
-    delete pDraggedSelection;
     delete pEntryPaintDev;
     ClearSelectedRectList();
     ClearColumnList();
@@ -196,8 +193,6 @@ void SvxIconChoiceCtrl_Impl::Clear( sal_Bool bInCtor )
 {
     StopEntryEditing( sal_True );
     nSelectionCount = 0;
-    DELETEZ(pDraggedSelection);
-    bInDragDrop = sal_False;
     pCurHighlightFrame = 0;
     StopEditTimer();
     CancelUserEvents();
@@ -400,12 +395,6 @@ void SvxIconChoiceCtrl_Impl::RemoveEntry( SvxIconChoiceCtrlEntry* pEntry )
     if( pEntry == pCurHighlightFrame )
         pCurHighlightFrame = 0;
 
-    if( bInDragDrop )
-    {
-        DELETEZ(pDraggedSelection);
-        bInDragDrop = sal_False;
-    }
-
     if( pEntry->IsSelected() )
         CallSelectHandler( 0 );
 


More information about the Libreoffice-commits mailing list