diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-09 11:50:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-10 09:19:04 +0200 |
| commit | 3acd7ab515ab6e97c9110b89d13136d94be5eef6 (patch) | |
| tree | ecdce8beb3fd0be63b22305d937b043d931fcea1 /sw/source/ui/dbui | |
| parent | 79f52d249fe043e6ec54be6ffa0c71a748920394 (diff) | |
convert sw/source/ui/inc/d*.hxx from String to OUString
Change-Id: I5ef0592411169884693d01dc497c53897c0b5928
Diffstat (limited to 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/dbinsdlg.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dbui/dbtree.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 95bac6ed83bb..051b0a6b6163 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -861,7 +861,7 @@ static void lcl_InsTextInArr( const String& rTxt, _DB_Columns& rColArr ) } } -bool SwInsertDBColAutoPilot::SplitTextToColArr( const String& rTxt, +bool SwInsertDBColAutoPilot::SplitTextToColArr( const OUString& rTxt, _DB_Columns& rColArr, sal_Bool bInsField ) { diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index 011c0c43247a..0f0a3a987f43 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -225,15 +225,15 @@ void SwDBTreeList::InitTreeList() String sDBName(pDBNames[i]); InsertEntry(sDBName, aImg, aImg, NULL, sal_True); } - String sDBName(sDefDBName.GetToken(0, DB_DELIM)); - String sTableName(sDefDBName.GetToken(1, DB_DELIM)); - String sColumnName(sDefDBName.GetToken(2, DB_DELIM)); + String sDBName(sDefDBName.getToken(0, DB_DELIM)); + String sTableName(sDefDBName.getToken(1, DB_DELIM)); + String sColumnName(sDefDBName.getToken(2, DB_DELIM)); Select(sDBName, sTableName, sColumnName); bInitialized = true; } -void SwDBTreeList::AddDataSource(const String& rSource) +void SwDBTreeList::AddDataSource(const OUString& rSource) { Image aImg = aImageList.GetImage(IMG_DB); SvTreeListEntry* pEntry = InsertEntry(rSource, aImg, aImg, NULL, sal_True); @@ -434,7 +434,7 @@ OUString SwDBTreeList::GetDBName(OUString& rTableName, OUString& rColumnName, sa /*------------------------------------------------------------------------ Description: Format: database.table ------------------------------------------------------------------------*/ -void SwDBTreeList::Select(const String& rDBName, const String& rTableName, const String& rColumnName) +void SwDBTreeList::Select(const OUString& rDBName, const OUString& rTableName, const OUString& rColumnName) { SvTreeListEntry* pParent; SvTreeListEntry* pChild; @@ -453,7 +453,7 @@ void SwDBTreeList::Select(const String& rDBName, const String& rTableName, const { pParent = pChild; - if (bShowColumns && rColumnName.Len()) + if (bShowColumns && !rColumnName.isEmpty()) { nChild = 0; |