summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-08-12 20:13:49 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-08-13 09:22:29 +0100
commit6b2cc1eb6c7404d6934aad2d2c78555a45c9b4a8 (patch)
treef27113c8129692c06dc03602411a8f880b94bddb /dbaccess
parent89253a0c258c1107f598e5a37470ecb09055a895 (diff)
XubString->OUString
Change-Id: I1db6254b23c5203c20c168989656d320f86a3bb9
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/control/SqlNameEdit.cxx12
-rw-r--r--dbaccess/source/ui/inc/FieldDescControl.hxx4
-rw-r--r--dbaccess/source/ui/inc/dbtreelistbox.hxx2
-rw-r--r--dbaccess/source/ui/inc/listviewitems.hxx2
4 files changed, 10 insertions, 10 deletions
diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx
index 2e28ddd34684..6d815fc8a81b 100644
--- a/dbaccess/source/ui/control/SqlNameEdit.cxx
+++ b/dbaccess/source/ui/control/SqlNameEdit.cxx
@@ -38,18 +38,18 @@ namespace dbaui
sal_Bool bCorrected = sal_False;
if ( m_bCheck )
{
- XubString sText = _sToCheck;
- xub_StrLen nMatch = 0;
- for ( xub_StrLen i=nMatch;i < sText.Len(); ++i )
+ OUString sText = _sToCheck;
+ sal_Int32 nMatch = 0;
+ for (sal_Int32 i = nMatch; i < sText.getLength(); ++i)
{
- if ( !isCharOk( sText.GetBuffer()[i], i == 0, m_bOnlyUpperCase, m_sAllowedChars ) )
+ if ( !isCharOk( sText[i], i == 0, m_bOnlyUpperCase, m_sAllowedChars ) )
{
- _rsCorrected += sText.Copy( nMatch, i - nMatch );
+ _rsCorrected += sText.copy(nMatch, i - nMatch);
bCorrected = sal_True;
nMatch = i + 1;
}
}
- _rsCorrected += sText.Copy( nMatch, sText.Len() - nMatch );
+ _rsCorrected += sText.copy( nMatch, sText.getLength() - nMatch );
}
return bCorrected;
}
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 54409082f284..c05021a52aaf 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -102,8 +102,8 @@ namespace dbaui
TOTypeInfoSP m_pPreviousType;
short m_nPos;
- XubString aYes;
- XubString aNo;
+ OUString aYes;
+ OUString aNo;
long m_nOldVThumb;
long m_nOldHThumb;
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index d15c7b404969..16ad5901134e 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -35,7 +35,7 @@ namespace dbaui
struct DBTreeEditedEntry
{
SvTreeListEntry* pEntry;
- XubString aNewText;
+ OUString aNewText;
};
class IEntryFilter
diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx
index 2dc6dd19bade..f9a81789921f 100644
--- a/dbaccess/source/ui/inc/listviewitems.hxx
+++ b/dbaccess/source/ui/inc/listviewitems.hxx
@@ -37,7 +37,7 @@ namespace dbaui
sal_Bool m_bEmphasized;
public:
- OBoldListboxString(SvTreeListEntry* _pEntry, sal_uInt16 _nFlags, const XubString& _rStr)
+ OBoldListboxString(SvTreeListEntry* _pEntry, sal_uInt16 _nFlags, const OUString& _rStr)
:SvLBoxString(_pEntry, _nFlags, _rStr)
,m_bEmphasized(sal_False)
{