diff options
author | Michael Stahl <mst@openoffice.org> | 2011-02-11 15:41:40 +0100 |
---|---|---|
committer | Michael Stahl <mst@openoffice.org> | 2011-02-11 15:41:40 +0100 |
commit | 2b9ee96b5d07cff557ea25deb6d6fbd908a08f24 (patch) | |
tree | 1c918787691e9d69e1f952768a08406931cd34e9 /sw/source/core/frmedt/feflyole.cxx | |
parent | a3c0c3a8762e47be72de05ac3ae1fc5032f2a1a9 (diff) | |
parent | c50e8a2df2e04d9d2c225df0ea648f0501acc250 (diff) |
sw34bf03: merge to-be-m100 DEV300_next
Diffstat (limited to 'sw/source/core/frmedt/feflyole.cxx')
-rw-r--r-- | sw/source/core/frmedt/feflyole.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx index 070a031e83d3..96373fffb57b 100644 --- a/sw/source/core/frmedt/feflyole.cxx +++ b/sw/source/core/frmedt/feflyole.cxx @@ -68,9 +68,9 @@ SwFlyFrm *SwFEShell::FindFlyFrm( const uno::Reference < embed::XEmbeddedObject > if ( !pFly ) { //Kein Fly oder der falsche selektiert. Ergo muessen wir leider suchen. - BOOL bExist = FALSE; + sal_Bool bExist = sal_False; SwStartNode *pStNd; - ULONG nSttIdx = GetNodes().GetEndOfAutotext().StartOfSectionIndex() + 1, + sal_uLong nSttIdx = GetNodes().GetEndOfAutotext().StartOfSectionIndex() + 1, nEndIdx = GetNodes().GetEndOfAutotext().GetIndex(); while( nSttIdx < nEndIdx && 0 != (pStNd = GetNodes()[ nSttIdx ]->GetStartNode()) ) @@ -79,7 +79,7 @@ SwFlyFrm *SwFEShell::FindFlyFrm( const uno::Reference < embed::XEmbeddedObject > if ( pNd->IsOLENode() && ((SwOLENode*)pNd)->GetOLEObj().GetOleRef() == xObj ) { - bExist = TRUE; + bExist = sal_True; SwFrm *pFrm = ((SwOLENode*)pNd)->GetFrm(); if ( pFrm ) pFly = pFrm->FindFlyFrm(); @@ -122,13 +122,13 @@ void SwFEShell::MakeObjVisible( const uno::Reference < embed::XEmbeddedObject >& } } -BOOL SwFEShell::FinishOLEObj() // Server wird beendet +sal_Bool SwFEShell::FinishOLEObj() // Server wird beendet { SfxInPlaceClient* pIPClient = GetSfxViewShell()->GetIPClient(); if ( !pIPClient ) - return FALSE; + return sal_False; - BOOL bRet = pIPClient->IsObjectInPlaceActive(); + sal_Bool bRet = pIPClient->IsObjectInPlaceActive(); if( bRet ) { uno::Reference < embed::XEmbeddedObject > xObj = pIPClient->GetObject(); |