Tag: cws_src680_warnings01 User: sb Date: 06/05/23 17:01:39 Modified: /dba/dbaccess/source/ui/tabledesign/ TEditControl.hxx
Log: RESYNC: (1.15-1.17); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TEditControl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TEditControl.hxx?r1=1.14.48.2&r2=1.14.48.3 Delta lines: +13 -13 --------------------- --- TEditControl.hxx 7 Apr 2006 20:56:02 -0000 1.14.48.2 +++ TEditControl.hxx 24 May 2006 00:01:36 -0000 1.14.48.3 @@ -70,8 +70,8 @@ NONE }; - ::std::vector<OTableRow*> m_aUndoList; - ::std::vector<OTableRow*>* m_pRowList; + ::std::vector< ::boost::shared_ptr<OTableRow> > m_aUndoList; + ::std::vector< ::boost::shared_ptr<OTableRow> >* m_pRowList; EEditMode eEditMode; @@ -80,7 +80,7 @@ Edit* pDescrCell; OTableFieldDescWin* pDescrWin; // properties of one column - OTableRow* pActRow; + ::boost::shared_ptr<OTableRow> pActRow; ULONG nIndexEvent; ULONG nCutEvent; @@ -131,8 +131,8 @@ // return FALSE, verhindert Zellenwechsel virtual void Undo(); virtual void Redo(); - virtual String GetCellText(long nRow, USHORT nColId) const; - virtual ULONG GetTotalCellWidth(long nRow, USHORT nColId); + virtual String GetCellText(long nRow, sal_uInt16 nColId) const; + virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); virtual void CopyRows(); virtual void InsertRows( long nRow ); @@ -165,18 +165,18 @@ void DisplayData( long nRow, BOOL bGrabFocus = TRUE ); // erzwingt das Anzeigen der genannten Zeile (selbst wenn es eigentlich schon die aktuelle ist) - virtual void SetCellData( long nRow, USHORT nColId, const TOTypeInfoSP& _pTypeInfo ); - virtual void SetCellData( long nRow, USHORT nColId, const ::com::sun::star::uno::Any& _rSaveData ); - virtual ::com::sun::star::uno::Any GetCellData( long nRow, USHORT nColId ); - virtual void SetControlText( long nRow, USHORT nColId, const String& rText ); - virtual String GetControlText( long nRow, USHORT nColId ); + virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ); + virtual void SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rSaveData ); + virtual ::com::sun::star::uno::Any GetCellData( long nRow, sal_uInt16 nColId ); + virtual void SetControlText( long nRow, sal_uInt16 nColId, const String& rText ); + virtual String GetControlText( long nRow, sal_uInt16 nColId ); virtual OTableDesignView* GetView() const; - ::std::vector<OTableRow*>* GetRowList(){ return m_pRowList; } + ::std::vector< ::boost::shared_ptr<OTableRow> >* GetRowList(){ return m_pRowList; } - OTableRow* GetActRow(){ return pActRow; } - void CellModified( long nRow, USHORT nColId ); + ::boost::shared_ptr<OTableRow> GetActRow(){ return pActRow; } + void CellModified( long nRow, sal_uInt16 nColId ); void SetReadOnly( BOOL bRead=TRUE ); virtual void Init(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
