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

Change-Id: I4b625f4688977121d4de16fcdbd4327aad989134

2 files changed, 15 insertions, 15 deletions

diff --git a/sw/source/ui/inc/mailmergehelper.hxx b/sw/source/ui/inc/mailmergehelper.hxx
index eb332246b1c5..128ba1b4a65f 100644
--- a/sw/source/ui/inc/mailmergehelper.hxx
+++ b/sw/source/ui/inc/mailmergehelper.hxx
@@ -49,8 +49,8 @@ namespace SwMailMergeHelper
     SW_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::mail::XSmtpService >
                          ConnectToSmtpServer( SwMailMergeConfigItem& rConfigItem,
                             com::sun::star::uno::Reference< com::sun::star::mail::XMailService >&  xInMailService,
-                            const String& rInMailServerPassword,
-                            const String& rOutMailServerPassword,
+                            const OUString& rInMailServerPassword,
+                            const OUString& rOutMailServerPassword,
                             Window* pDialogParentWindow = 0 );
 }
 
@@ -114,7 +114,7 @@ public:
     void                    EnableScrollBar(bool bEnable = true);
 
     // fill the actual data into a string (address block or greeting)
-    static String FillData(
+    static OUString FillData(
             const OUString& rAddress,
             SwMailMergeConfigItem& rConfigItem,
             const ::com::sun::star::uno::Sequence< OUString>* pAssignments = 0);
@@ -129,9 +129,9 @@ public:
   -----------------------------------------------------------------------*/
 struct SwMergeAddressItem
 {
-    String  sText;
-    bool    bIsColumn;
-    bool    bIsReturn;
+    OUString  sText;
+    bool      bIsColumn;
+    bool      bIsReturn;
     SwMergeAddressItem() :
         bIsColumn(false),
         bIsReturn(false) {}
@@ -139,13 +139,13 @@ struct SwMergeAddressItem
 
 class SW_DLLPUBLIC   SwAddressIterator
 {
-    String sAddress;
+    OUString sAddress;
 public:
-    SwAddressIterator(const String& rAddress) :
+    SwAddressIterator(const OUString& rAddress) :
         sAddress(rAddress){}
 
     SwMergeAddressItem  Next();
-    bool                HasMore() const{return sAddress.Len() > 0;}
+    bool                HasMore() const{return !sAddress.isEmpty();}
 };
 
 class SW_DLLPUBLIC SwAuthenticator :
diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx
index 1219df82fcae..3c150a3d1962 100644
--- a/sw/source/ui/inc/mailmrge.hxx
+++ b/sw/source/ui/inc/mailmrge.hxx
@@ -105,8 +105,8 @@ class SwMailMergeDlg : public SvxStandardDialog
 
     SwWrtShell&     rSh;
     SwModuleOptions* pModOpt;
-    const String&   rDBName;
-    const String&   rTableName;
+    OUString        rDBName;
+    OUString        rTableName;
 
     sal_uInt16          nMergeType;
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >       m_aSelection;
@@ -130,8 +130,8 @@ class SwMailMergeDlg : public SvxStandardDialog
 
 public:
      SwMailMergeDlg(Window* pParent, SwWrtShell& rSh,
-         const String& rSourceName,
-        const String& rTblName,
+         const OUString& rSourceName,
+        const OUString& rTblName,
         sal_Int32 nCommandType,
         const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0);
@@ -141,8 +141,8 @@ public:
 
     bool IsSaveIndividualDocs() const { return aSaveIndividualRB.IsChecked(); }
     bool IsGenerateFromDataBase() const { return aGenerateFromDataBaseCB.IsChecked(); }
-    String GetColumnName() const { return aColumnLB.GetSelectEntry();}
-    String GetPath() const { return aPathED.GetText();}
+    OUString GetColumnName() const { return aColumnLB.GetSelectEntry();}
+    OUString GetPath() const { return aPathED.GetText();}
 
     const OUString& GetSaveFilter() const {return m_sSaveFilter;}
     inline const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const { return m_aSelection; }