diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-24 15:55:56 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-24 15:55:56 +0000 |
commit | 8d413b99bc867c0e5f84c62403327ba4e92e5be5 (patch) | |
tree | 224deabc14a8a0a17f33ad5db26e3966099381d5 /svx/source/tbxctrls/lboxctrl.cxx | |
parent | 2105d55b7c70cc670c9d7f6e366cea07d216717d (diff) |
INTEGRATION: CWS tbe19 (1.20.448); FILE MERGED
2005/01/27 17:01:49 tbe 1.20.448.1: #i40118# undo & restore in basic
Diffstat (limited to 'svx/source/tbxctrls/lboxctrl.cxx')
-rw-r--r-- | svx/source/tbxctrls/lboxctrl.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 6fc87cf9b1fc..f55feede7349 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: lboxctrl.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2004-07-06 13:19:31 $ + * last change: $Author: vg $ $Date: 2005-02-24 16:55:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -332,6 +332,7 @@ SvxUndoRedoControl::SvxUndoRedoControl( USHORT nSlotId, USHORT nId, ToolBox& rTb { rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); rTbx.Invalidate(); + aDefaultText = MnemonicGenerator::EraseAllMnemonicChars( rTbx.GetItemText( nId ) ); } SvxUndoRedoControl::~SvxUndoRedoControl() @@ -343,7 +344,12 @@ void SvxUndoRedoControl::StateChanged( { if ( nSID == SID_UNDO || nSID == SID_REDO ) { - if ( pState && pState->ISA( SfxStringItem )) + if ( eState == SFX_ITEM_DISABLED ) + { + ToolBox& rBox = GetToolBox(); + rBox.SetQuickHelpText( GetId(), aDefaultText ); + } + else if ( pState && pState->ISA( SfxStringItem ) ) { SfxStringItem& rItem = *(SfxStringItem *)pState; ToolBox& rBox = GetToolBox(); |