diff options
Diffstat (limited to 'sw/source/core/frmedt/feflyole.cxx')
-rw-r--r-- | sw/source/core/frmedt/feflyole.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx index c78fb22d7421..1138859bcc47 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,8 +79,13 @@ SwFlyFrm *SwFEShell::FindFlyFrm( const uno::Reference < embed::XEmbeddedObject > if ( pNd->IsOLENode() && ((SwOLENode*)pNd)->GetOLEObj().GetOleRef() == xObj ) { +<<<<<<< local bExist = TRUE; SwFrm *pFrm = ((SwOLENode*)pNd)->getLayoutFrm( GetLayout() ); +======= + bExist = sal_True; + SwFrm *pFrm = ((SwOLENode*)pNd)->GetFrm(); +>>>>>>> other if ( pFrm ) pFly = pFrm->FindFlyFrm(); break; @@ -122,13 +127,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(); |