convert sw/source/ui/inc/d*.hxx from String to OUString

Change-Id: I5ef0592411169884693d01dc497c53897c0b5928

5 files changed, 17 insertions, 17 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;
 
diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx
index 0257e55d8bd8..fb1de9ed9d28 100644
--- a/sw/source/ui/inc/dbinsdlg.hxx
+++ b/sw/source/ui/inc/dbinsdlg.hxx
@@ -65,7 +65,7 @@ struct SwInsDBColumn
     sal_Bool bHasFmt : 1;
     sal_Bool bIsDBFmt : 1;
 
-    SwInsDBColumn( const String& rStr, sal_uInt16 nColumn )
+    SwInsDBColumn( const OUString& rStr, sal_uInt16 nColumn )
         : sColumn( rStr ),
         nDBNumFmt( 0 ),
         nUsrNumFmt( 0 ),
@@ -126,7 +126,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
     const SwDBData  aDBData;
 
     Link            aOldNumFmtLnk;
-    String          sNoTmpl;
+    OUString        sNoTmpl;
 
     SwView*         pView;
     SwTableAutoFmt* pTAutoFmt;
@@ -144,7 +144,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
     DECL_LINK( DblClickHdl, ListBox* );
     DECL_LINK( HeaderHdl, Button* );
 
-    bool SplitTextToColArr( const String& rTxt, _DB_Columns& rColArr, sal_Bool bInsField );
+    bool SplitTextToColArr( const OUString& rTxt, _DB_Columns& rColArr, sal_Bool bInsField );
         using SfxModalDialog::Notify;
     virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
     virtual void            Commit();
diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx
index 04091560a4c6..28406cdc2a32 100644
--- a/sw/source/ui/inc/dbtree.hxx
+++ b/sw/source/ui/inc/dbtree.hxx
@@ -35,7 +35,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox
     Image           aTableBMP;
     Image           aQueryBMP;
 
-    String          sDefDBName;
+    OUString        sDefDBName;
     bool            bInitialized;
     sal_Bool            bShowColumns;
 
@@ -58,13 +58,13 @@ public:
 
     OUString GetDBName( OUString& rTableName, OUString& rColumnName, sal_Bool* pbIsTable = 0);
 
-    void    Select( const String& rDBName, const String& rTableName,
-                    const String& rColumnName );
+    void    Select( const OUString& rDBName, const OUString& rTableName,
+                    const OUString& rColumnName );
 
     void    ShowColumns(sal_Bool bShowCol);
     void    SetWrtShell(SwWrtShell& rSh);
 
-    void    AddDataSource(const String& rSource);
+    void    AddDataSource(const OUString& rSource);
 };
 
 #endif
diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/ui/inc/dbui.hxx
index b0558cdbb2d3..bfb9fb83c49f 100644
--- a/sw/source/ui/inc/dbui.hxx
+++ b/sw/source/ui/inc/dbui.hxx
@@ -62,9 +62,9 @@ private: //member
     FixedText       m_aCounting;
     CancelButton    m_aCancelButton;
 
-    String          m_sCountingPattern;
-    String          m_sVariable_Total;
-    String          m_sVariable_Position;
+    OUString        m_sCountingPattern;
+    OUString        m_sVariable_Total;
+    OUString        m_sVariable_Position;
     sal_Int32       m_nTotalCount;
     sal_Int32       m_nCurrentPosition;
 };