diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-24 10:52:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-24 10:53:17 +0200 |
| commit | b45a12c37d2b671e54404afda5dee1b0947bd3ed (patch) | |
| tree | 484fa50da87e5434970c774527a77e0dd079e1b9 /sd/source/filter | |
| parent | e4e654e40575300eaab429a6b94348bf43b9d7ce (diff) | |
sd: sal_Bool->bool
Change-Id: I3172a42f6b6abe434ffe0475d1201ff50b6c06ea
Diffstat (limited to 'sd/source/filter')
31 files changed, 771 insertions, 771 deletions
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 1793453622c6..5ef8987574d9 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -49,7 +49,7 @@ extern "C" sal_uInt32 ImportCGM( OUString&, Reference< XModel >&, sal_uInt32, Re #endif -SdCGMFilter::SdCGMFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) : +SdCGMFilter::SdCGMFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) : SdFilter( rMedium, rDocShell, bShowProgress ) { } @@ -58,12 +58,12 @@ SdCGMFilter::~SdCGMFilter() { } -sal_Bool SdCGMFilter::Import() +bool SdCGMFilter::Import() { #ifndef DISABLE_DYNLOADING ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); #endif - sal_Bool bRet = sal_False; + bool bRet = false; if( #ifndef DISABLE_DYNLOADING @@ -87,7 +87,7 @@ sal_Bool SdCGMFilter::Import() if( nRetValue ) { - bRet = sal_True; + bRet = true; if( ( nRetValue &~0xff000000 ) != 0xffffff ) // maybe the backgroundcolor is already white { // so we must not set a master page @@ -110,14 +110,14 @@ sal_Bool SdCGMFilter::Import() return bRet; } -sal_Bool SdCGMFilter::Export() +bool SdCGMFilter::Export() { #ifdef DISABLE_DYNLOADING // No ExportCGM function exists(!) return sal_False; #else ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); - sal_Bool bRet = sal_False; + bool bRet = false; if( pLibrary && mxModel.is() ) { diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 68c8fe94ffb2..d3e91bf8a9e8 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -69,8 +69,8 @@ PPTWriter::PPTWriter( SvStorageRef& rSvStorage, SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) : PPTWriterBase ( rXModel, rXStatInd ), mnCnvrtFlags ( nCnvrtFlags ), - mbStatus ( sal_False ), - mbUseNewAnimations ( sal_True ), + mbStatus ( false ), + mbUseNewAnimations ( true ), mnStatMaxValue ( 0 ), mnLatestStatValue ( 0 ), mnTextStyle( 0 ), @@ -105,7 +105,7 @@ void PPTWriter::exportPPTPre( const std::vector< com::sun::star::beans::Property if ( mXStatusIndicator.is() ) { - mbStatusIndicator = sal_True; + mbStatusIndicator = true; mnStatMaxValue = ( mnPages + mnMasterPages ) * 5; mXStatusIndicator->start( OUString( "PowerPoint Export" ), mnStatMaxValue + ( mnStatMaxValue >> 3 ) ); } @@ -161,13 +161,13 @@ void PPTWriter::exportPPTPost( ) if ( !ImplCreateDocumentSummaryInformation() ) return; - mbStatus = sal_True; + mbStatus = true; }; void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStream& rBinaryTagData10Atom ); void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 nMode, - sal_Bool bHasBackground, Reference< XPropertySet > aXBackgroundPropSet ) + bool bHasBackground, Reference< XPropertySet > aXBackgroundPropSet ) { Any aAny; @@ -183,7 +183,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ .WriteUInt16( (sal_uInt16)0 ); // padword mnDiaMode = 0; - sal_Bool bVisible = sal_True; + bool bVisible = true; ::com::sun::star::presentation::FadeEffect eFe = ::com::sun::star::presentation::FadeEffect_NONE; if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Visible" ) ) ) @@ -205,9 +205,9 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ aAny >>= eFe; sal_uInt32 nSoundRef = 0; - sal_Bool bIsSound = sal_False; - sal_Bool bStopSound = sal_False; - sal_Bool bLoopSound = sal_False; + bool bIsSound = false; + bool bStopSound = false; + bool bLoopSound = false; if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Sound" ) ) ) { @@ -215,7 +215,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ if ( aAny >>= aSoundURL ) { nSoundRef = maSoundCollection.GetId( aSoundURL ); - bIsSound = sal_True; + bIsSound = true; } else aAny >>= bStopSound; @@ -223,11 +223,11 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "LoopSound" ) ) ) aAny >>= bLoopSound; - sal_Bool bNeedsSSSlideInfoAtom = ( bVisible == sal_False ) - || ( mnDiaMode == 2 ) - || ( bIsSound ) - || ( bStopSound ) - || ( eFe != ::com::sun::star::presentation::FadeEffect_NONE ); + bool bNeedsSSSlideInfoAtom = ( bVisible == false ) + || ( mnDiaMode == 2 ) + || ( bIsSound ) + || ( bStopSound ) + || ( eFe != ::com::sun::star::presentation::FadeEffect_NONE ); if ( bNeedsSSSlideInfoAtom ) { sal_uInt8 nDirection = 0; @@ -256,7 +256,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ nTransitionType = GetTransition( eFe, nDirection ); if ( mnDiaMode == 2 ) // automatic ? nBuildFlags |= 0x400; - if ( bVisible == sal_False ) + if ( bVisible == false ) nBuildFlags |= 4; if ( bIsSound ) nBuildFlags |= 16; @@ -284,7 +284,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ mpPptEscherEx->OpenContainer( EPP_PPDrawing ); mpPptEscherEx->OpenContainer( ESCHER_DgContainer ); mpPptEscherEx->EnterGroup(0,0); - ImplWritePage( rLayout, aSolverContainer, NORMAL, sal_False, nPageNum ); // the shapes of the pages are created in the PPT document + ImplWritePage( rLayout, aSolverContainer, NORMAL, false, nPageNum ); // the shapes of the pages are created in the PPT document mpPptEscherEx->LeaveGroup(); if ( bHasBackground ) @@ -396,8 +396,8 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS mpPptEscherEx->BeginAtom(); - sal_Bool bFirst = sal_True; - sal_Bool bSimpleText = sal_False; + bool bFirst = true; + bool bSimpleText = false; mpStrm->WriteUInt16( (sal_uInt16)5 ); // paragraph count @@ -405,13 +405,13 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS { if ( nInstance >= EPP_TEXTTYPE_CenterBody ) { - bFirst = sal_False; - bSimpleText = sal_True; + bFirst = false; + bSimpleText = true; mpStrm->WriteUInt16( nLev ); } mpStyleSheet->mpParaSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet ); mpStyleSheet->mpCharSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet ); - bFirst = sal_False; + bFirst = false; } mpPptEscherEx->EndAtom( EPP_TxMasterStyleAtom, 0, nInstance ); } @@ -423,7 +423,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS mpPptEscherEx->OpenContainer( ESCHER_DgContainer ); mpPptEscherEx->EnterGroup(0,0); - ImplWritePage( GetLayout( 0 ), aSolverContainer, MASTER, sal_True ); // the shapes of the pages are created in the PPT document + ImplWritePage( GetLayout( 0 ), aSolverContainer, MASTER, true ); // the shapes of the pages are created in the PPT document mpPptEscherEx->LeaveGroup(); ImplWriteBackground( aXBackgroundPropSet ); @@ -461,11 +461,11 @@ PPTWriter::~PPTWriter() mXStatusIndicator->end(); } -sal_Bool PPTWriter::ImplCreateCurrentUserStream() +bool PPTWriter::ImplCreateCurrentUserStream() { mpCurUserStrm = mrStg->OpenSotStream( OUString( "Current User" ) ); if ( !mpCurUserStrm ) - return sal_False; + return false; char pUserName[] = "Current User"; sal_uInt32 nLenOfUserName = strlen( pUserName ); sal_uInt32 nSizeOfRecord = 0x14 + ( ( nLenOfUserName + 4 ) & ~ 3 ); @@ -488,10 +488,10 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream() mpCurUserStrm->WriteUChar( (sal_uInt8)0 ); // pad bytes }; mpCurUserStrm->Seek( nEditPos ); - return sal_True; + return true; }; -sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation() +bool PPTWriter::ImplCreateDocumentSummaryInformation() { uno::Reference<document::XDocumentPropertiesSupplier> xDPS( mXModel, uno::UNO_QUERY_THROW); @@ -539,7 +539,7 @@ sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation() } } - return sal_True; + return true; } void PPTWriter::ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sal_uInt32 nInstance, sal_uInt32 nSlideId ) @@ -561,17 +561,17 @@ void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, ::com::sun::star { OUString aString; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "HeaderText" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "HeaderText" ), true ) ) { if ( aAny >>= aString ) PPTWriter::WriteCString( rStrm, aString, 1 ); } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "FooterText" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "FooterText" ), true ) ) { if ( aAny >>= aString ) PPTWriter::WriteCString( rStrm, aString, 2 ); } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "DateTimeText" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "DateTimeText" ), true ) ) { if ( aAny >>= aString ) PPTWriter::WriteCString( rStrm, aString, 0 ); @@ -583,37 +583,37 @@ void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com { if ( rXPagePropSet.is() ) { - sal_Bool bVal = sal_False; + bool bVal = false; sal_uInt32 nVal = 0; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsHeaderVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsHeaderVisible" ), true ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x100000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsFooterVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsFooterVisible" ), true ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x200000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsDateTimeVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsDateTimeVisible" ), true ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x010000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsPageNumberVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsPageNumberVisible" ), true ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x080000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsDateTimeFixed" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsDateTimeFixed" ), true ) ) { if ( ( aAny >>= bVal ) && !bVal ) nVal |= 0x20000; else nVal |= 0x40000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "DateTimeFormat" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "DateTimeFormat" ), true ) ) { sal_Int32 nFormat = *(sal_Int32*)aAny.getValue(); SvxDateFormat eDateFormat = (SvxDateFormat)( nFormat & 0xf ); @@ -661,7 +661,7 @@ void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com } } -sal_Bool PPTWriter::ImplCreateDocument() +bool PPTWriter::ImplCreateDocument() { sal_uInt32 i; sal_uInt16 nSlideType = EPP_SLIDESIZE_TYPECUSTOM; @@ -724,7 +724,7 @@ sal_Bool PPTWriter::ImplCreateDocument() .WriteUInt32( (sal_uInt32)0 ); // reserved, usually 0 if ( !GetPageByIndex( i, NORMAL ) ) // very exciting: once again through all pages - return sal_False; + return false; SetCurrentStyleSheet( GetMasterIndex( NORMAL ) ); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > @@ -805,7 +805,7 @@ sal_Bool PPTWriter::ImplCreateDocument() if ( ImplGetPropertyValue( OUString("IsAutomatic" ) ) ) { - sal_Bool bBool = sal_False; + bool bBool = false; mAny >>= bBool; if ( !bBool ) nFlags |= 1; @@ -813,14 +813,14 @@ sal_Bool PPTWriter::ImplCreateDocument() if ( ImplGetPropertyValue( OUString( "IsEndless" ) ) ) // the correct name would be IsNotEndless: WTF? { - sal_Bool bBool = sal_False; + bool bBool = false; mAny >>= bBool; if ( bBool ) nFlags |= 0x80; } if ( ImplGetPropertyValue( OUString( "IsFullScreen" ) ) ) { - sal_Bool bBool = sal_False; + bool bBool = false; mAny >>= bBool; if ( !bBool ) nFlags |= 0x11; @@ -922,10 +922,10 @@ sal_Bool PPTWriter::ImplCreateDocument() } mpPptEscherEx->AddAtom( 0, EPP_EndDocument ); mpPptEscherEx->CloseContainer(); // EPP_Document - return sal_True; + return true; }; -sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) +bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) { sal_uInt32 nCurrentOfs, nParaOfs, nParaCount = 0; @@ -1003,10 +1003,10 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) rStrm.WriteUInt32( (sal_uInt32)( nCurrentOfs - ( nParaOfs + 4 ) ) ); rStrm.WriteUInt32( nParaCount ); rStrm.Seek( nCurrentOfs ); - return sal_True; + return true; } -sal_Bool PPTWriter::ImplCreateMainNotes() +bool PPTWriter::ImplCreateMainNotes() { EscherSolverContainer aSolverContainer; @@ -1019,7 +1019,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes() mpPptEscherEx->OpenContainer( ESCHER_DgContainer ); mpPptEscherEx->EnterGroup(0,0); - ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, sal_True ); + ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, true ); mpPptEscherEx->LeaveGroup(); mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -1043,7 +1043,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes() mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 ); mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x99cc00 ).WriteUInt32( (sal_uInt32)0xcc3333 ).WriteUInt32( (sal_uInt32)0xffcccc ).WriteUInt32( (sal_uInt32)0xb2b2b2 ); mpPptEscherEx->CloseContainer(); // EPP_Notes - return sal_True; + return true; } static OUString getInitials( const OUString& rName ) @@ -1148,7 +1148,7 @@ void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum ) mpPptEscherEx->OpenContainer( ESCHER_DgContainer ); mpPptEscherEx->EnterGroup(0,0); - ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, sal_False ); // the shapes of the pages are created in the PPT document + ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, false ); // the shapes of the pages are created in the PPT document mpPptEscherEx->LeaveGroup(); mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -1308,7 +1308,7 @@ void PPTWriter::ImplWriteOLE( ) //Initialize the graphic size which will be used on export ::com::sun::star::awt::Size aSize( pPtr->xShape->getSize() ); SvStorageRef xDest( new SvStorage( new SvMemoryStream(), true ) ); - sal_Bool bOk = oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xDest, pPtr->xControlModel, aSize, aName ); + bool bOk = oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xDest, pPtr->xControlModel, aSize, aName ); if ( bOk ) pStrm = xDest->CreateMemoryStream(); } @@ -1334,7 +1334,7 @@ void PPTWriter::ImplWriteOLE( ) // write PersistantTable and UserEditAtom -sal_Bool PPTWriter::ImplWriteAtomEnding() +bool PPTWriter::ImplWriteAtomEnding() { #define EPP_LastViewTypeSlideView 1 @@ -1439,31 +1439,31 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() .WriteInt16( (sal_Int16)EPP_LastViewTypeSlideView ) // last view type .WriteInt16( (sal_Int16)0x12 ); // padword - return sal_True; + return true; } // - exported function - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SvStorageRef& rSvStorage, +extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SvStorageRef& rSvStorage, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel, ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd, SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) { PPTWriter* pPPTWriter; - sal_Bool bStatus = sal_False; + bool bStatus = false; pPPTWriter = new PPTWriter( rSvStorage, rXModel, rXStatInd, pVBA, nCnvrtFlags ); if ( pPPTWriter ) { pPPTWriter->exportPPT(rMediaData); - bStatus = ( pPPTWriter->IsValid() == sal_True ); + bStatus = pPPTWriter->IsValid(); delete pPPTWriter; } return bStatus; } -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) +extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) { SvStorageRef xDest( new SvStorage( new SvMemoryStream(), true ) ); SvxImportMSVBasic aMSVBas( rDocShell, *xDest ); @@ -1488,14 +1488,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocS xTemp->Read( pTemp, nLen ); pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ ); pBas->ObjectOwnsMemory( true ); - return sal_True; + return true; } } } } } - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 9350bda4658b..e2b6f03bca56 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -159,8 +159,8 @@ struct CellBorder; class PPTWriter : public PPTWriterBase, public PPTExBulletProvider { sal_uInt32 mnCnvrtFlags; - sal_Bool mbStatus; - sal_Bool mbUseNewAnimations; + bool mbStatus; + bool mbUseNewAnimations; sal_uInt32 mnStatMaxValue; sal_uInt32 mnLatestStatValue; @@ -174,7 +174,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > mXTextField; sal_uInt32 mnTextStyle; - sal_Bool mbFontIndependentLineSpacing; + bool mbFontIndependentLineSpacing; sal_uInt32 mnTextSize; SvStorageRef mrStg; @@ -220,56 +220,56 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider protected: - sal_Bool ImplCreateDocumentSummaryInformation(); - sal_Bool ImplCreateCurrentUserStream(); + bool ImplCreateDocumentSummaryInformation(); + bool ImplCreateCurrentUserStream(); void ImplCreateHeaderFooterStrings( SvStream& rOut, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ); void ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ); - virtual sal_Bool ImplCreateDocument() SAL_OVERRIDE; - sal_Bool ImplCreateHyperBlob( SvMemoryStream& rStream ); + virtual bool ImplCreateDocument() SAL_OVERRIDE; + bool ImplCreateHyperBlob( SvMemoryStream& rStream ); sal_uInt32 ImplInsertBookmarkURL( const OUString& rBookmark, const sal_uInt32 nType, - const OUString& rStringVer0, const OUString& rStringVer1, const OUString& rStringVer2, const OUString& rStringVer3 ); - virtual sal_Bool ImplCreateMainNotes() SAL_OVERRIDE; - sal_Bool ImplCreateNotes( sal_uInt32 nPageNum ); + const OUString& rStringVer0, const OUString& rStringVer1, const OUString& rStringVer2, const OUString& rStringVer3 ); + virtual bool ImplCreateMainNotes() SAL_OVERRIDE; + bool ImplCreateNotes( sal_uInt32 nPageNum ); void ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXBackgroundPropSet ); - void ImplWriteVBA(); + void ImplWriteVBA(); void ImplWriteOLE(); - sal_Bool ImplWriteAtomEnding(); + bool ImplWriteAtomEnding(); void ImplFlipBoundingBox( EscherPropertyContainer& rPropOpt ); - sal_Bool ImplGetText(); - sal_Bool ImplCreatePresentationPlaceholder( const sal_Bool bMaster, const PageType PageType, + bool ImplGetText(); + bool ImplCreatePresentationPlaceholder( const bool bMaster, const PageType PageType, const sal_uInt32 StyleInstance, const sal_uInt8 PlaceHolderId ); - sal_Bool ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, + bool ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, ::com::sun::star::presentation::AnimationEffect& eEffect, ::com::sun::star::presentation::AnimationEffect& eTextEffect, - sal_Bool& bHasSound ); + bool& bHasSound ); void ImplWriteObjectEffect( SvStream& rSt, ::com::sun::star::presentation::AnimationEffect eEffect, ::com::sun::star::presentation::AnimationEffect eTextEffect, sal_uInt16 nOrder ); - void ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eAction, sal_Bool bMediaClickAction ); + void ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eAction, bool bMediaClickAction ); void ImplWriteParagraphs( SvStream& rOutStrm, TextObj& rTextObj ); void ImplWritePortions( SvStream& rOutStrm, TextObj& rTextObj ); void ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_uInt32 nAtomInstance, TextRuleEntry* pTextRule, SvStream& rExtBu, EscherPropertyContainer* ); void ImplAdjustFirstLineLineSpacing( TextObj& rTextObj, EscherPropertyContainer& rPropOpt ); void ImplCreateShape( sal_uInt32 nType, sal_uInt32 nFlags, EscherSolverContainer& ); - void ImplCreateTextShape( EscherPropertyContainer&, EscherSolverContainer&, sal_Bool bFill ); + void ImplCreateTextShape( EscherPropertyContainer&, EscherSolverContainer&, bool bFill ); void ImplWritePage( const PHLayout& rLayout, - EscherSolverContainer& rSolver, - PageType ePageType, - sal_Bool bMaster, - int nPageNumber = 0 ); - sal_Bool ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ); + EscherSolverContainer& rSolver, + PageType ePageType, + bool bMaster, + int nPageNumber = 0 ); + bool ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ); void ImplCreateTable( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rXShape, EscherSolverContainer& aSolverContainer, EscherPropertyContainer& aPropOpt ); - sal_Bool ImplCloseDocument(); // we write the font, hyper and sound list + bool ImplCloseDocument(); // we write the font, hyper and sound list virtual void ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterID, sal_uInt16 nMode, - sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; + bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; virtual void ImplWriteNotes( sal_uInt32 nPageNum ) SAL_OVERRIDE; virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; @@ -281,7 +281,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider virtual ~PPTWriter(); - sal_Bool IsValid() const { return mbStatus; }; + bool IsValid() const { return mbStatus; }; virtual void exportPPTPre( const std::vector< com::sun::star::beans::PropertyValue >& ) SAL_OVERRIDE; virtual void exportPPTPost( ) SAL_OVERRIDE; diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index 1cef1d08aa05..00eb6a1a3de8 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -71,9 +71,9 @@ struct PHLayout sal_uInt8 nTypeOfTitle; sal_uInt8 nTypeOfOutliner; - sal_Bool bTitlePossible; - sal_Bool bOutlinerPossible; - sal_Bool bSecOutlinerPossible; + bool bTitlePossible; + bool bOutlinerPossible; + bool bSecOutlinerPossible; }; enum PageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3, LAYOUT = 4 }; @@ -87,8 +87,8 @@ class PropValue ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > mXPropSet; - sal_Bool ImplGetPropertyValue( const OUString& rString ); - sal_Bool ImplGetPropertyValue( const ::com::sun::star::uno::Reference + bool ImplGetPropertyValue( const OUString& rString ); + bool ImplGetPropertyValue( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &, const OUString& ); public : @@ -101,11 +101,11 @@ class PropValue ::com::sun::star::uno::Any GetAny() { return mAny; } - static sal_Bool GetPropertyValue( + static bool GetPropertyValue( ::com::sun::star::uno::Any& rAny, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, const OUString& rPropertyName, - sal_Bool bTestPropertyAvailability = sal_False ); + bool bTestPropertyAvailability = false ); static ::com::sun::star::beans::PropertyState GetPropertyState( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &, @@ -142,7 +142,7 @@ struct FontCollectionEntry sal_Int16 CharSet; OUString Original; - sal_Bool bIsConverted; + bool bIsConverted; FontCollectionEntry( const OUString& rName, sal_Int16 nFamily, sal_Int16 nPitch, sal_Int16 nCharSet ) : Scaling ( 1.0 ), @@ -252,14 +252,14 @@ struct PPTExCharSheet void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, FontCollection& rFontCollection, int nLevel ); - void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText, + void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, bool bFirst, bool bSimpleText, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet ); }; struct PPTExParaLevel { - sal_Bool mbIsBullet; + bool mbIsBullet; sal_uInt16 mnBulletChar; sal_uInt16 mnBulletFont; sal_uInt16 mnBulletHeight; @@ -274,7 +274,7 @@ struct PPTExParaLevel sal_uInt16 mnBulletOfs; sal_uInt16 mnDefaultTab; - sal_Bool mbExtendedBulletsUsed; + bool mbExtendedBulletsUsed; sal_uInt16 mnBulletId; sal_uInt16 mnBulletStart; sal_uInt32 mnMappedNumType; @@ -294,7 +294,7 @@ struct PPTExParaSheet void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, FontCollection& rFontCollection, int nLevel, const PPTExCharLevel& rCharLevel ); - void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText, + void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, bool bFirst, bool bSimpleText, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet ); }; @@ -314,7 +314,7 @@ class PPTExStyleSheet void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, FontCollection& rFontCollection, int nInstance, int nLevel ); - sal_Bool IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue ); + bool IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue ); sal_uInt32 SizeOfTxCFStyleAtom() const; void WriteTxCFStyleAtom( SvStream& rSt ); @@ -326,7 +326,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mXModel; ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mXStatusIndicator; - sal_Bool mbStatusIndicator; + bool mbStatusIndicator; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPagesSupplier > mXDrawPagesSupplier; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPagesSupplier > mXMasterPagesSupplier; @@ -340,8 +340,8 @@ protected: ::com::sun::star::awt::Point maPosition; Rectangle maRect; OString mType; - sal_Bool mbPresObj; - sal_Bool mbEmptyPresObj; + bool mbPresObj; + bool mbEmptyPresObj; sal_Int32 mnAngle; sal_uInt32 mnPages; ///< number of Slides ( w/o master pages & notes & handout ) @@ -361,7 +361,7 @@ protected: FontCollection maFontCollection; virtual void ImplWriteSlide( sal_uInt32 /* nPageNum */, sal_uInt32 /* nMasterNum */, sal_uInt16 /* nMode */, - sal_Bool /* bHasBackground */, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > /* aXBackgroundPropSet */ ) {} + bool /* bHasBackground */, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > /* aXBackgroundPropSet */ ) {} virtual void ImplWriteNotes( sal_uInt32 nPageNum ) = 0; virtual void ImplWriteSlideMaster( sal_uInt32 /* nPageNum */, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > /* aXBackgroundPropSet */ ) {} virtual void ImplWriteLayout( sal_Int32 /* nOffset */, sal_uInt32 /* nMasterNum */ ) {} @@ -369,19 +369,19 @@ protected: virtual void exportPPTPre( const std::vector< com::sun::star::beans::PropertyValue >& ) {} virtual void exportPPTPost() {} - virtual sal_Bool ImplCreateDocument()=0; - virtual sal_Bool ImplCreateMainNotes()=0; + virtual bool ImplCreateDocument()=0; + virtual bool ImplCreateMainNotes()=0; - sal_Bool GetStyleSheets(); - sal_Bool GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = sal_False ); + bool GetStyleSheets(); + bool GetShapeByIndex( sal_uInt32 nIndex, bool bGroup = false ); - sal_Bool CreateMainNotes(); + bool CreateMainNotes(); ::com::sun::star::awt::Size MapSize( const ::com::sun::star::awt::Size& ); ::com::sun::star::awt::Point MapPoint( const ::com::sun::star::awt::Point& ); Rectangle MapRectangle( const ::com::sun::star::awt::Rectangle& ); - sal_Bool ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX ); + bool ContainsOtherShapeThanPlaceholders( bool bForOOMLX ); public: PPTWriterBase(); @@ -392,21 +392,21 @@ public: void exportPPT(const std::vector< com::sun::star::beans::PropertyValue >&); - sal_Bool InitSOIface(); - sal_Bool GetPageByIndex( sal_uInt32 nIndex, PageType ); + bool InitSOIface(); + bool GetPageByIndex( sal_uInt32 nIndex, PageType ); sal_uInt32 GetMasterIndex( PageType ePageType ); - sal_Bool SetCurrentStyleSheet( sal_uInt32 nPageNum ); + bool SetCurrentStyleSheet( sal_uInt32 nPageNum ); - sal_Bool GetPresObj() { return mbPresObj; } + bool GetPresObj() { return mbPresObj; } PHLayout& GetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const; PHLayout& GetLayout( sal_Int32 nOffset ) const; sal_Int32 GetLayoutOffset( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const; sal_Int32 GetLayoutOffsetFixed( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const; - sal_Bool CreateSlide( sal_uInt32 nPageNum ); - sal_Bool CreateSlideMaster( sal_uInt32 nPageNum ); - sal_Bool CreateNotes( sal_uInt32 nPageNum ); + bool CreateSlide( sal_uInt32 nPageNum ); + bool CreateSlideMaster( sal_uInt32 nPageNum ); + bool CreateNotes( sal_uInt32 nPageNum ); static sal_Int8 GetTransition( sal_Int16 nTransitionType, sal_Int16 nTransitionSubtype, ::com::sun::star::presentation::FadeEffect eEffect, sal_uInt8& nDirection ); static sal_Int8 GetTransition( ::com::sun::star::presentation::FadeEffect eEffect, sal_uInt8& nDirection ); diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 6f47adf1e43f..23e5b8e383dc 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -88,30 +88,30 @@ public: protected: virtual void ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 nMode, - sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; + bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; virtual void ImplWriteNotes( sal_uInt32 nPageNum ) SAL_OVERRIDE; virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; virtual void ImplWriteLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum ) SAL_OVERRIDE; void ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum ); void WriteTheme( sal_Int32 nThemeNum ); - virtual sal_Bool ImplCreateDocument() SAL_OVERRIDE; - virtual sal_Bool ImplCreateMainNotes() SAL_OVERRIDE; + virtual bool ImplCreateDocument() SAL_OVERRIDE; + virtual bool ImplCreateMainNotes() SAL_OVERRIDE; virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; - sal_Bool WriteNotesMaster(); + bool WriteNotesMaster(); void WriteAnimateTo( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any aValue, const OUString& rAttributeName ); void WriteAnimateValues( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& rXAnimate ); - void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any& rAny, sal_Bool bWriteEvent, sal_Bool bMainSeqChild ); - void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, const char* pDelay, const char* pEvent, double fDelay, sal_Bool bHasFDelay ); + void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any& rAny, bool bWriteEvent, bool bMainSeqChild ); + void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, const char* pDelay, const char* pEvent, double fDelay, bool bHasFDelay ); void WriteAnimations( ::sax_fastparser::FSHelperPtr pFS ); void WriteAnimationAttributeName( ::sax_fastparser::FSHelperPtr pFS, const OUString& rAttributeName ); - void WriteAnimationNode( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Bool bMainSeqChild ); - void WriteAnimationNodeAnimate( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, sal_Bool bMainSeqChild ); - void WriteAnimationNodeAnimateInside( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Bool bMainSeqChild, sal_Bool bSimple ); - void WriteAnimationNodeSeq( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, sal_Bool bMainSeqChild ); - void WriteAnimationNodeEffect( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, sal_Bool bMainSeqChild ); - void WriteAnimationNodeCommonPropsStart( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Bool bSingle, sal_Bool bMainSeqChild ); + void WriteAnimationNode( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, bool bMainSeqChild ); + void WriteAnimationNodeAnimate( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, bool bMainSeqChild ); + void WriteAnimationNodeAnimateInside( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, bool bMainSeqChild, bool bSimple ); + void WriteAnimationNodeSeq( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, bool bMainSeqChild ); + void WriteAnimationNodeEffect( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, bool bMainSeqChild ); + void WriteAnimationNodeCommonPropsStart( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, bool bSingle, bool bMainSeqChild ); void WriteAnimationProperty( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any& rAny ); void WriteAnimationTarget( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any aTarget ); bool WriteComments( sal_uInt32 nPageNum ); @@ -121,7 +121,7 @@ protected: sal_Int32 GetLayoutFileId( sal_Int32 nOffset, sal_uInt32 nMasterNum ); // shapes - void WriteShapeTree( ::sax_fastparser::FSHelperPtr pFS, PageType ePageType, sal_Bool bMaster ); + void WriteShapeTree( ::sax_fastparser::FSHelperPtr pFS, PageType ePageType, bool bMaster ); sal_uInt32 GetNewSlideId() { return mnSlideIdMax ++; } sal_uInt32 GetNewSlideMasterId() { return mnSlideMasterIdMax ++; } @@ -145,7 +145,7 @@ private: sal_uInt32 mnSlideMasterIdMax; sal_uInt32 mnAnimationNodeIdMax; - sal_Bool mbCreateNotes; + bool mbCreateNotes; static sal_Int32 nStyleLevelToken[5]; diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index f78ee569614d..bf8bd4fd0807 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -394,7 +394,7 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const return nHyperId; } -sal_Bool PPTWriter::ImplCloseDocument() +bool PPTWriter::ImplCloseDocument() { sal_uInt32 nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_Document ); if ( nOfs ) @@ -408,12 +408,12 @@ sal_Bool PPTWriter::ImplCloseDocument() EscherExAtom aTxMasterStyleAtom( aTxMasterStyleAtomStrm, EPP_TxMasterStyleAtom, EPP_TEXTTYPE_Other ); aTxMasterStyleAtomStrm.WriteUInt16( (sal_uInt16)5 ); // paragraph count sal_uInt16 nLev; - sal_Bool bFirst = sal_True; + bool bFirst = true; for ( nLev = 0; nLev < 5; nLev++ ) { - mpStyleSheet->mpParaSheet[ EPP_TEXTTYPE_Other ]->Write( aTxMasterStyleAtomStrm, mpPptEscherEx, nLev, bFirst, sal_False, mXPagePropSet ); - mpStyleSheet->mpCharSheet[ EPP_TEXTTYPE_Other ]->Write( aTxMasterStyleAtomStrm, mpPptEscherEx, nLev, bFirst, sal_False, mXPagePropSet ); - bFirst = sal_False; + mpStyleSheet->mpParaSheet[ EPP_TEXTTYPE_Other ]->Write( aTxMasterStyleAtomStrm, mpPptEscherEx, nLev, bFirst, false, mXPagePropSet ); + mpStyleSheet->mpCharSheet[ EPP_TEXTTYPE_Other ]->Write( aTxMasterStyleAtomStrm, mpPptEscherEx, nLev, bFirst, false, mXPagePropSet ); + bFirst = false; } } @@ -547,22 +547,22 @@ sal_Bool PPTWriter::ImplCloseDocument() if ( nOldPos ) { mpStrm->Seek( nOldPos ); - return sal_True; + return true; } } - return sal_False; + return false; } -sal_Bool PropValue::GetPropertyValue( +bool PropValue::GetPropertyValue( ::com::sun::star::uno::Any& rAny, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const OUString& rString, - sal_Bool bTestPropertyAvailability ) + bool bTestPropertyAvailability ) { - sal_Bool bRetValue = sal_True; + bool bRetValue = true; if ( bTestPropertyAvailability ) { - bRetValue = sal_False; + bRetValue = false; try { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > @@ -572,7 +572,7 @@ sal_Bool PropValue::GetPropertyValue( } catch( ::com::sun::star::uno::Exception& ) { - bRetValue = sal_False; + bRetValue = false; } } if ( bRetValue ) @@ -581,11 +581,11 @@ sal_Bool PropValue::GetPropertyValue( { rAny = rXPropSet->getPropertyValue( rString ); if ( !rAny.hasValue() ) - bRetValue = sal_False; + bRetValue = false; } catch( ::com::sun::star::uno::Exception& ) { - bRetValue = sal_False; + bRetValue = false; } } return bRetValue; @@ -610,31 +610,31 @@ sal_Bool PropValue::GetPropertyValue( return eRetValue; } -sal_Bool PropValue::ImplGetPropertyValue( const OUString& rString ) +bool PropValue::ImplGetPropertyValue( const OUString& rString ) { return GetPropertyValue( mAny, mXPropSet, rString ); } -sal_Bool PropValue::ImplGetPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & aXPropSet, const OUString& rString ) +bool PropValue::ImplGetPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & aXPropSet, const OUString& rString ) { return GetPropertyValue( mAny, aXPropSet, rString ); } -sal_Bool PropStateValue::ImplGetPropertyValue( const OUString& rString, sal_Bool bGetPropertyState ) +bool PropStateValue::ImplGetPropertyValue( const OUString& rString, bool bGetPropertyState ) { ePropState = ::com::sun::star::beans::PropertyState_AMBIGUOUS_VALUE; - sal_Bool bRetValue = sal_True; + bool bRetValue = true; #ifdef UNX ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > aXPropSetInfo( mXPropSet->getPropertySetInfo() ); if ( !aXPropSetInfo.is() ) - return sal_False; + return false; #endif try { mAny = mXPropSet->getPropertyValue( rString ); if ( !mAny.hasValue() ) - bRetValue = sal_False; + bRetValue = false; else if ( bGetPropertyState ) ePropState = mXPropState->getPropertyState( rString ); else @@ -642,21 +642,21 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const OUString& rString, sal_Bool } catch( ::com::sun::star::uno::Exception& ) { - bRetValue = sal_False; + bRetValue = false; } return bRetValue; } void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) { - sal_Bool bFirstParagraph = sal_True; + bool bFirstParagraph = true; sal_uInt32 nCharCount; sal_uInt32 nPropertyFlags = 0; sal_uInt16 nDepth = 0; sal_Int16 nLineSpacing; int nInstance = rTextObj.GetInstance(); - for ( sal_uInt32 i = 0; i < rTextObj.ParagraphCount(); ++i, bFirstParagraph = sal_False ) + for ( sal_uInt32 i = 0; i < rTextObj.ParagraphCount(); ++i, bFirstParagraph = false ) { ParagraphObj* pPara = rTextObj.GetParagraph(i); PortionObj* pPortion = pPara->front(); @@ -709,10 +709,10 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, ParaAttr_LowerDist, pPara->mnLineSpacingBottom ) ) ) nPropertyFlags |= 0x00004000; if ( ( pPara->meForbiddenRules == ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) || - ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, ParaAttr_UpperDist, pPara->mbForbiddenRules ) ) ) + ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, ParaAttr_UpperDist, pPara->mbForbiddenRules ? 1 : 0 ) ) ) nPropertyFlags |= 0x00020000; if ( ( pPara->meParagraphPunctation == ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) || - ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, ParaAttr_UpperDist, pPara->mbParagraphPunctation ) ) ) + ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, ParaAttr_UpperDist, pPara->mbParagraphPunctation ? 1 : 0 ) ) ) nPropertyFlags |= 0x00080000; if ( ( pPara->meBiDi == ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) || ( mpStyleSheet->IsHardAttribute( nInstance, nDepth, ParaAttr_BiDi, pPara->mnBiDi ) ) ) @@ -755,9 +755,9 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) sal_uInt32 nBulletColor = pPara->nBulletColor; if ( nBulletColor == COL_AUTO ) { - sal_Bool bIsDark = sal_False; + bool bIsDark = false; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundDark" ), true ) ) aAny >>= bIsDark; nBulletColor = bIsDark ? 0xffffff : 0x000000; } @@ -808,9 +808,9 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) if ( nCharColor == COL_AUTO ) // nCharColor depends to the background color { - sal_Bool bIsDark = sal_False; + bool bIsDark = false; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundDark" ), true ) ) aAny >>= bIsDark; nCharColor = bIsDark ? 0xffffff : 0x000000; } @@ -900,7 +900,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) if ( aPropSetOfNextShape.is() ) { if ( PropValue::GetPropertyValue( aAny, aPropSetOfNextShape, - OUString( "FillColor" ), sal_True ) ) + OUString( "FillColor" ), true ) ) { if ( nCharColor == mpPptEscherEx->GetColor( *((sal_uInt32*)aAny.getValue()) ) ) { @@ -978,10 +978,10 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) /** * Loads and converts text from shape, value is stored in mnTextSize. */ -sal_Bool PPTWriter::ImplGetText() +bool PPTWriter::ImplGetText() { mnTextSize = 0; - mbFontIndependentLineSpacing = sal_False; + mbFontIndependentLineSpacing = false; mXText = ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > ( mXShape, ::com::sun::star::uno::UNO_QUERY ); @@ -1864,7 +1864,7 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, nBuildType = 2; if ( ImplGetPropertyValue( OUString( "SoundOn" ) ) ) { - sal_Bool bBool(sal_False); + bool bBool(false); mAny >>= bBool; if ( bBool ) { @@ -1876,8 +1876,8 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, } } } - sal_Bool bDimHide = sal_False; - sal_Bool bDimPrevious = sal_False; + bool bDimHide = false; + bool bDimPrevious = false; if ( ImplGetPropertyValue( OUString( "DimHide" ) ) ) mAny >>= bDimHide; if ( ImplGetPropertyValue( OUString( "DimPrevious" ) ) ) @@ -1896,7 +1896,7 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, .WriteUInt16( (sal_uInt16)0 ); // PadWord } -void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eCa, sal_Bool bMediaClickAction ) +void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eCa, bool bMediaClickAction ) { sal_uInt32 nSoundRef = 0; // a reference to a sound in the sound collection, or NULL. sal_uInt32 nHyperLinkID = 0;// a persistent unique identifier to an external hyperlink object (only valid when action == HyperlinkAction). @@ -2050,10 +2050,10 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat for ( int i = 0; i < 4; i++, rSt.WriteUInt32( (sal_uInt32)0 ) ) ; } -sal_Bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropSet, +bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropSet, ::com::sun::star::presentation::AnimationEffect& eEffect, ::com::sun::star::presentation::AnimationEffect& eTextEffect, - sal_Bool& bIsSound ) + bool& bIsSound ) { ::com::sun::star::uno::Any aAny; if ( GetPropertyValue( aAny, rPropSet, OUString( "Effect" ) ) ) @@ -2068,18 +2068,18 @@ sal_Bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com if ( GetPropertyValue( aAny, rPropSet, OUString( "SoundOn" ) ) ) aAny >>= bIsSound; else - bIsSound = sal_False; + bIsSound = false; - sal_Bool bHasEffect = ( ( eEffect != ::com::sun::star::presentation::AnimationEffect_NONE ) + bool bHasEffect = ( ( eEffect != ::com::sun::star::presentation::AnimationEffect_NONE ) || ( eTextEffect != ::com::sun::star::presentation::AnimationEffect_NONE ) || bIsSound ); return bHasEffect; }; -sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPage, const PageType /* ePageType */, - const sal_uInt32 nStyleInstance, const sal_uInt8 nPlaceHolderId ) +bool PPTWriter::ImplCreatePresentationPlaceholder( const bool bMasterPage, const PageType /* ePageType */, + const sal_uInt32 nStyleInstance, const sal_uInt8 nPlaceHolderId ) { - sal_Bool bRet = ImplGetText(); + bool bRet = ImplGetText(); if ( bRet && bMasterPage ) { mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -2125,7 +2125,7 @@ sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPag mpPptEscherEx->CloseContainer(); // ESCHER_SpContainer } else - bRet = sal_False; + bRet = false; return bRet; } @@ -2136,7 +2136,7 @@ void PPTWriter::ImplCreateShape( sal_uInt32 nType, sal_uInt32 nFlags, EscherSolv rSolver.AddShape( mXShape, nId ); } -void PPTWriter::ImplCreateTextShape( EscherPropertyContainer& rPropOpt, EscherSolverContainer& rSolver, sal_Bool bFill ) +void PPTWriter::ImplCreateTextShape( EscherPropertyContainer& rPropOpt, EscherSolverContainer& rSolver, bool bFill ) { mnTextStyle = EPP_TEXTSTYLE_TEXT; mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -2147,7 +2147,7 @@ void PPTWriter::ImplCreateTextShape( EscherPropertyContainer& rPropOpt, EscherSo rPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, false, true ); } -void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& aSolverContainer, PageType ePageType, sal_Bool bMasterPage, int nPageNumber ) +void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& aSolverContainer, PageType ePageType, bool bMasterPage, int nPageNumber ) { // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) // sal_uInt32 nGroupLevel = 0; @@ -2160,16 +2160,16 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a nIndices = nInstance = nLastPer = nShapeCount = nEffectCount = 0; - sal_Bool bIsTitlePossible = sal_True; // powerpoint is not able to handle more than one title + bool bIsTitlePossible = true; // powerpoint is not able to handle more than one title sal_uInt32 nOutlinerCount = 0; // the outline objects have to conform to the layout, sal_uInt32 nPrevTextStyle = 0; // there are no more than two allowed nOlePictureId = 0; - sal_Bool bAdditionalText = sal_False; + bool bAdditionalText = false; - sal_Bool bSecOutl = sal_False; + bool bSecOutl = false; sal_uInt32 nPObjects = 0; SvMemoryStream* pClientTextBox = NULL; @@ -2195,26 +2195,26 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a nGroups = GetGroupsClosed(); for ( sal_uInt32 i = 0; i < nGroups; i++, mpPptEscherEx->LeaveGroup() ) ; - if ( GetShapeByIndex( GetCurrentGroupIndex(), sal_True ) ) + if ( GetShapeByIndex( GetCurrentGroupIndex(), true ) ) { - sal_Bool bIsSound; - sal_Bool bMediaClickAction = sal_False; + bool bIsSound; + bool bMediaClickAction = false; ::com::sun::star::presentation::AnimationEffect eAe; ::com::sun::star::presentation::AnimationEffect eTe; if ( ImplGetPropertyValue( OUString( "PresentationOrder" ) ) ) nEffectCount = *(sal_uInt16*)mAny.getValue(); - sal_Bool bEffect = ImplGetEffect( mXPropSet, eAe, eTe, bIsSound ); + bool bEffect = ImplGetEffect( mXPropSet, eAe, eTe, bIsSound ); ::com::sun::star::presentation::ClickAction eCa = ::com::sun::star::presentation::ClickAction_NONE; if ( ImplGetPropertyValue( OUString( "OnClick" ) ) ) mAny >>= eCa; - sal_Bool bGroup = mType == "drawing.Group"; - sal_Bool bOpenBezier = mType == "drawing.OpenBezier"; - sal_Bool bClosedBezier = mType == "drawing.ClosedBezier"; - sal_Bool bPolyPolygon = mType == "drawing.PolyPolygon"; - sal_Bool bPolyLine = mType == "drawing.PolyLine"; + bool bGroup = mType == "drawing.Group"; + bool bOpenBezier = mType == "drawing.OpenBezier"; + bool bClosedBezier = mType == "drawing.ClosedBezier"; + bool bPolyPolygon = mType == "drawing.PolyPolygon"; + bool bPolyLine = mType == "drawing.PolyLine"; const ::com::sun::star::awt::Size aSize100thmm( mXShape->getSize() ); const ::com::sun::star::awt::Point aPoint100thmm( mXShape->getPosition() ); @@ -2246,13 +2246,13 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } else { - sal_Bool bIsFontwork = sal_False; - sal_Bool bIsHatching = sal_False; + bool bIsFontwork = false; + bool bIsHatching = false; ::com::sun::star::uno::Any aAny; ::com::sun::star::drawing::FillStyle eFS; - if ( GetPropertyValue( aAny, mXPropSet, OUString( "IsFontwork" ), sal_True ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "IsFontwork" ), true ) ) aAny >>= bIsFontwork; - if ( GetPropertyValue( aAny, mXPropSet, OUString( "FillStyle" ), sal_True ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "FillStyle" ), true ) ) { aAny >>= eFS; bIsHatching = eFS == ::com::sun::star::drawing::FillStyle_HATCH; @@ -2401,7 +2401,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a aEnd.X += aCenter.X; aEnd.Y += aCenter.Y; Polygon aPolygon( aRect, Point( aStart.X, aStart.Y ), Point( aEnd.X, aEnd.Y ), ePolyKind ); - sal_Bool bNeedText = sal_True; + bool bNeedText = true; if ( mnAngle ) { aPolygon.Rotate( aRect.TopLeft(), (sal_uInt16)( mnAngle / 10 ) ); @@ -2410,8 +2410,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) // mpPptEscherEx->EnterGroup( 0,0 ); // nGroupLevel = mpPptEscherEx->GetGroupLevel(); - bNeedText = sal_False; - bAdditionalText = sal_True; + bNeedText = false; + bAdditionalText = true; mnTextSize = 0; } mnAngle = 0; @@ -2602,7 +2602,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { aTextRefPoint = ::com::sun::star::awt::Point( maRect.Left(), maRect.Top() ); mnTextSize = 0; - bAdditionalText = sal_True; + bAdditionalText = true; // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) // mpPptEscherEx->EnterGroup( &maRect,0 ); } @@ -2625,7 +2625,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) // mpPptEscherEx->EnterGroup( 0,0 ); // nGroupLevel = mpPptEscherEx->GetGroupLevel(); - bAdditionalText = sal_True; + bAdditionalText = true; mnTextSize = 0; } mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -2645,7 +2645,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) // mpPptEscherEx->EnterGroup( 0,0 ); // nGroupLevel = mpPptEscherEx->GetGroupLevel(); - bAdditionalText = sal_True; + bAdditionalText = true; mnTextSize = 0; } mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -2665,7 +2665,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) // mpPptEscherEx->EnterGroup( 0,0 ); // nGroupLevel = mpPptEscherEx->GetGroupLevel(); - bAdditionalText = sal_True; + bAdditionalText = true; mnTextSize = 0; } mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -2685,7 +2685,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) // mpPptEscherEx->EnterGroup( 0,0 ); // nGroupLevel = mpPptEscherEx->GetGroupLevel(); - bAdditionalText = sal_True; + bAdditionalText = true; mnTextSize = 0; } mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -2758,7 +2758,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else nPlaceHolderAtom = EPP_PLACEHOLDER_NOTESBODY; } - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } else if ( mType == "presentation.TitleText" ) { @@ -2774,7 +2774,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } else if ( rLayout.bTitlePossible && bIsTitlePossible ) { - bIsTitlePossible = sal_False; + bIsTitlePossible = false; ImplGetText(); TextObjBinary aTextObj( mXText, EPP_TEXTTYPE_Title, maFontCollection, (PPTExBulletProvider&)*this ); @@ -2853,12 +2853,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } } else - mbPresObj = sal_False; + mbPresObj = false; } if ( !mbPresObj ) { mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } } else if ( ( mType == "presentation.Outliner" ) || ( mType == "presentation.Subtitle" ) ) @@ -2966,7 +2966,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } } else if ( ( mType == "drawing.Page" ) || ( mType == "presentation.Page" ) ) @@ -2978,7 +2978,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else nPlaceHolderAtom = EPP_PLACEHOLDER_NOTESSLIDEIMAGE; } - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } else if ( mType == "drawing.Frame" ) { @@ -3063,9 +3063,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a continue; else { - mbPresObj = sal_False; + mbPresObj = false; mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } } else if ( mType == "presentation.Footer" ) @@ -3074,9 +3074,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a continue; else { - mbPresObj = sal_False; + mbPresObj = false; mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } } else if ( mType == "presentation.DateTime" ) @@ -3085,9 +3085,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a continue; else { - mbPresObj = sal_False; + mbPresObj = false; mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } } else if ( mType == "presentation.SlideNumber" ) @@ -3096,9 +3096,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a continue; else { - mbPresObj = sal_False; + mbPresObj = false; mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } } else if ( (mType.getLength() > 9) && (mType[8] == '3') && (mType[9] == 'D') ) // drawing.3D @@ -3214,7 +3214,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a continue; } - sal_Bool bClientData = ( bEffect || ( eCa != ::com::sun::star::presentation::ClickAction_NONE ) || + bool bClientData = ( bEffect || ( eCa != ::com::sun::star::presentation::ClickAction_NONE ) || nPlaceHolderAtom || nOlePictureId ); if ( bClientData ) { @@ -3296,9 +3296,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( !pClientTextBox ) pClientTextBox = new SvMemoryStream( 0x200, 0x200 ); - if ( mbEmptyPresObj == sal_False ) + if ( mbEmptyPresObj == false ) { - if ( ( ePageType == NORMAL ) && ( bMasterPage == sal_False ) ) + if ( ( ePageType == NORMAL ) && ( bMasterPage == false ) ) { sal_uInt32 nTextType = EPP_TEXTTYPE_Body; if ( mnTextStyle == EPP_TEXTSTYLE_BODY ) @@ -3307,7 +3307,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a nTextType = EPP_TEXTTYPE_HalfBody; else if ( mType == "presentation.Subtitle" ) nTextType = EPP_TEXTTYPE_CenterBody; - bSecOutl = sal_True; + bSecOutl = true; } else nTextType = EPP_TEXTTYPE_Title; @@ -3400,12 +3400,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( bAdditionalText ) { - bAdditionalText = sal_False; + bAdditionalText = false; ::com::sun::star::uno::Any aAny; EscherPropertyContainer aPropOpt; mnAngle = ( PropValue::GetPropertyValue( aAny, - mXPropSet, OUString( "RotateAngle" ), sal_True ) ) + mXPropSet, OUString( "RotateAngle" ), true ) ) ? *((sal_Int32*)aAny.getValue() ) : 0; @@ -3416,7 +3416,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a double fDist = hypot( maRect.GetWidth(), maRect.GetHeight() ); maRect = Rectangle( Point( aTextRefPoint.X, aTextRefPoint.Y ), Point( (sal_Int32)( aTextRefPoint.X + fDist ), aTextRefPoint.Y - 1 ) ); - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_False ); + ImplCreateTextShape( aPropOpt, aSolverContainer, false ); aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x60006 ); // Size Shape To Fit Text if ( mnAngle < 0 ) mnAngle = ( 36000 + mnAngle ) % 36000; @@ -3425,7 +3425,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } else { - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_False ); + ImplCreateTextShape( aPropOpt, aSolverContainer, false ); if ( mnAngle < 0 ) mnAngle = ( 36000 + mnAngle ) % 36000; else @@ -3480,7 +3480,7 @@ struct CellBorder CellBorder() : mnPos ( 0 ), mnLength( 0 ){}; }; -sal_Bool PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2) +bool PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2) { sal_Int32 nLineWidth = pCellBorder->maCellBorder.OuterLineWidth + pCellBorder->maCellBorder.InnerLineWidth; if ( nLineWidth ) @@ -3510,9 +3510,9 @@ sal_Bool PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int .WriteInt32( nX2 ) .WriteInt32( nY2 ); mpPptEscherEx->CloseContainer(); - return sal_True; + return true; } - return sal_False; + return false; } //get merged cell's width @@ -3659,7 +3659,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc sal_Int32 nRight = GetCellRight( nColumn, maRect,aColumns,xCell ); sal_Int32 nBottom = GetCellBottom( nRow, maRect,aRows,xCell ); - mbFontIndependentLineSpacing = sal_False; + mbFontIndependentLineSpacing = false; mXPropSet = uno::Reference< beans::XPropertySet >( xCell, uno::UNO_QUERY_THROW ); mXText = uno::Reference< text::XSimpleText >( xCell, uno::UNO_QUERY_THROW ); mnTextSize = mXText->getString().getLength(); @@ -3722,7 +3722,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc CellBorder aCellBorder; aCellBorder.mnPos = aColumns[ nColumn ].first; aCellBorder.mnLength = aColumns[ nColumn ].second; - sal_Bool bTop = sal_False; + bool bTop = false; //write nLine*nColumn cell's top border if ( nLine < xRows->getCount() ) { // top border @@ -3780,7 +3780,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc CellBorder aCellBorder; aCellBorder.mnPos = aRows[ nRow].first; aCellBorder.mnLength = aRows[ nRow].second; - sal_Bool bLeft = sal_False; + bool bLeft = false; if ( nLine < xColumns->getCount() ) { // left border uno::Reference< table::XMergeableCell > xCell( xCellRange->getCellByPosition( nLine, nRow ), uno::UNO_QUERY_THROW ); diff --git a/sd/source/filter/eppt/grouptable.hxx b/sd/source/filter/eppt/grouptable.hxx index ac3acb746e58..ae6c59407a87 100644 --- a/sd/source/filter/eppt/grouptable.hxx +++ b/sd/source/filter/eppt/grouptable.hxx @@ -65,8 +65,8 @@ class GroupTable sal_uInt32 GetGroupsClosed(); void ResetGroupTable( sal_uInt32 nCount ); void ClearGroupTable(); - sal_Bool EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex ); - sal_Bool GetNextGroupEntry(); + bool EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex ); + bool GetNextGroupEntry(); GroupTable(); ~GroupTable(); }; diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index aae16dede5b1..e16df1f0265f 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -148,7 +148,7 @@ void ImplTranslateAttribute( OUString& rString, const TranslateMode eTranslateMo sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const OUString& rPresetSubType ) { sal_uInt32 nPresetSubType = 0; - sal_Bool bTranslated = sal_False; + bool bTranslated = false; if ( ( nPresetClass == (sal_uInt32)EffectPresetClass::ENTRANCE ) || ( nPresetClass == (sal_uInt32)EffectPresetClass::EXIT ) ) { @@ -161,12 +161,12 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl if ( rPresetSubType == "downward" ) { nPresetSubType = 5; - bTranslated = sal_True; + bTranslated = true; } else if ( rPresetSubType == "across" ) { nPresetSubType = 10; - bTranslated = sal_True; + bTranslated = true; } } break; @@ -175,7 +175,7 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl if ( rPresetSubType == "across" ) { nPresetSubType = 10; - bTranslated = sal_True; + bTranslated = true; } } break; @@ -184,22 +184,22 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl if ( rPresetSubType == "right-to-top" ) { nPresetSubType = 3; - bTranslated = sal_True; + bTranslated = true; } else if ( rPresetSubType == "right-to-bottom" ) { nPresetSubType = 6; - bTranslated = sal_True; + bTranslated = true; } else if ( rPresetSubType == "left-to-top" ) { nPresetSubType = 9; - bTranslated = sal_True; + bTranslated = true; } else if ( rPresetSubType == "left-to-bottom" ) { nPresetSubType = 12; - bTranslated = sal_True; + bTranslated = true; } } break; @@ -213,7 +213,7 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl if ( rPresetSubType.equalsAscii( p->mpStrSubType ) ) { nPresetSubType = p->mnID; - bTranslated = sal_True; + bTranslated = true; break; } p++; @@ -225,7 +225,7 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl return nPresetSubType; } -const sal_Char* AnimationExporter::FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const sal_Bool bDirection ) +const sal_Char* AnimationExporter::FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const bool bDirection ) { const sal_Char* pRet = NULL; int nFit = 0; @@ -297,7 +297,7 @@ sal_Int16 AnimationExporter::GetFillMode( const Reference< XAnimationNode >& xNo if( nFill == AnimationFill::AUTO ) { nFill = AnimationFill::REMOVE; - sal_Bool bIsIndefiniteTiming = sal_True; + bool bIsIndefiniteTiming = true; Any aAny = xNode->getDuration(); if( aAny.hasValue() ) { @@ -343,7 +343,7 @@ void AnimationExporter::doexport( const Reference< XDrawPage >& xPage, SvStream& if( xRootNode.is() ) { processAfterEffectNodes( xRootNode ); - exportNode( rStrm, xRootNode, NULL, DFF_msofbtAnimGroup, 1, 0, sal_False, AnimationFill::AUTO ); + exportNode( rStrm, xRootNode, NULL, DFF_msofbtAnimGroup, 1, 0, false, AnimationFill::AUTO ); } } } @@ -483,7 +483,7 @@ bool AnimationExporter::isEmptyNode( const Reference< XAnimationNode >& xNode ) } void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > xNode, const Reference< XAnimationNode >* pParent, const sal_uInt16 nContainerRecType, - const sal_uInt16 nInstance, const sal_Int32 nGroupLevel, const sal_Bool bTakeBackInteractiveSequenceTiming, const sal_Int16 nFDef ) + const sal_uInt16 nInstance, const sal_Int32 nGroupLevel, const bool bTakeBackInteractiveSequenceTiming, const sal_Int16 nFDef ) { if( (nGroupLevel == 4) && isEmptyNode( xNode ) ) return; @@ -494,7 +494,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > if( nContainerRecType == DFF_msofbtAnimGroup ) mnCurrentGroup++; - sal_Bool bTakeBackInteractiveSequenceTimingForChild = sal_False; + bool bTakeBackInteractiveSequenceTimingForChild = false; sal_Int16 nFillDefault = GetFillMode( xNode, nFDef ); bool bSkipChildren = false; @@ -511,7 +511,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportAnimNode( rStrm, xNode, pParent, nGroupLevel, nFillDefault ); exportAnimPropertySet( rStrm, xNode ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } break; @@ -535,11 +535,11 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > if ( ( nGroupLevel == 1 ) && ( nNodeType == ::com::sun::star::presentation::EffectNodeType::INTERACTIVE_SEQUENCE ) ) { nFlags |= 0x20; - bTakeBackInteractiveSequenceTimingForChild = sal_True; + bTakeBackInteractiveSequenceTimingForChild = true; } exportAnimAction( rStrm, xNode ); exportAnimEvent( rStrm, xNode, nFlags ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } break; @@ -575,7 +575,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportIterate( rStrm, xNode ); exportAnimPropertySet( rStrm, xNode ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } break; @@ -584,7 +584,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportAnimNode( rStrm, xNode, pParent, nGroupLevel, nFillDefault ); exportAnimPropertySet( rStrm, xNode ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); exportAnimate( rStrm, xNode ); } break; @@ -598,7 +598,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportAnimPropertySet( rStrm, xNode ); exportAnimateSet( rStrm, xNode, bIsAfterEffectNode ? AFTEREFFECT_SET : AFTEREFFECT_NONE ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } else { @@ -613,7 +613,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportAnimPropertySet( rStrm, xNode ); exportAnimateMotion( rStrm, xNode ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } break; @@ -629,7 +629,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportAnimPropertySet( rStrm, xNode ); exportAnimateColor( rStrm, xNode, bIsAfterEffectNode ? AFTEREFFECT_COLOR : AFTEREFFECT_NONE ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } else { @@ -644,7 +644,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportAnimPropertySet( rStrm, xNode ); exportAnimateTransform( rStrm, xNode ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } break; @@ -653,7 +653,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportAnimNode( rStrm, xNode, pParent, nGroupLevel, nFillDefault ); exportAnimPropertySet( rStrm, xNode ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); exportTransitionFilter( rStrm, xNode ); } break; @@ -705,7 +705,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > } } } - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } break; } @@ -768,7 +768,7 @@ Reference< XAnimationNode > AnimationExporter::createAfterEffectNodeClone( const return xNode; } -sal_Bool AnimationExporter::GetNodeType( const Reference< XAnimationNode >& xNode, sal_Int16& nType ) +bool AnimationExporter::GetNodeType( const Reference< XAnimationNode >& xNode, sal_Int16& nType ) { // trying to get the nodetype Sequence< NamedValue > aUserData = xNode->getUserData(); @@ -781,12 +781,12 @@ sal_Bool AnimationExporter::GetNodeType( const Reference< XAnimationNode >& xNod if ( p->Name == "node-type" ) { if ( p->Value >>= nType ) - return sal_True; + return true; } } } - return sal_False; + return false; } void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnimationNode >& xNode, @@ -916,10 +916,10 @@ void AnimationExporter::GetUserData( const Sequence< NamedValue >& rUserData, co } } -sal_uInt32 AnimationExporter::GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, sal_Bool& bPresetId ) +sal_uInt32 AnimationExporter::GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, bool& bPresetId ) { sal_uInt32 nPresetId = 0; - bPresetId = sal_False; + bPresetId = false; if ( rPreset.match( OUString( "ppt_" ), 0 ) ) { @@ -928,7 +928,7 @@ sal_uInt32 AnimationExporter::GetPresetID( const OUString& rPreset, sal_uInt32 n { OUString aNumber( rPreset.copy( nLast + 1 ) ); nPresetId = aNumber.toInt32(); - bPresetId = sal_True; + bPresetId = true; } } else @@ -940,7 +940,7 @@ sal_uInt32 AnimationExporter::GetPresetID( const OUString& rPreset, sal_uInt32 n if( p->mpStrPresetId ) { nPresetId = p->mnPresetId; - bPresetId = sal_True; + bPresetId = true; } } @@ -1005,8 +1005,8 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer sal_uInt32 nPresetSubType = 0; sal_uInt32 nAPIPresetClass = EffectPresetClass::CUSTOM; sal_uInt32 nPresetClass = DFF_ANIM_PRESS_CLASS_USER_DEFINED; - sal_Bool bPresetClass, bPresetId, bPresetSubType; - bPresetId = bPresetClass = bPresetSubType = sal_False; + bool bPresetClass, bPresetId, bPresetSubType; + bPresetId = bPresetClass = bPresetSubType = false; if ( pAny[ DFF_ANIM_PRESET_CLASS ] ) { @@ -1025,7 +1025,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer nPPTPresetClass = DFF_ANIM_PRESS_CLASS_USER_DEFINED; } nPresetClass = nPPTPresetClass; - bPresetClass = sal_True; + bPresetClass = true; } } if ( pAny[ DFF_ANIM_PRESET_ID ] ) @@ -1041,7 +1041,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer if ( *pAny[ DFF_ANIM_PRESET_SUB_TYPE ] >>= sPresetSubType ) { nPresetSubType = TranslatePresetSubType( nPresetClass, nPresetId, sPresetSubType ); - bPresetSubType = sal_True; + bPresetSubType = true; } } if ( bPresetId ) @@ -1058,7 +1058,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer if ( pAny[ DFF_ANIM_AFTEREFFECT ] ) { - sal_Bool bAfterEffect = sal_False; + bool bAfterEffect = false; if ( *pAny[ DFF_ANIM_AFTEREFFECT ] >>= bAfterEffect ) exportAnimPropertyByte( rStrm, DFF_ANIM_AFTEREFFECT, bAfterEffect, TRANSLATE_NONE ); } @@ -1080,8 +1080,8 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer if( xColor.is() ) { - sal_Bool bDirection = !xColor->getDirection(); - exportAnimPropertyuInt32( rStrm, DFF_ANIM_DIRECTION, bDirection, TRANSLATE_NONE ); + bool bDirection = !xColor->getDirection(); + exportAnimPropertyuInt32( rStrm, DFF_ANIM_DIRECTION, bDirection ? 1 : 0, TRANSLATE_NONE ); } } @@ -1124,9 +1124,9 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer return nNodeType; } -sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const ::com::sun::star::uno::Any& rAny, const TranslateMode eTranslateMode ) +bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const ::com::sun::star::uno::Any& rAny, const TranslateMode eTranslateMode ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( rAny.hasValue() ) { switch( rAny.getValueType().getTypeClass() ) @@ -1140,7 +1140,7 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1 if ( rAny >>= nVal ) { exportAnimPropertyuInt32( rStrm, nPropertyId, nVal, eTranslateMode ); - bRet = sal_True; + bRet = true; } } break; @@ -1151,7 +1151,7 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1 if ( rAny >>= fVal ) { exportAnimPropertyFloat( rStrm, nPropertyId, fVal, eTranslateMode ); - bRet = sal_True; + bRet = true; } } break; @@ -1170,7 +1170,7 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1 else { exportAnimPropertyFloat( rStrm, nPropertyId, fVal, eTranslateMode ); - bRet = sal_True; + bRet = true; } } } @@ -1181,7 +1181,7 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1 if ( rAny >>= aStr ) { exportAnimPropertyString( rStrm, nPropertyId, aStr, eTranslateMode ); - bRet = sal_True; + bRet = true; } } break; @@ -1272,7 +1272,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim sal_Int32 nU3 = 0; sal_Int32 nBegin = 0; - sal_Bool bCreateEvent = sal_False; + bool bCreateEvent = false; Any aSource; switch( i ) @@ -1321,7 +1321,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim double fTiming = 0.0; if ( aAny >>= aEvent ) { - bCreateEvent = sal_True; + bCreateEvent = true; switch( aEvent.Trigger ) { case EventTrigger::NONE : nTrigger = 0; break; @@ -1351,13 +1351,13 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim } else if ( aAny >>= eTiming ) { - bCreateEvent = sal_True; + bCreateEvent = true; if ( eTiming == Timing_INDEFINITE ) nBegin = -1; } else if ( aAny >>= fTiming ) { - bCreateEvent = sal_True; + bCreateEvent = true; nBegin = (sal_Int32)( fTiming * 1000.0 ); } } @@ -1367,7 +1367,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim { if ( nFlags & ( 1 << i ) ) { - bCreateEvent = sal_True; + bCreateEvent = true; nU1 = 1; nTrigger = 9; } @@ -1377,7 +1377,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim { if ( nFlags & ( 1 << i ) ) { - bCreateEvent = sal_True; + bCreateEvent = true; nU1 = 1; nTrigger = 10; } @@ -1512,7 +1512,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const OUStr } else if ( rAttributeName == "Visibility" ) { - sal_Bool bVisible = sal_True; + bool bVisible = true; if ( rSourceValue >>= bVisible ) { if ( bVisible ) @@ -1713,16 +1713,16 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X exportAnimPropertyuInt32( rStrm, 5, 0, TRANSLATE_NONE ); } } - exportAnimateTargetElement( rStrm, aTarget.hasValue() ? aTarget : xAnimate->getTarget(), sal_False ); + exportAnimateTargetElement( rStrm, aTarget.hasValue() ? aTarget : xAnimate->getTarget(), false ); } } -Reference< XShape > AnimationExporter::getTargetElementShape( const Any& rAny, sal_Int32& rBegin, sal_Int32& rEnd, sal_Bool& rParagraphTarget ) +Reference< XShape > AnimationExporter::getTargetElementShape( const Any& rAny, sal_Int32& rBegin, sal_Int32& rEnd, bool& rParagraphTarget ) { Reference< XShape > xShape; rAny >>= xShape; - rParagraphTarget = sal_False; + rParagraphTarget = false; if( !xShape.is() ) { @@ -1736,7 +1736,7 @@ Reference< XShape > AnimationExporter::getTargetElementShape( const Any& rAny, s Reference< XSimpleText > xText( xShape, UNO_QUERY ); if ( xText.is() ) { - rParagraphTarget = sal_True; + rParagraphTarget = true; Reference< XEnumerationAccess > xTextParagraphEnumerationAccess( xText, UNO_QUERY ); if ( xTextParagraphEnumerationAccess.is() ) { @@ -1768,12 +1768,12 @@ Reference< XShape > AnimationExporter::getTargetElementShape( const Any& rAny, s return xShape; } -void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any aAny, const sal_Bool bCreate2b01Atom ) +void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any aAny, const bool bCreate2b01Atom ) { sal_uInt32 nRefMode = 0; // nRefMode == 2 -> Paragraph sal_Int32 begin = -1; sal_Int32 end = -1; - sal_Bool bParagraphTarget; + bool bParagraphTarget; Reference< XShape > xShape = getTargetElementShape( aAny, begin, end, bParagraphTarget ); @@ -1845,7 +1845,7 @@ void AnimationExporter::exportAnimateKeyPoints( SvStream& rStrm, const Reference } } -void AnimationExporter::exportAnimValue( SvStream& rStrm, const Reference< XAnimationNode >& xNode, const sal_Bool bExportAlways ) +void AnimationExporter::exportAnimValue( SvStream& rStrm, const Reference< XAnimationNode >& xNode, const bool bExportAlways ) { Any aAny; // repeat count (0) @@ -1888,7 +1888,7 @@ void AnimationExporter::exportAnimValue( SvStream& rStrm, const Reference< XAnim } // autoreverse (5) - sal_Bool bAutoReverse = xNode->getAutoReverse(); + bool bAutoReverse = xNode->getAutoReverse(); if ( bExportAlways || bAutoReverse ) { EscherExAtom aExAtom( rStrm, DFF_msofbtAnimValue ); @@ -2046,9 +2046,9 @@ void AnimationExporter::exportAnimateTransform( SvStream& rStrm, const Reference } } -sal_Bool AnimationExporter::getColorAny( const Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ) const +bool AnimationExporter::getColorAny( const Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ) const { - sal_Bool bIsColor = sal_True; + bool bIsColor = true; rMode = 0; if ( nColorSpace == AnimationColorSpace::HSL ) @@ -2069,7 +2069,7 @@ sal_Bool AnimationExporter::getColorAny( const Any& rAny, const sal_Int16 nColor rC = (sal_Int32) ( aHSL[ 2 ] * 255.0 ); } else - bIsColor = sal_False; + bIsColor = false; return bIsColor; } diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx index 18b24c439292..a73b730feab0 100644 --- a/sd/source/filter/eppt/pptexanimations.hxx +++ b/sd/source/filter/eppt/pptexanimations.hxx @@ -69,8 +69,8 @@ class AnimationExporter ::com::sun::star::uno::Any aTarget; void writeZString( SvStream& rStrm, const OUString& rVal ); - sal_Bool getColorAny( const ::com::sun::star::uno::Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ) const; - sal_Bool exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const ::com::sun::star::uno::Any& rAny, const TranslateMode eTranslateMode ); + bool getColorAny( const ::com::sun::star::uno::Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ) const; + bool exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const ::com::sun::star::uno::Any& rAny, const TranslateMode eTranslateMode ); void exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const OUString& rVal, const TranslateMode eTranslateMode ); void exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt16 nPropertyId, const double& rVal, const TranslateMode eTranslateMode ); void exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode eTranslateMode ); @@ -88,11 +88,11 @@ class AnimationExporter void exportAnimEvent( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const sal_Int32 nFlags = 0 ); void exportNode( SvStream& rStrm, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > xNode, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >* xParent, - const sal_uInt16 nContainerRecType, const sal_uInt16 nInstance, const sal_Int32 nGroupLevel, const sal_Bool bTakeBackInteractiveSequenceTiming, + const sal_uInt16 nContainerRecType, const sal_uInt16 nInstance, const sal_Int32 nGroupLevel, const bool bTakeBackInteractiveSequenceTiming, const sal_Int16 nFillDefault ); - void exportAnimateTargetElement( SvStream& rStrm, const ::com::sun::star::uno::Any aAny, const sal_Bool bCreate2b01Atom ); + void exportAnimateTargetElement( SvStream& rStrm, const ::com::sun::star::uno::Any aAny, const bool bCreate2b01Atom ); void exportAnimateKeyPoints( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xAnimate ); - void exportAnimValue( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const sal_Bool bExportAlways ); + void exportAnimValue( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const bool bExportAlways ); void exportTransitionFilter( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void exportAnimateMotion( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void exportAnimateTransform( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); @@ -120,15 +120,15 @@ public: // helper methods also used in ooxml export static ::com::sun::star::uno::Any convertAnimateValue( const ::com::sun::star::uno::Any& rSource, const OUString& rAttributeName ); - static sal_Bool GetNodeType( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, sal_Int16& nType ); + static bool GetNodeType( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, sal_Int16& nType ); static sal_Int16 GetFillMode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const sal_Int16 nFillDefault ); static void GetUserData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rUserData, const ::com::sun::star::uno::Any ** pAny, sal_Size nLen ); static sal_uInt32 TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const OUString& rPresetSubType ); - static sal_uInt32 GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, sal_Bool& bPresetId ); + static sal_uInt32 GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, bool& bPresetId ); static sal_uInt32 GetValueTypeForAttributeName( const OUString& rAttributeName ); - static const sal_Char* FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const sal_Bool bDirection ); - static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTargetElementShape( const ::com::sun::star::uno::Any& rAny, sal_Int32& rBegin, sal_Int32& rEnd, sal_Bool& rParagraphTarget ); + static const sal_Char* FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const bool bDirection ); + static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTargetElementShape( const ::com::sun::star::uno::Any& rAny, sal_Int32& rBegin, sal_Int32& rEnd, bool& rParagraphTarget ); }; } // namespace ppt diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx index dea8b243d456..1ebeb6fcd51f 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.cxx +++ b/sd/source/filter/eppt/pptexsoundcollection.cxx @@ -64,7 +64,7 @@ OUString ExSoundEntry::ImplGetExtension() const return aExtension; } -sal_Bool ExSoundEntry::IsSameURL(const OUString& rURL) const +bool ExSoundEntry::IsSameURL(const OUString& rURL) const { return ( rURL == aSoundURL ); } diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx index 8a0561e658db..8bb5c52f4adc 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.hxx +++ b/sd/source/filter/eppt/pptexsoundcollection.hxx @@ -41,7 +41,7 @@ class ExSoundEntry public : - sal_Bool IsSameURL(const OUString& rURL) const; + bool IsSameURL(const OUString& rURL) const; sal_uInt32 GetFileSize( ) const { return nFileSize; }; ExSoundEntry(const OUString& rSoundURL); diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index a6df016fe948..4205bf9b2ae4 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -100,31 +100,31 @@ using ::com::sun::star::uno::UNO_QUERY; static PHLayout pPHLayout[] = { - { EPP_LAYOUT_TITLESLIDE, { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_True, sal_True }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_False, sal_False, sal_False }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, sal_True, sal_False, sal_False }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_False, sal_False }, - { EPP_LAYOUT_RIGHTCOLUMN2ROWS, { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_LEFTCOLUMN2ROWS, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_TOPROW2COLUMN, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_4OBJECTS, { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_False, sal_False }, - { EPP_LAYOUT_ONLYTITLE, { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_False, sal_False }, - { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_False, sal_False, sal_False }, - { EPP_LAYOUT_TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_TITLERIGHTBODYLEFT, { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, sal_True, sal_True, sal_False } + { EPP_LAYOUT_TITLESLIDE, { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, true, true, false }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, true, true, true }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, false, false, false }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, true, false, false }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, false, false }, + { EPP_LAYOUT_RIGHTCOLUMN2ROWS, { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_LEFTCOLUMN2ROWS, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_TOPROW2COLUMN, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_4OBJECTS, { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, false, false }, + { EPP_LAYOUT_ONLYTITLE, { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, true, false, false }, + { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, false, false, false }, + { EPP_LAYOUT_TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, true, true, false }, + { EPP_LAYOUT_TITLERIGHTBODYLEFT, { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, true, true, false }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, true, true, false }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, true, true, false } }; PPTWriterBase::PPTWriterBase() @@ -252,7 +252,7 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert exportPPTPost(); } -sal_Bool PPTWriterBase::InitSOIface() +bool PPTWriterBase::InitSOIface() { while( true ) { @@ -274,12 +274,12 @@ sal_Bool PPTWriterBase::InitSOIface() if ( !GetPageByIndex( 0, NORMAL ) ) break; - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) +bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) { while( true ) { @@ -292,7 +292,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) { mXDrawPages = mXDrawPagesSupplier->getDrawPages(); if( !mXDrawPages.is() ) - return sal_False; + return false; } break; @@ -300,7 +300,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) { mXDrawPages = mXMasterPagesSupplier->getMasterPages(); if( !mXDrawPages.is() ) - return sal_False; + return false; } break; default: @@ -331,7 +331,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) /* try to get the "real" background PropertySet. If the normal page is not supporting this property, it is taken the property from the master */ - sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, OUString( "Background" ), sal_True ); + bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, OUString( "Background" ), true ); if ( bHasBackground ) bHasBackground = ( aAny >>= mXBackgroundPropSet ); if ( !bHasBackground ) @@ -348,7 +348,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) ( aXMasterDrawPage, UNO_QUERY ); if ( aXMasterPagePropSet.is() ) { - sal_Bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet, OUString( "Background" ) ); + bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet, OUString( "Background" ) ); if ( bBackground ) { aAny >>= mXBackgroundPropSet; @@ -357,23 +357,23 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) } } } - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) +bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) { Any aAny; if ( !GetPageByIndex( nPageNum, NORMAL ) ) - return sal_False; + return false; sal_uInt32 nMasterNum = GetMasterIndex( NORMAL ); SetCurrentStyleSheet( nMasterNum ); Reference< XPropertySet > aXBackgroundPropSet; - sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, OUString( "Background" ) ); + bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, OUString( "Background" ) ); if ( bHasBackground ) bHasBackground = ( aAny >>= aXBackgroundPropSet ); @@ -384,7 +384,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) /* sj: Don't know what's IsBackgroundVisible for, have to ask cl if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundVisible" ) ) ) { - sal_Bool bBackgroundVisible; + bool bBackgroundVisible; if ( aAny >>= bBackgroundVisible ) { if ( bBackgroundVisible ) @@ -394,7 +394,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) */ if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundObjectsVisible" ) ) ) { - sal_Bool bBackgroundObjectsVisible = sal_False; + bool bBackgroundObjectsVisible = false; if ( aAny >>= bBackgroundObjectsVisible ) { if ( !bBackgroundObjectsVisible ) @@ -404,35 +404,35 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) ImplWriteSlide( nPageNum, nMasterNum, nMode, bHasBackground, aXBackgroundPropSet ); - return sal_True; + return true; }; -sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum ) +bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum ) { if ( !GetPageByIndex( nPageNum, NOTICE ) ) - return sal_False; + return false; SetCurrentStyleSheet( GetMasterIndex( NORMAL ) ); ImplWriteNotes( nPageNum ); - return sal_True; + return true; }; -sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum ) +bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum ) { if ( !GetPageByIndex( nPageNum, MASTER ) ) - return sal_False; + return false; SetCurrentStyleSheet( nPageNum ); if ( !ImplGetPropertyValue( mXPagePropSet, OUString( "Background" ) ) ) // load background shape - return sal_False; + return false; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet; if ( !( mAny >>= aXBackgroundPropSet ) ) - return sal_False; + return false; ImplWriteSlideMaster( nPageNum, aXBackgroundPropSet ); - return sal_True; + return true; }; sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const @@ -505,21 +505,21 @@ sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType ) return nRetValue; } -sal_Bool PPTWriterBase::SetCurrentStyleSheet( sal_uInt32 nPageNum ) +bool PPTWriterBase::SetCurrentStyleSheet( sal_uInt32 nPageNum ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( nPageNum >= maStyleSheetList.size() ) nPageNum = 0; else - bRet = sal_True; + bRet = true; mpStyleSheet = maStyleSheetList[ nPageNum ]; return bRet; } -sal_Bool PPTWriterBase::GetStyleSheets() +bool PPTWriterBase::GetStyleSheets() { int nInstance, nLevel; - sal_Bool bRetValue = sal_False; + bool bRetValue = false; sal_uInt32 nPageNum; for ( nPageNum = 0; nPageNum < mnMasterPages; nPageNum++ ) @@ -653,33 +653,33 @@ sal_Bool PPTWriterBase::GetStyleSheets() return bRetValue; } -sal_Bool PPTWriterBase::CreateMainNotes() +bool PPTWriterBase::CreateMainNotes() { if ( !GetPageByIndex( 0, NOTICE ) ) - return sal_False; + return false; SetCurrentStyleSheet( 0 ); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPageTarget > aXMasterPageTarget( mXDrawPage, ::com::sun::star::uno::UNO_QUERY ); if ( !aXMasterPageTarget.is() ) - return sal_False; + return false; mXDrawPage = aXMasterPageTarget->getMasterPage(); if ( !mXDrawPage.is() ) - return sal_False; + return false; mXPropSet = ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY ); if ( !mXPropSet.is() ) - return sal_False; + return false; mXShapes = ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY ); if ( !mXShapes.is() ) - return sal_False; + return false; return ImplCreateMainNotes(); } @@ -710,11 +710,11 @@ Rectangle PPTWriterBase::MapRectangle( const awt::Rectangle& rRect ) return Rectangle( Point( aP.X, aP.Y ), Size( aS.Width, aS.Height ) ); } -sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) +bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, bool bGroup ) { while(true) { - if ( ( bGroup == sal_False ) || ( GetCurrentGroupLevel() == 0 ) ) + if ( ( bGroup == false ) || ( GetCurrentGroupLevel() == 0 ) ) { Any aAny( mXShapes->getByIndex( nIndex ) ); aAny >>= mXShape; @@ -745,7 +745,7 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) aTypeBuffer.remove(nPos, RTL_CONSTASCII_LENGTH("Shape")); mType = aTypeBuffer.makeStringAndClear(); - mbPresObj = mbEmptyPresObj = sal_False; + mbPresObj = mbEmptyPresObj = false; if ( ImplGetPropertyValue( OUString( "IsPresentationObject" ) ) ) mAny >>= mbPresObj; @@ -753,13 +753,13 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) mAny >>= mbEmptyPresObj; mnAngle = ( PropValue::GetPropertyValue( aAny, - mXPropSet, OUString( "RotateAngle" ), sal_True ) ) + mXPropSet, OUString( "RotateAngle" ), true ) ) ? *((sal_Int32*)aAny.getValue() ) : 0; - return sal_True; + return true; } - return sal_False; + return false; } sal_Int8 PPTWriterBase::GetTransition( sal_Int16 nTransitionType, sal_Int16 nTransitionSubtype, FadeEffect eEffect, sal_uInt8& nDirection ) @@ -966,13 +966,13 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection return nPPTTransitionType; } -sal_Bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX ) +bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( bool bForOOMLX ) { sal_uInt32 nShapes = mXShapes->getCount(); - sal_Bool bOtherThanPlaceHolders = sal_False; + bool bOtherThanPlaceHolders = false; if ( nShapes ) - for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == sal_False ); nIndex++ ) + for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == false ); nIndex++ ) { if ( GetShapeByIndex( nIndex ) && mType != "drawing.Page" ) { @@ -982,10 +982,10 @@ sal_Bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX ) Reference< XSimpleText > rXText( mXShape, UNO_QUERY ); if( rXText.is() && !rXText->getString().isEmpty() ) - bOtherThanPlaceHolders = sal_True; + bOtherThanPlaceHolders = true; } else - bOtherThanPlaceHolders = sal_True; + bOtherThanPlaceHolders = true; } DBG(printf("mType == %s\n", mType.getStr())); } diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 6d9453968ac4..886cb9459239 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -105,19 +105,19 @@ class PowerPointShapeExport : public ShapeExport { PowerPointExport& mrExport; PageType mePageType; - sal_Bool mbMaster; + bool mbMaster; public: PowerPointShapeExport( FSHelperPtr pFS, ShapeHashMap* pShapeMap, PowerPointExport* pFB ); - void SetMaster( sal_Bool bMaster ); + void SetMaster( bool bMaster ); void SetPageType( PageType ePageType ); ShapeExport& WriteNonVisualProperties( Reference< XShape > xShape ) SAL_OVERRIDE; ShapeExport& WriteTextShape( Reference< XShape > xShape ) SAL_OVERRIDE; ShapeExport& WriteUnknownShape( Reference< XShape > xShape ) SAL_OVERRIDE; ShapeExport& WritePlaceholderShape( Reference< XShape > xShape, PlaceholderType ePlaceholder ); - ShapeExport& WritePageShape( Reference< XShape > xShape, PageType ePageType, sal_Bool bPresObj ); + ShapeExport& WritePageShape( Reference< XShape > xShape, PageType ePageType, bool bPresObj ); // helper parts - sal_Bool WritePlaceholder( Reference< XShape > xShape, PlaceholderType ePlaceholder, sal_Bool bMaster ); + bool WritePlaceholder( Reference< XShape > xShape, PlaceholderType ePlaceholder, bool bMaster ); }; enum PPTXLayout { @@ -211,11 +211,11 @@ PowerPointShapeExport::PowerPointShapeExport( FSHelperPtr pFS, ShapeHashMap* pSh : ShapeExport( XML_p, pFS, pShapeMap, pFB ) , mrExport( *pFB ) , mePageType(UNDEFINED) - , mbMaster(sal_False) + , mbMaster(false) { } -void PowerPointShapeExport::SetMaster( sal_Bool bMaster ) +void PowerPointShapeExport::SetMaster( bool bMaster ) { mbMaster = bMaster; } @@ -733,7 +733,7 @@ void PowerPointExport::WriteAnimationAttributeName( FSHelperPtr pFS, const OUStr void PowerPointExport::WriteAnimationTarget( FSHelperPtr pFS, Any aTarget ) { sal_Int32 nBegin = -1, nEnd = -1; - sal_Bool bParagraphTarget; + bool bParagraphTarget; Reference< XShape > rXShape = AnimationExporter::getTargetElementShape( aTarget, nBegin, nEnd, bParagraphTarget ); if( rXShape.is() ) { @@ -754,7 +754,7 @@ void PowerPointExport::WriteAnimationTarget( FSHelperPtr pFS, Any aTarget ) } } -void PowerPointExport::WriteAnimationNodeAnimate( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, sal_Bool bMainSeqChild ) +void PowerPointExport::WriteAnimationNodeAnimate( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, bool bMainSeqChild ) { Reference< XAnimate > rXAnimate( rXNode, UNO_QUERY ); if( !rXAnimate.is() ) @@ -762,7 +762,7 @@ void PowerPointExport::WriteAnimationNodeAnimate( FSHelperPtr pFS, const Referen const char* pCalcMode = NULL; const char* pValueType = NULL; - sal_Bool bSimple = ( nXmlNodeType != XML_anim ); + bool bSimple = ( nXmlNodeType != XML_anim ); if( !bSimple ) { switch( rXAnimate->getCalcMode() ) { @@ -795,7 +795,7 @@ void PowerPointExport::WriteAnimationNodeAnimate( FSHelperPtr pFS, const Referen pFS->endElementNS( XML_p, nXmlNodeType ); } -void PowerPointExport::WriteAnimationNodeAnimateInside( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Bool bMainSeqChild, sal_Bool bSimple ) +void PowerPointExport::WriteAnimationNodeAnimateInside( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, bool bMainSeqChild, bool bSimple ) { Reference< XAnimate > rXAnimate( rXNode, UNO_QUERY ); if( !rXAnimate.is() ) @@ -826,7 +826,7 @@ void PowerPointExport::WriteAnimationNodeAnimateInside( FSHelperPtr pFS, const R pFS->startElementNS( XML_p, XML_cBhvr, XML_additive, pAdditive, FSEND ); - WriteAnimationNodeCommonPropsStart( pFS, rXNode, sal_True, bMainSeqChild ); + WriteAnimationNodeCommonPropsStart( pFS, rXNode, true, bMainSeqChild ); WriteAnimationTarget( pFS, rXAnimate->getTarget() ); WriteAnimationAttributeName( pFS, rXAnimate->getAttributeName() ); pFS->endElementNS( XML_p, XML_cBhvr ); @@ -834,7 +834,7 @@ void PowerPointExport::WriteAnimationNodeAnimateInside( FSHelperPtr pFS, const R WriteAnimateTo( pFS, rXAnimate->getTo(), rXAnimate->getAttributeName() ); } -void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, const char* pDelay, const char* pEvent, double fDelay, sal_Bool bHasFDelay ) +void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, const char* pDelay, const char* pEvent, double fDelay, bool bHasFDelay ) { if( bHasFDelay || pDelay || pEvent ) { if( !pEvent ) @@ -856,9 +856,9 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, const char* pDe } } -void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_Bool bWriteEvent, sal_Bool bMainSeqChild ) +void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, bool bWriteEvent, bool bMainSeqChild ) { - sal_Bool bHasFDelay = sal_False; + bool bHasFDelay = false; double fDelay = 0; Timing eTiming; Event aEvent; @@ -866,7 +866,7 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_ const char* pEvent = NULL; if( rAny >>= fDelay ) - bHasFDelay = sal_True; + bHasFDelay = true; else if( rAny >>= eTiming ) { if( eTiming == Timing_INDEFINITE ) @@ -919,7 +919,7 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_ } if( aEvent.Offset >>= fDelay ) { - bHasFDelay = sal_True; + bHasFDelay = true; DBG(printf ("event offset: %f\n", fDelay)); } else if( aEvent.Offset >>= eTiming ) { if( eTiming == Timing_INDEFINITE ) @@ -931,7 +931,7 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_ WriteAnimationCondition( pFS, pDelay, pEvent, fDelay, bHasFDelay ); } -void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Bool bSingle, sal_Bool bMainSeqChild ) +void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, bool bSingle, bool bMainSeqChild ) { const char* pDuration = NULL; const char* pRestart = NULL; @@ -1023,7 +1023,7 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons } sal_uInt32 nPresetId = 0; - sal_Bool bPresetId = sal_False; + bool bPresetId = false; if ( pAny[ DFF_ANIM_PRESET_ID ] ) { OUString sPreset; if ( *pAny[ DFF_ANIM_PRESET_ID ] >>= sPreset ) @@ -1031,12 +1031,12 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons } sal_uInt32 nPresetSubType = 0; - sal_Bool bPresetSubType = sal_False; + bool bPresetSubType = false; if ( pAny[ DFF_ANIM_PRESET_SUB_TYPE ] ) { OUString sPresetSubType; if ( *pAny[ DFF_ANIM_PRESET_SUB_TYPE ] >>= sPresetSubType ) { nPresetSubType = AnimationExporter::TranslatePresetSubType( nPresetClass, nPresetId, sPresetSubType ); - bPresetSubType = sal_True; + bPresetSubType = true; } } @@ -1077,9 +1077,9 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons pFS->startElementNS( XML_p, XML_stCondLst, FSEND ); if( aAny >>= aCondSeq ) { for( int i = 0; i < aCondSeq.getLength(); i ++ ) - WriteAnimationCondition( pFS, aCondSeq[ i ], sal_False, bMainSeqChild ); + WriteAnimationCondition( pFS, aCondSeq[ i ], false, bMainSeqChild ); } else - WriteAnimationCondition( pFS, aAny, sal_False, bMainSeqChild ); + WriteAnimationCondition( pFS, aAny, false, bMainSeqChild ); pFS->endElementNS( XML_p, XML_stCondLst ); } @@ -1090,9 +1090,9 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons pFS->startElementNS( XML_p, XML_endCondLst, FSEND ); if( aAny >>= aCondSeq ) { for( int i = 0; i < aCondSeq.getLength(); i ++ ) - WriteAnimationCondition( pFS, aCondSeq[ i ], sal_False, bMainSeqChild ); + WriteAnimationCondition( pFS, aCondSeq[ i ], false, bMainSeqChild ); } else - WriteAnimationCondition( pFS, aAny, sal_False, bMainSeqChild ); + WriteAnimationCondition( pFS, aAny, false, bMainSeqChild ); pFS->endElementNS( XML_p, XML_stCondLst ); } @@ -1121,26 +1121,26 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons pFS->endElementNS( XML_p, XML_cTn ); } -void PowerPointExport::WriteAnimationNodeSeq( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32, sal_Bool bMainSeqChild ) +void PowerPointExport::WriteAnimationNodeSeq( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32, bool bMainSeqChild ) { DBG(printf ("write animation node SEQ\n")); pFS->startElementNS( XML_p, XML_seq, FSEND ); - WriteAnimationNodeCommonPropsStart( pFS, rXNode, sal_True, bMainSeqChild ); + WriteAnimationNodeCommonPropsStart( pFS, rXNode, true, bMainSeqChild ); pFS->startElementNS( XML_p, XML_prevCondLst, FSEND ); - WriteAnimationCondition( pFS, NULL, "onPrev", 0, sal_True ); + WriteAnimationCondition( pFS, NULL, "onPrev", 0, true ); pFS->endElementNS( XML_p, XML_prevCondLst ); pFS->startElementNS( XML_p, XML_nextCondLst, FSEND ); - WriteAnimationCondition( pFS, NULL, "onNext", 0, sal_True ); + WriteAnimationCondition( pFS, NULL, "onNext", 0, true ); pFS->endElementNS( XML_p, XML_nextCondLst ); pFS->endElementNS( XML_p, XML_seq ); } -void PowerPointExport::WriteAnimationNodeEffect( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32, sal_Bool bMainSeqChild ) +void PowerPointExport::WriteAnimationNodeEffect( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32, bool bMainSeqChild ) { DBG(printf ("write animation node FILTER\n")); @@ -1153,17 +1153,17 @@ void PowerPointExport::WriteAnimationNodeEffect( FSHelperPtr pFS, const Referenc XML_transition, pDirection, FSEND ); - WriteAnimationNodeAnimateInside( pFS, rXNode, bMainSeqChild, sal_False ); + WriteAnimationNodeAnimateInside( pFS, rXNode, bMainSeqChild, false ); pFS->endElementNS( XML_p, XML_animEffect ); } } -void PowerPointExport::WriteAnimationNode( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Bool bMainSeqChild ) +void PowerPointExport::WriteAnimationNode( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, bool bMainSeqChild ) { DBG(printf ("export node type: %d\n", rXNode->getType())); sal_Int32 xmlNodeType = -1; - typedef void (PowerPointExport::*AnimationNodeWriteMethod)( FSHelperPtr, const Reference< XAnimationNode >&, sal_Int32, sal_Bool ); + typedef void (PowerPointExport::*AnimationNodeWriteMethod)( FSHelperPtr, const Reference< XAnimationNode >&, sal_Int32, bool ); AnimationNodeWriteMethod pMethod = NULL; switch( rXNode->getType() ) { @@ -1197,7 +1197,7 @@ void PowerPointExport::WriteAnimationNode( FSHelperPtr pFS, const Reference< XAn pFS->startElementNS( XML_p, xmlNodeType, FSEND ); - WriteAnimationNodeCommonPropsStart( pFS, rXNode, sal_True, bMainSeqChild ); + WriteAnimationNodeCommonPropsStart( pFS, rXNode, true, bMainSeqChild ); pFS->endElementNS( XML_p, xmlNodeType ); } @@ -1216,7 +1216,7 @@ void PowerPointExport::WriteAnimations( FSHelperPtr pFS ) pFS->startElementNS( XML_p, XML_timing, FSEND ); pFS->startElementNS( XML_p, XML_tnLst, FSEND ); - WriteAnimationNode( pFS, xNode, sal_False ); + WriteAnimationNode( pFS, xNode, false ); pFS->endElementNS( XML_p, XML_tnLst ); pFS->endElementNS( XML_p, XML_timing ); @@ -1350,7 +1350,7 @@ bool PowerPointExport::WriteComments( sal_uInt32 nPageNum ) } void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 /* nMode */, - sal_Bool bHasBackground, Reference< XPropertySet > aXBackgroundPropSet ) + bool bHasBackground, Reference< XPropertySet > aXBackgroundPropSet ) { DBG(printf("write slide: %" SAL_PRIuUINT32 "\n----------------\n", nPageNum)); @@ -1389,7 +1389,7 @@ void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNu const char* pShow = NULL; if( GETA( Visible ) ) { - sal_Bool bShow(sal_False); + bool bShow(false); if( ( mAny >>= bShow ) && !bShow ) pShow = "0"; } @@ -1405,7 +1405,7 @@ void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNu ImplWriteBackground( pFS, aXBackgroundPropSet ); } - WriteShapeTree( pFS, NORMAL, sal_False ); + WriteShapeTree( pFS, NORMAL, false ); pFS->endElementNS( XML_p, XML_cSld ); @@ -1438,7 +1438,7 @@ void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNu void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum ) { - if( !mbCreateNotes || !ContainsOtherShapeThanPlaceholders( sal_True ) ) + if( !mbCreateNotes || !ContainsOtherShapeThanPlaceholders( true ) ) return; DBG(printf("write Notes %" SAL_PRIuUINT32 "\n----------------\n", nPageNum)); @@ -1454,7 +1454,7 @@ void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum ) pFS->startElementNS( XML_p, XML_cSld, FSEND ); - WriteShapeTree( pFS, NOTICE, sal_False ); + WriteShapeTree( pFS, NOTICE, false ); pFS->endElementNS( XML_p, XML_cSld ); @@ -1565,7 +1565,7 @@ void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPr pFS->startElementNS( XML_p, XML_cSld, FSEND ); ImplWriteBackground( pFS, aXBackgroundPropSet ); - WriteShapeTree( pFS, LAYOUT, sal_True ); + WriteShapeTree( pFS, LAYOUT, true ); pFS->endElementNS( XML_p, XML_cSld ); @@ -1679,7 +1679,7 @@ void PowerPointExport::ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMaste XML_name, aLayoutInfo[ nOffset ].sName, FSEND ); //pFS->write( MINIMAL_SPTREE ); // TODO: write actual shape tree - WriteShapeTree( pFS, LAYOUT, sal_True ); + WriteShapeTree( pFS, LAYOUT, true ); pFS->endElementNS( XML_p, XML_cSld ); @@ -1692,7 +1692,7 @@ void PowerPointExport::ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMaste xDrawPages->remove( xSlide ); } -void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, PageType ePageType, sal_Bool bMaster ) +void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, PageType ePageType, bool bMaster ) { PowerPointShapeExport aDML( pFS, &maShapeMap, this ); aDML.SetMaster( bMaster ); @@ -1711,7 +1711,7 @@ void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, PageType ePageType, sal_ DBG(printf( "leave group\n" )); } - if ( GetShapeByIndex( GetCurrentGroupIndex(), sal_True ) ) { + if ( GetShapeByIndex( GetCurrentGroupIndex(), true ) ) { DBG(printf( "mType: \"%s\"\n", mType.getStr() )); aDML.WriteShape( mXShape ); } @@ -1723,7 +1723,7 @@ void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, PageType ePageType, sal_ #define BEGIN_SHAPE mpFS->startElementNS( XML_p, XML_sp, FSEND ) #define END_SHAPE mpFS->endElementNS( XML_p, XML_sp ) -ShapeExport& PowerPointShapeExport::WritePageShape( Reference< XShape > xShape, PageType ePageType, sal_Bool bPresObj ) +ShapeExport& PowerPointShapeExport::WritePageShape( Reference< XShape > xShape, PageType ePageType, bool bPresObj ) { if( ( ePageType == NOTICE && bPresObj ) || ePageType == LAYOUT ) return WritePlaceholderShape( xShape, SlideImage ); @@ -1731,16 +1731,16 @@ ShapeExport& PowerPointShapeExport::WritePageShape( Reference< XShape > xShape, return WriteTextShape( xShape ); } -sal_Bool PowerPointShapeExport::WritePlaceholder( Reference< XShape > xShape, PlaceholderType ePlaceholder, sal_Bool bMaster ) +bool PowerPointShapeExport::WritePlaceholder( Reference< XShape > xShape, PlaceholderType ePlaceholder, bool bMaster ) { DBG(printf("WritePlaceholder %d %d\n", bMaster, ShapeExport::NonEmptyText( xShape ))); if( bMaster && ShapeExport::NonEmptyText( xShape ) ) { WritePlaceholderShape( xShape, ePlaceholder ); - return sal_True; + return true; } - return sal_False; + return false; } ShapeExport& PowerPointShapeExport::WritePlaceholderShape( Reference< XShape > xShape, PlaceholderType ePlaceholder ) @@ -2045,25 +2045,25 @@ void PowerPointExport::WriteTheme( sal_Int32 nThemeNum ) pFS->endElementNS( XML_a, XML_theme ); } -sal_Bool PowerPointExport::ImplCreateDocument() +bool PowerPointExport::ImplCreateDocument() { - mbCreateNotes = sal_False; + mbCreateNotes = false; for( sal_uInt32 i = 0; i < mnPages; i++ ) { if ( !GetPageByIndex( i, NOTICE ) ) - return sal_False; + return false; - if( ContainsOtherShapeThanPlaceholders( sal_True ) ) { - mbCreateNotes = sal_True; + if( ContainsOtherShapeThanPlaceholders( true ) ) { + mbCreateNotes = true; break; } } - return sal_True; + return true; } -sal_Bool PowerPointExport::WriteNotesMaster() +bool PowerPointExport::WriteNotesMaster() { DBG(printf("write Notes master\n----------------\n")); @@ -2103,7 +2103,7 @@ sal_Bool PowerPointExport::WriteNotesMaster() ( mAny >>= aXBackgroundPropSet ) ) ImplWriteBackground( pFS, aXBackgroundPropSet ); - WriteShapeTree( pFS, NOTICE, sal_True ); + WriteShapeTree( pFS, NOTICE, true ); pFS->endElementNS( XML_p, XML_cSld ); @@ -2127,15 +2127,15 @@ sal_Bool PowerPointExport::WriteNotesMaster() DBG(printf("----------------\n")); - return sal_True; + return true; } -sal_Bool PowerPointExport::ImplCreateMainNotes() +bool PowerPointExport::ImplCreateMainNotes() { if( mbCreateNotes ) return WriteNotesMaster(); - return sal_True; + return true; } OUString SAL_CALL PowerPointExport_getImplementationName() throw() diff --git a/sd/source/filter/eppt/pptx-grouptable.cxx b/sd/source/filter/eppt/pptx-grouptable.cxx index a6595d98af23..24c398f5a46f 100644 --- a/sd/source/filter/eppt/pptx-grouptable.cxx +++ b/sd/source/filter/eppt/pptx-grouptable.cxx @@ -54,9 +54,9 @@ void GroupTable::ImplResizeGroupTable( sal_uInt32 nEntrys ) -sal_Bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rXIndexAccessRef ) +bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rXIndexAccessRef ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( rXIndexAccessRef.is() ) { GroupEntry* pNewGroup = new GroupEntry( rXIndexAccessRef ); @@ -65,7 +65,7 @@ sal_Bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::s if ( mnMaxGroupEntry == mnCurrentGroupEntry ) ImplResizeGroupTable( mnMaxGroupEntry + 8 ); mpGroupEntry[ mnCurrentGroupEntry++ ] = pNewGroup; - bRet = sal_True; + bRet = true; } else delete pNewGroup; @@ -100,21 +100,21 @@ void GroupTable::ResetGroupTable( sal_uInt32 nCount ) -sal_Bool GroupTable::GetNextGroupEntry() +bool GroupTable::GetNextGroupEntry() { while ( mnCurrentGroupEntry ) { mnIndex = mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mnCurrentPos++; if ( mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mnCount > mnIndex ) - return sal_True; + return true; delete ( mpGroupEntry[ --mnCurrentGroupEntry ] ); if ( mnCurrentGroupEntry ) mnGroupsClosed++; } - return sal_False; + return false; } diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx index b99755e9ab8e..cd1e8fd6570f 100644 --- a/sd/source/filter/eppt/pptx-stylesheet.cxx +++ b/sd/source/filter/eppt/pptx-stylesheet.cxx @@ -90,7 +90,7 @@ void PPTExCharSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co rLev.mnFlags = aPortionObj.mnCharAttr; } -void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bool, sal_Bool bSimpleText, +void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, bool, bool bSimpleText, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet ) { const PPTExCharLevel& rLev = maCharLevel[ nLev ]; @@ -106,9 +106,9 @@ void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo sal_uInt32 nFontColor = rLev.mnFontColor; if ( nFontColor == COL_AUTO ) { - sal_Bool bIsDark = sal_False; + bool bIsDark = false; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rPagePropSet, OUString( "IsBackgroundDark" ), true ) ) aAny >>= bIsDark; nFontColor = bIsDark ? 0xffffff : 0x000000; } @@ -134,7 +134,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull rBuProv ( rProv ), mnInstance ( nInstance ) { - sal_Bool bHasBullet = sal_False; + bool bHasBullet = false; sal_uInt16 nUpperDist = 0; sal_uInt16 nBulletChar = 0x2022; @@ -154,7 +154,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull case EPP_TEXTTYPE_HalfBody : case EPP_TEXTTYPE_QuarterBody : { - bHasBullet = sal_True; + bHasBullet = true; nUpperDist = 0x14; } break; @@ -216,7 +216,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull rLev.mnAsianSettings = 2; rLev.mnBiDi = 0; - rLev.mbExtendedBulletsUsed = sal_False; + rLev.mbExtendedBulletsUsed = false; rLev.mnBulletId = 0xffff; rLev.mnBulletStart = 0; rLev.mnMappedNumType = 0; @@ -238,7 +238,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co sal_Int16 nLineSpacing = aParagraphObj.mnLineSpacing; if ( nLineSpacing > 0 ) // if nLinespacing is < 0 the linespacing is an absolute spacing { - sal_Bool bFixedLineSpacing = sal_False; + bool bFixedLineSpacing = false; uno::Any aAny = rXPropSet->getPropertyValue("FontIndependentLineSpacing"); if( !(aAny >>= bFixedLineSpacing) || !bFixedLineSpacing ) { @@ -293,7 +293,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co { PPTExParaLevel& rLevel = maParaLevel[ i ]; if ( i ) - aParagraphObj.ImplGetNumberingLevel( rBuProv, i, sal_False ); + aParagraphObj.ImplGetNumberingLevel( rBuProv, i, false ); rLevel.mnTextOfs = aParagraphObj.nTextOfs; rLevel.mnBulletOfs = (sal_uInt16)aParagraphObj.nBulletOfs; rLevel.mnBulletChar = aParagraphObj.cBulletId; @@ -313,7 +313,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co } } -void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bool, sal_Bool bSimpleText, +void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, bool, bool bSimpleText, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet ) { const PPTExParaLevel& rLev = maParaLevel[ nLev ]; @@ -349,9 +349,9 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo sal_uInt32 nBulletColor = rLev.mnBulletColor; if ( nBulletColor == COL_AUTO ) { - sal_Bool bIsDark = sal_False; + bool bIsDark = false; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rPagePropSet, OUString( "IsBackgroundDark" ), true ) ) aAny >>= bIsDark; nBulletColor = bIsDark ? 0xffffff : 0x000000; } @@ -416,7 +416,7 @@ void PPTExStyleSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::c mpParaSheet[ nInstance ]->SetStyleSheet( rXPropSet, rFontCollection, nLevel, mpCharSheet[ nInstance ]->maCharLevel[ nLevel ] ); } -sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue ) +bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue ) { const PPTExParaLevel& rPara = mpParaSheet[ nInstance ]->maParaLevel[ nLevel ]; const PPTExCharLevel& rChar = mpCharSheet[ nInstance ]->maCharLevel[ nLevel ]; @@ -449,7 +449,7 @@ sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLev case CharAttr_Embossed : nFlag = 512; break; case CharAttr_Font : return ( rChar.mnFont != nValue ); case CharAttr_AsianOrComplexFont : return ( rChar.mnAsianOrComplexFont != nValue ); - case CharAttr_Symbol : return sal_True; + case CharAttr_Symbol : return true; case CharAttr_FontHeight : return ( rChar.mnFontHeight != nValue ); case CharAttr_FontColor : return ( rChar.mnFontColor != nValue ); case CharAttr_Escapement : return ( rChar.mnEscapement != nValue ); @@ -463,7 +463,7 @@ sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLev else return ( ( nValue & nFlag ) != 0 ); } - return sal_True; + return true; } sal_uInt32 PPTExStyleSheet::SizeOfTxCFStyleAtom() const diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 75effa87af83..e2cd4b66c2cb 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -59,17 +59,17 @@ PortionObj::PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star mnFont ( 0 ), mnAsianOrComplexFont( 0xffff ), mnTextSize ( 0 ), - mbLastPortion ( sal_True ), + mbLastPortion ( true ), mpText ( NULL ), mpFieldEntry ( NULL ) { mXPropSet = rXPropSet; - ImplGetPortionValues( rFontCollection, sal_False ); + ImplGetPortionValues( rFontCollection, false ); } PortionObj::PortionObj(::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRange, - sal_Bool bLast, FontCollection& rFontCollection) + bool bLast, FontCollection& rFontCollection) : meCharColor(css::beans::PropertyState_AMBIGUOUS_VALUE) , meCharHeight(css::beans::PropertyState_AMBIGUOUS_VALUE) , meFontName(css::beans::PropertyState_AMBIGUOUS_VALUE) @@ -88,7 +88,7 @@ PortionObj::PortionObj(::com::sun::star::uno::Reference< ::com::sun::star::text: { OUString aString( rXTextRange->getString() ); OUString aURL; - sal_Bool bRTL_endingParen = sal_False; + bool bRTL_endingParen = false; mnTextSize = aString.getLength(); if ( bLast ) @@ -106,7 +106,7 @@ PortionObj::PortionObj(::com::sun::star::uno::Reference< ::com::sun::star::text: ::com::sun::star::beans::XPropertyState > ( rXTextRange, ::com::sun::star::uno::UNO_QUERY ); - sal_Bool bPropSetsValid = ( mXPropSet.is() && mXPropState.is() ); + bool bPropSetsValid = ( mXPropSet.is() && mXPropState.is() ); if ( bPropSetsValid ) nFieldType = ImplGetTextField( rXTextRange, mXPropSet, aURL ); if ( nFieldType ) @@ -118,14 +118,14 @@ PortionObj::PortionObj(::com::sun::star::uno::Reference< ::com::sun::star::text: mpFieldEntry->aFieldUrl = aURL; } } - sal_Bool bSymbol = sal_False; + bool bSymbol = false; - if ( bPropSetsValid && ImplGetPropertyValue( OUString( "CharFontCharSet" ), sal_False ) ) + if ( bPropSetsValid && ImplGetPropertyValue( OUString( "CharFontCharSet" ), false ) ) { sal_Int16 nCharset = 0; mAny >>= nCharset; if ( nCharset == ::com::sun::star::awt::CharSet::SYMBOL ) - bSymbol = sal_True; + bSymbol = true; } if ( mpFieldEntry && ( nFieldType & 0x800000 ) ) // placeholder ? { @@ -144,7 +144,7 @@ PortionObj::PortionObj(::com::sun::star::uno::Reference< ::com::sun::star::text: && rFontCollection.GetScriptDirection(aString) == com::sun::star::i18n::ScriptDirection::RIGHT_TO_LEFT) { mnTextSize++; - bRTL_endingParen = sal_True; + bRTL_endingParen = true; } mpText = new sal_uInt16[ mnTextSize ]; sal_uInt16 nChar; @@ -203,7 +203,7 @@ PortionObj::PortionObj(::com::sun::star::uno::Reference< ::com::sun::star::text: mpText[ mnTextSize - 1 ] = 0xd; if ( bPropSetsValid ) - ImplGetPortionValues( rFontCollection, sal_True ); + ImplGetPortionValues( rFontCollection, true ); } } @@ -218,7 +218,7 @@ PortionObj::~PortionObj() ImplClear(); } -void PortionObj::Write( SvStream* pStrm, sal_Bool bLast ) +void PortionObj::Write( SvStream* pStrm, bool bLast ) { sal_uInt32 nCount = mnTextSize; if ( bLast && mbLastPortion ) @@ -227,10 +227,10 @@ void PortionObj::Write( SvStream* pStrm, sal_Bool bLast ) pStrm->WriteUInt16( (sal_uInt16)mpText[ i ] ); } -void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue ) +void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, bool bGetPropStateValue ) { - sal_Bool bOk = ImplGetPropertyValue( OUString( "CharFontName" ), bGetPropStateValue ); + bool bOk = ImplGetPropertyValue( OUString( "CharFontName" ), bGetPropStateValue ); meFontName = ePropState; if ( bOk ) { @@ -240,11 +240,11 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( mnFont == nCount ) { FontCollectionEntry& rFontDesc = rFontCollection.GetLast(); - if ( ImplGetPropertyValue( OUString( "CharFontCharSet" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontCharSet" ), false ) ) mAny >>= rFontDesc.CharSet; - if ( ImplGetPropertyValue( OUString( "CharFontFamily" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontFamily" ), false ) ) mAny >>= rFontDesc.Family; - if ( ImplGetPropertyValue( OUString( "CharFontPitch" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontPitch" ), false ) ) mAny >>= rFontDesc.Pitch; } } @@ -267,11 +267,11 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( mnAsianOrComplexFont == nCount ) { FontCollectionEntry& rFontDesc = rFontCollection.GetLast(); - if ( ImplGetPropertyValue( OUString( "CharFontCharSetAsian" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontCharSetAsian" ), false ) ) mAny >>= rFontDesc.CharSet; - if ( ImplGetPropertyValue( OUString( "CharFontFamilyAsian" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontFamilyAsian" ), false ) ) mAny >>= rFontDesc.Family; - if ( ImplGetPropertyValue( OUString( "CharFontPitchAsian" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontPitchAsian" ), false ) ) mAny >>= rFontDesc.Pitch; } } @@ -288,11 +288,11 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( mnAsianOrComplexFont == nCount ) { FontCollectionEntry& rFontDesc = rFontCollection.GetLast(); - if ( ImplGetPropertyValue( OUString( "CharFontCharSetComplex" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontCharSetComplex" ), false ) ) mAny >>= rFontDesc.CharSet; - if ( ImplGetPropertyValue( OUString( "CharFontFamilyComplex" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontFamilyComplex" ), false ) ) mAny >>= rFontDesc.Family; - if ( ImplGetPropertyValue( OUString( "CharFontPitchComplex" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontPitchComplex" ), false ) ) mAny >>= rFontDesc.Pitch; } } @@ -328,7 +328,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool } mnCharHeight = 24; - if ( GetPropertyValue( mAny, mXPropSet, aCharHeightName, sal_False ) ) + if ( GetPropertyValue( mAny, mXPropSet, aCharHeightName, false ) ) { float fVal(0.0); if ( mAny >>= fVal ) @@ -337,7 +337,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool meCharHeight = GetPropertyState( mXPropSet, aCharHeightName ); } } - if ( GetPropertyValue( mAny, mXPropSet, aCharWeightName, sal_False ) ) + if ( GetPropertyValue( mAny, mXPropSet, aCharWeightName, false ) ) { float fFloat(0.0); if ( mAny >>= fFloat ) @@ -348,13 +348,13 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool mnCharAttrHard |= 1; } } - if ( GetPropertyValue( mAny, mXPropSet, aCharLocaleName, sal_False ) ) + if ( GetPropertyValue( mAny, mXPropSet, aCharLocaleName, false ) ) { com::sun::star::lang::Locale eLocale; if ( mAny >>= eLocale ) meCharLocale = eLocale; } - if ( GetPropertyValue( mAny, mXPropSet, aCharPostureName, sal_False ) ) + if ( GetPropertyValue( mAny, mXPropSet, aCharPostureName, false ) ) { ::com::sun::star::awt::FontSlant aFS; if ( mAny >>= aFS ) @@ -390,7 +390,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( ImplGetPropertyValue( OUString( "CharShadowed" ), bGetPropStateValue ) ) { - sal_Bool bBool(sal_False); + bool bBool(false); mAny >>= bBool; if ( bBool ) mnCharAttr |= 0x10; @@ -496,12 +496,12 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com sal_uInt32 nRetValue = 0; sal_Int32 nFormat; ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, rXPropSet, OUString( "TextPortionType" ), sal_True ) ) + if ( GetPropertyValue( aAny, rXPropSet, OUString( "TextPortionType" ), true ) ) { OUString aTextFieldType( *(OUString*)aAny.getValue() ); if ( aTextFieldType == "TextField" ) { - if ( GetPropertyValue( aAny, rXPropSet, aTextFieldType, sal_True ) ) + if ( GetPropertyValue( aAny, rXPropSet, aTextFieldType, true ) ) { ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > aXTextField; if ( aAny >>= aXTextField ) @@ -517,7 +517,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com { if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) { - sal_Bool bBool = sal_False; + bool bBool = false; aAny >>= bBool; if ( !bBool ) // Fixed DateFields does not exist in PPT { @@ -559,7 +559,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com { if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) { - sal_Bool bBool = sal_False; + bool bBool = false; aAny >>= bBool; if ( !bBool ) { @@ -583,7 +583,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com { if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) { - sal_Bool bBool = sal_False; + bool bBool = false; aAny >>= bBool; if ( !bBool ) { @@ -664,13 +664,13 @@ ParagraphObj::ParagraphObj(const ::com::sun::star::uno::Reference< ::com::sun::s { mXPropSet = rXPropSet; - bExtendedParameters = sal_False; + bExtendedParameters = false; nDepth = 0; nBulletFlags = 0; nParaFlags = 0; - ImplGetParagraphValues( rProv, sal_False ); + ImplGetParagraphValues( rProv, false ); } ParagraphObj::ParagraphObj(::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContent, @@ -698,7 +698,7 @@ ParagraphObj::ParagraphObj(::com::sun::star::uno::Reference< ::com::sun::star::t , mbParagraphPunctation(false) , mnBiDi(0) { - bExtendedParameters = sal_False; + bExtendedParameters = false; nDepth = 0; nBulletFlags = 0; @@ -737,7 +737,7 @@ ParagraphObj::ParagraphObj(::com::sun::star::uno::Reference< ::com::sun::star::t } } } - ImplGetParagraphValues( rProv, sal_True ); + ImplGetParagraphValues( rProv, true ); } } @@ -784,7 +784,7 @@ void ParagraphObj::CalculateGraphicBulletSize( sal_uInt16 nFontHeight ) } } -void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nNumberingDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue ) +void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nNumberingDepth, bool bIsBullet, bool bGetPropStateValue ) { ::com::sun::star::uno::Any aAny; if ( GetPropertyValue( aAny, mXPropSet, OUString( "ParaLeftMargin" ) ) ) @@ -816,7 +816,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 sal_Int32 nPropertyCount = aPropertySequence.getLength(); if ( nPropertyCount ) { - bExtendedParameters = sal_True; + bExtendedParameters = true; nBulletRealSize = 100; nMappedNumType = 0; @@ -911,7 +911,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 { nBulletId = rBuProv.GetId( aUniqueId, aBuGraSize ); if ( nBulletId != 0xffff ) - bExtendedBulletsUsed = sal_True; + bExtendedBulletsUsed = true; } } } @@ -960,7 +960,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 { if ( nNumberingType != SVX_NUM_CHAR_SPECIAL ) { - bExtendedBulletsUsed = sal_True; + bExtendedBulletsUsed = true; if ( nNumberingDepth & 1 ) cBulletId = 0x2013; // defaulting bullet characters for ppt97 else if ( nNumberingDepth == 4 ) @@ -1099,10 +1099,10 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 nBulletOfs = 0; } -void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue ) +void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, bool bGetPropStateValue ) { ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, mXPropSet, "NumberingLevel", sal_True ) ) + if ( GetPropertyValue( aAny, mXPropSet, "NumberingLevel", true ) ) { if ( bGetPropStateValue ) meBullet = GetPropertyState( mXPropSet, "NumberingLevel" ); @@ -1110,20 +1110,20 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo if ( nDepth < 0 ) { - mbIsBullet = sal_False; + mbIsBullet = false; nDepth = 0; } else { if ( nDepth > 4 ) nDepth = 4; - mbIsBullet = sal_True; + mbIsBullet = true; } } else { nDepth = 0; - mbIsBullet = sal_False; + mbIsBullet = false; } ImplGetNumberingLevel( rBuProv, nDepth, mbIsBullet, bGetPropStateValue ); @@ -1158,12 +1158,12 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo { case ::com::sun::star::style::LineSpacingMode::FIX : mnLineSpacing = (sal_Int16)(-( aLineSpacing.Height ) ); - mbFixedLineSpacing = sal_True; + mbFixedLineSpacing = true; break; case ::com::sun::star::style::LineSpacingMode::MINIMUM : case ::com::sun::star::style::LineSpacingMode::LEADING : mnLineSpacing = (sal_Int16)(-( aLineSpacing.Height ) ); - mbFixedLineSpacing = sal_False; + mbFixedLineSpacing = false; break; case ::com::sun::star::style::LineSpacingMode::PROP : @@ -1284,8 +1284,8 @@ struct ImplTextObj sal_uInt32 mnTextSize; int mnInstance; std::vector<ParagraphObj*> maList; - sal_Bool mbHasExtendedBullets; - sal_Bool mbFixedCellHeightUsed; + bool mbHasExtendedBullets; + bool mbFixedCellHeightUsed; ImplTextObj( int nInstance ); ~ImplTextObj(); @@ -1296,8 +1296,8 @@ ImplTextObj::ImplTextObj( int nInstance ) { mnTextSize = 0; mnInstance = nInstance; - mbHasExtendedBullets = sal_False; - mbFixedCellHeightUsed = sal_False; + mbHasExtendedBullets = false; + mbFixedCellHeightUsed = false; } ImplTextObj::~ImplTextObj() @@ -1327,11 +1327,11 @@ TextObj::TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSim if ( aAny >>= aXParagraph ) { if ( !aXTextParagraphE->hasMoreElements() ) - aParaFlags.bLastParagraph = sal_True; + aParaFlags.bLastParagraph = true; ParagraphObj* pPara = new ParagraphObj( aXParagraph, aParaFlags, rFontCollection, rProv ); mpImplTextObj->mbHasExtendedBullets |= pPara->bExtendedBulletsUsed; mpImplTextObj->maList.push_back( pPara ); - aParaFlags.bFirstParagraph = sal_False; + aParaFlags.bFirstParagraph = false; } } } @@ -1366,7 +1366,7 @@ int TextObj::GetInstance() const return mpImplTextObj->mnInstance; } -sal_Bool TextObj::HasExtendedBullets() +bool TextObj::HasExtendedBullets() { return mpImplTextObj->mbHasExtendedBullets; } @@ -1381,12 +1381,12 @@ void FontCollectionEntry::ImplInit( const OUString& rName ) if ( !aSubstName.isEmpty() ) { Name = aSubstName; - bIsConverted = sal_True; + bIsConverted = true; } else { Name = rName; - bIsConverted = sal_False; + bIsConverted = false; } } diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx index 71abbba19564..e7fe688f11b8 100644 --- a/sd/source/filter/eppt/text.hxx +++ b/sd/source/filter/eppt/text.hxx @@ -39,7 +39,7 @@ namespace style { struct TabStop; } struct SOParagraph { - sal_Bool bExtendedParameters; + bool bExtendedParameters; sal_uInt32 nParaFlags; sal_Int16 nBulletFlags; OUString sPrefix; @@ -57,10 +57,10 @@ struct SOParagraph sal_Unicode cBulletId; // if Numbering Type == CharSpecial ::com::sun::star::awt::FontDescriptor aFontDesc; - sal_Bool bExtendedBulletsUsed; + bool bExtendedBulletsUsed; sal_uInt16 nBulletId; sal_uInt32 nMappedNumType; - sal_Bool bNumberingIsNumber; + bool bNumberingIsNumber; SOParagraph() : bExtendedParameters(false) @@ -95,7 +95,7 @@ protected: css::beans::PropertyState ePropState; css::uno::Reference < css::beans::XPropertyState > mXPropState; - sal_Bool ImplGetPropertyValue( const OUString& rString, sal_Bool bGetPropertyState = sal_True ); + bool ImplGetPropertyValue( const OUString& rString, bool bGetPropertyState = true ); }; struct FieldEntry @@ -126,7 +126,7 @@ class PortionObj : public PropStateValue sal_uInt32 ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, OUString& rURL ); sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); - void ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue = sal_False ); + void ImplGetPortionValues( FontCollection& rFontCollection, bool bGetPropStateValue = false ); public : @@ -146,19 +146,19 @@ class PortionObj : public PropStateValue sal_Int16 mnCharEscapement; sal_uInt32 mnTextSize; - sal_Bool mbLastPortion; + bool mbLastPortion; sal_uInt16* mpText; FieldEntry* mpFieldEntry; PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef, - sal_Bool bLast, FontCollection& rFontCollection ); + bool bLast, FontCollection& rFontCollection ); PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, FontCollection& rFontCollection ); PortionObj( const PortionObj& rPortionObj ); ~PortionObj(); - void Write( SvStream* pStrm, sal_Bool bLast ); + void Write( SvStream* pStrm, bool bLast ); sal_uInt32 Count() const { return mnTextSize; }; PortionObj& operator=( const PortionObj& rPortionObj ); @@ -166,10 +166,10 @@ class PortionObj : public PropStateValue struct ParaFlags { - sal_Bool bFirstParagraph : 1; - sal_Bool bLastParagraph : 1; + bool bFirstParagraph : 1; + bool bLastParagraph : 1; - ParaFlags() { bFirstParagraph = sal_True; bLastParagraph = sal_False; }; + ParaFlags() { bFirstParagraph = true; bLastParagraph = false; }; }; class ParagraphObj : public std::vector<PortionObj*>, public PropStateValue, public SOParagraph @@ -185,8 +185,8 @@ class ParagraphObj : public std::vector<PortionObj*>, public PropStateValue, pub void ImplConstruct( const ParagraphObj& rParagraphObj ); void ImplClear(); sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); - void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = sal_False ); - void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = sal_False ); + void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, bool bGetPropStateValue = false ); + void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, bool bIsBullet, bool bGetPropStateValue = false ); public : @@ -194,9 +194,9 @@ class ParagraphObj : public std::vector<PortionObj*>, public PropStateValue, pub sal_uInt32 mnTextSize; - sal_Bool mbIsBullet; - sal_Bool mbFirstParagraph; - sal_Bool mbLastParagraph; + bool mbIsBullet; + bool mbFirstParagraph; + bool mbLastParagraph; ::com::sun::star::beans::PropertyState meBullet; ::com::sun::star::beans::PropertyState meTextAdjust; @@ -209,11 +209,11 @@ class ParagraphObj : public std::vector<PortionObj*>, public PropStateValue, pub sal_uInt16 mnTextAdjust; sal_Int16 mnLineSpacing; - sal_Bool mbFixedLineSpacing; + bool mbFixedLineSpacing; sal_Int16 mnLineSpacingTop; sal_Int16 mnLineSpacingBottom; - sal_Bool mbForbiddenRules; - sal_Bool mbParagraphPunctation; + bool mbForbiddenRules; + bool mbParagraphPunctation; sal_uInt16 mnBiDi; ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContentRef, @@ -247,7 +247,7 @@ public : sal_uInt32 ParagraphCount() const; sal_uInt32 Count() const; int GetInstance() const; - sal_Bool HasExtendedBullets(); + bool HasExtendedBullets(); void WriteTextSpecInfo( SvStream* pStrm ); }; diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index e23b97c0d52f..f5c1399bf347 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -134,7 +134,7 @@ void SdGRFFilter_ImplInteractionHdl::handle( const com::sun::star::uno::Referenc SdGRFFilter::SdGRFFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) : - SdFilter( rMedium, rDocShell, sal_True ) + SdFilter( rMedium, rDocShell, true ) { } @@ -190,13 +190,13 @@ void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong n -sal_Bool SdGRFFilter::Import() +bool SdGRFFilter::Import() { Graphic aGraphic; const OUString aFileName( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); const sal_uInt16 nFilter = rGraphicFilter.GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() ); - sal_Bool bRet = sal_False; + bool bRet = false; SvStream* pIStm = mrMedium.GetInStream(); sal_uInt16 nReturn = pIStm ? rGraphicFilter.ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1; @@ -242,18 +242,18 @@ sal_Bool SdGRFFilter::Import() aPos.Y() = ( ( aPagSize.Height() - aGrfSize.Height() ) >> 1 ) + pPage->GetUppBorder(); pPage->InsertObject( new SdrGrafObj( aGraphic, Rectangle( aPos, aGrfSize ) ) ); - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool SdGRFFilter::Export() +bool SdGRFFilter::Export() { // SJ: todo: error handling, the GraphicExportFilter does not support proper errorhandling - sal_Bool bRet = sal_False; + bool bRet = false; uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference< drawing::XGraphicExportFilter > xExporter = drawing::GraphicExportFilter::create( xContext ); @@ -298,14 +298,14 @@ sal_Bool SdGRFFilter::Export() OUString sFilterName( "FilterName" ); OUString sShortName( rGraphicFilter.GetExportFormatShortName( nFilter ) ); - sal_Bool bFilterNameFound = sal_False; + bool bFilterNameFound = false; sal_Int32 i, nCount; for ( i = 0, nCount = aArgs.getLength(); i < nCount; i++ ) { OUString& rStr = aArgs[ i ].Name; if ( rStr == sFilterName ) { - bFilterNameFound = sal_True; + bFilterNameFound = true; aArgs[ i ].Name = sFilterName; aArgs[ i ].Value <<= sShortName; } diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index f6619fc68563..dd69ce4fb475 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -464,14 +464,14 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams { if( mbImpress ) { - sal_Bool temp = sal_False; + bool temp = false; pParams->Value >>= temp; mbNotes = temp; } } else if ( pParams->Name == "IsExportContentsPage" ) { - sal_Bool temp = sal_False; + bool temp = false; pParams->Value >>= temp; mbContentsPage = temp; } @@ -497,19 +497,19 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams } else if ( pParams->Name == "EnableDownload" ) { - sal_Bool temp = sal_False; + bool temp = false; pParams->Value >>= temp; mbDownload = temp; } else if ( pParams->Name == "SlideSound" ) { - sal_Bool temp = sal_True; + bool temp = true; pParams->Value >>= temp; mbSlideSound = temp; } else if ( pParams->Name == "HiddenSlides" ) { - sal_Bool temp = sal_True; + bool temp = true; pParams->Value >>= temp; mbHiddenSlides = temp; } @@ -550,7 +550,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams } else if ( pParams->Name == "IsUseDocumentColors" ) { - sal_Bool temp = sal_False; + bool temp = false; pParams->Value >>= temp; mbDocColors = temp; } @@ -563,7 +563,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams } else if ( pParams->Name == "KioskEndless" ) { - sal_Bool temp = sal_False; + bool temp = false; pParams->Value >>= temp; mbEndless = temp; } @@ -965,7 +965,7 @@ bool HtmlExport::SavePresentation() { uno::Sequence< beans::PropertyValue > aProperties( 2 ); aProperties[ 0 ].Name = "Overwrite"; - aProperties[ 0 ].Value <<= (sal_Bool)sal_True; + aProperties[ 0 ].Value <<= true; aProperties[ 1 ].Name = "FilterName"; aProperties[ 1 ].Value <<= OUString("impress8"); xStorable->storeToURL( aURL, aProperties ); @@ -1675,8 +1675,8 @@ bool HtmlExport::CreateHtmlForPresPages() // if necessary, convert page and object names into the // corresponding names of the html file - sal_Bool bIsMasterPage; - sal_uInt16 nPgNum = mpDoc->GetPageByName( aURL, bIsMasterPage ); + bool bIsMasterPage; + sal_uInt16 nPgNum = mpDoc->GetPageByName( aURL, bIsMasterPage ); SdrObject* pObj = NULL; if (nPgNum == SDRPAGE_NOTFOUND) @@ -1760,8 +1760,8 @@ bool HtmlExport::CreateHtmlForPresPages() { case presentation::ClickAction_BOOKMARK: { - sal_Bool bIsMasterPage; - sal_uInt16 nPgNum = mpDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage ); + bool bIsMasterPage; + sal_uInt16 nPgNum = mpDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage ); SdrObject* pObj = NULL; if( nPgNum == SDRPAGE_NOTFOUND ) diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 4d4de4672065..1407699f1b85 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -93,39 +93,39 @@ public: OUString m_aURL; // special Kiosk options - sal_Bool m_bAutoSlide; + bool m_bAutoSlide; sal_uInt32 m_nSlideDuration; - sal_Bool m_bEndless; + bool m_bEndless; // special HTML options - sal_Bool m_bContentPage; - sal_Bool m_bNotes; + bool m_bContentPage; + bool m_bNotes; // misc options sal_uInt16 m_nResolution; OUString m_aCompression; PublishingFormat m_eFormat; - sal_Bool m_bSlideSound; - sal_Bool m_bHiddenSlides; + bool m_bSlideSound; + bool m_bHiddenSlides; // title page information OUString m_aAuthor; OUString m_aEMail; OUString m_aWWW; OUString m_aMisc; - sal_Bool m_bDownload; - sal_Bool m_bCreated; // not used + bool m_bDownload; + bool m_bCreated; // not used // buttons and colorscheme sal_Int16 m_nButtonThema; - sal_Bool m_bUserAttr; + bool m_bUserAttr; Color m_aBackColor; Color m_aTextColor; Color m_aLinkColor; Color m_aVLinkColor; Color m_aALinkColor; - sal_Bool m_bUseAttribs; - sal_Bool m_bUseColor; + bool m_bUseAttribs; + bool m_bUseColor; SdPublishingDesign(); @@ -136,11 +136,11 @@ public: // load Default-settings SdPublishingDesign::SdPublishingDesign() - : m_bCreated(sal_False) + : m_bCreated(false) { m_eMode = PUBLISH_HTML; - m_bContentPage = sal_True; - m_bNotes = sal_True; + m_bContentPage = true; + m_bNotes = true; m_eFormat = FORMAT_PNG; @@ -156,12 +156,12 @@ SdPublishingDesign::SdPublishingDesign() m_aAuthor += " "; m_aAuthor += aUserOptions.GetLastName(); m_aEMail = aUserOptions.GetEmail(); - m_bDownload = sal_False; + m_bDownload = false; m_nButtonThema = -1; - m_bUserAttr = sal_False; - m_bUseAttribs = sal_True; - m_bUseColor = sal_True; + m_bUserAttr = false; + m_bUseAttribs = true; + m_bUseColor = true; m_aBackColor = COL_WHITE; m_aTextColor = COL_BLACK; @@ -171,12 +171,12 @@ SdPublishingDesign::SdPublishingDesign() m_eScript = SCRIPT_ASP; - m_bAutoSlide = sal_True; + m_bAutoSlide = true; m_nSlideDuration = 15; - m_bEndless = sal_True; + m_bEndless = true; - m_bSlideSound = sal_True; - m_bHiddenSlides = sal_False; + m_bSlideSound = true; + m_bHiddenSlides = false; } // Compares the values without paying attention to the name @@ -252,8 +252,8 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) RTL_TEXTENCODING_UTF8); rIn.ReadUInt16( nTemp16 ); rDesign.m_eMode = (HtmlPublishMode)nTemp16; - rIn.ReadUChar( rDesign.m_bContentPage ); - rIn.ReadUChar( rDesign.m_bNotes ); + rIn.ReadCharAsBool( rDesign.m_bContentPage ); + rIn.ReadCharAsBool( rDesign.m_bNotes ); rIn.ReadUInt16( rDesign.m_nResolution ); rDesign.m_aCompression = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); @@ -267,17 +267,17 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) RTL_TEXTENCODING_UTF8); rDesign.m_aMisc = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rIn.ReadUChar( rDesign.m_bDownload ); - rIn.ReadUChar( rDesign.m_bCreated ); // not used + rIn.ReadCharAsBool( rDesign.m_bDownload ); + rIn.ReadCharAsBool( rDesign.m_bCreated ); // not used rIn.ReadInt16( rDesign.m_nButtonThema ); - rIn.ReadUChar( rDesign.m_bUserAttr ); + rIn.ReadCharAsBool( rDesign.m_bUserAttr ); ReadColor( rIn, rDesign.m_aBackColor ); ReadColor( rIn, rDesign.m_aTextColor ); ReadColor( rIn, rDesign.m_aLinkColor ); ReadColor( rIn, rDesign.m_aVLinkColor ); ReadColor( rIn, rDesign.m_aALinkColor ); - rIn.ReadUChar( rDesign.m_bUseAttribs ); - rIn.ReadUChar( rDesign.m_bUseColor ); + rIn.ReadCharAsBool( rDesign.m_bUseAttribs ); + rIn.ReadCharAsBool( rDesign.m_bUseColor ); rIn.ReadUInt16( nTemp16 ); rDesign.m_eScript = (PublishingScript)nTemp16; @@ -286,11 +286,11 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) rDesign.m_aCGI = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rIn.ReadUChar( rDesign.m_bAutoSlide ); + rIn.ReadCharAsBool( rDesign.m_bAutoSlide ); rIn.ReadUInt32( rDesign.m_nSlideDuration ); - rIn.ReadUChar( rDesign.m_bEndless ); - rIn.ReadUChar( rDesign.m_bSlideSound ); - rIn.ReadUChar( rDesign.m_bHiddenSlides ); + rIn.ReadCharAsBool( rDesign.m_bEndless ); + rIn.ReadCharAsBool( rDesign.m_bSlideSound ); + rIn.ReadCharAsBool( rDesign.m_bHiddenSlides ); return rIn; } @@ -373,8 +373,8 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) , aNextPageButton(this,SdResId(BUT_NEXT)) , aFinishButton(this,SdResId(BUT_FINISH)) , aAssistentFunc(NOOFPAGES) -, m_bButtonsDirty(sal_True) -, m_bDesignListDirty(sal_False) +, m_bButtonsDirty(true) +, m_bDesignListDirty(false) , m_pDesign(NULL) { m_bImpress = eDocType == DOCUMENT_TYPE_IMPRESS; @@ -761,13 +761,13 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) aProps.push_back( aValue ); aValue.Name = "IsExportContentsPage"; - aValue.Value <<= (sal_Bool)pPage2_Content->IsChecked(); + aValue.Value <<= pPage2_Content->IsChecked(); aProps.push_back( aValue ); if(m_bImpress) { aValue.Name = "IsExportNotes"; - aValue.Value <<= (sal_Bool)pPage2_Notes->IsChecked(); + aValue.Value <<= pPage2_Notes->IsChecked(); aProps.push_back( aValue ); } @@ -800,7 +800,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) aProps.push_back( aValue ); aValue.Name = "KioskEndless"; - aValue.Value <<= (sal_Bool)pPage2_Endless->IsChecked(); + aValue.Value <<= pPage2_Endless->IsChecked(); aProps.push_back( aValue ); } @@ -864,7 +864,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) if( m_bImpress ) { aValue.Name = "EnableDownload"; - aValue.Value <<= (sal_Bool)pPage4_Download->IsChecked(); + aValue.Value <<= pPage4_Download->IsChecked(); aProps.push_back( aValue ); } @@ -903,7 +903,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) if( pPage6_DocColors->IsChecked() ) { aValue.Name = "IsUseDocumentColors"; - aValue.Value <<= (sal_Bool)sal_True; + aValue.Value <<= true; aProps.push_back( aValue ); } @@ -981,7 +981,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl) m_aDesignList.erase(iter); - m_bDesignListDirty = sal_True; + m_bDesignListDirty = true; UpdatePage(); @@ -991,7 +991,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl) // Clickhandler for the other servertypess IMPL_LINK( SdPublishingDlg, WebServerHdl, RadioButton *, pButton ) { - sal_Bool bASP = pButton == pPage2_ASP; + bool bASP = pButton == pPage2_ASP; pPage2_ASP->Check( bASP ); pPage2_PERL->Check( !bASP ); @@ -1114,19 +1114,19 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl) SdPublishingDesign* pDesign = new SdPublishingDesign(); GetDesign(pDesign); - sal_Bool bSave = sal_False; + bool bSave = false; if(pPage1_OldDesign->IsChecked() && m_pDesign) { // are there changes? if(!(*pDesign == *m_pDesign)) - bSave = sal_True; + bSave = true; } else { SdPublishingDesign aDefaultDesign; if(!(aDefaultDesign == *pDesign)) - bSave = sal_True; + bSave = true; } if(bSave) @@ -1135,10 +1135,10 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl) if(m_pDesign) aName = m_pDesign->m_aDesignName; - sal_Bool bRetry; + bool bRetry; do { - bRetry = sal_False; + bRetry = false; SdDesignNameDlg aDlg(this, aName ); @@ -1166,7 +1166,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl) if(!bRetry) { m_aDesignList.push_back(pDesign); - m_bDesignListDirty = sal_True; + m_bDesignListDirty = true; pDesign = NULL; } } @@ -1234,7 +1234,7 @@ void SdPublishingDlg::UpdatePage() pPage2_Index_txt->Show(); pPage2_Index->Show(); - sal_Bool bPerl = pPage2_PERL->IsChecked(); + bool bPerl = pPage2_PERL->IsChecked(); pPage2_Index->Enable(bPerl); pPage2_Index_txt->Enable(bPerl); pPage2_URL_txt->Enable(bPerl); @@ -1263,7 +1263,7 @@ void SdPublishingDlg::UpdatePage() pPage2_Duration_txt->Show(); pPage2_Duration->Show(); pPage2_Endless->Show(); - sal_Bool bAuto = pPage2_ChgAuto->IsChecked(); + bool bAuto = pPage2_ChgAuto->IsChecked(); pPage2_Duration->Enable(bAuto); pPage2_Endless->Enable(bAuto); } @@ -1348,7 +1348,7 @@ void SdPublishingDlg::LoadPreviewButtons() } pPage5_Buttons->SetItemHeight( nHeight ); - m_bButtonsDirty = sal_False; + m_bButtonsDirty = false; } } @@ -1508,9 +1508,9 @@ IMPL_LINK_NOARG(SdPublishingDlg, LastPageHdl) } // Load Designs -sal_Bool SdPublishingDlg::Load() +bool SdPublishingDlg::Load() { - m_bDesignListDirty = sal_False; + m_bDesignListDirty = false; INetURLObject aURL( SvtPathOptions().GetUserConfigPath() ); aURL.Append( OUString( "designs.sod" ) ); @@ -1520,13 +1520,13 @@ sal_Bool SdPublishingDlg::Load() com::sun::star::uno::Reference < com::sun::star::task::XInteractionHandler > xHandler; SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, xHandler ); - sal_Bool bOk = pIStm && ( pIStm->GetError() == 0); + bool bOk = pIStm && ( pIStm->GetError() == 0); if( pIStm ) delete pIStm; if( !bOk ) - return sal_False; + return false; } SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE ); @@ -1534,13 +1534,13 @@ sal_Bool SdPublishingDlg::Load() SvStream* pStream = aMedium.GetInStream(); if( !pStream ) - return( sal_False ); + return false; sal_uInt16 aCheck; pStream->ReadUInt16( aCheck ); if(aCheck != nMagic) - return sal_False; + return false; SdIOCompat aIO(*pStream, STREAM_READ); @@ -1561,7 +1561,7 @@ sal_Bool SdPublishingDlg::Load() } // Save Designs -sal_Bool SdPublishingDlg::Save() +bool SdPublishingDlg::Save() { INetURLObject aURL( SvtPathOptions().GetUserConfigPath() ); aURL.Append( OUString( "designs.sod" ) ); @@ -1571,7 +1571,7 @@ sal_Bool SdPublishingDlg::Save() SvStream* pStream = aMedium.GetOutStream(); if( !pStream ) - return( sal_False ); + return false; sal_uInt16 aCheck = nMagic; pStream->WriteUInt16( aCheck ); diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx index db809d7e99dc..6d45d9c0197e 100644 --- a/sd/source/filter/html/sdhtmlfilter.cxx +++ b/sd/source/filter/html/sdhtmlfilter.cxx @@ -43,7 +43,7 @@ // - SdPPTFilter - -SdHTMLFilter::SdHTMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) : +SdHTMLFilter::SdHTMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) : SdFilter( rMedium, rDocShell, bShowProgress ) { } @@ -56,7 +56,7 @@ SdHTMLFilter::~SdHTMLFilter() -sal_Bool SdHTMLFilter::Export() +bool SdHTMLFilter::Export() { mrMedium.Close(); mrMedium.Commit(); diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index 7af1c053a99c..bc5f7ad8d1bd 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -640,7 +640,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) // set after effect if( this->HasAfterEffect() ) { - pEffect->setHasAfterEffect( sal_True ); + pEffect->setHasAfterEffect( true ); if( this->HasAfterEffect_ChangeColor() ) pEffect->setDimColor( uno::makeAny( this->GetDimColor() ) ); else @@ -679,8 +679,8 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) { sal_Int32 nParagraphLevel = this->GetParagraphLevel(); double fDelaySeconds = this->GetDelayTimeInSeconds(); - sal_Bool bAnimateAssociatedShape = this->HasAnimateAssociatedShape();//or only text - sal_Bool bTextReverse = this->HasReverseOrder(); + bool bAnimateAssociatedShape = this->HasAnimateAssociatedShape();//or only text + bool bTextReverse = this->HasReverseOrder(); // now create effects for each paragraph ::sd::CustomAnimationTextGroupPtr pGroup = pMainSequence-> diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx index bf9ddf2e7a44..8a6d0440d008 100644 --- a/sd/source/filter/ppt/pptanimations.hxx +++ b/sd/source/filter/ppt/pptanimations.hxx @@ -249,53 +249,53 @@ struct transition const sal_Char* mpName; sal_Int16 mnType; sal_Int16 mnSubType; - sal_Bool mbDirection; // true: default geometric direction + bool mbDirection; // true: default geometric direction static const transition* find( const OUString& rName ); - static const sal_Char* find( const sal_Int16 mnType, const sal_Int16 mnSubType, const sal_Bool bDirection ); + static const sal_Char* find( const sal_Int16 mnType, const sal_Int16 mnSubType, const bool bDirection ); }; static const transition gTransitions[] = { -{ "wipe(up)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, sal_True }, -{ "wipe(right)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::LEFTTORIGHT, sal_False }, -{ "wipe(left)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::LEFTTORIGHT, sal_True }, -{ "wipe(down)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, sal_False }, -{ "wheel(1)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::ONEBLADE, sal_True }, -{ "wheel(2)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::TWOBLADEVERTICAL, sal_True }, -{ "wheel(3)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::THREEBLADE, sal_True }, -{ "wheel(4)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::FOURBLADE, sal_True }, -{ "wheel(8)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::EIGHTBLADE, sal_True }, -{ "strips(downLeft)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALRIGHT, sal_True }, -{ "strips(upLeft)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALLEFT, sal_False }, -{ "strips(downRight)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALLEFT, sal_True }, -{ "strips(upRight)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALRIGHT, sal_False }, -{ "barn(inVertical)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, sal_False }, -{ "barn(outVertical)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, sal_True }, -{ "barn(inHorizontal)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_False }, -{ "barn(outHorizontal)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_True }, -{ "randombar(vertical)", ::com::sun::star::animations::TransitionType::RANDOMBARWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, sal_True}, -{ "randombar(horizontal)", ::com::sun::star::animations::TransitionType::RANDOMBARWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_True }, -{ "checkerboard(down)", ::com::sun::star::animations::TransitionType::CHECKERBOARDWIPE, ::com::sun::star::animations::TransitionSubType::DOWN, sal_True}, -{ "checkerboard(across)", ::com::sun::star::animations::TransitionType::CHECKERBOARDWIPE, ::com::sun::star::animations::TransitionSubType::ACROSS, sal_True }, -{ "plus(out)", ::com::sun::star::animations::TransitionType::FOURBOXWIPE, ::com::sun::star::animations::TransitionSubType::CORNERSIN, sal_False }, -{ "plus(in)", ::com::sun::star::animations::TransitionType::FOURBOXWIPE, ::com::sun::star::animations::TransitionSubType::CORNERSIN, sal_True }, -{ "diamond(out)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::DIAMOND, sal_True }, -{ "diamond(in)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::DIAMOND, sal_False }, -{ "circle(out)", ::com::sun::star::animations::TransitionType::ELLIPSEWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_True }, -{ "circle(in)", ::com::sun::star::animations::TransitionType::ELLIPSEWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_False }, -{ "box(out)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::RECTANGLE, sal_True }, -{ "box(in)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::RECTANGLE, sal_False }, -{ "wedge", ::com::sun::star::animations::TransitionType::FANWIPE, ::com::sun::star::animations::TransitionSubType::CENTERTOP, sal_True }, -{ "blinds(vertical)", ::com::sun::star::animations::TransitionType::BLINDSWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, sal_True }, -{ "blinds(horizontal)", ::com::sun::star::animations::TransitionType::BLINDSWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_True }, -{ "fade", ::com::sun::star::animations::TransitionType::FADE, ::com::sun::star::animations::TransitionSubType::CROSSFADE, sal_True }, -{ "slide(fromTop)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMTOP, sal_True }, -{ "slide(fromRight)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMRIGHT, sal_True }, -{ "slide(fromLeft)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMLEFT, sal_True }, -{ "slide(fromBottom)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMBOTTOM, sal_True }, -{ "dissolve", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, sal_True }, -{ "image", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, sal_True }, // TODO -{ NULL, 0, 0, sal_False } +{ "wipe(up)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, true }, +{ "wipe(right)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::LEFTTORIGHT, false }, +{ "wipe(left)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::LEFTTORIGHT, true }, +{ "wipe(down)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, false }, +{ "wheel(1)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::ONEBLADE, true }, +{ "wheel(2)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::TWOBLADEVERTICAL, true }, +{ "wheel(3)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::THREEBLADE, true }, +{ "wheel(4)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::FOURBLADE, true }, +{ "wheel(8)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::EIGHTBLADE, true }, +{ "strips(downLeft)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALRIGHT, true }, +{ "strips(upLeft)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALLEFT, false }, +{ "strips(downRight)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALLEFT, true }, +{ "strips(upRight)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALRIGHT, false }, +{ "barn(inVertical)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, false }, +{ "barn(outVertical)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, true }, +{ "barn(inHorizontal)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, false }, +{ "barn(outHorizontal)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true }, +{ "randombar(vertical)", ::com::sun::star::animations::TransitionType::RANDOMBARWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, true}, +{ "randombar(horizontal)", ::com::sun::star::animations::TransitionType::RANDOMBARWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true }, +{ "checkerboard(down)", ::com::sun::star::animations::TransitionType::CHECKERBOARDWIPE, ::com::sun::star::animations::TransitionSubType::DOWN, true}, +{ "checkerboard(across)", ::com::sun::star::animations::TransitionType::CHECKERBOARDWIPE, ::com::sun::star::animations::TransitionSubType::ACROSS, true }, +{ "plus(out)", ::com::sun::star::animations::TransitionType::FOURBOXWIPE, ::com::sun::star::animations::TransitionSubType::CORNERSIN, false }, +{ "plus(in)", ::com::sun::star::animations::TransitionType::FOURBOXWIPE, ::com::sun::star::animations::TransitionSubType::CORNERSIN, true }, +{ "diamond(out)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::DIAMOND, true }, +{ "diamond(in)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::DIAMOND, false }, +{ "circle(out)", ::com::sun::star::animations::TransitionType::ELLIPSEWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true }, +{ "circle(in)", ::com::sun::star::animations::TransitionType::ELLIPSEWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, false }, +{ "box(out)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::RECTANGLE, true }, +{ "box(in)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::RECTANGLE, false }, +{ "wedge", ::com::sun::star::animations::TransitionType::FANWIPE, ::com::sun::star::animations::TransitionSubType::CENTERTOP, true }, +{ "blinds(vertical)", ::com::sun::star::animations::TransitionType::BLINDSWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, true }, +{ "blinds(horizontal)", ::com::sun::star::animations::TransitionType::BLINDSWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true }, +{ "fade", ::com::sun::star::animations::TransitionType::FADE, ::com::sun::star::animations::TransitionSubType::CROSSFADE, true }, +{ "slide(fromTop)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMTOP, true }, +{ "slide(fromRight)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMRIGHT, true }, +{ "slide(fromLeft)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMLEFT, true }, +{ "slide(fromBottom)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMBOTTOM, true }, +{ "dissolve", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, true }, +{ "image", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, true }, // TODO +{ NULL, 0, 0, false } }; struct convert_subtype diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 2654830fe16a..80653bc23f9d 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -154,7 +154,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto pFilter = new ImplSdPPTImport( pDocument, rStorage, rMedium, aParam ); } -sal_Bool SdPPTImport::Import() +bool SdPPTImport::Import() { return pFilter->Import(); } @@ -168,7 +168,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage : SdrPowerPointImport(rParam, rMedium.GetBaseURL()) , mrMed(rMedium) , mrStorage(rStorage_) - , mbDocumentFound(sal_False) + , mbDocumentFound(false) , mnFilterOptions(0) , mpDoc(pDocument) , mePresChange(PRESCHANGE_MANUAL) @@ -179,7 +179,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage { mbDocumentFound = SeekToDocument( &maDocHd ); // maDocHd = the latest DocumentHeader while ( SeekToRec( rStCtrl, PPT_PST_Document, nStreamLen, &maDocHd ) ) - mbDocumentFound = sal_True; + mbDocumentFound = true; sal_uInt32 nDggContainerOfs = 0; @@ -232,10 +232,10 @@ ImplSdPPTImport::~ImplSdPPTImport() // Import -sal_Bool ImplSdPPTImport::Import() +bool ImplSdPPTImport::Import() { if ( !bOk ) - return sal_False; + return false; pSdrModel->setLock(true); pSdrModel->EnableUndo(false); @@ -295,7 +295,7 @@ sal_Bool ImplSdPPTImport::Import() sal_uInt32 nEntryCount = 0; for ( i = 0; i < nVecCount; i++ ) { - if ( !aPropItem.Read( aUString, VT_EMPTY, sal_False ) ) + if ( !aPropItem.Read( aUString, VT_EMPTY, false ) ) break; aPropItem.ReadUInt32( nType ); if ( ( nType != VT_I4 ) && ( nType != VT_UI4 ) ) @@ -324,7 +324,7 @@ sal_Bool ImplSdPPTImport::Import() } for ( i = 0; i < nSlideTitleCount; i++ ) { - if ( !aPropItem.Read( aUString, nType, sal_False ) ) + if ( !aPropItem.Read( aUString, nType, false ) ) break; OUString aString( aUString ); @@ -419,7 +419,7 @@ sal_Bool ImplSdPPTImport::Import() for( nToken = 0; nToken < nTokenCount; nToken++ ) aStringAry[nToken] = OUStringToOString(aString.getToken( nToken, (sal_Unicode)',' ), RTL_TEXTENCODING_UTF8); - sal_Bool bDocInternalSubAddress = sal_False; + bool bDocInternalSubAddress = false; // first pass, searching for a SlideId for( nToken = 0; nToken < nTokenCount; nToken++ ) @@ -436,7 +436,7 @@ sal_Bool ImplSdPPTImport::Import() if ( nPage != PPTSLIDEPERSIST_ENTRY_NOTFOUND ) { nPageNumber = nPage; - bDocInternalSubAddress = sal_True; + bDocInternalSubAddress = true; break; } } @@ -454,7 +454,7 @@ sal_Bool ImplSdPPTImport::Import() if (pIter != maSlideNameList.end()) { nPageNumber = pIter - maSlideNameList.begin(); - bDocInternalSubAddress = sal_True; + bDocInternalSubAddress = true; } } } @@ -468,7 +468,7 @@ sal_Bool ImplSdPPTImport::Import() if ( ( nNumber & ~0xff ) == 0 ) { nPageNumber = (sal_uInt32)nNumber - 1; - bDocInternalSubAddress = sal_True; + bDocInternalSubAddress = true; break; } } @@ -557,18 +557,18 @@ sal_Bool ImplSdPPTImport::Import() SdPage* pPage = (SdPage*)MakeBlancPage( true ); if ( pPage ) { - sal_Bool bNotesMaster = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bNotesMaster; - sal_Bool bStarDrawFiller = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bStarDrawFiller; + bool bNotesMaster = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bNotesMaster; + bool bStarDrawFiller = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bStarDrawFiller; PageKind ePgKind = ( bNotesMaster ) ? PK_NOTES : PK_STANDARD; - sal_Bool bHandout = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bHandoutMaster; + bool bHandout = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bHandoutMaster; if ( bHandout ) ePgKind = PK_HANDOUT; pPage->SetPageKind( ePgKind ); pSdrModel->InsertMasterPage( (SdrPage*)pPage ); if ( bNotesMaster && bStarDrawFiller ) - ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_NOTES, sal_True ); + ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_NOTES, true ); if ( nMasterNum ) { boost::optional< sal_Int16 > oStartNumbering; @@ -628,7 +628,7 @@ sal_Bool ImplSdPPTImport::Import() sal_uInt32 nTitleInstance = TSS_TYPE_PAGETITLE; sal_uInt32 nOutlinerInstance = TSS_TYPE_BODY; const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom(); - sal_Bool bSwapStyleSheet = pSlideLayout->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE; + bool bSwapStyleSheet = pSlideLayout->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE; if ( bSwapStyleSheet ) { nTitleInstance = TSS_TYPE_TITLE; @@ -723,7 +723,7 @@ sal_Bool ImplSdPPTImport::Import() if ( pNotesClone ) { OUString aLayoutName( ((SdPage*)pSdrModel->GetMasterPage( nAktPageNum - 1 ))->GetLayoutName() ); - ((SdPage*)pNotesClone)->SetPresentationLayout( aLayoutName, sal_False, sal_False, sal_False ); + ((SdPage*)pNotesClone)->SetPresentationLayout( aLayoutName, false, false, false ); ((SdPage*)pNotesClone)->SetLayoutName( aLayoutName ); } } @@ -742,7 +742,7 @@ sal_Bool ImplSdPPTImport::Import() if ( pObj ) pMPage->NbcInsertObject( pObj ); - sal_Bool bNewAnimationsUsed = sal_False; + bool bNewAnimationsUsed = false; ProcessData aProcessData( *(*pList)[ nAktPageNum ], (SdPage*)pMPage ); sal_uInt32 nFPosMerk = rStCtrl.Tell(); DffRecordHeader aPageHd; @@ -879,7 +879,7 @@ sal_Bool ImplSdPPTImport::Import() { for ( sal_uInt16 nPage = 0; nPage < nPageAnz; nPage++ ) { - sal_Bool bNewAnimationsUsed = sal_False; + bool bNewAnimationsUsed = false; mePresChange = PRESCHANGE_SEMIAUTO; SetPageNum( nPage, PPT_SLIDEPAGE ); @@ -978,13 +978,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, sal_False ); + pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, false ); } else { pNotesPage->SetPageKind( PK_NOTES ); pNotesPage->TRG_SetMasterPage(*pSdrModel->GetMasterPage(nNotesMasterNum)); - pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, sal_True ); + pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, true ); pSdrModel->InsertPage( pNotesPage ); SdrObject* pPageObj = pNotesPage->GetPresObj( PRESOBJ_PAGE, 1 ); if ( pPageObj ) @@ -1024,7 +1024,7 @@ sal_Bool ImplSdPPTImport::Import() ((SdPage*)pPage)->TRG_SetMasterPage( *((SdPage*)pFoundMaster) ); ((SdPage*)pPage)->SetLayoutName( ((SdPage*)pFoundMaster)->GetLayoutName() ); } - ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_TITLE, sal_True, sal_True ); + ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_TITLE, true, true ); eAktPageKind = PPT_NOTEPAGE; SdrPage* pNPage = MakeBlancPage( false ); @@ -1155,13 +1155,13 @@ sal_Bool ImplSdPPTImport::Import() break; } if ( eAutoLayout != AUTOLAYOUT_NONE ) - pPage->SetAutoLayout( eAutoLayout, sal_False ); + pPage->SetAutoLayout( eAutoLayout, false ); } } // handout master page: auto layout SdPage* pHandoutMPage = mpDoc->GetMasterSdPage( 0, PK_HANDOUT ); - pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, sal_True, sal_True ); + pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, true, true ); } sal_uInt32 nSlideCount = GetPageCount(); @@ -1179,7 +1179,7 @@ sal_Bool ImplSdPPTImport::Import() } if ( mbDocumentFound ) { - mpDoc->SetSummationOfParagraphs( sal_True ); + mpDoc->SetSummationOfParagraphs( true ); if ( pDocShell ) { ::sd::FrameView* pFrameView = mpDoc->GetFrameView( 0 ); @@ -1257,7 +1257,7 @@ sal_Bool ImplSdPPTImport::Import() sal_uInt32 nSCount = aContent.nRecLen >> 2; if ( pPageList && nSCount ) { - SdCustomShowList* pList = mpDoc->GetCustomShowList( sal_True ); + SdCustomShowList* pList = mpDoc->GetCustomShowList( true ); if ( pList ) { SdCustomShow* pSdCustomShow = new SdCustomShow( mpDoc ); @@ -1326,7 +1326,7 @@ sal_Bool ImplSdPPTImport::Import() // set the current custom show if ( !aCustomShow.isEmpty() ) { - SdCustomShowList* pList = mpDoc->GetCustomShowList( sal_False ); + SdCustomShowList* pList = mpDoc->GetCustomShowList( false ); if ( pList ) { SdCustomShow* pPtr = NULL; @@ -1465,7 +1465,7 @@ bool Ppt97AnimationStlSortHelper::operator()( const std::pair< SdrObject*, Ppt97 return false; } -void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimationsUsed ) +void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimationsUsed ) { sal_uLong nFilePosMerk = rStCtrl.Tell(); @@ -1493,8 +1493,8 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat { sal_uLong nPageRecEnd = aPageRecHd.GetRecEndFilePos(); - sal_Bool bTryTwice = ( eAktPageKind == PPT_SLIDEPAGE ); - sal_Bool bSSSlideInfoAtom = sal_False; + bool bTryTwice = ( eAktPageKind == PPT_SLIDEPAGE ); + bool bSSSlideInfoAtom = false; while ( true ) { while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < nPageRecEnd ) ) @@ -1505,7 +1505,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat { case PPT_PST_SSSlideInfoAtom: { - bSSSlideInfoAtom = sal_True; + bSSSlideInfoAtom = true; if ( eAktPageKind == PPT_MASTERPAGE ) { if ( pActualSlidePersist ) @@ -1755,10 +1755,10 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat pPage->SetPresChange( mePresChange ); if ( nBuildFlags & 4 ) - pPage->SetExcluded( sal_True ); // don't show slide + pPage->SetExcluded( true ); // don't show slide if ( nBuildFlags & 16 ) { // slide with sound effect - pPage->SetSound( sal_True ); + pPage->SetSound( true ); OUString aSoundFile( ReadSound( nSoundRef ) ); pPage->SetSoundFile( aSoundFile ); } @@ -1772,9 +1772,9 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat } aHd.SeekToEndOfRecord( rStCtrl ); } - if ( bTryTwice && ( bSSSlideInfoAtom == sal_False ) ) + if ( bTryTwice && ( bSSSlideInfoAtom == false ) ) { - bTryTwice = sal_False; + bTryTwice = false; if ( HasMasterPage( nAktPageNum, eAktPageKind ) ) { sal_uInt16 nMasterNum = GetMasterPageIndex( nAktPageNum, eAktPageKind ); @@ -1853,8 +1853,8 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const { sal_uInt32 nDataLen = aSoundBlockRecHd.GetRecEndFilePos(); DffRecordHeader aSoundRecHd; - sal_Bool bRefStrValid = sal_False; - sal_Bool bDone = sal_False; + bool bRefStrValid = false; + bool bDone = false; while( !bDone && SeekToRec( rStCtrl, PPT_PST_Sound, nDataLen, &aSoundRecHd ) ) { @@ -1864,7 +1864,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 2 ) ) { if ( ReadString( aRefStr ) ) - bRefStrValid = sal_True; + bRefStrValid = true; } if ( bRefStrValid ) { @@ -1874,7 +1874,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 0 ) ) { ReadString( aRetval ); - bDone = sal_True; + bDone = true; } } } @@ -1882,7 +1882,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const { // Check if this sound file already exists. // If not, it is exported to our local sound directory. - sal_Bool bSoundExists = sal_False; + bool bSoundExists = false; ::std::vector< OUString > aSoundList; GalleryExplorer::FillObjList( GALLERY_THEME_SOUNDS, aSoundList ); @@ -1895,7 +1895,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const if( aURL.GetName() == aRetval ) { aRetval = aSoundList[ n ]; - bSoundExists = sal_True; + bSoundExists = true; } } @@ -2245,8 +2245,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj { if ( eAktPageKind == PPT_MASTERPAGE ) { - sal_Bool bCreatePlaceHolder = ( pTextObj->GetInstance() != TSS_TYPE_UNUSED ); - sal_Bool bIsHeaderFooter = ( ePresKind == PRESOBJ_HEADER) || (ePresKind == PRESOBJ_FOOTER) + bool bCreatePlaceHolder = ( pTextObj->GetInstance() != TSS_TYPE_UNUSED ); + bool bIsHeaderFooter = ( ePresKind == PRESOBJ_HEADER) || (ePresKind == PRESOBJ_FOOTER) || (ePresKind == PRESOBJ_DATETIME) || (ePresKind == PRESOBJ_SLIDENUMBER); if ( bCreatePlaceHolder && ( pTextObj->GetInstance() == TSS_TYPE_TEXT_IN_SHAPE ) ) bCreatePlaceHolder = bIsHeaderFooter; @@ -2309,8 +2309,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj if ( eAktPageKind == PPT_SLIDEPAGE ) { PresObjKind ePresObjKind = PRESOBJ_NONE; - sal_Bool bEmptyPresObj = sal_True; - sal_Bool bVertical = sal_False; + bool bEmptyPresObj = true; + bool bVertical = false; if ( ( pTextObj->GetShapeType() == mso_sptRectangle ) || ( pTextObj->GetShapeType() == mso_sptTextBox ) ) { //if a placeholder with some custom attribute,the pTextObj will keep those attr,whose text size is zero, @@ -2320,10 +2320,10 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj { case PPT_PLACEHOLDER_NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break; case PPT_PLACEHOLDER_VERTICALTEXTTITLE : - bVertical = sal_True; // PASSTHROUGH !!! + bVertical = true; // PASSTHROUGH !!! case PPT_PLACEHOLDER_TITLE : ePresObjKind = PRESOBJ_TITLE; break; case PPT_PLACEHOLDER_VERTICALTEXTBODY : - bVertical = sal_True; // PASSTHROUGH !!! + bVertical = 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 @@ -2349,7 +2349,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj { if ( !pTextObj->Count() && pObj->ISA( SdrGrafObj ) ) { - bEmptyPresObj = sal_False; + bEmptyPresObj = false; switch ( nPlaceholderId ) { case PPT_PLACEHOLDER_MEDIACLIP : @@ -2369,7 +2369,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj } else { - SdrObject* pPresObj = pPage->CreatePresObj( ePresObjKind, bVertical, pText->GetLogicRect(), sal_True ); + SdrObject* pPresObj = pPage->CreatePresObj( ePresObjKind, bVertical, pText->GetLogicRect(), true ); pPresObj->SetUserCall( pPage ); SfxItemSet aSet( pSdrModel->GetItemPool() ); @@ -2534,8 +2534,8 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi pProcessData->pPage->InsertPresObj( pObj, PRESOBJ_PAGE ); } - sal_Bool bInhabitanceChecked = sal_False; - sal_Bool bAnimationInfoFound = sal_False; + bool bInhabitanceChecked = false; + bool bAnimationInfoFound = false; DffRecordHeader aMasterShapeHd; if ( maShapeRecords.SeekToContent( rSt, DFF_msofbtClientData, SEEK_FROM_CURRENT_AND_RESTART ) ) @@ -2592,7 +2592,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi maAnimations[pObj] = pAnimation; - bAnimationInfoFound = sal_True; + bAnimationInfoFound = true; } } } @@ -2660,7 +2660,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi if ( bInhabitanceChecked || bAnimationInfoFound ) break; - bInhabitanceChecked = sal_True; + bInhabitanceChecked = true; if ( ! ( IsProperty( DFF_Prop_hspMaster ) && SeekToShape( rSt, pData, GetPropertyValue( DFF_Prop_hspMaster ) ) ) ) break; ReadDffRecordHeader( rSt, aMasterShapeHd ); @@ -2694,7 +2694,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT( SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMedium ) { SdPPTImport* pImport = new SdPPTImport( pDocument, rDocStream, rStorage, rMedium ); - sal_Bool bRet = pImport->Import(); + bool bRet = pImport->Import(); delete pImport; diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index 2de8fd608ccf..49c7e6479b96 100644 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -52,7 +52,7 @@ class ImplSdPPTImport : public SdrPowerPointImport // SvStream* mpPicStream; DffRecordHeader maDocHd; std::vector<OUString> maSlideNameList; - sal_Bool mbDocumentFound; + bool mbDocumentFound; sal_uInt32 mnFilterOptions; SdDrawDocument* mpDoc; PresChange mePresChange; @@ -61,7 +61,7 @@ class ImplSdPPTImport : public SdrPowerPointImport tAnimationMap maAnimations; void SetHeaderFooterPageSettings( SdPage* pPage, const PptSlidePersistEntry* pMasterPersist ); - void ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimationsUsed ); + void ImportPageEffect( SdPage* pPage, const bool bNewAnimationsUsed ); void FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiveInfoAtom* pIAtom, const OUString& aMacroName ); @@ -77,7 +77,7 @@ public: ImplSdPPTImport( SdDrawDocument* pDoc, SvStorage& rStorage, SfxMedium& rMed, PowerPointImportParam& ); virtual ~ImplSdPPTImport(); - sal_Bool Import(); + bool Import(); virtual bool ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rFormComp ) const SAL_OVERRIDE; }; @@ -90,7 +90,7 @@ class SdPPTImport SdPPTImport( SdDrawDocument* pDoc, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMed ); ~SdPPTImport(); - sal_Bool Import(); + bool Import(); }; #endif // INCLUDED_SD_SOURCE_FILTER_PPT_PPTIN_HXX diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 3b8c73d6c09a..3f1e1418ebc0 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -761,7 +761,7 @@ bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >& NamedValue* pLastValue = pValue; sal_Int32 nLength = aUserData.getLength(), nRemoved = 0; - sal_Bool bAfterEffect = false; + bool bAfterEffect = false; sal_Int32 nMasterRel = 0; for( ; nLength--; pValue++ ) { @@ -1104,7 +1104,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const AnimationNode& rNode, const PropertySet& rSet ) { - sal_Bool bAfterEffect = false; + bool bAfterEffect = false; // attribute Restart if( rNode.mnRestart ) @@ -1368,9 +1368,9 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim { if( rSet.hasProperty( DFF_ANIM_DIRECTION ) ) { - sal_Bool bDirection = sal_False; + bool bDirection = false; if( rSet.getProperty( DFF_ANIM_DIRECTION ) >>= bDirection ) - xColor->setDirection( (sal_Bool)!bDirection ); + xColor->setDirection( !bDirection ); } if( rSet.hasProperty( DFF_ANIM_COLORSPACE ) ) diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index 955588e00ede..3972efba8cb1 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -74,10 +74,10 @@ static sal_Int32 lcl_getMaxSafeStrLen(sal_uInt32 nSize) return static_cast< sal_Int32 >( nSize ); } -sal_Bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, sal_Bool bAlign ) +bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign ) { sal_uInt32 i, nItemSize, nType, nItemPos; - sal_Bool bRetValue = sal_False; + bool bRetValue = false; nItemPos = Tell(); @@ -113,7 +113,7 @@ sal_Bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, sal_Bool bAl } else rString = OUString(); - bRetValue = sal_True; + bRetValue = true; } else { @@ -124,7 +124,7 @@ sal_Bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, sal_Bool bAl rString = OUString(pString, rtl_str_getLength(pString), mnTextEnc); else rString = OUString(); - bRetValue = sal_True; + bRetValue = true; } } delete[] pString; @@ -154,7 +154,7 @@ sal_Bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, sal_Bool bAl rString = OUString(pString, lcl_getMaxSafeStrLen(nItemSize)); else rString = OUString(); - bRetValue = sal_True; + bRetValue = true; } delete[] pString; } @@ -212,7 +212,7 @@ Section::Section( const sal_uInt8* pFMTID ) -sal_Bool Section::GetProperty( sal_uInt32 nId, PropItem& rPropItem ) +bool Section::GetProperty( sal_uInt32 nId, PropItem& rPropItem ) { if ( nId ) { @@ -229,10 +229,10 @@ sal_Bool Section::GetProperty( sal_uInt32 nId, PropItem& rPropItem ) rPropItem.SetTextEncoding( mnTextEnc ); rPropItem.Write( iter->mpBuf,iter->mnSize ); rPropItem.Seek( STREAM_SEEK_TO_BEGIN ); - return sal_True; + return true; } } - return sal_False; + return false; } @@ -264,9 +264,9 @@ void Section::AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBu -sal_Bool Section::GetDictionary( Dictionary& rDict ) +bool Section::GetDictionary( Dictionary& rDict ) { - sal_Bool bRetValue = sal_False; + bool bRetValue = false; boost::ptr_vector<PropEntry>::iterator iter; for (iter = maEntries.begin(); iter != maEntries.end(); ++iter) @@ -313,7 +313,7 @@ sal_Bool Section::GetDictionary( Dictionary& rDict ) break; rDict.insert( std::make_pair(aString,nId) ); } - bRetValue = sal_True; + bRetValue = true; } } return bRetValue; @@ -354,7 +354,7 @@ void Section::Read( SvStorageStream *pStrm ) nVectorCount = 1; - sal_Bool bVariant = ( nPropType == VT_VARIANT ); + bool bVariant = ( nPropType == VT_VARIANT ); for ( i = 0; nPropSize && ( i < nVectorCount ); i++ ) { @@ -523,7 +523,7 @@ Section& Section::operator=( const Section& rSection ) PropRead::PropRead( SvStorage& rStorage, const OUString& rName ) : - mbStatus ( sal_False ), + mbStatus ( false ), mnByteOrder ( 0xfffe ), mnFormat ( 0 ), mnVersionLo ( 4 ), @@ -536,7 +536,7 @@ PropRead::PropRead( SvStorage& rStorage, const OUString& rName ) : { mpSvStream->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); memset( mApplicationCLSID, 0, 16 ); - mbStatus = sal_True; + mbStatus = true; } } } @@ -580,7 +580,7 @@ void PropRead::Read() mpSvStream->ReadUInt32( nSections ); if ( nSections > 2 ) // sj: PowerPoint documents are containing max 2 sections { - mbStatus = sal_False; + mbStatus = false; } else for ( sal_uInt32 i = 0; i < nSections; i++ ) { diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx index 5a623559d73b..7d2ea78f2581 100644 --- a/sd/source/filter/ppt/propread.hxx +++ b/sd/source/filter/ppt/propread.hxx @@ -123,7 +123,7 @@ public: void Clear(); void SetTextEncoding( sal_uInt16 nTextEnc ){ mnTextEnc = nTextEnc; }; - sal_Bool Read( OUString& rString, sal_uInt32 nType = VT_EMPTY, sal_Bool bDwordAlign = sal_True ); + bool Read( OUString& rString, sal_uInt32 nType = VT_EMPTY, bool bDwordAlign = true ); PropItem& operator=( PropItem& rPropItem ); using SvStream::Read; @@ -145,15 +145,15 @@ class Section Section( const Section& rSection ); Section& operator=( const Section& rSection ); - sal_Bool GetProperty( sal_uInt32 nId, PropItem& rPropItem ); - sal_Bool GetDictionary( Dictionary& rDict ); + bool GetProperty( sal_uInt32 nId, PropItem& rPropItem ); + bool GetDictionary( Dictionary& rDict ); const sal_uInt8* GetFMTID() const { return aFMTID; }; void Read( SvStorageStream* pStrm ); }; class PropRead { - sal_Bool mbStatus; + bool mbStatus; SvStorageStreamRef mpSvStream; sal_uInt16 mnByteOrder; @@ -170,7 +170,7 @@ class PropRead PropRead& operator=( const PropRead& rPropRead ); const Section* GetSection( const sal_uInt8* pFMTID ); - sal_Bool IsValid() const { return mbStatus; }; + bool IsValid() const { return mbStatus; }; void Read(); }; diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index a7df9aff0e5c..b0289f2f3eb0 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::frame; // - SdFilter - -SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) +SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) : mxModel( rDocShell.GetModel() ) , mrMedium( rMedium ) , mrDocShell( rDocShell ) diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index be51d9c4ae8f..cfeaeebef5fb 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -66,7 +66,7 @@ extern "C" sal_Bool SaveVBA( SfxObjectShell&, SvMemoryStream*& ); // - SdPPTFilter - -SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) : +SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) : SdFilter( rMedium, rDocShell, bShowProgress ), pBas ( NULL ) { @@ -81,9 +81,9 @@ SdPPTFilter::~SdPPTFilter() -sal_Bool SdPPTFilter::Import() +bool SdPPTFilter::Import() { - sal_Bool bRet = sal_False; + bool bRet = false; SotStorageRef pStorage = new SotStorage( mrMedium.GetInStream(), false ); if( !pStorage->GetError() ) { @@ -133,12 +133,12 @@ sal_Bool SdPPTFilter::Import() -sal_Bool SdPPTFilter::Export() +bool SdPPTFilter::Export() { #ifndef DISABLE_DYNLOADING ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); #endif - sal_Bool bRet = sal_False; + bool bRet = false; #ifndef DISABLE_DYNLOADING if( pLibrary ) diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 53143f67e1d3..7b77d2cca04d 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -168,7 +168,7 @@ XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer ) // - SdXMLWrapper - -SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) : +SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) : SdFilter( rMedium, rDocShell, bShowProgress ), meFilterMode( eFilterMode ), mnStoreVer( nStoreVer ) { } @@ -185,8 +185,8 @@ sal_Int32 ReadThroughComponent( const sal_Char* pFilterName, Sequence<Any> rFilterArguments, const OUString& rName, - sal_Bool bMustBeSuccessfull, - sal_Bool bEncrypted ) + bool bMustBeSuccessfull, + bool bEncrypted ) { DBG_ASSERT(xInputStream.is(), "input stream missing"); DBG_ASSERT(xModelComponent.is(), "document missing"); @@ -231,7 +231,7 @@ sal_Int32 ReadThroughComponent( // sax parser sends wrapped exceptions, // try to find the original one xml::sax::SAXException aSaxEx = *(xml::sax::SAXException*)(&r); - sal_Bool bTryChild = sal_True; + bool bTryChild = true; while( bTryChild ) { @@ -239,7 +239,7 @@ sal_Int32 ReadThroughComponent( if ( aSaxEx.WrappedException >>= aTmp ) aSaxEx = aTmp; else - bTryChild = sal_False; + bTryChild = false; } packages::zip::ZipIOException aBrokenPackage; @@ -327,14 +327,14 @@ sal_Int32 ReadThroughComponent( const sal_Char* pFilterName, Sequence<Any> rFilterArguments, const OUString& rName, - sal_Bool bMustBeSuccessfull ) + bool bMustBeSuccessfull ) { DBG_ASSERT(xStorage.is(), "Need storage!"); DBG_ASSERT(NULL != pStreamName, "Please, please, give me a name!"); // open stream (and set parser input) OUString sStreamName = OUString::createFromAscii(pStreamName); - sal_Bool bContainsStream = sal_False; + bool bContainsStream = false; try { bContainsStream = xStorage->isStreamElement(sStreamName); @@ -388,7 +388,7 @@ sal_Int32 ReadThroughComponent( Any aAny = xProps->getPropertyValue( "Encrypted" ); - sal_Bool bEncrypted = aAny.getValueType() == ::getBooleanCppuType() && + bool bEncrypted = aAny.getValueType() == ::getBooleanCppuType() && *(sal_Bool *)aAny.getValue(); Reference <io::XInputStream> xInputStream = xStream->getInputStream(); @@ -415,7 +415,7 @@ sal_Int32 ReadThroughComponent( -sal_Bool SdXMLFilter::Import( ErrCode& nError ) +bool SdXMLFilter::Import( ErrCode& nError ) { sal_uInt32 nRet = 0; @@ -614,26 +614,26 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) nWarn = ReadThroughComponent( xStorage, xModelComp, "meta.xml", "Meta.xml", rxContext, pServices->mpMeta, - aEmptyArgs, aName, sal_False ); + aEmptyArgs, aName, false ); if( meFilterMode != SDXMLMODE_Organizer ) { nWarn2 = ReadThroughComponent( xStorage, xModelComp, "settings.xml", NULL, rxContext, pServices->mpSettings, - aFilterArgs, aName, sal_False ); + aFilterArgs, aName, false ); } nRet = ReadThroughComponent( xStorage, xModelComp, "styles.xml", NULL, rxContext, pServices->mpStyles, - aFilterArgs, aName, sal_True ); + aFilterArgs, aName, true ); if( !nRet && (meFilterMode != SDXMLMODE_Organizer) ) nRet = ReadThroughComponent( xStorage, xModelComp, "content.xml", "Content.xml", rxContext, pServices->mpContent, - aFilterArgs, aName, sal_True ); + aFilterArgs, aName, true ); if( !nRet ) { @@ -786,19 +786,19 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) -sal_Bool SdXMLFilter::Export() +bool SdXMLFilter::Export() { SvXMLEmbeddedObjectHelper* pObjectHelper = NULL; SvXMLGraphicHelper* pGraphicHelper = NULL; - sal_Bool bDocRet = sal_False; + bool bDocRet = false; if( !mxModel.is() ) { SAL_WARN( "sd.filter","Got NO Model in XMLExport"); - return sal_False; + return false; } - sal_Bool bLocked = mxModel->hasControllersLocked(); + bool bLocked = mxModel->hasControllersLocked(); try { @@ -809,7 +809,7 @@ sal_Bool SdXMLFilter::Export() if( !xServiceInfo.is() || !xServiceInfo->supportsService( "com.sun.star.drawing.GenericDrawingDocument" ) ) { SAL_WARN( "sd.filter", "Model is no DrawingDocument in XMLExport" ); - return sal_False; + return false; } uno::Reference<uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); @@ -850,7 +850,7 @@ sal_Bool SdXMLFilter::Export() SvtSaveOptions aSaveOpt; OUString sUsePrettyPrinting("UsePrettyPrinting"); - sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() ); + bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() ); xInfoSet->setPropertyValue( sUsePrettyPrinting, makeAny( bUsePrettyPrinting ) ); const uno::Reference < embed::XStorage >& xStorage = mrMedium.GetOutputStorage(); @@ -963,12 +963,12 @@ sal_Bool SdXMLFilter::Export() DBG_ASSERT(xStream.is(), "Can't create output stream in package!"); if( !xStream.is() ) - return sal_False; + return false; xDocOut = xStream->getOutputStream(); Reference <beans::XPropertySet > xProps( xStream, uno::UNO_QUERY ); if( !xDocOut.is() || !xProps.is() ) - return sal_False; + return false; uno::Any aAny; aAny <<= OUString( "text/xml"); @@ -976,7 +976,7 @@ sal_Bool SdXMLFilter::Export() // encrypt all streams xProps->setPropertyValue( "UseCommonStoragePasswordEncryption", - uno::makeAny( (sal_Bool)sal_True ) ); + uno::makeAny( true ) ); const OUString sStreamName( "StreamName"); xInfoSet->setPropertyValue( sStreamName, Any( sDocName ) ); @@ -1024,7 +1024,7 @@ sal_Bool SdXMLFilter::Export() #else (void)e; #endif - bDocRet = sal_False; + bDocRet = false; } if ( !bLocked ) mxModel->unlockControllers(); |