converting remaining usage of String in SW to OUString

Change-Id: Iaaa3812412dc880eb9d08144219ebe428007884e

3 files changed, 35 insertions, 35 deletions

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 4f164076a79d..61d9f2d86f4c 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -286,7 +286,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet
             if(TOX_AUTHORITIES == eCurrentTOXType.eType)
             {
                 const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
-                                                rSh.GetFldType(RES_AUTHORITY, aEmptyStr);
+                                                rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr);
                 if(pFType)
                 {
                     OUString sBrackets;
@@ -432,7 +432,7 @@ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType)
         if(TOX_AUTHORITIES == eType.eType)
         {
             const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
-                                            rSh.GetFldType(RES_AUTHORITY, aEmptyStr);
+                                            rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr);
             if(pFType)
             {
                 OUString sBrackets(pFType->GetPrefix());
@@ -1011,7 +1011,7 @@ void SwTOXSelectTabPage::ApplyTOXDescription()
         if(rDesc.GetTitle())
             m_pTitleED->SetText(*rDesc.GetTitle());
         else
-            m_pTitleED->SetText(aEmptyStr);
+            m_pTitleED->SetText(aEmptyOUStr);
         m_pTitleED->SaveValue();
     }
 
@@ -1165,7 +1165,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
             if(m_pFromFileCB->IsChecked())
                 rDesc.SetAutoMarkURL(sAutoMarkURL);
             else
-                rDesc.SetAutoMarkURL(aEmptyStr);
+                rDesc.SetAutoMarkURL(aEmptyOUStr);
         }
         break;
         case TOX_ILLUSTRATIONS:
@@ -1193,7 +1193,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
             if(m_pBracketLB->GetSelectEntryPos())
                 rDesc.SetAuthBrackets(m_pBracketLB->GetSelectEntry());
             else
-                rDesc.SetAuthBrackets(aEmptyStr);
+                rDesc.SetAuthBrackets(aEmptyOUStr);
             rDesc.SetAuthSequence(m_pSequenceCB->IsChecked());
         }
         break;
@@ -1983,7 +1983,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
         {
             SwWrtShell& rSh = pTOXDlg->GetWrtShell();
             const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
-                                    rSh.GetFldType(RES_AUTHORITY, aEmptyStr);
+                                    rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr);
             if(pFType)
             {
                 if(pFType->IsSortByDocument())
@@ -2546,7 +2546,7 @@ void SwTOXEntryTabPage::SetWrtShell(SwWrtShell& rSh)
         }
     }
     m_pMainEntryStyleLB->SelectEntry( SwStyleNameMapper::GetUIName(
-                                RES_POOLCHR_IDX_MAIN_ENTRY, aEmptyStr ));
+                                RES_POOLCHR_IDX_MAIN_ENTRY, aEmptyOUStr ));
 }
 
 OUString SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const
@@ -2676,7 +2676,7 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL)
                 {
                     bLastWasText = true;
                     SwFormToken aTemp(TOKEN_TEXT);
-                    Control* pCtrl = InsertItem(aEmptyStr, aTemp);
+                    Control* pCtrl = InsertItem(aEmptyOUStr, aTemp);
                     if(!pSetActiveControl)
                         pSetActiveControl = pCtrl;
                 }
@@ -2706,7 +2706,7 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL)
         {
             bLastWasText = true;
             SwFormToken aTemp(TOKEN_TEXT);
-            Control* pCtrl = InsertItem(aEmptyStr, aTemp);
+            Control* pCtrl = InsertItem(aEmptyOUStr, aTemp);
             if(!pSetActiveControl)
                 pSetActiveControl = pCtrl;
         }
@@ -3598,7 +3598,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl)
         m_pLevelLB->RemoveEntry(nPos);
         m_pLevelLB->InsertEntry(aStr, nPos);
         m_pLevelLB->SelectEntry(aStr);
-        m_pCurrentForm->SetTemplate(nPos, aEmptyStr);
+        m_pCurrentForm->SetTemplate(nPos, aEmptyOUStr);
         Modify();
     }
     return 0;
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index ee266a549b33..e3d9c951ea04 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -345,7 +345,7 @@ void    SwIndexMarkPane::UpdateLanguageDependenciesForPhoneticReading()
 OUString SwIndexMarkPane::GetDefaultPhoneticReading( const OUString& rText )
 {
     if( !bIsPhoneticReadingEnabled )
-        return aEmptyStr;
+        return aEmptyOUStr;
 
     return xExtendedIndexEntrySupplier->getPhoneticCandidate(rText, LanguageTag::convertToLocale( nLangForPhoneticReading ));
 }
@@ -716,7 +716,7 @@ IMPL_LINK( SwIndexMarkPane, ModifyHdl, ListBox *, pBox )
         bool bHasText = (!m_pEntryED->GetText().isEmpty());
         if(!bHasText)
         {
-            m_pPhoneticED0->SetText(aEmptyStr);
+            m_pPhoneticED0->SetText(aEmptyOUStr);
             bPhoneticED0_ChangedByUser = sal_False;
         }
         else if(!bPhoneticED0_ChangedByUser)
@@ -917,9 +917,9 @@ IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox )
         sal_Bool bEnable = !pBox->GetText().isEmpty();
         if(!bEnable)
         {
-            m_pKey2DCB->SetText(aEmptyStr);
-            m_pPhoneticED1->SetText(aEmptyStr);
-            m_pPhoneticED2->SetText(aEmptyStr);
+            m_pKey2DCB->SetText(aEmptyOUStr);
+            m_pPhoneticED1->SetText(aEmptyOUStr);
+            m_pPhoneticED2->SetText(aEmptyOUStr);
             bPhoneticED1_ChangedByUser = sal_False;
             bPhoneticED2_ChangedByUser = sal_False;
         }
@@ -940,7 +940,7 @@ IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox )
     {
         if(pBox->GetText().isEmpty())
         {
-            m_pPhoneticED2->SetText(aEmptyStr);
+            m_pPhoneticED2->SetText(aEmptyOUStr);
             bPhoneticED2_ChangedByUser = sal_False;
         }
         else
@@ -1211,7 +1211,7 @@ IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox*, pBox)
         if(!sEntry.isEmpty())
         {
             const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
-                                        pSh->GetFldType(RES_AUTHORITY, aEmptyStr);
+                                        pSh->GetFldType(RES_AUTHORITY, aEmptyOUStr);
             const SwAuthEntry*  pEntry = pFType ? pFType->GetEntryByIdentifier(sEntry) : 0;
             for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++)
                 m_sFields[i] = pEntry ?
@@ -1221,7 +1221,7 @@ IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox*, pBox)
     if (pBox->GetSelectEntry().isEmpty())
     {
         for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++)
-            m_sFields[i] = aEmptyStr;
+            m_sFields[i] = aEmptyOUStr;
     }
     m_pAuthorFI->SetText(m_sFields[AUTH_FIELD_AUTHOR]);
     m_pTitleFI->SetText(m_sFields[AUTH_FIELD_TITLE]);
@@ -1238,7 +1238,7 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl)
         OSL_ENSURE(!m_sFields[AUTH_FIELD_AUTHORITY_TYPE].isEmpty() , "No authority type is set!");
         //check if the entry already exists with different content
         const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
-                                        pSh->GetFldType(RES_AUTHORITY, aEmptyStr);
+                                        pSh->GetFldType(RES_AUTHORITY, aEmptyOUStr);
         const SwAuthEntry*  pEntry = pFType ?
                 pFType->GetEntryByIdentifier( m_sFields[AUTH_FIELD_IDENTIFIER])
                 : 0;
@@ -1270,12 +1270,12 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl)
                     aNewData.SetAuthorField((ToxAuthorityField)i, m_sFields[i]);
                 pSh->ChangeAuthorityData(&aNewData);
             }
-            SwInsertFld_Data aData(TYP_AUTHORITY, 0, sFields, aEmptyStr, 0 );
+            SwInsertFld_Data aData(TYP_AUTHORITY, 0, sFields, aEmptyOUStr, 0 );
             aMgr.InsertFld( aData );
         }
         else if(aMgr.GetCurFld())
         {
-            aMgr.UpdateCurFld(0, sFields, aEmptyStr);
+            aMgr.UpdateCurFld(0, sFields, aEmptyOUStr);
         }
     }
     if(!bNewEntry)
@@ -1374,7 +1374,7 @@ IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, RadioButton*, pButton)
     else
     {
         const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
-                                    pSh->GetFldType(RES_AUTHORITY, aEmptyStr);
+                                    pSh->GetFldType(RES_AUTHORITY, aEmptyOUStr);
         if(pFType)
         {
             std::vector<OUString> aIds;
@@ -1415,7 +1415,7 @@ IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, Edit*, pEdit)
         else if(bIsFromComponent)
         {
             const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
-                                        pSh->GetFldType(RES_AUTHORITY, aEmptyStr);
+                                        pSh->GetFldType(RES_AUTHORITY, aEmptyOUStr);
             bAllowed = !pFType || !pFType->GetEntryByIdentifier(sEntry);
         }
         else
@@ -1521,7 +1521,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
 
 
             const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
-                                        rSh.GetFldType(RES_AUTHORITY, aEmptyStr);
+                                        rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr);
             if(pFType)
             {
                 std::vector<OUString> aIds;
@@ -1610,7 +1610,7 @@ OUString  SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) cons
 IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, ComboBox*, pBox)
 {
     const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
-                                rWrtSh.GetFldType(RES_AUTHORITY, aEmptyStr);
+                                rWrtSh.GetFldType(RES_AUTHORITY, aEmptyOUStr);
     if(pFType)
     {
         const SwAuthEntry* pEntry = pFType->GetEntryByIdentifier(
diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx
index 9343a954142d..f0223022dcac 100644
--- a/sw/source/ui/index/toxmgr.cxx
+++ b/sw/source/ui/index/toxmgr.cxx
@@ -153,7 +153,7 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc)
             if(rDesc.GetPhoneticReadingOfPrimKey())
                 pCurTOXMark->SetPrimaryKeyReading( *rDesc.GetPhoneticReadingOfPrimKey() );
             else
-                pCurTOXMark->SetPrimaryKeyReading( aEmptyStr );
+                pCurTOXMark->SetPrimaryKeyReading( aEmptyOUStr );
 
             if( rDesc.GetSecKey() && !rDesc.GetSecKey()->isEmpty() )
             {
@@ -161,25 +161,25 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc)
                 if(rDesc.GetPhoneticReadingOfSecKey())
                     pCurTOXMark->SetSecondaryKeyReading( *rDesc.GetPhoneticReadingOfSecKey() );
                 else
-                    pCurTOXMark->SetSecondaryKeyReading( aEmptyStr );
+                    pCurTOXMark->SetSecondaryKeyReading( aEmptyOUStr );
             }
             else
             {
-                pCurTOXMark->SetSecondaryKey( aEmptyStr );
-                pCurTOXMark->SetSecondaryKeyReading( aEmptyStr );
+                pCurTOXMark->SetSecondaryKey( aEmptyOUStr );
+                pCurTOXMark->SetSecondaryKeyReading( aEmptyOUStr );
             }
         }
         else
         {
-            pCurTOXMark->SetPrimaryKey( aEmptyStr );
-            pCurTOXMark->SetPrimaryKeyReading( aEmptyStr );
-            pCurTOXMark->SetSecondaryKey( aEmptyStr );
-            pCurTOXMark->SetSecondaryKeyReading( aEmptyStr );
+            pCurTOXMark->SetPrimaryKey( aEmptyOUStr );
+            pCurTOXMark->SetPrimaryKeyReading( aEmptyOUStr );
+            pCurTOXMark->SetSecondaryKey( aEmptyOUStr );
+            pCurTOXMark->SetSecondaryKeyReading( aEmptyOUStr );
         }
         if(rDesc.GetPhoneticReadingOfAltStr())
             pCurTOXMark->SetTextReading( *rDesc.GetPhoneticReadingOfAltStr() );
         else
-            pCurTOXMark->SetTextReading( aEmptyStr );
+            pCurTOXMark->SetTextReading( aEmptyOUStr );
         pCurTOXMark->SetMainEntry(rDesc.IsMainEntry());
     }
     else
@@ -358,7 +358,7 @@ sal_Bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
             if(TOX_AUTHORITIES == eCurTOXType)
             {
                 SwAuthorityFieldType* pFType = (SwAuthorityFieldType*)
-                                                pSh->GetFldType(RES_AUTHORITY, aEmptyStr);
+                                                pSh->GetFldType(RES_AUTHORITY, aEmptyOUStr);
                 if (!pFType)
                 {
                     SwAuthorityFieldType const type(pSh->GetDoc());