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

Change-Id: I7f6b4a29655390356aef9c6045590ee00c0fed4f

3 files changed, 10 insertions, 10 deletions

diff --git a/sw/source/ui/inc/unoatxt.hxx b/sw/source/ui/inc/unoatxt.hxx
index e04e3d3ec789..9237315ecec3 100644
--- a/sw/source/ui/inc/unoatxt.hxx
+++ b/sw/source/ui/inc/unoatxt.hxx
@@ -101,8 +101,8 @@ class SwXAutoTextGroup : public cppu::WeakImplHelper6
 {
     const SfxItemPropertySet* pPropSet;
     SwGlossaries*           pGlossaries;
-    OUString           sName;
-    String                  m_sGroupName;   // prefix m_ to disambiguate from some local vars in the implementation
+    OUString                sName;
+    OUString                m_sGroupName;   // prefix m_ to disambiguate from some local vars in the implementation
 
 protected:
     virtual ~SwXAutoTextGroup();    // ref-counted objects are not to be deleted from outside -> protected dtor
@@ -169,8 +169,8 @@ class SwXAutoTextEntry
         >
 {
     SwGlossaries*   pGlossaries;
-    String          sGroupName;
-    String          sEntryName;
+    OUString        sGroupName;
+    OUString        sEntryName;
     SwDocShellRef   xDocSh;
     SwXBodyText*    pBodyText;
     com::sun::star::uno::Reference < com::sun::star::lang::XServiceInfo> xBodyText;
@@ -203,7 +203,7 @@ protected:
     virtual ~SwXAutoTextEntry();    // ref-counted objects are not to be deleted from outside -> protected dtor
 
 public:
-    SwXAutoTextEntry(SwGlossaries* , const String& rGroupName, const String& rEntryName);
+    SwXAutoTextEntry(SwGlossaries* , const OUString& rGroupName, const OUString& rEntryName);
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
@@ -238,8 +238,8 @@ public:
 
     void    Invalidate() {pGlossaries = 0;}
     const SwGlossaries* GetGlossaries() { return pGlossaries; }
-    const String&   GetGroupName() {return sGroupName;}
-    const String&   GetEntryName() {return sEntryName;}
+    const OUString&   GetGroupName() {return sGroupName;}
+    const OUString&   GetEntryName() {return sEntryName;}
 };
 
 
diff --git a/sw/source/ui/inc/unomailmerge.hxx b/sw/source/ui/inc/unomailmerge.hxx
index f6ec22f6337a..6ac450e9a164 100644
--- a/sw/source/ui/inc/unomailmerge.hxx
+++ b/sw/source/ui/inc/unomailmerge.hxx
@@ -96,7 +96,7 @@ class SwXMailMerge :
 
     SfxObjectShellRef xDocSh;   // the document
 
-    String          aTmpFileName;
+    OUString        aTmpFileName;
 
     // properties of mail merge service
     com::sun::star::uno::Sequence< com::sun::star::uno::Any >           aSelection;
diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx
index 33a8cbab8a1f..20fabdab1ac9 100644
--- a/sw/source/ui/inc/unotools.hxx
+++ b/sw/source/ui/inc/unotools.hxx
@@ -78,7 +78,7 @@ class SW_DLLPUBLIC SwOneExampleFrame
     Link            aInitializedLink;
 
     MenuResource    aMenuRes;
-    String          sArgumentURL;
+    OUString        sArgumentURL;
 
     SwView*         pModuleView;
 
@@ -99,7 +99,7 @@ public:
     SwOneExampleFrame(Window& rWin,
                     sal_uInt32 nStyleFlags = EX_SHOW_ONLINE_LAYOUT,
                     const Link* pInitalizedLink = 0,
-                    String* pURL = 0);
+                    OUString* pURL = 0);
     ~SwOneExampleFrame();
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > &       GetControl()    {return _xControl; }