summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx6
-rw-r--r--dbaccess/source/ui/control/TableGrantCtrl.cxx2
-rw-r--r--dbaccess/source/ui/dlg/indexfieldscontrol.cxx2
-rw-r--r--dbaccess/source/ui/inc/TableGrantCtrl.hxx2
-rw-r--r--dbaccess/source/ui/inc/indexfieldscontrol.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.hxx2
9 files changed, 12 insertions, 12 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)
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 74b6acd6fd8c..b0c2eb8f797d 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -454,7 +454,7 @@ DBG_NAME(IndexFieldsControl)
return 0L;
}
//------------------------------------------------------------------
- String IndexFieldsControl::GetCellText(long _nRow,sal_uInt16 nColId) const
+ OUString IndexFieldsControl::GetCellText(long _nRow,sal_uInt16 nColId) const
{
ConstIndexFieldsIterator aRow = m_aFields.end();
if ( _nRow >= 0 )
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index 6d916cfae8af..da236d9570ca 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -87,7 +87,7 @@ protected:
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();
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index f71d9f673f81..7f4dd8c61655 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -70,7 +70,7 @@ namespace dbaui
void SetModifyHdl(const Link& _rHdl) { m_aModifyHdl = _rHdl; }
Link GetModifyHdl() const { return m_aModifyHdl; }
- virtual String GetCellText(long _nRow,sal_uInt16 nColId) const;
+ virtual OUString GetCellText(long _nRow,sal_uInt16 nColId) const;
protected:
// EditBrowseBox overridables
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index b54b3814b85e..8045c43d243f 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2203,7 +2203,7 @@ void OSelectionBrowseBox::SetNoneVisbleRow(long nRows)
m_bVisibleRow[i] = !(nRows & nVisibleRowMask[i]);
}
//------------------------------------------------------------------------------
-String OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
+OUString OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
{
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
@@ -2212,7 +2212,7 @@ String OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
OTableFieldDescRef pEntry = getFields()[nPos-1];
OSL_ENSURE(pEntry != NULL, "OSelectionBrowseBox::GetCellText : invalid column id, prepare for GPF ... ");
if ( pEntry->IsEmpty() )
- return String();
+ return OUString();
String aText;
switch (nRow)
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 40cbfc737ef4..65867fc3363b 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -154,7 +154,7 @@ namespace dbaui
@return
the text out of the cell
*/
- virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const;
+ virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const;
/** returns the description of the row.
@param _nRow
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 839b470cd3ee..6786a3814918 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -1243,7 +1243,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId )
}
//------------------------------------------------------------------------------
-String OTableEditorCtrl::GetCellText( long nRow, sal_uInt16 nColId ) const
+OUString OTableEditorCtrl::GetCellText( long nRow, sal_uInt16 nColId ) const
{
DBG_CHKTHIS(OTableEditorCtrl,NULL);
OUString sCellText;
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 8d245366850c..92394940b9e0 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -102,7 +102,7 @@ namespace dbaui
// return sal_False, verhindert Zellenwechsel
virtual void Undo();
virtual void Redo();
- virtual String GetCellText(long nRow, sal_uInt16 nColId) const;
+ virtual OUString GetCellText(long nRow, sal_uInt16 nColId) const;
virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId);
virtual void CopyRows();