diff options
Diffstat (limited to 'sw/source/core/doc/docdraw.cxx')
| -rw-r--r-- | sw/source/core/doc/docdraw.cxx | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 1a10428d5a58..e40e2a74b48b 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -219,7 +219,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView ) const SdrMarkList &rMrkList = rDrawView.GetMarkedObjectList(); SwDrawFrmFmt *pFmt = 0L; SdrObject *pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj(); - BOOL bNoGroup = ( 0 == pObj->GetUpGroup() ); + sal_Bool bNoGroup = ( 0 == pObj->GetUpGroup() ); SwDrawContact* pNewContact = 0; if( bNoGroup ) { @@ -229,7 +229,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView ) SwUndoDrawGroup* pUndo = !DoesUndo() ? 0 - : new SwUndoDrawGroup( (USHORT)rMrkList.GetMarkCount() ); + : new SwUndoDrawGroup( (sal_uInt16)rMrkList.GetMarkCount() ); // --> OD 2005-08-16 #i53320# bool bGroupMembersNotPositioned( false ); @@ -240,7 +240,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView ) } // <-- //ContactObjekte und Formate vernichten. - for( USHORT i = 0; i < rMrkList.GetMarkCount(); ++i ) + for( sal_uInt16 i = 0; i < rMrkList.GetMarkCount(); ++i ) { pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj); @@ -345,7 +345,7 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView ) { String sDrwFmtNm( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("DrawObject" ))); - for ( USHORT i = 0; i < nMarkCount; ++i ) + for ( sal_uInt16 i = 0; i < nMarkCount; ++i ) { SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); if ( pObj->IsA( TYPE(SdrObjGroup) ) ) @@ -361,7 +361,7 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView ) AppendUndo( pUndo ); } - for ( USHORT i2 = 0; i2 < pLst->GetObjCount(); ++i2 ) + for ( sal_uInt16 i2 = 0; i2 < pLst->GetObjCount(); ++i2 ) { SdrObject* pSubObj = pLst->GetObj( i2 ); SwDrawFrmFmt *pFmt = MakeDrawFrmFmt( sDrwFmtNm, @@ -436,15 +436,15 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView ) |* |*************************************************************************/ -BOOL SwDoc::DeleteSelection( SwDrawView& rDrawView ) +sal_Bool SwDoc::DeleteSelection( SwDrawView& rDrawView ) { - BOOL bCallBase = FALSE; + sal_Bool bCallBase = sal_False; const SdrMarkList &rMrkList = rDrawView.GetMarkedObjectList(); if( rMrkList.GetMarkCount() ) { StartUndo(UNDO_EMPTY, NULL); - USHORT i; - BOOL bDelMarked = TRUE; + sal_uInt16 i; + sal_Bool bDelMarked = sal_True; if( 1 == rMrkList.GetMarkCount() ) { @@ -456,7 +456,7 @@ BOOL SwDoc::DeleteSelection( SwDrawView& rDrawView ) if( pFrmFmt ) { DelLayoutFmt( pFrmFmt ); - bDelMarked = FALSE; + bDelMarked = sal_False; } } } @@ -471,7 +471,7 @@ BOOL SwDoc::DeleteSelection( SwDrawView& rDrawView ) if( pFrmFmt && FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() ) { - rDrawView.MarkObj( pObj, rDrawView.Imp().GetPageView(), TRUE ); + rDrawView.MarkObj( pObj, rDrawView.Imp().GetPageView(), sal_True ); --i; DelLayoutFmt( pFrmFmt ); } @@ -484,7 +484,7 @@ BOOL SwDoc::DeleteSelection( SwDrawView& rDrawView ) if( !pObj->GetUpGroup() ) { SwUndoDrawDelete* pUndo = !DoesUndo() ? 0 - : new SwUndoDrawDelete( (USHORT)rMrkList.GetMarkCount() ); + : new SwUndoDrawDelete( (sal_uInt16)rMrkList.GetMarkCount() ); //ContactObjekte vernichten, Formate sicherstellen. for( i = 0; i < rMrkList.GetMarkCount(); ++i ) @@ -518,7 +518,7 @@ BOOL SwDoc::DeleteSelection( SwDrawView& rDrawView ) if( pUndo ) AppendUndo( pUndo ); } - bCallBase = TRUE; + bCallBase = sal_True; } SetModified(); @@ -538,7 +538,7 @@ BOOL SwDoc::DeleteSelection( SwDrawView& rDrawView ) |*************************************************************************/ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAn, - UINT32 nArrOrdNum ) + sal_uInt32 nArrOrdNum ) : pFmt( pFrmFmt ), pAnchor( pFlyAn ), nOrdNum( nArrOrdNum ) { // #i11176# @@ -610,7 +610,7 @@ void SwDoc::InitDrawModel() pSdrPool->SetPoolDefaultItem(SdrShadowXDistItem((300 * 72) / 127)); pSdrPool->SetPoolDefaultItem(SdrShadowYDistItem((300 * 72) / 127)); } - SfxItemPool *pEEgPool = EditEngine::CreatePool( FALSE ); + SfxItemPool *pEEgPool = EditEngine::CreatePool( sal_False ); pSdrPool->SetSecondaryPool( pEEgPool ); if ( !GetAttrPool().GetFrozenIdRanges () ) GetAttrPool().FreezeIdRanges(); @@ -650,7 +650,7 @@ void SwDoc::InitDrawModel() nInvisibleControls = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID(); } - pDrawModel->InsertPage( pDrawModel->AllocPage( FALSE ) ); + pDrawModel->InsertPage( pDrawModel->AllocPage( sal_False ) ); RTL_LOGFILE_CONTEXT_TRACE( aLog, "after create DrawDocument" ); RTL_LOGFILE_CONTEXT_TRACE( aLog, "before create Spellchecker/Hyphenator" ); @@ -692,13 +692,13 @@ void SwDoc::NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) { String sLayerNm; sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("InvisibleHell" )); - _rSdrPageView.SetLayerVisible( sLayerNm, FALSE ); + _rSdrPageView.SetLayerVisible( sLayerNm, sal_False ); sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("InvisibleHeaven" )); - _rSdrPageView.SetLayerVisible( sLayerNm, FALSE ); + _rSdrPageView.SetLayerVisible( sLayerNm, sal_False ); sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("InvisibleControls" )); - _rSdrPageView.SetLayerVisible( sLayerNm, FALSE ); + _rSdrPageView.SetLayerVisible( sLayerNm, sal_False ); } /** method to determine, if a layer ID belongs to the visible ones. @@ -901,7 +901,7 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo) ******************************************************************/ pInfo->SetRepresentation( ((const SvxDateField*) pField)->GetFormatted( - *GetNumberFormatter( TRUE ), LANGUAGE_SYSTEM) ); + *GetNumberFormatter( sal_True ), LANGUAGE_SYSTEM) ); } else if (pField && pField->ISA(SvxURLField)) { @@ -927,7 +927,7 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo) break; } - USHORT nChrFmt; + sal_uInt16 nChrFmt; if (IsVisitedURL(((const SvxURLField*)pField)->GetURL())) nChrFmt = RES_POOLCHR_INET_VISIT; @@ -956,7 +956,7 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo) ******************************************************************/ pInfo->SetRepresentation( ((const SvxExtTimeField*) pField)->GetFormatted( - *GetNumberFormatter( TRUE ), LANGUAGE_SYSTEM) ); + *GetNumberFormatter( sal_True ), LANGUAGE_SYSTEM) ); } else { |