diff options
Diffstat (limited to 'sfx2/source/view/frame.cxx')
| -rw-r--r-- | sfx2/source/view/frame.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 49deab951843..1b9260474938 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -145,14 +145,14 @@ SfxFrame::~SfxFrame() sal_Bool SfxFrame::DoClose() { // Eigentlich wird noch ein PrepareClose gebraucht !!! - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( !pImp->bClosing ) { pImp->bClosing = sal_True; CancelTransfers(); // now close frame; it will be deleted if this call is successful, so don't use any members after that! - bRet = TRUE; + bRet = sal_True; try { Reference< XCloseable > xCloseable ( pImp->xFrame, UNO_QUERY ); @@ -170,7 +170,7 @@ sal_Bool SfxFrame::DoClose() catch( ::com::sun::star::util::CloseVetoException& ) { pImp->bClosing = sal_False; - bRet = FALSE; + bRet = sal_False; } catch( ::com::sun::star::lang::DisposedException& ) { @@ -247,7 +247,7 @@ sal_uInt16 SfxFrame::PrepareClose_Impl( sal_Bool bUI, sal_Bool bForBrowsing ) if ( nRet == RET_OK ) { // if this frame has child frames, ask them too - for( USHORT nPos = GetChildFrameCount(); nRet == RET_OK && nPos--; ) + for( sal_uInt16 nPos = GetChildFrameCount(); nRet == RET_OK && nPos--; ) nRet = pChildArr->GetObject( nPos )->PrepareClose_Impl( bUI, bForBrowsing ); } @@ -296,7 +296,7 @@ sal_Bool SfxFrame::IsClosing_Impl() const void SfxFrame::SetIsClosing_Impl() { - pImp->bClosing = TRUE; + pImp->bClosing = sal_True; } sal_uInt16 SfxFrame::GetChildFrameCount() const @@ -592,18 +592,18 @@ SfxPoolItem* SfxFrameItem::Clone( SfxItemPool *) const return pNew; } -sal_Bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const +sal_Bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const { if ( wFrame ) { rVal <<= wFrame->GetFrameInterface(); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } -sal_Bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) +sal_Bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) { Reference < XFrame > xFrame; if ( (rVal >>= xFrame) && xFrame.is() ) @@ -614,15 +614,15 @@ sal_Bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) if ( pFr->GetFrameInterface() == xFrame ) { wFrame = pFrame = pFr; - return TRUE; + return sal_True; } pFr = SfxFrame::GetNext( *pFr ); } - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } @@ -643,13 +643,13 @@ SfxPoolItem* SfxUsrAnyItem::Clone( SfxItemPool *) const return new SfxUsrAnyItem( Which(), aValue ); } -sal_Bool SfxUsrAnyItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const +sal_Bool SfxUsrAnyItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal = aValue; return sal_True; } -sal_Bool SfxUsrAnyItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) +sal_Bool SfxUsrAnyItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { aValue = rVal; return sal_True; @@ -677,13 +677,13 @@ SfxPoolItem* SfxUnoFrameItem::Clone( SfxItemPool* ) const return new SfxUnoFrameItem( Which(), m_xFrame ); } -sal_Bool SfxUnoFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const +sal_Bool SfxUnoFrameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= m_xFrame; return sal_True; } -sal_Bool SfxUnoFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) +sal_Bool SfxUnoFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { return ( rVal >>= m_xFrame ); } @@ -978,7 +978,7 @@ SfxFrame* SfxFrame::GetFirst() SfxFrame* SfxFrame::GetNext( SfxFrame& rFrame ) { - USHORT nPos = pFramesArr_Impl->GetPos( &rFrame ); + sal_uInt16 nPos = pFramesArr_Impl->GetPos( &rFrame ); if ( nPos+1 < pFramesArr_Impl->Count() ) return pFramesArr_Impl->GetObject(nPos+1); else |