diff options
| -rw-r--r-- | reportdesign/inc/RptObject.hxx | 6 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/RptObject.cxx | 27 |
2 files changed, 0 insertions, 33 deletions
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index f825484f1..076f152fb 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -176,8 +176,6 @@ public: virtual ~OCustomShape(); virtual sal_Int32 GetStep() const; - - virtual SdrObject* CheckHit(const Point& rPnt,USHORT nTol,const SetOfByte*) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape(); @@ -220,8 +218,6 @@ public: virtual ~OOle2Obj(); virtual sal_Int32 GetStep() const; - - virtual SdrObject* CheckHit(const Point& rPnt,USHORT nTol,const SetOfByte*) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape(); @@ -266,8 +262,6 @@ public: TYPEINFO(); virtual sal_Int32 GetStep() const; - - virtual SdrObject* CheckHit(const Point& rPnt,USHORT nTol,const SetOfByte*) const; virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException); /** creates the m_xMediator when it doesn't already exist. diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index b7f5ab138..8e64894c4 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -609,16 +609,6 @@ FASTBOOL OCustomShape::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) return bResult; } -//---------------------------------------------------------------------------- -SdrObject* OCustomShape::CheckHit( const Point& rPnt, USHORT nTol,const SetOfByte* pSet ) const -{ - // #109994# fixed here, because the drawing layer doesn't handle objects - // with a width or height of 0 in a proper way - if ( IsInside(aOutRect,rPnt,nTol) ) - return const_cast<OCustomShape*>(this); - - return SdrObjCustomShape::CheckHit( rPnt, nTol, pSet ); -} //---------------------------------------------------------------------------- void OCustomShape::SetObjectItemHelper(const SfxPoolItem& rItem) @@ -900,15 +890,7 @@ FASTBOOL OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) return aDefaultName; } -//---------------------------------------------------------------------------- -SdrObject* OUnoObject::CheckHit( const Point& rPnt, USHORT nTol,const SetOfByte* pSet ) const -{ - DBG_CHKTHIS( rpt_OUnoObject,NULL); - if ( IsInside(aOutRect,rPnt,nTol) ) - return const_cast<OUnoObject*>(this); - return SdrUnoObj::CheckHit( rPnt, nTol, pSet ); -} // ----------------------------------------------------------------------------- void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) throw( uno::RuntimeException) { @@ -1144,16 +1126,7 @@ FASTBOOL OOle2Obj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) return bResult; } -//---------------------------------------------------------------------------- -SdrObject* OOle2Obj::CheckHit( const Point& rPnt, USHORT nTol,const SetOfByte* pSet ) const -{ - DBG_CHKTHIS( rpt_OOle2Obj,NULL); - if ( IsInside(aOutRect,rPnt,nTol) ) - return const_cast<OOle2Obj*>(this); - return SdrOle2Obj::CheckHit( rPnt, nTol, pSet ); -} -// ----------------------------------------------------------------------------- uno::Reference< beans::XPropertySet> OOle2Obj::getAwtComponent() { return uno::Reference< beans::XPropertySet>(m_xReportComponent,uno::UNO_QUERY); |