User: rt Date: 2008-01-29 13:49:08+0000 Modified: dba/reportdesign/source/ui/inc/ViewsWindow.hxx
Log: INTEGRATION: CWS reportdesign02 (1.4.36); FILE MERGED 2007/11/28 15:19:29 lla 1.4.36.2: #i80260# with pressed ctrl key it isn't possible to move the object out of the section. 2007/11/26 06:24:44 lla 1.4.36.1: #i80260# drag n drop, lines over all sections, no ctrl key need to move obj in different section 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.4&r2=1.5 Delta lines: +11 -2 -------------------- --- ViewsWindow.hxx 2007-08-03 10:01:53+0000 1.4 +++ ViewsWindow.hxx 2008-01-29 13:49:05+0000 1.5 @@ -320,8 +320,16 @@ */ void BrkAction(); void BegMarkObj(const Point& _aPnt,const OSectionView* _pSection); + private: + void BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _aRect, const OSectionView* _pSection); + void EndDragObj_removeInvisibleObjects(); + Point m_aDragDelta; + ::std::vector<SdrObject*> m_aBegDragTempList; + bool isObjectInMyTempList(SdrObject *); + public: void BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionView* _pSection); void EndDragObj(BOOL _bDragIntoNewSection,const OSectionView* _pSection,const Point& _aPnt); + void EndAction(); void ForceMarkedToAnotherPage(); BOOL IsAction() const; @@ -337,7 +345,8 @@ */ OSectionView* getSectionRelativeToPosition(const OSectionView* _pSection,Point& _rPnt); - void MovAction(const Point& rPnt,const OSectionView* _pSection,bool _bMove = true); + void MovAction(const Point& rPnt,const OSectionView* _pSection,bool _bMove /*= true */, bool _bControlKeySet); + // void MovAction2(const Point& rPnt,const OSectionView* _pSection); void setPoint(const Point& _aPnt); inline Point getPoint() const { return m_aPoint; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
