strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#96473#: remap verb id to list entry position

Browse source
This commit is contained in:
Kai Ahrens 2002-01-14 11:15:41 +00:00
parent e740193dda
commit de92d35b82
2 changed files with 59 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sd/source/ui/dlg/tpaction.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: tpaction.cxx,v $
*
* $Revision: 1.18 $
* $Revision: 1.19 $
*
* last change: $Author: ka $ $Date: 2001-12-17 13:31:56 $
* last change: $Author: ka $ $Date: 2002-01-14 12:15:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -156,6 +156,8 @@
#include "res_bmp.hrc"
#include "filedlg.hxx"
#include <algorithm>
using namespace ::com::sun::star;
static USHORT pActionRanges[] =
@ -332,6 +334,8 @@ void SdTPAction::Construct()
if( pGrafObj )
{
bOLEAction = TRUE;
aVerbVector.push_back( 0 );
aLbOLEAction.InsertEntry( String( SdResId( STR_EDIT_OBJ ) ).EraseAllChars('~') );
}
else if( pOleObj )
@ -347,7 +351,8 @@ void SdTPAction::Construct()
const SvVerb& rVerb = pList->GetObject( i );
if( rVerb.IsOnMenu() )
{
String aTmp = rVerb.GetName();
String aTmp( rVerb.GetName() );
aVerbVector.push_back( rVerb.GetId() );
aLbOLEAction.InsertEntry( aTmp.EraseAllChars('~') );
}
}
@ -1305,8 +1310,13 @@ void SdTPAction::SetEditText( String& rStr )
aEdtSound.SetText( aText );
break;
case presentation::ClickAction_VERB:
aLbOLEAction.SelectEntryPos( (USHORT)rStr.ToInt32() );
break;
{
::std::vector< long >::iterator aFound( ::std::find( aVerbVector.begin(), aVerbVector.end(), rStr.ToInt32() ) );
if( aFound != aVerbVector.end() )
aLbOLEAction.SelectEntryPos( static_cast< short >( aFound - aVerbVector.begin() ) );
}
break;
case presentation::ClickAction_PROGRAM:
aEdtProgram.SetText( aText );
break;
@ -1342,7 +1352,14 @@ String SdTPAction::GetEditText( BOOL bFullDocDestination )
break;
case presentation::ClickAction_VERB:
return( UniString::CreateFromInt32( aLbOLEAction.GetSelectEntryPos() ) );
{
const USHORT nPos = aLbOLEAction.GetSelectEntryPos();
if( nPos < aVerbVector.size() )
aStr = UniString::CreateFromInt32( aVerbVector[ nPos ] );
return( aStr );
}
case presentation::ClickAction_DOCUMENT:
aStr = aEdtDocument.GetText();

69
sd/source/ui/inc/tpaction.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: tpaction.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: ka $ $Date: 2001-10-23 11:54:26 $
* last change: $Author: ka $ $Date: 2002-01-14 12:13:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -100,6 +100,8 @@
#include "sdtreelb.hxx"
#include "anmdef.hxx"
#include <vector>
class SdView;
class SdDrawDocument;
@ -128,42 +130,43 @@ public:
class SdTPAction : public SfxTabPage
{
private:
FixedText aFtAction; // always visible
ListBox aLbAction;
FixedText aFtAction; // always visible
ListBox aLbAction;
FixedLine aFlEffect; // fade controls
FixedText aFtAnimation;
ListBox aLbEffect;
FixedText aFtSpeed;
RadioButton aRbtSlow;
RadioButton aRbtMedium;
RadioButton aRbtFast;
FixedLine aFlEffect; // fade controls
FixedText aFtAnimation;
ListBox aLbEffect;
FixedText aFtSpeed;
RadioButton aRbtSlow;
RadioButton aRbtMedium;
RadioButton aRbtFast;
FixedText aFtTree; // jump destination controls
SdPageObjsTLB aLbTree;
SdPageObjsTLB aLbTreeDocument;
ListBox aLbOLEAction;
FixedText aFtTree; // jump destination controls
SdPageObjsTLB aLbTree;
SdPageObjsTLB aLbTreeDocument;
ListBox aLbOLEAction;
FixedLine aFlSeparator;
TriStateBox aTsbSound;
Edit aEdtSound;
Edit aEdtBookmark;
Edit aEdtDocument;
Edit aEdtProgram;
Edit aEdtMacro;
PushButton aBtnSearch;
PushButton aBtnSeek;
TriStateBox aTsbPlayFull;
FixedLine aFlSeparator;
TriStateBox aTsbSound;
Edit aEdtSound;
Edit aEdtBookmark;
Edit aEdtDocument;
Edit aEdtProgram;
Edit aEdtMacro;
PushButton aBtnSearch;
PushButton aBtnSeek;
TriStateBox aTsbPlayFull;
const SfxItemSet& rOutAttrs;
const SdView* pView;
SdDrawDocument* pDoc;
XColorTable* pColTab;
const SfxItemSet& rOutAttrs;
const SdView* pView;
SdDrawDocument* pDoc;
XColorTable* pColTab;
BOOL bTreeUpdated;
List* pCurrentEffects;
List* pCurrentActions;
String aLastFile;
BOOL bTreeUpdated;
List* pCurrentEffects;
List* pCurrentActions;
String aLastFile;
::std::vector< long > aVerbVector;
//------------------------------------