Kaydet (Commit) d3deac52 authored tarafından Joseph Powers's avatar Joseph Powers

Remove DragDrop code from class SvxIconChoiceCtrl_Impl

It wasn' used so no one should miss it.
üst c8d8c442
...@@ -219,7 +219,6 @@ class SvxIconChoiceCtrl_Impl ...@@ -219,7 +219,6 @@ class SvxIconChoiceCtrl_Impl
LocalFocus aFocus; // Data for focusrect LocalFocus aFocus; // Data for focusrect
::svt::AccessibleFactoryAccess aAccFactory; ::svt::AccessibleFactoryAccess aAccFactory;
List* pDraggedSelection;
SvxIconChoiceCtrlEntry* pCurEditedEntry; SvxIconChoiceCtrlEntry* pCurEditedEntry;
SvxIconChoiceCtrlTextMode eTextMode; SvxIconChoiceCtrlTextMode eTextMode;
SelectionMode eSelectionMode; SelectionMode eSelectionMode;
...@@ -228,7 +227,6 @@ class SvxIconChoiceCtrl_Impl ...@@ -228,7 +227,6 @@ class SvxIconChoiceCtrl_Impl
sal_Bool bBoundRectsDirty; sal_Bool bBoundRectsDirty;
sal_Bool bUpdateMode; sal_Bool bUpdateMode;
sal_Bool bEntryEditingEnabled; sal_Bool bEntryEditingEnabled;
sal_Bool bInDragDrop;
void ShowCursor( sal_Bool bShow ); void ShowCursor( sal_Bool bShow );
......
...@@ -120,14 +120,12 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( ...@@ -120,14 +120,12 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
pCurHighlightFrame = 0; pCurHighlightFrame = 0;
pEdit = 0; pEdit = 0;
pAnchor = 0; pAnchor = 0;
pDraggedSelection = 0;
pPrevDropTarget = 0; pPrevDropTarget = 0;
pHdlEntry = 0; pHdlEntry = 0;
pHead = NULL; pHead = NULL;
pCursor = NULL; pCursor = NULL;
bUpdateMode = sal_True; bUpdateMode = sal_True;
bEntryEditingEnabled = sal_False; bEntryEditingEnabled = sal_False;
bInDragDrop = sal_False;
bHighlightFramePressed = sal_False; bHighlightFramePressed = sal_False;
eSelectionMode = MULTIPLE_SELECTION; eSelectionMode = MULTIPLE_SELECTION;
pView = pCurView; pView = pCurView;
...@@ -186,7 +184,6 @@ SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl() ...@@ -186,7 +184,6 @@ SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl()
delete pDDDev; delete pDDDev;
delete pDDBufDev; delete pDDBufDev;
delete pDDTempDev; delete pDDTempDev;
delete pDraggedSelection;
delete pEntryPaintDev; delete pEntryPaintDev;
ClearSelectedRectList(); ClearSelectedRectList();
ClearColumnList(); ClearColumnList();
...@@ -196,8 +193,6 @@ void SvxIconChoiceCtrl_Impl::Clear( sal_Bool bInCtor ) ...@@ -196,8 +193,6 @@ void SvxIconChoiceCtrl_Impl::Clear( sal_Bool bInCtor )
{ {
StopEntryEditing( sal_True ); StopEntryEditing( sal_True );
nSelectionCount = 0; nSelectionCount = 0;
DELETEZ(pDraggedSelection);
bInDragDrop = sal_False;
pCurHighlightFrame = 0; pCurHighlightFrame = 0;
StopEditTimer(); StopEditTimer();
CancelUserEvents(); CancelUserEvents();
...@@ -400,12 +395,6 @@ void SvxIconChoiceCtrl_Impl::RemoveEntry( SvxIconChoiceCtrlEntry* pEntry ) ...@@ -400,12 +395,6 @@ void SvxIconChoiceCtrl_Impl::RemoveEntry( SvxIconChoiceCtrlEntry* pEntry )
if( pEntry == pCurHighlightFrame ) if( pEntry == pCurHighlightFrame )
pCurHighlightFrame = 0; pCurHighlightFrame = 0;
if( bInDragDrop )
{
DELETEZ(pDraggedSelection);
bInDragDrop = sal_False;
}
if( pEntry->IsSelected() ) if( pEntry->IsSelected() )
CallSelectHandler( 0 ); CallSelectHandler( 0 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment