summaryrefslogtreecommitdiff
path: root/sd/source/filter/ppt
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/filter/ppt')
-rw-r--r--sd/source/filter/ppt/ppt97animations.cxx2
-rw-r--r--sd/source/filter/ppt/ppt97animations.hxx30
-rw-r--r--sd/source/filter/ppt/pptin.cxx230
-rwxr-xr-x[-rw-r--r--]sd/source/filter/ppt/pptin.hxx2
-rw-r--r--sd/source/filter/ppt/pptinanimations.cxx24
-rw-r--r--sd/source/filter/ppt/propread.cxx4
-rwxr-xr-x[-rw-r--r--]sd/source/filter/ppt/propread.hxx10
7 files changed, 151 insertions, 151 deletions
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index 033e0e33604e..8836b1b4851d 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -165,7 +165,7 @@ bool Ppt97Animation::HasAfterEffect_DimAfterEffect() const
return m_aAtom.nAfterEffect == 3;
}
#endif
-UINT32 Ppt97Animation::GetSoundRef() const
+sal_uInt32 Ppt97Animation::GetSoundRef() const
{
return m_aAtom.nSoundRef;
}
diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx
index 64e10250a53c..705f42978a50 100644
--- a/sd/source/filter/ppt/ppt97animations.hxx
+++ b/sd/source/filter/ppt/ppt97animations.hxx
@@ -41,22 +41,22 @@ class Ppt97AnimationInfoAtom
friend class Ppt97Animation;
//-- member
- UINT32 nDimColor;
- UINT32 nFlags; // 0x0004: time instead of click
- UINT32 nSoundRef;
- INT32 nDelayTime; // 1/1000 sec
- UINT16 nOrderID;
- UINT16 nSlideCount;
- UINT8 nBuildType;
- UINT8 nFlyMethod;
- UINT8 nFlyDirection;
- UINT8 nAfterEffect; //nAfterEffect: 0: none; 1: change color; 2: dim on next effect; 3: dim after effect;
- UINT8 nSubEffect;
- UINT8 nOLEVerb;
+ sal_uInt32 nDimColor;
+ sal_uInt32 nFlags; // 0x0004: time instead of click
+ sal_uInt32 nSoundRef;
+ sal_Int32 nDelayTime; // 1/1000 sec
+ sal_uInt16 nOrderID;
+ sal_uInt16 nSlideCount;
+ sal_uInt8 nBuildType;
+ sal_uInt8 nFlyMethod;
+ sal_uInt8 nFlyDirection;
+ sal_uInt8 nAfterEffect; //nAfterEffect: 0: none; 1: change color; 2: dim on next effect; 3: dim after effect;
+ sal_uInt8 nSubEffect;
+ sal_uInt8 nOLEVerb;
// unknown, because whole size needs to be 28
- UINT8 nUnknown1;
- UINT8 nUnknown2;
+ sal_uInt8 nUnknown1;
+ sal_uInt8 nUnknown2;
//-- methods
void ReadStream( SvStream& rIn );
@@ -107,7 +107,7 @@ public: //public methods
bool HasParagraphEffect() const;
bool HasSoundEffect() const;
sal_Int32 GetDimColor() const;
- UINT32 GetSoundRef() const;
+ sal_uInt32 GetSoundRef() const;
bool HasAnimateAssociatedShape() const; //true if the shape should be animated in addition to the text
//set methods
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index c63aaf9f07c0..6fc45cc710a4 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -156,7 +156,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto
SfxItemSet& rSet = pSheet->GetItemSet();
// if autokerning is set in style, override it, ppt has no autokerning
- if( rSet.GetItemState( EE_CHAR_PAIRKERNING, FALSE ) == SFX_ITEM_SET )
+ if( rSet.GetItemState( EE_CHAR_PAIRKERNING, sal_False ) == SFX_ITEM_SET )
rSet.ClearItem( EE_CHAR_PAIRKERNING );
}
}
@@ -178,7 +178,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage
: SdrPowerPointImport ( rParam, rMedium.GetBaseURL() )
, mrMed ( rMedium )
, mrStorage ( rStorage_ )
-, mbDocumentFound ( FALSE )
+, mbDocumentFound ( sal_False )
, mnFilterOptions ( 0 )
{
mpDoc = pDocument;
@@ -186,22 +186,22 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage
{
mbDocumentFound = SeekToDocument( &maDocHd ); // maDocHd = the latest DocumentHeader
while ( SeekToRec( rStCtrl, PPT_PST_Document, nStreamLen, &maDocHd ) )
- mbDocumentFound = TRUE;
+ mbDocumentFound = sal_True;
- UINT32 nDggContainerOfs = 0;
+ sal_uInt32 nDggContainerOfs = 0;
if ( mbDocumentFound )
{
- ULONG nPosMerk = rStCtrl.Tell();
+ sal_uLong nPosMerk = rStCtrl.Tell();
pStData = rStorage_.OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "Pictures" ) ), STREAM_STD_READ );
rStCtrl.Seek( maDocHd.GetRecBegFilePos() + 8 );
- ULONG nDocLen = maDocHd.GetRecEndFilePos();
+ sal_uLong nDocLen = maDocHd.GetRecEndFilePos();
DffRecordHeader aPPDGHd;
if ( SeekToRec( rStCtrl, PPT_PST_PPDrawingGroup, nDocLen, &aPPDGHd ) )
{
- ULONG nPPDGLen = aPPDGHd.GetRecEndFilePos();
+ sal_uLong nPPDGLen = aPPDGHd.GetRecEndFilePos();
if ( SeekToRec( rStCtrl, DFF_msofbtDggContainer, nPPDGLen, NULL ) )
nDggContainerOfs = rStCtrl.Tell();
}
@@ -253,7 +253,7 @@ ImplSdPPTImport::~ImplSdPPTImport()
sal_Bool ImplSdPPTImport::Import()
{
if ( !bOk )
- return FALSE;
+ return sal_False;
pSdrModel->setLock(true);
pSdrModel->EnableUndo(false);
@@ -265,8 +265,8 @@ sal_Bool ImplSdPPTImport::Import()
((EditEngine&)rOutl.GetEditEngine()).SetControlWord( nControlWord );
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
- mnBackgroundLayerID = rAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), FALSE );
- mnBackgroundObjectsLayerID = rAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), FALSE );
+ mnBackgroundLayerID = rAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), sal_False );
+ mnBackgroundObjectsLayerID = rAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), sal_False );
::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh();
if ( pDocShell )
@@ -278,11 +278,11 @@ sal_Bool ImplSdPPTImport::Import()
{
PropItem aPropItem;
- UINT32 nType, nPropSize, nPropCount;
+ sal_uInt32 nType, nPropSize, nPropCount;
pDInfoSec2->Read();
- BYTE aPropSetGUID[ 16 ] =
+ sal_uInt8 aPropSetGUID[ 16 ] =
{
0x02, 0xd5, 0xcd, 0xd5, 0x9c, 0x2e, 0x1b, 0x10, 0x93, 0x97, 0x08, 0x00, 0x2b, 0x2c, 0xf9, 0xae
};
@@ -295,14 +295,14 @@ sal_Bool ImplSdPPTImport::Import()
if ( ( nType == VT_I4 ) || ( nType == VT_UI4 ) )
{
// examine PID_HEADINGPAIR to get the correct entry for PID_DOCPARTS
- UINT32 nSlideCount, nVecCount;
+ sal_uInt32 nSlideCount, nVecCount;
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;
+ sal_uInt32 nSlideTitleIndex = 0, nSlideTitleCount = 0;
+ sal_uInt32 nFontIndex, nFontCount = 0;
+ sal_uInt32 nDesignTemplateIndex, nDesignTemplateCount = 0;
+ sal_uInt32 i, nTemp, nEntryCount = 0;
String aUString;
@@ -315,7 +315,7 @@ sal_Bool ImplSdPPTImport::Import()
for ( i = 0; i < nVecCount; i++ )
{
- if ( !aPropItem.Read( aUString, VT_EMPTY, FALSE ) )
+ if ( !aPropItem.Read( aUString, VT_EMPTY, sal_False ) )
break;
aPropItem >> nType;
if ( ( nType != VT_I4 ) && ( nType != VT_UI4 ) )
@@ -354,7 +354,7 @@ sal_Bool ImplSdPPTImport::Import()
}
for ( i = 0; i < nSlideTitleCount; i++ )
{
- if ( !aPropItem.Read( aUString, nType, FALSE ) )
+ if ( !aPropItem.Read( aUString, nType, sal_False ) )
break;
String* pString = new String( aUString );
if ( pString->EqualsAscii( "No Slide Title" ))
@@ -379,7 +379,7 @@ sal_Bool ImplSdPPTImport::Import()
}
}
- BYTE aUserPropSetGUID[ 16 ] =
+ sal_uInt8 aUserPropSetGUID[ 16 ] =
{
0x05, 0xd5, 0xcd, 0xd5, 0x9c, 0x2e, 0x1b, 0x10, 0x93, 0x97, 0x08, 0x00, 0x2b, 0x2c, 0xf9, 0xae
};
@@ -389,7 +389,7 @@ sal_Bool ImplSdPPTImport::Import()
Dictionary aDict;
if ( pSection->GetDictionary( aDict ) )
{
- UINT32 nPropId = aDict.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_PID_HLINKS" )));
+ sal_uInt32 nPropId = aDict.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_PID_HLINKS" )));
if ( nPropId )
{
if ( pSection->GetProperty( nPropId, aPropItem ) )
@@ -403,7 +403,7 @@ sal_Bool ImplSdPPTImport::Import()
if ( ! ( nPropCount % 6 ) )
{
- UINT32 i;
+ sal_uInt32 i;
nPropCount /= 6; // 6 propertys a hyperlink
@@ -515,7 +515,7 @@ sal_Bool ImplSdPPTImport::Import()
{
pHyperlink->aConvSubString = String( SdResId( STR_PAGE ) );
pHyperlink->aConvSubString.Append( sal_Unicode( ' ' ) );
- pHyperlink->aConvSubString.Append( mpDoc->CreatePageNumValue( (USHORT)nPageNumber + 1 ) );
+ pHyperlink->aConvSubString.Append( mpDoc->CreatePageNumValue( (sal_uInt16)nPageNumber + 1 ) );
}
}
}
@@ -540,7 +540,7 @@ sal_Bool ImplSdPPTImport::Import()
DffRecordHeader aHyperHd;
if ( SeekToRec( rStCtrl, PPT_PST_ExObjList, maDocHd.GetRecEndFilePos(), &aHyperHd ) )
{
- UINT32 nExObjHyperListLen = aHyperHd.GetRecEndFilePos();
+ sal_uInt32 nExObjHyperListLen = aHyperHd.GetRecEndFilePos();
for ( void* pPtr = aHyperList.First(); pPtr; pPtr = aHyperList.Next() )
{
DffRecordHeader aHyperE;
@@ -574,24 +574,24 @@ sal_Bool ImplSdPPTImport::Import()
SfxProgress* pStbMgr = new SfxProgress( pDocShell, String( SdResId( STR_POWERPOINT_IMPORT ) ),
pMasterPages->Count() + pSlidePages->Count() + pNotePages->Count() );
- UINT32 nImportedPages = 0;
+ sal_uInt32 nImportedPages = 0;
{
- UINT16 nMasterAnz = GetPageCount( PPT_MASTERPAGE );
+ sal_uInt16 nMasterAnz = GetPageCount( PPT_MASTERPAGE );
- for ( USHORT nMasterNum = 0; nMasterNum < nMasterAnz; nMasterNum++ )
+ for ( sal_uInt16 nMasterNum = 0; nMasterNum < nMasterAnz; nMasterNum++ )
{
SetPageNum( nMasterNum, PPT_MASTERPAGE );
- SdPage* pPage = (SdPage*)MakeBlancPage( TRUE );
+ SdPage* pPage = (SdPage*)MakeBlancPage( sal_True );
if ( pPage )
{
- BOOL bNotesMaster = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bNotesMaster;
- BOOL bStarDrawFiller = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bStarDrawFiller;
+ sal_Bool bNotesMaster = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bNotesMaster;
+ sal_Bool bStarDrawFiller = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bStarDrawFiller;
PageKind ePgKind = ( bNotesMaster ) ? PK_NOTES : PK_STANDARD;
pPage->SetPageKind( ePgKind );
pSdrModel->InsertMasterPage( (SdrPage*)pPage );
if ( bNotesMaster && bStarDrawFiller )
- ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_NOTES, TRUE );
+ ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_NOTES, sal_True );
if ( nMasterNum )
{
boost::optional< sal_Int16 > oStartNumbering;
@@ -651,8 +651,8 @@ sal_Bool ImplSdPPTImport::Import()
/////////////////////
if ( pPage->GetPageKind() == PK_STANDARD )
{
- UINT32 nTitleInstance = TSS_TYPE_PAGETITLE;
- UINT32 nOutlinerInstance = TSS_TYPE_BODY;
+ sal_uInt32 nTitleInstance = TSS_TYPE_PAGETITLE;
+ sal_uInt32 nOutlinerInstance = TSS_TYPE_BODY;
/////////////////////
// titelstylesheet //
@@ -670,7 +670,7 @@ sal_Bool ImplSdPPTImport::Import()
////////////////////////
// outlinerstylesheet //
////////////////////////
- UINT16 nLevel;
+ sal_uInt16 nLevel;
PPTParagraphObj* pParagraphs[ 9 ];
PPTParagraphObj* pPreviousPara = NULL;
@@ -751,7 +751,7 @@ sal_Bool ImplSdPPTImport::Import()
((SdPage*)pNotesClone)->SetLayoutName( aLayoutName );
}
}
- else if ( ( pPersist->bStarDrawFiller == FALSE ) )
+ else if ( ( pPersist->bStarDrawFiller == sal_False ) )
{
PptSlidePersistEntry* pE = pPersist;
while( ( pE->aSlideAtom.nFlags & 4 ) && pE->aSlideAtom.nMasterId )
@@ -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, sal_True ); // import background
if ( pObj )
pMPage->NbcInsertObject( pObj );
@@ -898,24 +898,24 @@ sal_Bool ImplSdPPTImport::Import()
// importing slide pages //
////////////////////////////////////
{
- UINT32 nFPosMerk = rStCtrl.Tell();
+ sal_uInt32 nFPosMerk = rStCtrl.Tell();
PptPageKind ePageKind = eAktPageKind;
- UINT16 nPageNum = nAktPageNum;
+ sal_uInt16 nPageNum = nAktPageNum;
- SdPage* pHandoutPage = (SdPage*)MakeBlancPage( FALSE );
+ SdPage* pHandoutPage = (SdPage*)MakeBlancPage( sal_False );
pHandoutPage->SetPageKind( PK_HANDOUT );
pSdrModel->InsertPage( pHandoutPage );
- USHORT nPageAnz = GetPageCount( PPT_SLIDEPAGE );
+ sal_uInt16 nPageAnz = GetPageCount( PPT_SLIDEPAGE );
if ( nPageAnz )
{
- for ( USHORT nPage = 0; nPage < nPageAnz; nPage++ )
+ for ( sal_uInt16 nPage = 0; nPage < nPageAnz; nPage++ )
{
sal_Bool bNewAnimationsUsed = sal_False;
mePresChange = PRESCHANGE_SEMIAUTO;
SetPageNum( nPage, PPT_SLIDEPAGE );
- SdPage* pPage = (SdPage*)MakeBlancPage( FALSE );
+ SdPage* pPage = (SdPage*)MakeBlancPage( sal_False );
PptSlidePersistEntry* pMasterPersist = NULL;
if ( HasMasterPage( nPage, PPT_SLIDEPAGE ) ) // try to get the LayoutName from the masterpage
{
@@ -987,7 +987,7 @@ sal_Bool ImplSdPPTImport::Import()
// creating the corresponding note page
eAktPageKind = PPT_NOTEPAGE;
- SdPage* pNotesPage = (SdPage*)MakeBlancPage( FALSE );
+ SdPage* pNotesPage = (SdPage*)MakeBlancPage( sal_False );
sal_uInt16 nNotesMasterNum = GetMasterPageIndex( nPage, PPT_SLIDEPAGE ) + 1;
sal_uInt32 nNotesPageId = GetNotesPageId( nPage );
if ( nNotesPageId )
@@ -1011,13 +1011,13 @@ sal_Bool ImplSdPPTImport::Import()
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 );
+ pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, sal_False );
}
else
{
pNotesPage->SetPageKind( PK_NOTES );
pNotesPage->TRG_SetMasterPage(*pSdrModel->GetMasterPage(nNotesMasterNum));
- pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, TRUE );
+ pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, sal_True );
pSdrModel->InsertPage( pNotesPage );
SdrObject* pPageObj = pNotesPage->GetPresObj( PRESOBJ_PAGE, 1 );
if ( pPageObj )
@@ -1033,7 +1033,7 @@ sal_Bool ImplSdPPTImport::Import()
{
// Das kann bei Dokumentvorlagen vorkommen
eAktPageKind = PPT_SLIDEPAGE;
- SdrPage* pPage = MakeBlancPage( FALSE );
+ SdrPage* pPage = MakeBlancPage( sal_False );
pSdrModel->InsertPage( pPage );
// #i37397#, trying to set the title master for the first page
@@ -1058,10 +1058,10 @@ sal_Bool ImplSdPPTImport::Import()
((SdPage*)pPage)->TRG_SetMasterPage( *((SdPage*)pFoundMaster) );
((SdPage*)pPage)->SetLayoutName( ((SdPage*)pFoundMaster)->GetLayoutName() );
}
- ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_TITLE, TRUE, TRUE );
+ ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_TITLE, sal_True, sal_True );
eAktPageKind = PPT_NOTEPAGE;
- SdrPage* pNPage = MakeBlancPage( FALSE );
+ SdrPage* pNPage = MakeBlancPage( sal_False );
pSdrModel->InsertPage( pNPage );
}
SetPageNum( nPageNum, ePageKind );
@@ -1089,7 +1089,7 @@ sal_Bool ImplSdPPTImport::Import()
case PPT_LAYOUT_TITLEANDBODYSLIDE :
{
eAutoLayout = AUTOLAYOUT_ENUM;
- USHORT nID1 = pSlideLayout->aPlaceholderId[ 1 ];
+ sal_uInt16 nID1 = pSlideLayout->aPlaceholderId[ 1 ];
switch ( nID1 )
{
case PPT_PLACEHOLDER_BODY :
@@ -1117,8 +1117,8 @@ sal_Bool ImplSdPPTImport::Import()
case PPT_LAYOUT_2COLUMNSANDTITLE :
{
eAutoLayout = AUTOLAYOUT_2TEXT;
- USHORT nID1 = pSlideLayout->aPlaceholderId[ 1 ];
- USHORT nID2 = pSlideLayout->aPlaceholderId[ 2 ];
+ sal_uInt16 nID1 = pSlideLayout->aPlaceholderId[ 1 ];
+ sal_uInt16 nID2 = pSlideLayout->aPlaceholderId[ 2 ];
if ( nID1 == PPT_PLACEHOLDER_BODY && nID2 == PPT_PLACEHOLDER_GRAPH )
eAutoLayout = AUTOLAYOUT_TEXTCHART;
else if ( nID1 == PPT_PLACEHOLDER_GRAPH && nID2 == PPT_PLACEHOLDER_BODY )
@@ -1143,8 +1143,8 @@ sal_Bool ImplSdPPTImport::Import()
case PPT_LAYOUT_2ROWSANDTITLE :
{
eAutoLayout = AUTOLAYOUT_2TEXT;
- USHORT nID1 = pSlideLayout->aPlaceholderId[ 1 ];
- USHORT nID2 = pSlideLayout->aPlaceholderId[ 2 ];
+ sal_uInt16 nID1 = pSlideLayout->aPlaceholderId[ 1 ];
+ sal_uInt16 nID2 = pSlideLayout->aPlaceholderId[ 2 ];
if ( nID1 == PPT_PLACEHOLDER_BODY && nID2 == PPT_PLACEHOLDER_OBJECT )
eAutoLayout = AUTOLAYOUT_TEXTOVEROBJ;
else if ( nID1 == PPT_PLACEHOLDER_OBJECT && nID2 == PPT_PLACEHOLDER_BODY )
@@ -1191,17 +1191,17 @@ sal_Bool ImplSdPPTImport::Import()
break;
}
if ( eAutoLayout != AUTOLAYOUT_NONE )
- pPage->SetAutoLayout( eAutoLayout, FALSE );
+ pPage->SetAutoLayout( eAutoLayout, sal_False );
}
}
//////////////////////////////////////////////////////////////
// Handzettel-MasterPage: Autolayout setzen //
//////////////////////////////////////////////////////////////
SdPage* pHandoutMPage = mpDoc->GetMasterSdPage( 0, PK_HANDOUT );
- pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, TRUE, TRUE );
+ pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, sal_True, sal_True );
}
- UINT32 nSlideCount = GetPageCount();
+ sal_uInt32 nSlideCount = GetPageCount();
for ( i = 0; ( i < nSlideCount) && ( i < maSlideNameList.Count() ); i++ )
{
SdPage* pPage = mpDoc->GetSdPage( i, PK_STANDARD );
@@ -1295,22 +1295,22 @@ sal_Bool ImplSdPPTImport::Import()
if ( SeekToRec( rStCtrl, PPT_PST_NamedShowSlides, aCuHeader.GetRecEndFilePos(), &aContent ) )
{
PptSlidePersistList* pPageList = GetPageList( PPT_SLIDEPAGE );
- UINT32 nSCount = aContent.nRecLen >> 2;
+ sal_uInt32 nSCount = aContent.nRecLen >> 2;
if ( pPageList && nSCount )
{
- List* pList = mpDoc->GetCustomShowList( TRUE );
+ List* pList = mpDoc->GetCustomShowList( sal_True );
if ( pList )
{
SdCustomShow* pSdCustomShow = new SdCustomShow( mpDoc );
if ( pSdCustomShow )
{
pSdCustomShow->SetName( aCuShow );
- UINT32 nFound = 0;
- for ( UINT32 nS = 0; nS < nSCount; nS++ )
+ sal_uInt32 nFound = 0;
+ for ( sal_uInt32 nS = 0; nS < nSCount; nS++ )
{
- UINT32 nPageNumber;
+ sal_uInt32 nPageNumber;
rStCtrl >> nPageNumber;
- USHORT nPage = pPageList->FindPage( nPageNumber );
+ sal_uInt16 nPage = pPageList->FindPage( nPageNumber );
if ( nPage != PPTSLIDEPERSIST_ENTRY_NOTFOUND )
{
SdPage* pPage = mpDoc->GetSdPage( nPage, PK_STANDARD );
@@ -1351,7 +1351,7 @@ sal_Bool ImplSdPPTImport::Import()
>> nEndSlide;
sal_Unicode nChar;
- for ( UINT32 i2 = 0; i2 < 32; i2++ )
+ for ( sal_uInt32 i2 = 0; i2 < 32; i2++ )
{
rStCtrl >> nChar;
if ( nChar )
@@ -1368,7 +1368,7 @@ sal_Bool ImplSdPPTImport::Import()
if ( aCustomShow.Len() )
{
void* pPtr;
- List* pList = mpDoc->GetCustomShowList( FALSE );
+ List* pList = mpDoc->GetCustomShowList( sal_False );
if ( pList )
{
for ( pPtr = pList->First(); pPtr; pPtr = pList->Next() )
@@ -1427,7 +1427,7 @@ void ImplSdPPTImport::SetHeaderFooterPageSettings( SdPage* pPage, const PptSlide
bool bVisible = pHFE->IsToDisplay( i );
if ( ( eAktPageKind == PPT_SLIDEPAGE )
&& ( rSlidePersist.aSlideAtom.aLayout.eLayout == PPT_LAYOUT_TITLESLIDE )
- && ( aDocAtom.bTitlePlaceholdersOmitted == TRUE ) )
+ && ( aDocAtom.bTitlePlaceholdersOmitted == sal_True ) )
{
bVisible = sal_False;
}
@@ -1512,7 +1512,7 @@ bool Ppt97AnimationStlSortHelper::operator()( const std::pair< SdrObject*, Ppt97
void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimationsUsed )
{
- ULONG nFilePosMerk = rStCtrl.Tell();
+ sal_uLong nFilePosMerk = rStCtrl.Tell();
// PageKind an der Seite setzen (bisher nur PK_STANDARD oder PK_NOTES)
if ( pPage->GetPageKind() == PK_STANDARD )
@@ -1528,7 +1528,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
if(pPage->TRG_HasMasterPage())
{
SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aVisibleLayers.Set(mnBackgroundObjectsLayerID, FALSE);
+ aVisibleLayers.Set(mnBackgroundObjectsLayerID, sal_False);
pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
}
}
@@ -1536,11 +1536,11 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
DffRecordHeader aPageRecHd;
if ( pPage && SeekToAktPage( &aPageRecHd ) )
{
- ULONG nPageRecEnd = aPageRecHd.GetRecEndFilePos();
+ sal_uLong nPageRecEnd = aPageRecHd.GetRecEndFilePos();
- BOOL bTryTwice = ( eAktPageKind == PPT_SLIDEPAGE );
- BOOL bSSSlideInfoAtom = FALSE;
- while ( TRUE )
+ sal_Bool bTryTwice = ( eAktPageKind == PPT_SLIDEPAGE );
+ sal_Bool bSSSlideInfoAtom = sal_False;
+ while ( sal_True )
{
while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < nPageRecEnd ) )
{
@@ -1550,7 +1550,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
{
case PPT_PST_SSSlideInfoAtom:
{
- bSSSlideInfoAtom = TRUE;
+ bSSSlideInfoAtom = sal_True;
if ( eAktPageKind == PPT_MASTERPAGE )
{
if ( pActualSlidePersist )
@@ -1800,10 +1800,10 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
pPage->SetPresChange( mePresChange );
if ( nBuildFlags & 4 )
- pPage->SetExcluded( TRUE ); // Dia nicht anzeigen
+ pPage->SetExcluded( sal_True ); // Dia nicht anzeigen
if ( nBuildFlags & 16 )
{ // Dia mit Soundeffekt
- pPage->SetSound( TRUE );
+ pPage->SetSound( sal_True );
String aSoundFile( ReadSound( nSoundRef ) );
pPage->SetSoundFile( aSoundFile );
}
@@ -1817,19 +1817,19 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
}
aHd.SeekToEndOfRecord( rStCtrl );
}
- if ( bTryTwice && ( bSSSlideInfoAtom == FALSE ) )
+ if ( bTryTwice && ( bSSSlideInfoAtom == sal_False ) )
{
- bTryTwice = FALSE;
+ bTryTwice = sal_False;
if ( HasMasterPage( nAktPageNum, eAktPageKind ) )
{
- USHORT nMasterNum = GetMasterPageIndex( nAktPageNum, eAktPageKind );
+ sal_uInt16 nMasterNum = GetMasterPageIndex( nAktPageNum, eAktPageKind );
PptSlidePersistList* pPageList = GetPageList( PPT_MASTERPAGE );
if ( pPageList && ( nMasterNum < pPageList->Count() ) )
{
PptSlidePersistEntry* pE = (*pPageList)[ nMasterNum ];
if ( pE )
{
- UINT32 nOfs = pE->aPersistAtom.nReserved;
+ sal_uInt32 nOfs = pE->aPersistAtom.nReserved;
if ( nOfs )
{
rStCtrl.Seek( nOfs );
@@ -1888,31 +1888,31 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
//
///////////////////////////////////////////////////////////////////////////
-String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const
+String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
{
String aRetval;
- UINT32 nPosMerk = rStCtrl.Tell();
+ sal_uInt32 nPosMerk = rStCtrl.Tell();
DffRecordHeader aDocHd;
if ( SeekToDocument( &aDocHd ) )
{
- UINT32 nSoundLen = aDocHd.GetRecEndFilePos();
+ sal_uInt32 nSoundLen = aDocHd.GetRecEndFilePos();
DffRecordHeader aSoundBlockRecHd;
if( SeekToRec( rStCtrl, PPT_PST_SoundCollection, nSoundLen, &aSoundBlockRecHd ) )
{
- UINT32 nDataLen = aSoundBlockRecHd.GetRecEndFilePos();
+ sal_uInt32 nDataLen = aSoundBlockRecHd.GetRecEndFilePos();
DffRecordHeader aSoundRecHd;
- BOOL bRefStrValid = FALSE;
- BOOL bDone = FALSE;
+ sal_Bool bRefStrValid = sal_False;
+ sal_Bool bDone = sal_False;
while( !bDone && SeekToRec( rStCtrl, PPT_PST_Sound, nDataLen, &aSoundRecHd ) )
{
- UINT32 nStrLen = aSoundRecHd.GetRecEndFilePos();
+ sal_uInt32 nStrLen = aSoundRecHd.GetRecEndFilePos();
String aRefStr;
- UINT32 nPosMerk2 = rStCtrl.Tell();
+ sal_uInt32 nPosMerk2 = rStCtrl.Tell();
if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 2 ) )
{
if ( ReadString( aRefStr ) )
- bRefStrValid = TRUE;
+ bRefStrValid = sal_True;
}
if ( bRefStrValid )
{
@@ -1922,7 +1922,7 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const
if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 0 ) )
{
ReadString( aRetval );
- bDone = TRUE;
+ bDone = sal_True;
}
}
}
@@ -1931,13 +1931,13 @@ 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;
+ sal_Bool bSoundExists = sal_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++ )
+ for( sal_uLong n = 0; ( n < pSoundList->Count() ) && !bSoundExists; n++ )
{
INetURLObject aURL( *(String*)pSoundList->GetObject( n ) );
String aSoundName( aURL.GetName() );
@@ -1945,7 +1945,7 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const
if( aSoundName == aRetval )
{
aRetval = *(String*)pSoundList->GetObject( n );
- bSoundExists = TRUE;
+ bSoundExists = sal_True;
}
}
@@ -1964,8 +1964,8 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const
INetURLObject aGalleryUserSound( aGalleryDir.GetToken( aGalleryDir.GetTokenCount( ';' ) - 1 ) );
aGalleryUserSound.Append( aRetval );
- UINT32 nSoundDataLen = aSoundDataRecHd.nRecLen;
- UINT8* pBuf = new UINT8[ nSoundDataLen ];
+ sal_uInt32 nSoundDataLen = aSoundDataRecHd.nRecLen;
+ sal_uInt8* pBuf = new sal_uInt8[ nSoundDataLen ];
rStCtrl.Read( pBuf, nSoundDataLen );
SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aGalleryUserSound.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC );
@@ -2229,7 +2229,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
{
pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for titleobject (SJ)" );
}
break;
@@ -2237,7 +2237,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
{
pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for subtitleobject (SJ)" );
}
break;
@@ -2245,7 +2245,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
case TSS_TYPE_HALFBODY :
case TSS_TYPE_QUARTERBODY :
{
- for ( UINT16 nLevel = 9; nLevel; nLevel-- )
+ for ( sal_uInt16 nLevel = 9; nLevel; nLevel-- )
{
String aName( pPage->GetLayoutName() );
aName.Append( (sal_Unicode)( ' ' ) );
@@ -2257,7 +2257,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
}
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for outlinerobject (SJ)" );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
ppStyleSheetAry = &pStyleSheetAry[ 0 ];
}
break;
@@ -2268,7 +2268,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
{
pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for titleobject (SJ)" );
}
else
@@ -2276,7 +2276,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_NOTES );
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for notesobj (SJ)" );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
}
}
break;
@@ -2311,8 +2311,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
{
if ( !bIsHeaderFooter )
{
- pText->SetNotVisibleAsMaster( TRUE );
- pText->SetEmptyPresObj( TRUE );
+ pText->SetNotVisibleAsMaster( sal_True );
+ pText->SetEmptyPresObj( sal_True );
}
pText->SetUserCall( pPage );
pPage->InsertPresObj( pText, ePresKind );
@@ -2335,13 +2335,13 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
rItemSet.Put( (SdrTextVertAdjustItem&)pText->GetMergedItem( SDRATTR_TEXT_VERTADJUST ) );
rItemSet.Put( (SdrTextHorzAdjustItem&)pText->GetMergedItem( SDRATTR_TEXT_HORZADJUST ) );
}
- pText->NbcSetStyleSheet( pSheet2, FALSE );
+ pText->NbcSetStyleSheet( pSheet2, sal_False );
}
SfxItemSet aTempAttr( mpDoc->GetPool() );
SdrTextMinFrameHeightItem aMinHeight( pText->GetLogicRect().GetSize().Height() );
aTempAttr.Put( aMinHeight );
- SdrTextAutoGrowHeightItem aAutoGrowHeight( FALSE );
+ SdrTextAutoGrowHeightItem aAutoGrowHeight( sal_False );
aTempAttr.Put( aAutoGrowHeight );
pText->SetMergedItemSet(aTempAttr);
}
@@ -2355,8 +2355,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom();
if ( pSlideLayout || ( eAktPageKind == PPT_NOTEPAGE ) )
{
- INT16 nPlaceholderId = pPlaceHolder->nPlaceholderId;
- UINT16 i = 0;
+ sal_Int16 nPlaceholderId = pPlaceHolder->nPlaceholderId;
+ sal_uInt16 i = 0;
if ( eAktPageKind == PPT_SLIDEPAGE )
{
for ( ; i < 8; i++ )
@@ -2427,14 +2427,14 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
}
else
{
- SdrObject* pPresObj = pPage->CreatePresObj( ePresObjKind, bVertical, pText->GetLogicRect(), TRUE );
+ SdrObject* pPresObj = pPage->CreatePresObj( ePresObjKind, bVertical, pText->GetLogicRect(), sal_True );
pPresObj->SetUserCall( pPage );
SfxItemSet aSet( pSdrModel->GetItemPool() );
ApplyAttributes( rStCtrl, aSet );
pPresObj->SetMergedItemSet(aSet);
- if ( ( eAktPageKind != PPT_NOTEPAGE ) && ( pSlideLayout->aPlacementId[ i ] != (ULONG)-1 ) )
+ if ( ( eAktPageKind != PPT_NOTEPAGE ) && ( pSlideLayout->aPlacementId[ i ] != (sal_uLong)-1 ) )
{
SdrObject* pTitleObj = ((SdPage&)pPage->TRG_GetMasterPage()).GetPresObj( PRESOBJ_TITLE );
SdrObject* pOutlineObj = ((SdPage&)pPage->TRG_GetMasterPage()).GetPresObj( PRESOBJ_OUTLINE );
@@ -2580,21 +2580,21 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
pProcessData->pPage->InsertPresObj( pObj, PRESOBJ_PAGE );
}
- BOOL bInhabitanceChecked = FALSE;
- BOOL bAnimationInfoFound = FALSE;
+ sal_Bool bInhabitanceChecked = sal_False;
+ sal_Bool bAnimationInfoFound = sal_False;
DffRecordHeader aMasterShapeHd;
if ( maShapeRecords.SeekToContent( rSt, DFF_msofbtClientData, SEEK_FROM_CURRENT_AND_RESTART ) )
{
DffRecordHeader& rHdClientData = *maShapeRecords.Current();
- while( TRUE )
+ while( sal_True )
{
- UINT32 nClientDataLen = rHdClientData.GetRecEndFilePos();
+ sal_uInt32 nClientDataLen = rHdClientData.GetRecEndFilePos();
DffRecordHeader aHd;
do
{
rSt >> aHd;
- UINT32 nHdRecEnd = aHd.GetRecEndFilePos();
+ sal_uInt32 nHdRecEnd = aHd.GetRecEndFilePos();
switch ( aHd.nRecType )
{
case PPT_PST_AnimationInfo :
@@ -2638,14 +2638,14 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
maAnimations[pObj] = pAnimation;
- bAnimationInfoFound = TRUE;
+ bAnimationInfoFound = sal_True;
}
}
}
break;
case PPT_PST_InteractiveInfo:
{
- UINT32 nFilePosMerk2 = rSt.Tell();
+ sal_uInt32 nFilePosMerk2 = rSt.Tell();
String aMacroName;
if(SeekToRec( rSt, PPT_PST_CString, nHdRecEnd, NULL, 0 ) )
@@ -2707,7 +2707,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
if ( bInhabitanceChecked || bAnimationInfoFound )
break;
- bInhabitanceChecked = TRUE;
+ bInhabitanceChecked = sal_True;
if ( ! ( IsProperty( DFF_Prop_hspMaster ) && SeekToShape( rSt, pData, GetPropertyValue( DFF_Prop_hspMaster ) ) ) )
break;
rSt >> aMasterShapeHd;
diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx
index f45505d75e1f..2f38ff74d444 100644..100755
--- a/sd/source/filter/ppt/pptin.hxx
+++ b/sd/source/filter/ppt/pptin.hxx
@@ -62,7 +62,7 @@ class ImplSdPPTImport : public SdrPowerPointImport
// SvStream* mpPicStream;
DffRecordHeader maDocHd;
List maSlideNameList;
- BOOL mbDocumentFound;
+ sal_Bool mbDocumentFound;
sal_uInt32 mnFilterOptions;
SdDrawDocument* mpDoc;
PresChange mePresChange;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 04c7566bbbee..4a5eb0688243 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -929,9 +929,9 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any
if( aString.getLength() >= 7 && aString[0] == '#' )
{
Color aColor;
- aColor.SetRed( (UINT8)(lcl_gethex( aString[1] ) * 16 + lcl_gethex( aString[2] )) );
- aColor.SetGreen( (UINT8)(lcl_gethex( aString[3] ) * 16 + lcl_gethex( aString[4] )) );
- aColor.SetBlue( (UINT8)(lcl_gethex( aString[5] ) * 16 + lcl_gethex( aString[6] )) );
+ aColor.SetRed( (sal_uInt8)(lcl_gethex( aString[1] ) * 16 + lcl_gethex( aString[2] )) );
+ aColor.SetGreen( (sal_uInt8)(lcl_gethex( aString[3] ) * 16 + lcl_gethex( aString[4] )) );
+ aColor.SetBlue( (sal_uInt8)(lcl_gethex( aString[5] ) * 16 + lcl_gethex( aString[6] )) );
rValue <<= (sal_Int32)aColor.GetColor();
bRet = true;
}
@@ -940,9 +940,9 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any
aString = aString.copy( 4, aString.getLength() - 5 );
Color aColor;
sal_Int32 index = 0;
- aColor.SetRed( (UINT8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
- aColor.SetGreen( (UINT8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
- aColor.SetRed( (UINT8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
+ aColor.SetRed( (sal_uInt8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
+ aColor.SetGreen( (sal_uInt8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
+ aColor.SetRed( (sal_uInt8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
rValue <<= (sal_Int32)aColor.GetColor();
bRet = true;
}
@@ -1839,7 +1839,7 @@ Any AnimationImporter::implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int3
dump( "rgb(%ld", nA );
dump( ",%ld", nB );
dump( ",%ld)", nC );
- Color aColor( (UINT8)nA, (UINT8)nB, (UINT8)nC );
+ Color aColor( (sal_uInt8)nA, (sal_uInt8)nB, (sal_uInt8)nC );
return makeAny( (sal_Int32)aColor.GetRGBColor() );
}
case 1: // hsl
@@ -1857,7 +1857,7 @@ Any AnimationImporter::implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int3
case 2: // index
{
Color aColor;
- mpPPTImport->GetColorFromPalette((USHORT)nA, aColor );
+ mpPPTImport->GetColorFromPalette((sal_uInt16)nA, aColor );
dump( "index(%ld", nA );
dump( " [%ld", (sal_Int32)aColor.GetRed() );
dump( ",%ld", (sal_Int32)aColor.GetGreen() );
@@ -3077,9 +3077,9 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An
const EditTextObject& rEditTextObject = pOPO->GetTextObject();
- const USHORT nParaCount = rEditTextObject.GetParagraphCount();
+ const sal_uInt16 nParaCount = rEditTextObject.GetParagraphCount();
- USHORT nPara = 0;
+ sal_uInt16 nPara = 0;
while( (nPara < nParaCount) && (begin > 0) )
{
@@ -3238,11 +3238,11 @@ void AnimationImporter::dump_atom_header( const Atom* pAtom, bool bOpen, bool bA
// --------------------------------------------------------------------
-void AnimationImporter::dump( UINT32 nLen, bool bNewLine )
+void AnimationImporter::dump( sal_uInt32 nLen, bool bNewLine )
{
char * faul = "0123456789abcdef";
- UINT32 i = 0;
+ sal_uInt32 i = 0;
int b = 0;
sal_Int8 nData;
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index 74f89d2ebd45..150acf381c4d 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -103,7 +103,7 @@ static xub_StrLen lcl_getMaxSafeStrLen(sal_uInt32 nSize)
return static_cast< xub_StrLen >( nSize );
}
-BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign )
+sal_Bool PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign )
{
sal_uInt32 i, nItemSize, nType, nItemPos;
sal_Bool bRetValue = sal_False;
@@ -255,7 +255,7 @@ void Dictionary::AddProperty( sal_uInt32 nId, const String& rString )
// -----------------------------------------------------------------------
-UINT32 Dictionary::GetProperty( const String& rString )
+sal_uInt32 Dictionary::GetProperty( const String& rString )
{
for ( Dict* pDict = (Dict*)First(); pDict; pDict = (Dict*)Next() )
{
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index b268fb3d019d..9adbd89aeb3e 100644..100755
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -129,13 +129,13 @@ class Dictionary : protected List
{
friend class Section;
- void AddProperty( UINT32 nId, const String& rString );
+ void AddProperty( sal_uInt32 nId, const String& rString );
public :
Dictionary(){};
~Dictionary();
Dictionary& operator=( Dictionary& rDictionary );
- UINT32 GetProperty( const String& rPropName );
+ sal_uInt32 GetProperty( const String& rPropName );
};
// ------------------------------------------------------------------------
@@ -146,7 +146,7 @@ class Section : private List
protected:
- BYTE aFMTID[ 16 ];
+ sal_uInt8 aFMTID[ 16 ];
void AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize );
@@ -167,7 +167,7 @@ class Section : private List
class PropRead : private List
{
sal_Bool mbStatus;
- SvStorageStream* mpSvStream;
+ SvStorageStreamRef mpSvStream;
sal_uInt16 mnByteOrder;
sal_uInt16 mnFormat;
@@ -182,7 +182,7 @@ class PropRead : private List
~PropRead();
PropRead& operator=( PropRead& rPropRead );
- const Section* GetSection( const BYTE* pFMTID );
+ const Section* GetSection( const sal_uInt8* pFMTID );
sal_Bool IsValid() const { return mbStatus; };
void Read();
};