summaryrefslogtreecommitdiff
path: root/sd/source/ui/func
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/func')
-rw-r--r--sd/source/ui/func/fudraw.cxx17
-rw-r--r--sd/source/ui/func/fuoaprms.cxx14
-rw-r--r--sd/source/ui/func/fusel.cxx13
-rw-r--r--sd/source/ui/func/unoaprms.cxx6
4 files changed, 26 insertions, 24 deletions
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 0a539111fb82..a0d7c47d9841 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -1006,7 +1006,7 @@ BOOL FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
// jump to object/page
aHelpText = String(SdResId(STR_CLICK_ACTION_BOOKMARK));
aHelpText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
- aHelpText.Append( String(INetURLObject::decode( pInfo->maBookmark, '%', INetURLObject::DECODE_WITH_CHARSET ) ));
+ aHelpText.Append( String(INetURLObject::decode( pInfo->GetBookmark(), '%', INetURLObject::DECODE_WITH_CHARSET ) ));
}
break;
@@ -1015,7 +1015,7 @@ BOOL FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
// jump to document (object/page)
aHelpText = String(SdResId(STR_CLICK_ACTION_DOCUMENT));
aHelpText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
- aHelpText.Append( String(INetURLObject::decode( pInfo->maBookmark, '%', INetURLObject::DECODE_WITH_CHARSET ) ));
+ aHelpText.Append( String(INetURLObject::decode( pInfo->GetBookmark(), '%', INetURLObject::DECODE_WITH_CHARSET ) ));
}
break;
@@ -1024,7 +1024,7 @@ BOOL FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
// execute program
aHelpText = String(SdResId(STR_CLICK_ACTION_PROGRAM));
aHelpText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
- aHelpText.Append( String(INetURLObject::decode( pInfo->maBookmark, '%', INetURLObject::DECODE_WITH_CHARSET ) ));
+ aHelpText.Append( String(INetURLObject::decode( pInfo->GetBookmark(), '%', INetURLObject::DECODE_WITH_CHARSET ) ));
}
break;
@@ -1034,18 +1034,19 @@ BOOL FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
aHelpText = String(SdResId(STR_CLICK_ACTION_MACRO));
aHelpText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
- if ( SfxApplication::IsXScriptURL( pInfo->maBookmark ) )
+ if ( SfxApplication::IsXScriptURL( pInfo->GetBookmark() ) )
{
- aHelpText.Append( pInfo->maBookmark );
+ aHelpText.Append( pInfo->GetBookmark() );
}
else
{
+ String sBookmark( pInfo->GetBookmark() );
sal_Unicode cToken = '.';
- aHelpText.Append( pInfo->maBookmark.GetToken( 2, cToken ) );
+ aHelpText.Append( sBookmark.GetToken( 2, cToken ) );
aHelpText.Append( cToken );
- aHelpText.Append( pInfo->maBookmark.GetToken( 1, cToken ) );
+ aHelpText.Append( sBookmark.GetToken( 1, cToken ) );
aHelpText.Append( cToken );
- aHelpText.Append( pInfo->maBookmark.GetToken( 0, cToken ) );
+ aHelpText.Append( sBookmark.GetToken( 0, cToken ) );
}
}
break;
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 965b52b3a94b..694f1ae6615a 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -186,7 +186,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
eClickAction = pInfo->meClickAction;
nClickActionSet = ATTR_SET;
- aBookmark = pInfo->maBookmark;
+ aBookmark = pInfo->GetBookmark();
nBookmarkSet = ATTR_SET;
eSecondEffect = pInfo->meSecondEffect;
@@ -243,7 +243,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
if( eClickAction != pInfo->meClickAction )
nClickActionSet = ATTR_MIXED;
- if( aBookmark != pInfo->maBookmark )
+ if( aBookmark != pInfo->GetBookmark() )
nBookmarkSet = ATTR_MIXED;
if( eSecondEffect != pInfo->meSecondEffect )
@@ -353,7 +353,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
aSound = pInfo->maSoundFile; nSoundFileSet = ATTR_SET;
bPlayFull = pInfo->mbPlayFull; nPlayFullSet = ATTR_SET;
eClickAction = pInfo->meClickAction; nClickActionSet = ATTR_SET;
- aBookmark = pInfo->maBookmark; nBookmarkSet = ATTR_SET;
+ aBookmark = pInfo->GetBookmark(); nBookmarkSet = ATTR_SET;
eSecondEffect = pInfo->meSecondEffect; nSecondEffectSet = ATTR_SET;
eSecondSpeed = pInfo->meSecondSpeed; nSecondSpeedSet = ATTR_SET;
bSecondSoundOn = pInfo->mbSecondSoundOn; nSecondSoundOnSet = ATTR_SET;
@@ -733,7 +733,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
pAction->SetPlayFull(pInfo->mbPlayFull, pInfo->mbPlayFull);
// pAction->SetPathObj(pInfo->mpPathObj, pInfo->mpPathObj);
pAction->SetClickAction(pInfo->meClickAction, pInfo->meClickAction);
- pAction->SetBookmark(pInfo->maBookmark, pInfo->maBookmark);
+ pAction->SetBookmark(pInfo->GetBookmark(), pInfo->GetBookmark());
// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE);
pAction->SetVerb(pInfo->mnVerb, pInfo->mnVerb);
pAction->SetSecondEffect(pInfo->meSecondEffect, pInfo->meSecondEffect);
@@ -762,10 +762,10 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
pAction->SetPlayFull(pInfo->mbPlayFull, bPlayFull);
pAction->SetPathObj(pInfo->mpPathObj, pPath);
pAction->SetClickAction(pInfo->meClickAction, eClickAction);
- pAction->SetBookmark(pInfo->maBookmark, aBookmark);
+ pAction->SetBookmark(pInfo->GetBookmark(), aBookmark);
// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation,
// pInfo->mbInvisibleInPresentation);
- pAction->SetVerb(pInfo->mnVerb, (USHORT)pInfo->maBookmark.ToInt32() );
+ pAction->SetVerb(pInfo->mnVerb, (USHORT)pInfo->GetBookmark().ToInt32() );
pAction->SetSecondEffect(pInfo->meSecondEffect, eSecondEffect);
pAction->SetSecondSpeed(pInfo->meSecondSpeed, eSecondSpeed);
pAction->SetSecondSoundOn(pInfo->mbSecondSoundOn, bSecondSoundOn);
@@ -807,7 +807,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
pInfo->meClickAction = eClickAction;
if (nBookmarkSet == ATTR_SET)
- pInfo->maBookmark = aBookmark;
+ pInfo->SetBookmark( aBookmark );
if (nSecondEffectSet == ATTR_SET)
pInfo->meSecondEffect = eSecondEffect;
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index cab26dee337e..068686d4a709 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1254,7 +1254,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
case presentation::ClickAction_BOOKMARK:
{
// Sprung zu Bookmark (Seite oder Objekt)
- SfxStringItem aItem(SID_NAVIGATOR_OBJECT, pInfo->maBookmark);
+ SfxStringItem aItem(SID_NAVIGATOR_OBJECT, pInfo->GetBookmark());
mpViewShell->GetViewFrame()->GetDispatcher()->
Execute(SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L);
bAnimated = TRUE;
@@ -1263,11 +1263,12 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
case presentation::ClickAction_DOCUMENT:
{
+ String sBookmark( pInfo->GetBookmark() );
// Sprung zu Dokument
- if (pInfo->maBookmark.Len())
+ if (sBookmark.Len())
{
SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName());
- SfxStringItem aStrItem(SID_FILE_NAME, pInfo->maBookmark);
+ SfxStringItem aStrItem(SID_FILE_NAME, sBookmark);
SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame);
SfxBoolItem aBrowseItem( SID_BROWSE, TRUE );
@@ -1328,7 +1329,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
{
try
{
- mxPlayer.set( avmedia::MediaWindow::createPlayer( pInfo->maBookmark ), uno::UNO_QUERY_THROW );
+ mxPlayer.set( avmedia::MediaWindow::createPlayer( pInfo->GetBookmark()), uno::UNO_QUERY_THROW );
mxPlayer->start();
}
catch( uno::Exception& e )
@@ -1352,7 +1353,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
case presentation::ClickAction_PROGRAM:
{
String aBaseURL = GetDocSh()->GetMedium()->GetBaseURL();
- INetURLObject aURL( ::URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), pInfo->maBookmark,
+ INetURLObject aURL( ::URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), pInfo->GetBookmark(),
URIHelper::GetMaybeFileHdl(), true, false,
INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ) );
@@ -1377,7 +1378,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
case presentation::ClickAction_MACRO:
{
// Execute makro
- String aMacro = pInfo->maBookmark;
+ String aMacro = pInfo->GetBookmark();
if ( SfxApplication::IsXScriptURL( aMacro ) )
{
diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx
index d602fa3ee9f4..7dcd41f87339 100644
--- a/sd/source/ui/func/unoaprms.cxx
+++ b/sd/source/ui/func/unoaprms.cxx
@@ -74,7 +74,7 @@ SdAnimationPrmsUndoAction::SdAnimationPrmsUndoAction(
pNewPathObj = pOldPathObj = pInfo->mpPathObj;
eNewClickAction = eOldClickAction = pInfo->meClickAction;
- aNewBookmark = aOldBookmark = pInfo->maBookmark;
+ aNewBookmark = aOldBookmark = pInfo->GetBookmark();
// bNewInvisibleInPres = bOldInvisibleInPres= pInfo->mbInvisibleInPresentation;
nNewVerb = nOldVerb = pInfo->mnVerb;
nNewPresOrder = nOldPresOrder = pInfo->mnPresOrder;
@@ -115,7 +115,7 @@ void SdAnimationPrmsUndoAction::Undo()
pInfo->mbPlayFull = bOldPlayFull;
// pInfo->mSetPath(pOldPathObj);
pInfo->meClickAction = eOldClickAction;
- pInfo->maBookmark = aOldBookmark;
+ pInfo->SetBookmark( aOldBookmark );
// pInfo->mbInvisibleInPresentation = bOldInvisibleInPres;
pInfo->mnVerb = nOldVerb;
pInfo->mnPresOrder = nOldPresOrder;
@@ -161,7 +161,7 @@ void SdAnimationPrmsUndoAction::Redo()
pInfo->mbPlayFull = bNewPlayFull;
// pInfo->mSetPath(pNewPathObj);
pInfo->meClickAction = eNewClickAction;
- pInfo->maBookmark = aNewBookmark;
+ pInfo->SetBookmark( aNewBookmark );
// pInfo->mbInvisibleInPresentation = bNewInvisibleInPres;
pInfo->mnVerb = nNewVerb;
pInfo->mnPresOrder = nNewPresOrder;
generated by cgit (git 2.34.1) at 2024-07-25 23:58:14 +0000