3 files changed, 58 insertions, 40 deletions

diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 671b5a9f54e5..7111a29a6a8a 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -3115,7 +3115,7 @@ void lcl_DeleteSubPopups(PopupMenu* pPopup)
     }
 }
 
-void SvImpLBox::Command( const CommandEvent& rCEvt )
+bool SvImpLBox::Command( const CommandEvent& rCEvt )
 {
     USHORT              nCommand = rCEvt.GetCommand();
 
@@ -3123,9 +3123,22 @@ void SvImpLBox::Command( const CommandEvent& rCEvt )
         aEditTimer.Stop();
 
     // Rollmaus-Event?
-    if( ( ( nCommand == COMMAND_WHEEL ) || ( nCommand == COMMAND_STARTAUTOSCROLL ) || ( nCommand == COMMAND_AUTOSCROLL ) )
-        && pView->HandleScrollCommand( rCEvt, &aHorSBar, &aVerSBar ) )
-            return;
+    if  (   (   ( nCommand == COMMAND_WHEEL )
+            ||  ( nCommand == COMMAND_STARTAUTOSCROLL )
+            ||  ( nCommand == COMMAND_AUTOSCROLL )
+            )
+        &&  pView->HandleScrollCommand( rCEvt, &aHorSBar, &aVerSBar )
+        )
+    {
+        return true;
+    }
+
+    if  (   ( nCommand == COMMAND_CONTEXTMENU )
+        &&  !bContextMenuHandling
+        )
+    {
+        return false;
+    }
 
     if( bContextMenuHandling && nCommand == COMMAND_CONTEXTMENU )
     {
@@ -3174,8 +3187,6 @@ void SvImpLBox::Command( const CommandEvent& rCEvt )
             {   // deselect all
                 pView->SelectAll( FALSE );
             }
-
-
         }
         else
         {   // key event (or at least no mouse event)
@@ -3235,15 +3246,18 @@ void SvImpLBox::Command( const CommandEvent& rCEvt )
                 aSelRestore.pop();
             }
         }
+        return true;
     }
-#ifndef NOCOMMAND
-    else
-    {
-        const Point& rPos = rCEvt.GetMousePosPixel();
-        if( rPos.X() < aOutputSize.Width() && rPos.Y() < aOutputSize.Height() )
-            aSelEng.Command( rCEvt );
-    }
-#endif
+
+    const Point& rPos = rCEvt.GetMousePosPixel();
+    if( rPos.X() < aOutputSize.Width() && rPos.Y() < aOutputSize.Height() )
+        aSelEng.Command( rCEvt );
+
+    // strictly, this is not correct. However, it leads to a behavior compatible to the one at the time
+    // when this method did have a void return value ...
+    // A proper solution would be to give the EditEngine::Command also a boolean return value, and forward
+    // this (or false) to our caller
+    return true;
 }
 
 void SvImpLBox::BeginScroll()
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index 2752e813052e..fb71f64772ad 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -1515,9 +1515,10 @@ void SvLBox::MakeVisible( SvLBoxEntry* )
     DBG_CHKTHIS(SvLBox,0);
 }
 
-void SvLBox::Command( const CommandEvent& )
+void SvLBox::Command( const CommandEvent& i_rCommandEvent )
 {
     DBG_CHKTHIS(SvLBox,0);
+    Control::Command( i_rCommandEvent );
 }
 
 void SvLBox::KeyInput( const KeyEvent& rKEvt )
@@ -1774,10 +1775,14 @@ void SvLBox::StartDrag( sal_Int8, const Point& rPosPixel )
 {
     DBG_CHKTHIS(SvLBox,0);
 
+    nOldDragMode = GetDragDropMode();
+    if ( !nOldDragMode )
+        return;
+
     ReleaseMouse();
+
     SvLBoxEntry* pEntry = GetEntry( rPosPixel ); // GetDropTarget( rPos );
-    nOldDragMode = GetDragDropMode();
-    if( !pEntry || !nOldDragMode )
+    if( !pEntry )
     {
         DragFinished( DND_ACTION_NONE );
         return;
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index 736f27a1eafb..bf6e41f93f36 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -40,6 +40,7 @@ class TabBar;
 #include <svtools/svlbox.hxx>
 #include <svtools/svlbitm.hxx>
 #include <svtools/svtreebx.hxx>
+#include <tools/diagnose_ex.h>
 #include <svimpbox.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -427,17 +428,6 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,SvLBoxEntry* pPa
     else
         SvLBox::Insert( pEntry, pParent, nPos );
 
-    short nExpWidth = (short)rDefExpBmp.GetSizePixel().Width();
-    short nColWidth = (short)rDefColBmp.GetSizePixel().Width();
-    short nMax = Max(nExpWidth, nColWidth);
-    // #97680# ----------------
-    nMax = pImp->UpdateContextBmpWidthVector( pEntry, nMax );
-    if( nMax > nContextBmpWidthMax )
-    {
-        nContextBmpWidthMax = nMax;
-        SetTabs();
-    }
-
     aPrevInsertedExpBmp = rDefExpBmp;
     aPrevInsertedColBmp = rDefColBmp;
 
@@ -468,17 +458,6 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,
     else
         SvLBox::Insert( pEntry, pParent, nPos );
 
-    short nExpWidth = (short)aExpEntryBmp.GetSizePixel().Width();
-    short nColWidth = (short)aCollEntryBmp.GetSizePixel().Width();
-    short nMax = Max(nExpWidth, nColWidth);
-    // #97680# ----------------
-    nMax = pImp->UpdateContextBmpWidthVector( pEntry, nMax );
-    if( nMax > nContextBmpWidthMax )
-    {
-        nContextBmpWidthMax = nMax;
-        SetTabs();
-    }
-
     aPrevInsertedExpBmp = aExpEntryBmp;
     aPrevInsertedColBmp = aCollEntryBmp;
 
@@ -2250,7 +2229,8 @@ Region SvTreeListBox::GetDragRegion() const
 void SvTreeListBox::Command( const CommandEvent& rCEvt )
 {
     DBG_CHKTHIS(SvTreeListBox,0);
-    pImp->Command( rCEvt );
+    if ( !pImp->Command( rCEvt ) )
+        SvLBox::Command( rCEvt );
 }
 
 
@@ -2346,6 +2326,25 @@ void SvTreeListBox::ModelNotification( USHORT nActionId, SvListEntry* pEntry1,
     SvLBox::ModelNotification( nActionId, pEntry1, pEntry2, nPos );
     switch( nActionId )
     {
+        case LISTACTION_INSERTED:
+        {
+            SvLBoxEntry* pEntry( dynamic_cast< SvLBoxEntry* >( pEntry1 ) );
+            ENSURE_OR_BREAK( pEntry, "SvTreeListBox::ModelNotification: invalid entry!" );
+            SvLBoxContextBmp* pBmpItem = static_cast< SvLBoxContextBmp* >( pEntry->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP ) );
+            if ( !pBmpItem )
+                break;
+            const Image& rBitmap1( pBmpItem->GetBitmap1() );
+            const Image& rBitmap2( pBmpItem->GetBitmap2() );
+            short nMaxWidth = short( Max( rBitmap1.GetSizePixel().Width(), rBitmap2.GetSizePixel().Width() ) );
+            nMaxWidth = pImp->UpdateContextBmpWidthVector( pEntry, nMaxWidth );
+            if( nMaxWidth > nContextBmpWidthMax )
+            {
+                nContextBmpWidthMax = nMaxWidth;
+                SetTabs();
+            }
+        }
+        break;
+
         case LISTACTION_RESORTING:
             SetUpdateMode( FALSE );
             break;