INTEGRATION: CWS geordi2q12 (1.21.212); FILE MERGED
2004/01/07 12:52:48 hr 1.21.212.1: #111934#: merge CWS mnemonics -> SRC680
This commit is contained in:
parent
a2e7f71859
commit
28d646ee70
1 changed files with 8 additions and 4 deletions
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: tpaction.cxx,v $
|
||||
*
|
||||
* $Revision: 1.21 $
|
||||
* $Revision: 1.22 $
|
||||
*
|
||||
* last change: $Author: rt $ $Date: 2003-04-08 15:19:54 $
|
||||
* last change: $Author: rt $ $Date: 2004-01-07 15:48:05 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -128,6 +128,10 @@
|
|||
#include <vcl/svapp.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _SV_MNEMONIC_HXX
|
||||
#include <vcl/mnemonic.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef SVTOOLS_URIHELPER_HXX
|
||||
#include <svtools/urihelper.hxx>
|
||||
#endif
|
||||
|
@ -336,7 +340,7 @@ void SdTPAction::Construct()
|
|||
bOLEAction = TRUE;
|
||||
|
||||
aVerbVector.push_back( 0 );
|
||||
aLbOLEAction.InsertEntry( String( SdResId( STR_EDIT_OBJ ) ).EraseAllChars('~') );
|
||||
aLbOLEAction.InsertEntry( MnemonicGenerator::EraseAllMnemonicChars( String( SdResId( STR_EDIT_OBJ ) ) ) );
|
||||
}
|
||||
else if( pOleObj )
|
||||
{
|
||||
|
@ -353,7 +357,7 @@ void SdTPAction::Construct()
|
|||
{
|
||||
String aTmp( rVerb.GetName() );
|
||||
aVerbVector.push_back( rVerb.GetId() );
|
||||
aLbOLEAction.InsertEntry( aTmp.EraseAllChars('~') );
|
||||
aLbOLEAction.InsertEntry( MnemonicGenerator::EraseAllMnemonicChars( aTmp ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue