diff options
Diffstat (limited to 'sw/source/core/view/vdraw.cxx')
| -rw-r--r-- | sw/source/core/view/vdraw.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index ef99855c0472..994841e6787f 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -272,11 +272,7 @@ sal_Bool SwViewImp::IsDragPossible( const Point &rPoint ) SdrObject *pO = rMrkList.GetMark(rMrkList.GetMarkCount()-1)->GetMarkedSdrObj(); SwRect aRect; -<<<<<<< local - if( pO && ::CalcClipRect( pO, aRect, FALSE ) ) -======= - if( ::CalcClipRect( pO, aRect, sal_False ) ) ->>>>>>> other + if( pO && ::CalcClipRect( pO, aRect, sal_False ) ) { SwRect aTmp; ::CalcClipRect( pO, aTmp, sal_True ); |