diff options
| author | hg <hg@oosvn01.> | 2009-10-08 15:56:43 +0000 |
|---|---|---|
| committer | hg <hg@oosvn01.> | 2009-10-08 15:56:43 +0000 |
| commit | f583724a28504c9d0bd710e87b760b9a0c903e43 (patch) | |
| tree | fdf29eb15dc63d37634d74d7af0adf67387a0210 /basctl/source/inc | |
| parent | a72dade8aa93bf07e5e66d0f61ae92e11f505c67 (diff) | |
| parent | 5fb2028499e85dfe2ceaa2328adc90439946ff25 (diff) | |
merge with m53
Diffstat (limited to 'basctl/source/inc')
| -rw-r--r-- | basctl/source/inc/dlgedobj.hxx | 3 | ||||
| -rw-r--r-- | basctl/source/inc/dlgedview.hxx | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index 6061eff2a8df..8d0f46b089f0 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -140,7 +140,6 @@ public: virtual void SAL_CALL _elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); virtual void SetLayer(SdrLayerID nLayer); - virtual SdrObject* CheckHit(const Point& rPnt,USHORT nTol,const SetOfByte*) const; }; @@ -194,8 +193,6 @@ public: virtual void UpdateGroups(); virtual void UpdateTabOrderAndGroups(); - virtual SdrObject* CheckHit(const Point& rPnt,USHORT nTol,const SetOfByte*) const; - ::com::sun::star::awt::DeviceInfo getDeviceInfo() const; private: diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx index 5b9538c347f8..11d580634e99 100644 --- a/basctl/source/inc/dlgedview.hxx +++ b/basctl/source/inc/dlgedview.hxx @@ -53,6 +53,11 @@ public: virtual void MarkListHasChanged(); virtual void MakeVisible( const Rectangle& rRect, Window& rWin ); + +protected: + // overloaded to handle HitTest for some objects special + using SdrView::CheckSingleSdrObjectHit; + virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const; }; #endif //_BASCTL_DLGEDVIEW_HXX |