User: hr Date: 06/06/19 20:18:39 Modified: /dba/dbaccess/source/ui/inc/ sbagrid.hxx
Log: INTEGRATION: CWS warnings01 (1.24.48); FILE MERGED 2006/03/24 15:36:19 fs 1.24.48.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: sbagrid.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/sbagrid.hxx?r1=1.24&r2=1.25 Delta lines: +16 -8 -------------------- --- sbagrid.hxx 8 Sep 2005 16:02:21 -0000 1.24 +++ sbagrid.hxx 20 Jun 2006 03:18:37 -0000 1.25 @@ -231,6 +231,9 @@ virtual void MouseButtonDown( const MouseEvent& rMEvt ); sal_Bool ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMousePos); + + private: + using FmGridHeader::StartDrag; }; // ========================================================================= @@ -263,10 +266,10 @@ ::svx::ODataAccessDescriptor m_aDataDescriptor; SbaGridListener* m_pMasterListener; sal_Int32 m_nAsyncDropEvent; - sal_uInt16 m_nLastColId; - sal_uInt16 m_nLastRowId; + USHORT m_nLastColId; + long m_nLastRowId; - sal_uInt16 m_nCurrentActionColId; + USHORT m_nCurrentActionColId; // ui actions (e.g. a context menu) may be performed on columns which aren't the current one // and aren't selected, so we have to track this column id @@ -300,7 +303,7 @@ @return The description of the specified object. */ - virtual ::rtl::OUString GetAccessibleDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual ::rtl::OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; protected: // DragSourceHelper overridables @@ -350,6 +353,11 @@ private: sal_Bool IsReadOnlyDB() const; + + private: + using FmGridControl::AcceptDrop; + using FmGridControl::ExecuteDrop; + using FmGridControl::MouseButtonDown; }; } #endif // _SBA_GRID_HXX --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
