User: hr Date: 2007-08-03 10:01:55+0000 Modified: dba/reportdesign/source/ui/inc/ViewsWindow.hxx
Log: INTEGRATION: CWS rpt23fix02 (1.2.4); FILE MERGED 2007/07/25 14:07:01 oj 1.2.4.2: #i77721# #i79958# dnd and selection across sections impl 2007/07/24 12:48:06 oj 1.2.4.1: merge from rpt23fix01 File Changes: Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: ViewsWindow.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ViewsWindow.hxx?r1=1.3&r2=1.4 Delta lines: +21 -5 -------------------- --- ViewsWindow.hxx 2007-08-02 14:37:50+0000 1.3 +++ ViewsWindow.hxx 2007-08-03 10:01:53+0000 1.4 @@ -141,6 +141,7 @@ svtools::ColorConfig m_aColorConfig; OReportWindow* m_pParent; ::rtl::OUString m_sShapeType; + Point m_aPoint; sal_Bool m_bInSplitHandler; sal_Bool m_bInUnmark; @@ -317,13 +318,28 @@ /** calls on every section BrkAction * */ - void breakAction(); - - void BegDragObj(const Point& _aPnt, SdrHdl* _pHdl); - void EndDragObj(BOOL _bCopy = FALSE); + void BrkAction(); + void BegMarkObj(const Point& _aPnt,const OSectionView* _pSection); + void BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionView* _pSection); + void EndDragObj(BOOL _bDragIntoNewSection,const OSectionView* _pSection,const Point& _aPnt); void EndAction(); - - void MovAction(const Point& rPnt); + void ForceMarkedToAnotherPage(); + BOOL IsAction() const; + BOOL IsDragObj() const; + void handleKey(const KeyCode& _rCode); + void stopScrollTimer(); + + /** return the section at the given point which is relative to the given section + * + * \param _pSection the section which is used as reference point + * \param _rPnt the point, it will be changed that it is inside the section which will be returned + * \return the section + */ + OSectionView* getSectionRelativeToPosition(const OSectionView* _pSection,Point& _rPnt); + + void MovAction(const Point& rPnt,const OSectionView* _pSection,bool _bMove = true); + void setPoint(const Point& _aPnt); + inline Point getPoint() const { return m_aPoint; } sal_uInt32 getMarkedObjectCount() const; }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
