convert String vectors to OUString vectors in SW

Change-Id: I431d805f2845830da0fa66f6521c5c7d6b5b10d5

6 files changed, 9 insertions, 9 deletions

diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index a964eb04544c..0ea2a0468110 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -233,13 +233,13 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
         SfxStyleSheetBasePool* pPool = rView.GetDocShell()->GetStyleSheetPool();
         pPool->SetSearchMask(SFX_STYLE_FAMILY_PSEUDO, SFXSTYLEBIT_ALL);
         const SfxStyleSheetBase* pBase = pPool->First();
-        std::set<String> aNames;
+        std::set<OUString> aNames;
         while(pBase)
         {
             aNames.insert(pBase->GetName());
             pBase = pPool->Next();
         }
-        for(std::set<String>::const_iterator it = aNames.begin(); it != aNames.end(); ++it)
+        for(std::set<OUString>::const_iterator it = aNames.begin(); it != aNames.end(); ++it)
             rBox.InsertEntry(*it);
     }
 
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index d4841f1798fe..0dd867e8f1b4 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -5727,7 +5727,7 @@ void QuickHelpData::FillStrArr( SwWrtShell& rSh, const OUString& rWord )
                 aWordCase = CASE_SENTENCE;
             else
             {
-                if ( rWord == static_cast<String>( rCC.uppercase( rWord ) ) )
+                if ( rWord == rCC.uppercase( rWord ) )
                     aWordCase = CASE_UPPER;
             }
         }
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 855c3f6c3e77..9ed8c830c5d7 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -417,13 +417,13 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
         SfxStyleSheetBasePool* pPool = pWrtShell->GetView().GetDocShell()->GetStyleSheetPool();
         pPool->SetSearchMask(SFX_STYLE_FAMILY_PSEUDO, SFXSTYLEBIT_ALL);
         const SfxStyleSheetBase* pBase = pPool->First();
-        std::set<String> aNames;
+        std::set<OUString> aNames;
         while(pBase)
         {
             aNames.insert(pBase->GetName());
             pBase = pPool->Next();
         }
-        for(std::set<String>::const_iterator it = aNames.begin(); it != aNames.end(); ++it)
+        for(std::set<OUString>::const_iterator it = aNames.begin(); it != aNames.end(); ++it)
             rBox.InsertEntry(*it);
     }
     else if (nId == m_nAlignId)
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 1d2b18df436a..811b892cf09f 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -283,7 +283,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
         xCtrlAcc->enableControl( ExtendedFilePickerElementIds::CHECKBOX_LINK, sal_False);
     }
 
-    std::vector<String> aFormats;
+    std::vector<OUString> aFormats;
     SwDoc* pDoc = pDocShell->GetDoc();
     const sal_uInt16 nArrLen = pDoc->GetFrmFmts()->size();
     sal_uInt16 i;
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index f2ad595f9218..416e03cc7f7d 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -247,7 +247,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
                             m_pWrtShell->Push();
                         OUString aReplace( m_pSrchItem->GetReplaceString() );
                         SearchOptions aTmp( m_pSrchItem->GetSearchOptions() );
-                        String *pBackRef = ReplaceBackReferences( aTmp, m_pWrtShell->GetCrsr() );
+                        OUString *pBackRef = ReplaceBackReferences( aTmp, m_pWrtShell->GetCrsr() );
                         if( pBackRef )
                             m_pSrchItem->SetReplaceString( *pBackRef );
                         Replace();
diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx
index fec8d5404a40..a566448976db 100644
--- a/sw/source/ui/utlui/gloslst.cxx
+++ b/sw/source/ui/utlui/gloslst.cxx
@@ -277,7 +277,7 @@ void SwGlossaryList::Update()
     {
         for( size_t nPath = 0; nPath < rPathArr.size(); nPath++ )
         {
-            std::vector<String> aFoundGroupNames;
+            std::vector<OUString> aFoundGroupNames;
             std::vector<OUString> aFiles;
             std::vector<DateTime*> aDateTimeArr;
 
@@ -325,7 +325,7 @@ void SwGlossaryList::Update()
                 {
                     bool bFound = false;
                     OUString sCompareGroup = pGroup->sName.getToken(0, GLOS_DELIM);
-                    for(std::vector<String>::const_iterator j = aFoundGroupNames.begin(); j != aFoundGroupNames.end() && !bFound; ++j)
+                    for(std::vector<OUString>::const_iterator j = aFoundGroupNames.begin(); j != aFoundGroupNames.end() && !bFound; ++j)
                         bFound = (sCompareGroup == *j);
 
                     if(!bFound)