diff options
Diffstat (limited to 'dbaccess/source/ui/control')
| -rw-r--r-- | dbaccess/source/ui/control/RelationControl.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/TableGrantCtrl.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index d61d39e9d986..4d6143d2654a 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -112,7 +112,7 @@ namespace dbaui virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const; virtual sal_Bool SeekRow( long nRow ); virtual sal_Bool SaveModified(); - virtual String GetCellText( long nRow, sal_uInt16 nColId ) const; + virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const; virtual void CellModified(); @@ -286,10 +286,10 @@ namespace dbaui } //------------------------------------------------------------------------------ - String ORelationControl::GetCellText( long nRow, sal_uInt16 nColId ) const + OUString ORelationControl::GetCellText( long nRow, sal_uInt16 nColId ) const { DBG_CHKTHIS(ORelationControl,NULL); - String sText; + OUString sText; if ( m_pConnData->GetConnLineDataList()->size() > static_cast<size_t>(nRow) ) { OConnectionLineDataRef pConnLineData = (*m_pConnData->GetConnLineDataList())[nRow]; diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 9aca17493a21..187cba27a9d4 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -274,7 +274,7 @@ sal_Bool OTableGrantControl::SaveModified() } //------------------------------------------------------------------------------ -String OTableGrantControl::GetCellText( long nRow, sal_uInt16 nColId ) const +OUString OTableGrantControl::GetCellText( long nRow, sal_uInt16 nColId ) const { DBG_CHKTHIS(OTableGrantControl,NULL); if(COL_TABLE_NAME == nColId) |