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

Change-Id: I7f6b4a29655390356aef9c6045590ee00c0fed4f

9 files changed, 21 insertions, 21 deletions

diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index ca16b1ad71b0..1e6e7a2127ef 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -61,7 +61,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage
     SwOneExampleFrame*  m_pExampleFrame;
     SwWrtShell*         m_pExampleWrtShell;
 
-    String              m_sExampleURL;
+    OUString            m_sExampleURL;
     SwFrmFmt*           m_pAddressBlockFormat;
 
     bool                m_bIsGreetingInserted;
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; }
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 53d55c0cf4b4..8f845f5d5412 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -522,7 +522,7 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl )
             else
             {
                 Link aLink(LINK(this, SwMultiTOXTabDialog, CreateExample_Hdl));
-                String sTemp(sTemplate);
+                OUString sTemp(sTemplate);
                 pExampleFrame = new SwOneExampleFrame(
                         *m_pExampleContainerWIN, EX_SHOW_ONLINE_LAYOUT, &aLink, &sTemp);
 
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 9e4c1ff7db26..a56556b455f6 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -670,8 +670,8 @@ Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry(
         }
 
         if  (   pEntry
-            &&  ( COMPARE_EQUAL == pEntry->GetGroupName().CompareTo( rGroupName ) )
-            &&  ( COMPARE_EQUAL == pEntry->GetEntryName().CompareTo( rEntryName ) )
+            &&  pEntry->GetGroupName() == rGroupName
+            &&  pEntry->GetEntryName() == rEntryName
             )
         {
             xReturn = pEntry;
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 6210faf43c18..275ea3a7edbf 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -749,8 +749,8 @@ sal_Int64 SAL_CALL SwXAutoTextEntry::getSomething( const uno::Sequence< sal_Int8
     return 0;
 }
 
-SwXAutoTextEntry::SwXAutoTextEntry(SwGlossaries* pGlss, const String& rGroupName,
-                                            const String& rEntryName) :
+SwXAutoTextEntry::SwXAutoTextEntry(SwGlossaries* pGlss, const OUString& rGroupName,
+                                            const OUString& rEntryName) :
     pGlossaries(pGlss),
     sGroupName(rGroupName),
     sEntryName(rEntryName),
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index e601f2478253..d4f43204ca71 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -402,7 +402,7 @@ SwXMailMerge::SwXMailMerge() :
 
 SwXMailMerge::~SwXMailMerge()
 {
-    if (aTmpFileName.Len())
+    if (!aTmpFileName.isEmpty())
         DeleteTmpFile_Impl( xModel, xDocSh, aTmpFileName );
     else    // there was no temporary file in use
     {
@@ -788,7 +788,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
     if ( xCurModel.get() != xModel.get() )
     {   // in case it was a temporary model -> close it, and delete the file
         DeleteTmpFile_Impl( xCurModel, xCurDocSh, aTmpFileName );
-        aTmpFileName.Erase();
+        aTmpFileName = "";
     }
     // (in case it wasn't a temporary model, it will be closed in the dtor, at the latest)
 
diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx
index a0fd65d2b7c8..52fb4d8d59c8 100644
--- a/sw/source/ui/utlui/unotools.cxx
+++ b/sw/source/ui/utlui/unotools.cxx
@@ -63,7 +63,7 @@ bool SwOneExampleFrame::bShowServiceNotAvailableMessage = true;
 SwOneExampleFrame::SwOneExampleFrame( Window& rWin,
                                         sal_uInt32 nFlags,
                                         const Link* pInitializedLink,
-                                        String* pURL ) :
+                                        OUString* pURL ) :
     aTopWindow(&rWin, this),
     aMenuRes(SW_RES(RES_FRMEX_MENU)),
     pModuleView(SW_MOD()->GetView()),
@@ -71,7 +71,7 @@ SwOneExampleFrame::SwOneExampleFrame( Window& rWin,
     bIsInitialized(sal_False),
     bServiceAvailable(sal_False)
 {
-    if (pURL && pURL->Len())
+    if (pURL && !pURL->isEmpty())
         sArgumentURL = *pURL;
 
     aTopWindow.SetPosSizePixel(Point(0, 0), rWin.GetSizePixel());
@@ -130,7 +130,7 @@ void SwOneExampleFrame::CreateControl()
         uno::Any aURL;
         // create new doc
         OUString sTempURL(cFactory);
-        if(sArgumentURL.Len())
+        if(!sArgumentURL.isEmpty())
             sTempURL = sArgumentURL;
         aURL <<= sTempURL;