diff options
Diffstat (limited to 'sw/source/core/frmedt/feflyole.cxx')
| -rw-r--r-- | sw/source/core/frmedt/feflyole.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx index 1138859bcc47..2ac1f14f24b2 100644 --- a/sw/source/core/frmedt/feflyole.cxx +++ b/sw/source/core/frmedt/feflyole.cxx @@ -79,13 +79,8 @@ 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 + SwFrm *pFrm = ((SwOLENode*)pNd)->getLayoutFrm( GetLayout() ); if ( pFrm ) pFly = pFrm->FindFlyFrm(); break; |