User: rt Date: 2008-06-16 13:42:37+0000 Modified: dba/reportdesign/source/ui/inc/dlgedfunc.hxx
Log: INTEGRATION: CWS rptchart02 (1.5.22); FILE MERGED 2008/04/16 06:29:50 oj 1.5.22.4: RESYNC: (1.5-1.6); FILE MERGED 2008/04/15 08:34:44 oj 1.5.22.3: #i88295# handle copy n paste 2008/04/03 12:01:46 oj 1.5.22.2: handle delete key properly when ole object is ui active 2008/04/03 06:35:20 oj 1.5.22.1: #i86343# remove unused code File Changes: Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: dlgedfunc.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/dlgedfunc.hxx?r1=1.6&r2=1.7 Delta lines: +21 -6 -------------------- --- dlgedfunc.hxx 2008-04-10 19:07:14+0000 1.6 +++ dlgedfunc.hxx 2008-06-16 13:42:34+0000 1.7 @@ -56,6 +56,13 @@ OSectionView* m_pView; Timer aScrollTimer; Point m_aMDPos; + com::sun::star::uno::Reference<com::sun::star::uno::XInterface> m_xOverlappingObj; + SdrObject * m_pOverlappingObj; + sal_Int32 m_nOverlappedControlColor; + sal_Int32 m_nOldColor; + bool m_bSelectionMode; + bool m_bUiActive; + bool m_bShowPropertyBrowser; DECL_LINK( ScrollTimeout, Timer * ); void ForceScroll( const Point& rPos ); @@ -78,6 +85,13 @@ custom shapes can drop every where */ bool isOnlyCustomShapeMarked(); + + /** activate object if it is of type OBJ_OLE2 + */ + void activateOle(SdrObject* _pObj); + + void checkTwoCklicks(const MouseEvent& rMEvt); + public: DlgEdFunc( OReportSection* pParent ); virtual ~DlgEdFunc(); @@ -100,16 +114,17 @@ bool isOverlapping(const MouseEvent& rMEvt); void setOverlappedControlColor(sal_Int32 _nColor); void stopScrollTimer(); + + /** deactivate all ole object + */ + void deactivateOle(bool _bSelect = false); + + inline bool isUiActive() const { return m_bUiActive; } protected: void colorizeOverlappedObject(SdrObject* _pOverlappedObj); void unColorizeOverlappedObj(); - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> m_xOverlappingObj; - SdrObject *m_pOverlappingObj; - sal_Int32 m_nOverlappedControlColor; - sal_Int32 m_nOldColor; - bool m_bSelectionMode; }; //============================================================================ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
