toolbar-decorations-svx-undo-redo.diff: Update "Undo" and "Redo" widgets.

2 files changed, 4 insertions, 14 deletions

diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 6d05c8bdb946..d61001738bad 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -70,7 +70,6 @@ class SvxPopupWindowListBox : public SfxPopupWindow
 {
     using FloatingWindow::StateChanged;
 
-    FixedInfo       aInfo;
     ListBox *       pListBox;
     ToolBox &       rToolBox;
     BOOL            bUserSel;
@@ -95,7 +94,6 @@ public:
 
     void                        StartSelection();
     inline ListBox &            GetListBox()    { return *pListBox; }
-    inline FixedInfo &          GetInfo()       { return aInfo; }
 
     BOOL                        IsUserSelected() const          { return bUserSel; }
     void                        SetUserSelected( BOOL bVal )    { bUserSel = bVal; }
@@ -106,7 +104,6 @@ public:
 
 SvxPopupWindowListBox::SvxPopupWindowListBox( USHORT nSlotId, const rtl::OUString& rCommandURL, USHORT nId, ToolBox& rTbx ) :
     SfxPopupWindow( nSlotId, Reference< XFrame >(), SVX_RES( RID_SVXTBX_UNDO_REDO_CTRL ) ),
-    aInfo       ( this, SVX_RES( FT_NUM_OPERATIONS ) ),
     rToolBox    ( rTbx ),
     bUserSel    ( FALSE ),
     nTbxId      ( nId ),
@@ -242,7 +239,7 @@ void SvxListBoxControl::Impl_SetInfo( USHORT nCount )
 
     String aText( aActionStr );
     aText.SearchAndReplaceAllAscii( "$(ARG1)", String::CreateFromInt32( nCount ) );
-    pPopupWin->GetInfo().SetText( aText );
+    pPopupWin->SetText( aText );
 }
 
 
diff --git a/svx/source/tbxctrls/lboxctrl.src b/svx/source/tbxctrls/lboxctrl.src
index 18e345675532..2022ddd0ee3c 100644
--- a/svx/source/tbxctrls/lboxctrl.src
+++ b/svx/source/tbxctrls/lboxctrl.src
@@ -32,27 +32,20 @@
 FloatingWindow RID_SVXTBX_UNDO_REDO_CTRL
 {
     Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( 150 , 74 ) ;
+    Size = MAP_APPFONT ( 102 , 87 ) ;
     HelpID = HID_SVXTBX_UNDO_REDO_CTRL ;
-    SysWin = TRUE;
-    Border = TRUE ;
+    StdPopup = TRUE;
     Hide = TRUE ;
-    SVLook = TRUE ;
     OutputSize = TRUE ;
 
     ListBox LB_SVXTBX_UNDO_REDO_CTRL
     {
         Pos = MAP_APPFONT ( 0 , 0 ) ;
-        Size = MAP_APPFONT ( 150 , 60 ) ;
+        Size = MAP_APPFONT ( 100 , 85 ) ;
         Border = TRUE ;
         DropDown = FALSE ;
         OutputSize = TRUE ;
     };
-    FixedText FT_NUM_OPERATIONS
-    {
-        Pos = MAP_APPFONT ( 6 , 64 ) ;
-        Size = MAP_APPFONT ( 138 , 10 ) ;
-    };
 };
 
 String RID_SVXSTR_NUM_UNDO_ACTIONS