sd/source/filter/ppt/pptin.cxx | 18 +++++++++---------
sd/source/filter/ppt/pptin.hxx | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit db90a3838f9cdd4866a0add4a5b5f5859d78e0d7
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Jun 25 19:45:21 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Jun 26 09:56:45 2023 +0200
FillSdAnimationInfo is never passed a null
Change-Id: Iaf292fc3476fbbc21fede3856a50864951c1db8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153568
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 0cdc7f8fb59b..53d28a3c46ea 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2081,27 +2081,27 @@ OUString ImplSdPPTImport::ReadMedia( sal_uInt32
nMediaRef ) const
}
// import of objects
-void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo,
PptInteractiveInfoAtom const * pIAtom, const OUString& aMacroName )
+void ImplSdPPTImport::FillSdAnimationInfo(SdAnimationInfo* pInfo, const
PptInteractiveInfoAtom& rIAtom, const OUString& rMacroName)
{
// set local information into pInfo
- if( pIAtom->nSoundRef )
+ if( rIAtom.nSoundRef )
{
- pInfo->SetBookmark( ReadSound( pIAtom->nSoundRef ) ); // path to
sound file in MS DOS notation
+ pInfo->SetBookmark( ReadSound( rIAtom.nSoundRef ) ); // path to
sound file in MS DOS notation
pInfo->meClickAction = css::presentation::ClickAction_SOUND;
// RunProgramAction
}
- switch ( pIAtom->nAction )
+ switch ( rIAtom.nAction )
{
case 0x02 : // RunProgramAction
{
pInfo->meClickAction = css::presentation::ClickAction_PROGRAM;
- pInfo->SetBookmark( aMacroName ); // program
name in aBookmark
+ pInfo->SetBookmark(rMacroName); // program name
in aBookmark
}
break;
case 0x03 : // JumpAction
{
- switch( pIAtom->nJump )
+ switch( rIAtom.nJump )
{
case 0x01 :
pInfo->meClickAction =
css::presentation::ClickAction_NEXTPAGE; // Next slide
@@ -2131,14 +2131,14 @@ void ImplSdPPTImport::FillSdAnimationInfo(
SdAnimationInfo* pInfo, PptInteractiv
{
SdHyperlinkEntry* pPtr = nullptr;
for (SdHyperlinkEntry & entry : m_aHyperList) {
- if ( entry.nIndex == pIAtom->nExHyperlinkId ) {
+ if ( entry.nIndex == rIAtom.nExHyperlinkId ) {
pPtr = &entry;
break;
}
}
if ( pPtr )
{
- switch( pIAtom->nHyperlinkType )
+ switch( rIAtom.nHyperlinkType )
{
case 9:
case 8: //
hyperlink : URL
@@ -2691,7 +2691,7 @@ rtl::Reference<SdrObject> ImplSdPPTImport::ProcessObj(
SvStream& rSt, DffObjData
// interactive object
SdAnimationInfo* pInfo =
SdDrawDocument::GetShapeUserData(*pObj, true);
- FillSdAnimationInfo( pInfo,
&aInteractiveInfoAtom, aMacroName );
+ FillSdAnimationInfo(pInfo,
aInteractiveInfoAtom, aMacroName);
if ( aInteractiveInfoAtom.nAction == 6 ) // Sj
-> media action
{
rHdClientData.SeekToContent( rStCtrl );
diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx
index 6dc02652cc76..c0d239fd23c5 100644
--- a/sd/source/filter/ppt/pptin.hxx
+++ b/sd/source/filter/ppt/pptin.hxx
@@ -58,7 +58,7 @@ class ImplSdPPTImport : public SdrPowerPointImport
void SetHeaderFooterPageSettings( SdPage* pPage, const
PptSlidePersistEntry* pMasterPersist );
void ImportPageEffect( SdPage* pPage, const bool
bNewAnimationsUsed );
- void FillSdAnimationInfo( SdAnimationInfo* pInfo,
PptInteractiveInfoAtom const * pIAtom, const OUString& aMacroName );
+ void FillSdAnimationInfo(SdAnimationInfo* pInfo, const
PptInteractiveInfoAtom& rIAtom, const OUString& rMacroName);
virtual rtl::Reference<SdrObject> ProcessObj( SvStream& rSt,
DffObjData& rData, SvxMSDffClientData& rClientData, ::tools::Rectangle&
rTextRect, SdrObject* pObj ) override;
virtual SdrObject* ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj*
pText, SdPageCapsule pPage,
