summaryrefslogtreecommitdiff
path: root/sd/source/filter/ppt/pptin.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/filter/ppt/pptin.cxx')
-rw-r--r--sd/source/filter/ppt/pptin.cxx348
1 files changed, 174 insertions, 174 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 2e0159a1fa13..b16f44592cde 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -92,7 +92,7 @@
#include <editeng/editstat.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/docfac.hxx>
-#define MAX_USER_MOVE 2
+#define MAX_USER_MOVE 2
#include "pptinanimations.hxx"
#include "ppt97animations.hxx"
@@ -175,16 +175,16 @@ SdPPTImport::~SdPPTImport()
}
ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage_, SfxMedium& rMedium, PowerPointImportParam& rParam )
-: SdrPowerPointImport ( rParam, rMedium.GetBaseURL() )
-, mrMed ( rMedium )
-, mrStorage ( rStorage_ )
-, mbDocumentFound ( FALSE )
-, mnFilterOptions ( 0 )
+: SdrPowerPointImport ( rParam, rMedium.GetBaseURL() )
+, mrMed ( rMedium )
+, mrStorage ( rStorage_ )
+, mbDocumentFound ( FALSE )
+, mnFilterOptions ( 0 )
{
mpDoc = pDocument;
if ( bOk )
{
- mbDocumentFound = SeekToDocument( &maDocHd ); // maDocHd = the latest DocumentHeader
+ mbDocumentFound = SeekToDocument( &maDocHd ); // maDocHd = the latest DocumentHeader
while ( SeekToRec( rStCtrl, PPT_PST_Document, nStreamLen, &maDocHd ) )
mbDocumentFound = TRUE;
@@ -299,10 +299,10 @@ sal_Bool ImplSdPPTImport::Import()
aPropItem >> nSlideCount;
if ( nSlideCount && pSection->GetProperty( PID_HEADINGPAIR, aPropItem ) )
{
- UINT32 nSlideTitleIndex = 0, nSlideTitleCount = 0;
- UINT32 nFontIndex, nFontCount = 0;
- UINT32 nDesignTemplateIndex, nDesignTemplateCount = 0;
- UINT32 i, nTemp, nEntryCount = 0;
+ UINT32 nSlideTitleIndex = 0, nSlideTitleCount = 0;
+ UINT32 nFontIndex, nFontCount = 0;
+ UINT32 nDesignTemplateIndex, nDesignTemplateCount = 0;
+ UINT32 i, nTemp, nEntryCount = 0;
String aUString;
@@ -405,7 +405,7 @@ sal_Bool ImplSdPPTImport::Import()
{
UINT32 i;
- nPropCount /= 6; // 6 propertys a hyperlink
+ nPropCount /= 6; // 6 propertys a hyperlink
SdHyperlinkEntry* pHyperlink = 0;
for ( i = 0; i < nPropCount; i++ )
@@ -553,8 +553,8 @@ sal_Bool ImplSdPPTImport::Import()
Size aVisAreaSize;
switch ( aUserEditAtom.eLastViewType )
{
- case 5 : // notes master
- case 3 : // notes
+ case 5 : // notes master
+ case 3 : // notes
aVisAreaSize = aDocAtom.GetNotesPageSize();
break;
default :
@@ -571,7 +571,7 @@ sal_Bool ImplSdPPTImport::Import()
UINT32 nImportedPages = 0;
{
- UINT16 nMasterAnz = GetPageCount( PPT_MASTERPAGE );
+ UINT16 nMasterAnz = GetPageCount( PPT_MASTERPAGE );
for ( USHORT nMasterNum = 0; nMasterNum < nMasterAnz; nMasterNum++ )
{
@@ -633,7 +633,7 @@ sal_Bool ImplSdPPTImport::Import()
aLayoutName += String::CreateFromInt32( (sal_Int32)( ( nMasterNum + 1 ) / 2 - 1 ) );
( (SdStyleSheetPool*)mpDoc->GetStyleSheetPool() )->CreateLayoutStyleSheets( aLayoutName );
}
- else // Notizseite: Praesentationslayout von der Standardseite verwenden
+ else // Notizseite: Praesentationslayout von der Standardseite verwenden
aLayoutName = ( (SdPage*)mpDoc->GetMasterPage( nMasterNum - 1 ) )->GetName();
}
pPage->SetName( aLayoutName );
@@ -648,12 +648,12 @@ sal_Bool ImplSdPPTImport::Import()
{
UINT32 nTitleInstance = TSS_TYPE_PAGETITLE;
UINT32 nOutlinerInstance = TSS_TYPE_BODY;
-// BOOL bSwapStyleSheet = pSlideLayout->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE;
-// if ( bSwapStyleSheet )
-// {
-// nTitleInstance = TSS_TYPE_TITLE;
-// nOutlinerInstance = TSS_TYPE_SUBTITLE;
-// }
+// BOOL bSwapStyleSheet = pSlideLayout->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE;
+// if ( bSwapStyleSheet )
+// {
+// nTitleInstance = TSS_TYPE_TITLE;
+// nOutlinerInstance = TSS_TYPE_SUBTITLE;
+// }
/////////////////////
// titelstylesheet //
/////////////////////
@@ -732,7 +732,7 @@ sal_Bool ImplSdPPTImport::Import()
{
SetPageNum( i, PPT_MASTERPAGE );
/////////////////////////////////////////////
- // importing master page objects //
+ // importing master page objects //
/////////////////////////////////////////////
PptSlidePersistList* pList = GetPageList( eAktPageKind );
PptSlidePersistEntry* pPersist = ( pList && ( nAktPageNum < pList->Count() ) )
@@ -762,7 +762,7 @@ sal_Bool ImplSdPPTImport::Import()
else
pE = (*pList)[ nNextMaster ];
}
- SdrObject* pObj = ImportPageBackgroundObject( *pMPage, pE->nBackgroundOffset, TRUE ); // import background
+ SdrObject* pObj = ImportPageBackgroundObject( *pMPage, pE->nBackgroundOffset, TRUE ); // import background
if ( pObj )
pMPage->NbcInsertObject( pObj );
@@ -802,7 +802,7 @@ sal_Bool ImplSdPPTImport::Import()
rStCtrl >> aHd2;
if ( ( aHd2.nRecType == DFF_msofbtSpContainer ) || ( aHd2.nRecType == DFF_msofbtSpgrContainer ) )
{
- if ( nObjCount++ ) // skipping the first object
+ if ( nObjCount++ ) // skipping the first object
{
Rectangle aEmpty;
aHd2.SeekToBegOfRecord( rStCtrl );
@@ -879,7 +879,7 @@ sal_Bool ImplSdPPTImport::Import()
}
else
{
- // without StyleSheet, set attributes directly. This
+ // without StyleSheet, set attributes directly. This
// should not be done at all and is an error (will be asserted by SdrPage)
pMPage->getSdrPageProperties().ClearItem();
pMPage->getSdrPageProperties().PutItemSet(pObj->GetMergedItemSet());
@@ -895,12 +895,12 @@ sal_Bool ImplSdPPTImport::Import()
pStbMgr->SetState( nImportedPages++ );
}
////////////////////////////////////
- // importing slide pages //
+ // importing slide pages //
////////////////////////////////////
{
- UINT32 nFPosMerk = rStCtrl.Tell();
- PptPageKind ePageKind = eAktPageKind;
- UINT16 nPageNum = nAktPageNum;
+ UINT32 nFPosMerk = rStCtrl.Tell();
+ PptPageKind ePageKind = eAktPageKind;
+ UINT16 nPageNum = nAktPageNum;
SdPage* pHandoutPage = (SdPage*)MakeBlancPage( FALSE );
pHandoutPage->SetPageKind( PK_HANDOUT );
@@ -927,8 +927,8 @@ sal_Bool ImplSdPPTImport::Import()
pPage->SetLayoutName(((SdPage&)pPage->TRG_GetMasterPage()).GetLayoutName());
}
pPage->SetPageKind( PK_STANDARD );
- pSdrModel->InsertPage( pPage ); // SJ: #i29625# because of form controls, the
- ImportPage( pPage, pMasterPersist ); // page must be inserted before importing
+ pSdrModel->InsertPage( pPage ); // SJ: #i29625# because of form controls, the
+ ImportPage( pPage, pMasterPersist ); // page must be inserted before importing
SetHeaderFooterPageSettings( pPage, pMasterPersist );
// CWS preseng01: pPage->SetPageKind( PK_STANDARD );
@@ -969,11 +969,11 @@ sal_Bool ImplSdPPTImport::Import()
}
break;
- case PPT_PST_NewlyAddedAtomByXP11008 : // ???
+ case PPT_PST_NewlyAddedAtomByXP11008 : // ???
break;
- case PPT_PST_NewlyAddedAtomByXP12011 : // ??? don't know, this atom is always 8 bytes big
- break; // and is appearing in nearly every l10 progtag
+ case PPT_PST_NewlyAddedAtomByXP12011 : // ??? don't know, this atom is always 8 bytes big
+ break; // and is appearing in nearly every l10 progtag
}
aProgTagContentHd.SeekToEndOfRecord( rStCtrl );
}
@@ -1015,8 +1015,8 @@ sal_Bool ImplSdPPTImport::Import()
}
pNotesPage->SetPageKind( PK_NOTES );
pNotesPage->TRG_SetMasterPage(*pSdrModel->GetMasterPage(nNotesMasterNum));
- pSdrModel->InsertPage( pNotesPage ); // SJ: #i29625# because of form controls, the
- ImportPage( pNotesPage, pMasterPersist2 ); // page must be inserted before importing
+ pSdrModel->InsertPage( pNotesPage ); // SJ: #i29625# because of form controls, the
+ ImportPage( pNotesPage, pMasterPersist2 ); // page must be inserted before importing
SetHeaderFooterPageSettings( pNotesPage, pMasterPersist2 );
pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, FALSE );
}
@@ -1075,7 +1075,7 @@ sal_Bool ImplSdPPTImport::Import()
rStCtrl.Seek( nFPosMerk );
}
///////////////////////////////////////////////////////////////////
- // Handzettel und Notiz-Seiten erzeugen //
+ // Handzettel und Notiz-Seiten erzeugen //
///////////////////////////////////////////////////////////////////
bOk = mpDoc->CreateMissingNotesAndHandoutPages();
if ( bOk )
@@ -1091,7 +1091,7 @@ sal_Bool ImplSdPPTImport::Import()
const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom();
if ( pSlideLayout )
{
- switch ( pSlideLayout->eLayout ) // Praesentationslayouts fuer Standard-Seiten
+ switch ( pSlideLayout->eLayout ) // Praesentationslayouts fuer Standard-Seiten
{
case PPT_LAYOUT_TITLEANDBODYSLIDE :
{
@@ -1189,11 +1189,11 @@ sal_Bool ImplSdPPTImport::Import()
case PPT_LAYOUT_BOTTOMROW2COLUMNS :
case PPT_LAYOUT_BLANCSLIDE :
- case PPT_LAYOUT_MASTERSLIDE : // Layout der Standard- und Titel-MasterPage
+ case PPT_LAYOUT_MASTERSLIDE : // Layout der Standard- und Titel-MasterPage
case PPT_LAYOUT_TITLEMASTERSLIDE :
- case PPT_LAYOUT_MASTERNOTES : // Layout der Notizen-MasterPage
- case PPT_LAYOUT_NOTESTITLEBODY : // Praesentationslayout fuer Notiz-Seiten
- case PPT_LAYOUT_HANDOUTLAYOUT : // Praesentationslayout fuer Handzettelseiten
+ case PPT_LAYOUT_MASTERNOTES : // Layout der Notizen-MasterPage
+ case PPT_LAYOUT_NOTESTITLEBODY : // Praesentationslayout fuer Notiz-Seiten
+ case PPT_LAYOUT_HANDOUTLAYOUT : // Praesentationslayout fuer Handzettelseiten
eAutoLayout = AUTOLAYOUT_NONE;
break;
}
@@ -1202,7 +1202,7 @@ sal_Bool ImplSdPPTImport::Import()
}
}
//////////////////////////////////////////////////////////////
- // Handzettel-MasterPage: Autolayout setzen //
+ // Handzettel-MasterPage: Autolayout setzen //
//////////////////////////////////////////////////////////////
SdPage* pHandoutMPage = mpDoc->GetMasterSdPage( 0, PK_HANDOUT );
pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, TRUE, TRUE );
@@ -1239,44 +1239,44 @@ sal_Bool ImplSdPPTImport::Import()
}
if ( pFrameView )
{
- sal_uInt16 nSelectedPage = 0;
- PageKind ePageKind = PK_STANDARD;
- EditMode eEditMode = EM_PAGE;
+ sal_uInt16 nSelectedPage = 0;
+ PageKind ePageKind = PK_STANDARD;
+ EditMode eEditMode = EM_PAGE;
switch ( aUserEditAtom.eLastViewType )
{
- case 7 : // outliner view
+ case 7 : // outliner view
{
SfxItemSet* pSet = mrMed.GetItemSet();
if ( pSet )
pSet->Put( SfxUInt16Item( SID_VIEW_ID, 3 ) );
}
break;
- case 8 : // slide sorter
+ case 8 : // slide sorter
{
SfxItemSet* pSet = mrMed.GetItemSet();
if ( pSet )
pSet->Put( SfxUInt16Item( SID_VIEW_ID, 2 ) );
}
break;
- case 10 : // titlemaster
+ case 10 : // titlemaster
nSelectedPage = 1;
- case 2 : // master
+ case 2 : // master
{
ePageKind = PK_STANDARD;
eEditMode = EM_MASTERPAGE;
}
break;
- case 5 : // notes master
+ case 5 : // notes master
eEditMode = EM_MASTERPAGE;
- case 3 : // notes
+ case 3 : // notes
ePageKind = PK_NOTES;
break;
- case 4 : // handout
+ case 4 : // handout
ePageKind = PK_HANDOUT;
break;
default :
- case 1 : // normal
+ case 1 : // normal
break;
}
pFrameView->SetPageKind( ePageKind );
@@ -1341,12 +1341,12 @@ sal_Bool ImplSdPPTImport::Import()
}
}
// this is defaulted, maybe there is no SSDocInfoAtom
- String aCustomShow;
- sal_uInt32 nFlags = 1; // Bit 0: Auto advance
- sal_uInt32 nPenColor = 0x1000000;
- sal_Int32 nRestartTime = 0x7fffffff;
- sal_uInt16 nStartSlide = 0;
- sal_Int16 nEndSlide = 0;
+ String aCustomShow;
+ sal_uInt32 nFlags = 1; // Bit 0: Auto advance
+ sal_uInt32 nPenColor = 0x1000000;
+ sal_Int32 nRestartTime = 0x7fffffff;
+ sal_uInt16 nStartSlide = 0;
+ sal_Int16 nEndSlide = 0;
// read the pres. configuration
rStCtrl.Seek( maDocHd.GetRecBegFilePos() + 8 );
@@ -1395,8 +1395,8 @@ sal_Bool ImplSdPPTImport::Import()
rPresSettings.mbCustomShow = ( nFlags & 8 ) != 0;
rPresSettings.mbEndless = ( nFlags & 0x80 ) != 0;
rPresSettings.mbFullScreen = ( nFlags & 0x10 ) == 0;
-// rPresSettings.mnPauseTimeout;
-// rPresSettings.mbShowLogo;
+// rPresSettings.mnPauseTimeout;
+// rPresSettings.mbShowLogo;
if ( nStartSlide && ( nStartSlide <= GetPageCount() ) )
{
SdPage* pPage = mpDoc->GetSdPage( nStartSlide - 1, PK_STANDARD );
@@ -1531,7 +1531,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
if ( pActualSlidePersist && ( eAktPageKind == PPT_SLIDEPAGE ) )
{
- if ( ! ( pActualSlidePersist->aSlideAtom.nFlags & 1 ) ) // do not follow master objects ?
+ if ( ! ( pActualSlidePersist->aSlideAtom.nFlags & 1 ) ) // do not follow master objects ?
{
if(pPage->TRG_HasMasterPage())
{
@@ -1569,12 +1569,12 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
sal_Int8 nDirection, nTransitionType, nByteDummy, nSpeed;
sal_Int16 nBuildFlags;
sal_Int32 nSlideTime, nSoundRef;
- rStCtrl >> nSlideTime // Standzeit (in Ticks)
- >> nSoundRef // Index in SoundCollection
- >> nDirection // Richtung des Ueberblendeffekts
- >> nTransitionType // Ueberblendeffekt
- >> nBuildFlags // Buildflags (s.u.)
- >> nSpeed // Geschwindigkeit (langsam, mittel, schnell)
+ rStCtrl >> nSlideTime // Standzeit (in Ticks)
+ >> nSoundRef // Index in SoundCollection
+ >> nDirection // Richtung des Ueberblendeffekts
+ >> nTransitionType // Ueberblendeffekt
+ >> nBuildFlags // Buildflags (s.u.)
+ >> nSpeed // Geschwindigkeit (langsam, mittel, schnell)
>> nByteDummy >> nByteDummy >> nByteDummy;
switch ( nTransitionType )
@@ -1598,21 +1598,21 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
case PPT_TRANSITION_TYPE_COVER :
{
if ( nDirection == 0 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_RIGHT ); // Von rechts ueberdecken
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_RIGHT ); // Von rechts ueberdecken
else if ( nDirection == 1 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_BOTTOM ); // Von unten ueberdecken
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_BOTTOM ); // Von unten ueberdecken
else if ( nDirection == 2 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LEFT ); // Von links ueberdecken
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LEFT ); // Von links ueberdecken
else if ( nDirection == 3 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_TOP ); // Von oben ueberdecken
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_TOP ); // Von oben ueberdecken
else if ( nDirection == 4 )
pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LOWERRIGHT );// Von rechts unten ueberdecken ??
else if ( nDirection == 5 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LOWERLEFT ); // Von links unten ueberdecken ??
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LOWERLEFT ); // Von links unten ueberdecken ??
else if ( nDirection == 6 )
pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_UPPERRIGHT );// Von rechts oben ueberdecken
else if ( nDirection == 7 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_UPPERLEFT ); // Von links oben ueberdecken ??
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_MOVE_FROM_UPPERLEFT ); // Von links oben ueberdecken ??
}
break;
case PPT_TRANSITION_TYPE_NONE :
@@ -1620,7 +1620,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
if ( nBuildFlags )
{
if ( nDirection == 0 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_NONE ); // Direkt
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_NONE ); // Direkt
else if ( nDirection == 1 )
{
pPage->setTransitionType( animations::TransitionType::BARWIPE );
@@ -1633,22 +1633,22 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
}
break;
case PPT_TRANSITION_TYPE_DISSOLVE :
- pPage->SetFadeEffect(::com::sun::star::presentation::FadeEffect_DISSOLVE); // Aufloesen
+ pPage->SetFadeEffect(::com::sun::star::presentation::FadeEffect_DISSOLVE); // Aufloesen
break;
case PPT_TRANSITION_TYPE_RANDOM_BARS :
{
if ( nDirection == 0 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_HORIZONTAL_LINES ); // Horizontale Linien
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_HORIZONTAL_LINES ); // Horizontale Linien
else if ( nDirection == 1 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_VERTICAL_LINES ); // Vertikale Linien
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_VERTICAL_LINES ); // Vertikale Linien
}
break;
case PPT_TRANSITION_TYPE_SPLIT :
{
if ( nDirection == 0 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_OPEN_VERTICAL ); // Horizontal oeffnen
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_OPEN_VERTICAL ); // Horizontal oeffnen
else if ( nDirection == 1 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_CLOSE_VERTICAL ); // Horizontal schliessen
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_CLOSE_VERTICAL ); // Horizontal schliessen
else if ( nDirection == 2 )
pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_OPEN_HORIZONTAL ); // Vertikal oeffnen
else if ( nDirection == 3 )
@@ -1670,13 +1670,13 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
case PPT_TRANSITION_TYPE_PULL :
{
if ( nDirection == 0 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_LEFT ); // Nach links aufdecken
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_LEFT ); // Nach links aufdecken
else if ( nDirection == 1 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_TOP ); // Nach oben aufdecken
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_TOP ); // Nach oben aufdecken
else if ( nDirection == 2 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_RIGHT ); // Nach rechts aufdecken
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_RIGHT ); // Nach rechts aufdecken
else if ( nDirection == 3 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_BOTTOM ); // Nach unten aufdecken
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_BOTTOM ); // Nach unten aufdecken
else if ( nDirection == 4 )
pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_UPPERLEFT );// Nach links oben aufdecken
else if ( nDirection == 5 )
@@ -1694,13 +1694,13 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
else if ( nDirection == 1 )
pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_BOTTOM );// Von unten rollen
else if ( nDirection == 2 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_LEFT ); // Von links rollen
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_LEFT ); // Von links rollen
else if ( nDirection == 3 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_TOP ); // Von oben rollen
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_TOP ); // Von oben rollen
}
break;
case PPT_TRANSITION_TYPE_RANDOM :
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_RANDOM ); // Automatisch
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_RANDOM ); // Automatisch
break;
case PPT_TRANSITION_TYPE_FADE :
{
@@ -1714,7 +1714,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
if ( nDirection == 0 )
pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_FROM_CENTER );// Von innen einblenden
else if ( nDirection == 1 )
- pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_TO_CENTER ); // Von aussen einblenden
+ pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_FADE_TO_CENTER ); // Von aussen einblenden
}
break;
case PPT_TRANSITION_TYPE_DIAMOND :
@@ -1729,7 +1729,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
pPage->setTransitionSubtype( animations::TransitionSubType::CORNERSOUT );
}
break;
- case PPT_TRANSITION_TYPE_CIRCLE :
+ case PPT_TRANSITION_TYPE_CIRCLE :
{
pPage->setTransitionType( animations::TransitionType::ELLIPSEWIPE );
pPage->setTransitionSubtype( animations::TransitionSubType::CIRCLE );
@@ -1793,11 +1793,11 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
}
if ( nSpeed == 0 )
- pPage->setTransitionDuration( 3.0 ); // langsam
+ pPage->setTransitionDuration( 3.0 ); // langsam
else if ( nSpeed == 1 )
- pPage->setTransitionDuration( 2.0 ); // mittel
+ pPage->setTransitionDuration( 2.0 ); // mittel
else if ( nSpeed == 2 )
- pPage->setTransitionDuration( 1.0 ); // schnell
+ pPage->setTransitionDuration( 1.0 ); // schnell
if ( nBuildFlags & 0x400 ) // slidechange by time
{ // Standzeit (in Ticks)
@@ -1807,20 +1807,20 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
else
pPage->SetPresChange( mePresChange );
-// if ( nBuildFlags & 1 ) // slidechange by mouseclick
-// pPage->SetPresChange( mePresChange );
+// if ( nBuildFlags & 1 ) // slidechange by mouseclick
+// pPage->SetPresChange( mePresChange );
if ( nBuildFlags & 4 )
- pPage->SetExcluded( TRUE ); // Dia nicht anzeigen
+ pPage->SetExcluded( TRUE ); // Dia nicht anzeigen
if ( nBuildFlags & 16 )
- { // Dia mit Soundeffekt
+ { // Dia mit Soundeffekt
pPage->SetSound( TRUE );
String aSoundFile( ReadSound( nSoundRef ) );
pPage->SetSoundFile( aSoundFile );
}
- if ( nBuildFlags & ( 1 << 6 ) ) // Loop until next sound
+ if ( nBuildFlags & ( 1 << 6 ) ) // Loop until next sound
pPage->SetLoopSound( sal_True );
- if ( nBuildFlags & ( 1 << 8 ) ) // Stop the previous sound
+ if ( nBuildFlags & ( 1 << 8 ) ) // Stop the previous sound
pPage->SetStopSound( sal_True );
break;
}
@@ -1942,16 +1942,16 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const
// ueberpruefen, ob diese Sound-Datei schon
// existiert. Wenn nicht, exportiere diese
// in unser lokales Sound-Verzeichnis.
- BOOL bSoundExists = FALSE;
- List* pSoundList = new List();
+ BOOL bSoundExists = FALSE;
+ List* pSoundList = new List();
GalleryExplorer::FillObjList( GALLERY_THEME_SOUNDS, *pSoundList );
GalleryExplorer::FillObjList( GALLERY_THEME_USERSOUNDS, *pSoundList );
for( ULONG n = 0; ( n < pSoundList->Count() ) && !bSoundExists; n++ )
{
- INetURLObject aURL( *(String*)pSoundList->GetObject( n ) );
- String aSoundName( aURL.GetName() );
+ INetURLObject aURL( *(String*)pSoundList->GetObject( n ) );
+ String aSoundName( aURL.GetName() );
if( aSoundName == aRetval )
{
@@ -1971,8 +1971,8 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const
DffRecordHeader aSoundDataRecHd;
if ( SeekToRec( rStCtrl, PPT_PST_SoundData, nStrLen, &aSoundDataRecHd, 0 ) )
{
- String aGalleryDir( SvtPathOptions().GetGalleryPath() );
- INetURLObject aGalleryUserSound( aGalleryDir.GetToken( aGalleryDir.GetTokenCount( ';' ) - 1 ) );
+ String aGalleryDir( SvtPathOptions().GetGalleryPath() );
+ INetURLObject aGalleryUserSound( aGalleryDir.GetToken( aGalleryDir.GetTokenCount( ';' ) - 1 ) );
aGalleryUserSound.Append( aRetval );
UINT32 nSoundDataLen = aSoundDataRecHd.nRecLen;
@@ -2086,51 +2086,51 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv
// Lokale Informationen in pInfo eintragen
if( pIAtom->nSoundRef )
{
- pInfo->SetBookmark( ReadSound( pIAtom->nSoundRef ) ); // Pfad zum Soundfile in MSDOS-Notation
- pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_SOUND; // RunProgramAction
+ pInfo->SetBookmark( ReadSound( pIAtom->nSoundRef ) ); // Pfad zum Soundfile in MSDOS-Notation
+ pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_SOUND; // RunProgramAction
}
-// if ( nFlags & 0x01 ) // koennen wir nicht ( beim Anklicken markieren )
+// if ( nFlags & 0x01 ) // koennen wir nicht ( beim Anklicken markieren )
switch ( pIAtom->nAction )
{
-// case 0x01 : // MacroAction
-// {
-// pInfo->meClickAction = ::com::sun::star::presentation::::com::sun::star::presentation::ClickAction_MACRO;
-// // aMacro liegt in folgender Form vor:
-// // "Macroname.Modulname.Libname.Dokumentname" oder
-// // "Macroname.Modulname.Libname.Applikationsname"
-// pInfo->maBookmark = aMacroName;
-// }
-// break;
- case 0x02 : // RunProgramAction
+// case 0x01 : // MacroAction
+// {
+// pInfo->meClickAction = ::com::sun::star::presentation::::com::sun::star::presentation::ClickAction_MACRO;
+// // aMacro liegt in folgender Form vor:
+// // "Macroname.Modulname.Libname.Dokumentname" oder
+// // "Macroname.Modulname.Libname.Applikationsname"
+// pInfo->maBookmark = aMacroName;
+// }
+// break;
+ case 0x02 : // RunProgramAction
{
pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PROGRAM;
- pInfo->SetBookmark( aMacroName ); // Programmname in aBookmark
+ pInfo->SetBookmark( aMacroName ); // Programmname in aBookmark
}
break;
- case 0x03 : // JumpAction
+ case 0x03 : // JumpAction
{
switch( pIAtom->nJump )
{
case 0x01 :
- pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_NEXTPAGE; // Next slide
+ pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_NEXTPAGE; // Next slide
break;
case 0x02 :
- pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PREVPAGE; // Previous slide
+ pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PREVPAGE; // Previous slide
break;
case 0x03 :
- pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_FIRSTPAGE; // First slide
+ pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_FIRSTPAGE; // First slide
break;
case 0x04 :
- pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_LASTPAGE; // last Slide
+ pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_LASTPAGE; // last Slide
break;
case 0x05 :
- pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PREVPAGE; // Last slide viewed
+ pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PREVPAGE; // Last slide viewed
break;
case 0x06 :
pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_STOPPRESENTATION; // End show
break;
default :
- pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_NONE; // 0x00: no action, else unknown
+ pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_NONE; // 0x00: no action, else unknown
break;
}
}
@@ -2148,7 +2148,7 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv
switch( pIAtom->nHyperlinkType )
{
case 9:
- case 8: // hyperlink : URL
+ case 8: // hyperlink : URL
{
if ( pPtr->aTarget.Len() )
{
@@ -2172,7 +2172,7 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv
case 10:
break;
- case 7: // hyperlink auf eine Seite
+ case 7: // hyperlink auf eine Seite
{
if ( pPtr->aConvSubString.Len() )
{
@@ -2185,10 +2185,10 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv
}
}
break;
- case 0x05 : // OLEAction ( OLEVerb to use, 0==first, 1==secnd, .. )
- case 0x06 : // MediaAction
- case 0x07 : // CustomShowAction
- default : // 0x00: no action, else unknown action
+ case 0x05 : // OLEAction ( OLEVerb to use, 0==first, 1==secnd, .. )
+ case 0x06 : // MediaAction
+ case 0x07 : // CustomShowAction
+ default : // 0x00: no action, else unknown action
break;
}
}
@@ -2196,9 +2196,9 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv
SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj, SdPage* pPage,
SfxStyleSheet* pSheet, SfxStyleSheet** ppStyleSheetAry ) const
{
- SfxStyleSheet* pStyleSheetAry[ 9 ];
- SdrTextObj* pText = pObj;
- SdrObject* pRet = pText;
+ SfxStyleSheet* pStyleSheetAry[ 9 ];
+ SdrTextObj* pText = pObj;
+ SdrObject* pRet = pText;
ppStyleSheetAry = NULL;
@@ -2217,7 +2217,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
aPresentationText = pPage->GetPresObjText( ePresKind );
}
break;
- case PPT_PLACEHOLDER_MASTERBODY :
+ case PPT_PLACEHOLDER_MASTERBODY :
{
ePresKind = PRESOBJ_OUTLINE;
aPresentationText = pPage->GetPresObjText( ePresKind );
@@ -2235,10 +2235,10 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
aPresentationText = pPage->GetPresObjText( ePresKind );
}
break;
- case PPT_PLACEHOLDER_MASTERDATE : ePresKind = PRESOBJ_DATETIME; break;
- case PPT_PLACEHOLDER_MASTERSLIDENUMBER : ePresKind = PRESOBJ_SLIDENUMBER;break;
- case PPT_PLACEHOLDER_MASTERFOOTER : ePresKind = PRESOBJ_FOOTER; break;
- case PPT_PLACEHOLDER_MASTERHEADER : ePresKind = PRESOBJ_HEADER; break;
+ case PPT_PLACEHOLDER_MASTERDATE : ePresKind = PRESOBJ_DATETIME; break;
+ case PPT_PLACEHOLDER_MASTERSLIDENUMBER : ePresKind = PRESOBJ_SLIDENUMBER;break;
+ case PPT_PLACEHOLDER_MASTERFOOTER : ePresKind = PRESOBJ_FOOTER; break;
+ case PPT_PLACEHOLDER_MASTERHEADER : ePresKind = PRESOBJ_HEADER; break;
}
}
switch ( pTextObj->GetDestinationInstance() )
@@ -2395,15 +2395,15 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
bEmptyPresObj = sal_False;
switch ( nPlaceholderId )
{
- case PPT_PLACEHOLDER_NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break;
+ case PPT_PLACEHOLDER_NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break;
case PPT_PLACEHOLDER_VERTICALTEXTTITLE :
bVertical = sal_True; // PASSTHROUGH !!!
- case PPT_PLACEHOLDER_TITLE : ePresObjKind = PRESOBJ_TITLE; break;
+ case PPT_PLACEHOLDER_TITLE : ePresObjKind = PRESOBJ_TITLE; break;
case PPT_PLACEHOLDER_VERTICALTEXTBODY :
bVertical = sal_True; // PASSTHROUGH !!!
- case PPT_PLACEHOLDER_BODY : ePresObjKind = PRESOBJ_OUTLINE; break;
- case PPT_PLACEHOLDER_CENTEREDTITLE : ePresObjKind = PRESOBJ_TITLE; break;
- case PPT_PLACEHOLDER_SUBTITLE : ePresObjKind = PRESOBJ_TEXT; break; // PRESOBJ_OUTLINE
+ case PPT_PLACEHOLDER_BODY : ePresObjKind = PRESOBJ_OUTLINE; break;
+ case PPT_PLACEHOLDER_CENTEREDTITLE : ePresObjKind = PRESOBJ_TITLE; break;
+ case PPT_PLACEHOLDER_SUBTITLE : ePresObjKind = PRESOBJ_TEXT; break; // PRESOBJ_OUTLINE
default :
{
@@ -2460,7 +2460,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
Rectangle aTitleRect;
Rectangle aOutlineRect;
- Size aOutlineSize;
+ Size aOutlineSize;
if ( pTitleObj )
aTitleRect = pTitleObj->GetLogicRect();
@@ -2470,11 +2470,11 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
aOutlineSize = aOutlineRect.GetSize();
}
Rectangle aLogicRect( pPresObj->GetLogicRect() );
- Size aLogicSize( aLogicRect.GetSize() );
+ Size aLogicSize( aLogicRect.GetSize() );
switch ( pSlideLayout->aPlacementId[ i ] )
{
- case 0 : // Lage im Titelbereich
+ case 0 : // Lage im Titelbereich
{
if ( aLogicRect != aTitleRect )
pPresObj->SetUserCall( NULL );
@@ -2484,23 +2484,23 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
case 1:
{
if ( pSlideLayout->eLayout == PPT_LAYOUT_TITLEANDBODYSLIDE )
- { // Lage im Outlinebereich
+ { // Lage im Outlinebereich
if ( aLogicRect != aOutlineRect )
pPresObj->SetUserCall( NULL );
}
else if ( pSlideLayout->eLayout == PPT_LAYOUT_2COLUMNSANDTITLE )
- { // Lage im Outlinebereich links
- if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE ||
- Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE ||
+ { // Lage im Outlinebereich links
+ if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE ||
+ Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE ||
Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE ||
- aLogicSize.Width() / aOutlineSize.Width() < 0.48 ||
- aLogicSize.Width() / aOutlineSize.Width() > 0.5)
+ aLogicSize.Width() / aOutlineSize.Width() < 0.48 ||
+ aLogicSize.Width() / aOutlineSize.Width() > 0.5)
{
pPresObj->SetUserCall(NULL);
}
}
else if ( pSlideLayout->eLayout == PPT_LAYOUT_2ROWSANDTITLE )
- { // Lage im Outlinebereich oben
+ { // Lage im Outlinebereich oben
if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE ||
Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE ||
Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE)
@@ -2510,7 +2510,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
}
else if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE ||
Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE)
- { // Lage im Outlinebereich links oben
+ { // Lage im Outlinebereich links oben
pPresObj->SetUserCall( NULL );
}
}
@@ -2519,36 +2519,36 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
case 2:
{
if ( pSlideLayout->eLayout == PPT_LAYOUT_2COLUMNSANDTITLE )
- { // Lage im Outlinebereich rechts
- if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE ||
- Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE ||
+ { // Lage im Outlinebereich rechts
+ if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE ||
+ Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE ||
Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE ||
- aLogicSize.Width() / aOutlineSize.Width() < 0.48 ||
- aLogicSize.Width() / aOutlineSize.Width() > 0.5)
+ aLogicSize.Width() / aOutlineSize.Width() < 0.48 ||
+ aLogicSize.Width() / aOutlineSize.Width() > 0.5)
{
pPresObj->SetUserCall( NULL );
}
}
else if ( pSlideLayout->eLayout == PPT_LAYOUT_2ROWSANDTITLE )
- { // Lage im Outlinebereich unten
- if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE ||
+ { // Lage im Outlinebereich unten
+ if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE ||
Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE ||
- Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE)
+ Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE)
{
pPresObj->SetUserCall( NULL );
}
}
else if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE ||
- Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE)
- { // Lage im Outlinebereich rechts oben
+ Abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE)
+ { // Lage im Outlinebereich rechts oben
pPresObj->SetUserCall(NULL);
}
}
break;
case 3:
- { // Lage im Outlinebereich links unten
- if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE ||
+ { // Lage im Outlinebereich links unten
+ if (Abs(aLogicRect.Left() - aOutlineRect.Left()) > MAX_USER_MOVE ||
Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE)
{
pPresObj->SetUserCall( NULL );
@@ -2557,8 +2557,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
break;
case 4:
- { // Lage im Outlinebereich rechts unten
- if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE ||
+ { // Lage im Outlinebereich rechts unten
+ if (Abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE ||
Abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE)
{
pObj->SetUserCall( NULL );
@@ -2567,7 +2567,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
break;
}
}
- pRet = NULL; // return zero cause this obj was already inserted by CreatePresObj
+ pRet = NULL; // return zero cause this obj was already inserted by CreatePresObj
}
}
else if ( !pTextObj->Count() )
@@ -2711,7 +2711,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
}
//--
- SdrObject::Free( pObj ), pObj = pMediaObj; // SJ: hoping that pObj is not inserted in any list
+ SdrObject::Free( pObj ), pObj = pMediaObj; // SJ: hoping that pObj is not inserted in any list
pMediaObj->setURL( aMediaURL );
}
}