converting remaining usage of String in SW to OUString

Change-Id: Iaaa3812412dc880eb9d08144219ebe428007884e

7 files changed, 27 insertions, 27 deletions

diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx
index bc72468d4434..76a37ca4cb97 100644
--- a/sw/source/ui/app/appenv.cxx
+++ b/sw/source/ui/app/appenv.cxx
@@ -112,7 +112,7 @@ OUString InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const OUString& r
                     if (nCnt >= 3)
                     {
                         ::ReplacePoint(sDBName, true);
-                        SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyStr, 0, &rSh );
+                        SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyOUStr, 0, &rSh );
                         rFldMgr.InsertFld( aData );
                         sRet = sDBName;
                         bField = true;
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index 6423a7940023..3980e43c540d 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -144,7 +144,7 @@ static const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rIte
     if( (!rItem.bSynchron || !(nCol|nRow)) && !(sDBName = InsertLabEnvText( rSh, rFldMgr, rItem.aWriting )).isEmpty() && !bLast )
     {
         sDBName = comphelper::string::setToken(sDBName, 3, DB_DELIM, "True");
-        SwInsertFld_Data aData(TYP_DBNEXTSETFLD, 0, sDBName, aEmptyStr, 0, &rSh );
+        SwInsertFld_Data aData(TYP_DBNEXTSETFLD, 0, sDBName, aEmptyOUStr, 0, &rSh );
         rFldMgr.InsertFld( aData );
     }
 
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 617e2e9ad779..cec89922bc82 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -297,7 +297,7 @@ sal_Bool SwDocShell::Save()
         case SFX_CREATE_MODE_ORGANIZER:
             {
                 WriterRef xWrt;
-                ::GetXMLWriter( aEmptyStr, GetMedium()->GetBaseURL( true ), xWrt );
+                ::GetXMLWriter( aEmptyOUStr, GetMedium()->GetBaseURL( true ), xWrt );
                 xWrt->SetOrganizerMode( sal_True );
                 SwWriter aWrt( *GetMedium(), *pDoc );
                 nErr = aWrt.Write( xWrt );
@@ -326,7 +326,7 @@ sal_Bool SwDocShell::Save()
                     pWrtShell->EndAllTblBoxEdit();
 
                 WriterRef xWrt;
-                ::GetXMLWriter( aEmptyStr, GetMedium()->GetBaseURL( true ), xWrt );
+                ::GetXMLWriter( aEmptyOUStr, GetMedium()->GetBaseURL( true ), xWrt );
 
                 sal_Bool bLockedView(sal_False);
                 if ( pWrtShell )
@@ -449,7 +449,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
                             SFX_CREATE_MODE_EMBEDDED == GetCreateMode() );
 
         WriterRef xWrt;
-        ::GetXMLWriter( aEmptyStr, rMedium.GetBaseURL( true ), xWrt );
+        ::GetXMLWriter( aEmptyOUStr, rMedium.GetBaseURL( true ), xWrt );
 
         sal_Bool bLockedView(sal_False);
         if ( pWrtShell )
@@ -881,7 +881,7 @@ sal_uInt16 SwDocShell::GetHiddenInformationState( sal_uInt16 nStates )
         OSL_ENSURE( GetWrtShell(), "No SwWrtShell, no information" );
         if ( GetWrtShell() )
         {
-            SwFieldType* pType = GetWrtShell()->GetFldType( RES_POSTITFLD, aEmptyStr );
+            SwFieldType* pType = GetWrtShell()->GetFldType( RES_POSTITFLD, aEmptyOUStr );
             SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
             SwFmtFld* pFirst = aIter.First();
             while( pFirst )
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 25140295dbeb..a04194a6a72b 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -641,7 +641,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         aTempFile.EnableKillingFile();
                         pSrcView->SaveContent(aTempFile.GetURL());
                         bDone = sal_True;
-                        SvxMacro aMac(aEmptyStr, aEmptyStr, STARBASIC);
+                        SvxMacro aMac(aEmptyOUStr, aEmptyOUStr, STARBASIC);
                         SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_OPENDOC ), aMac, this);
                         SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_PREPARECLOSEDOC ), aMac, this);
                         SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_ACTIVATEDOC ),     aMac, this);
@@ -698,7 +698,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                 {
                     WriterRef xWrt;
                     // mba: looks as if relative URLs don't make sense here
-                    ::GetRTFWriter( aEmptyStr, OUString(), xWrt );
+                    ::GetRTFWriter( aEmptyOUStr, OUString(), xWrt );
                     SvMemoryStream *pStrm = new SvMemoryStream();
                     pStrm->SetBufferSize( 16348 );
                     SwWriter aWrt( *pStrm, *pSmryDoc );
@@ -1054,7 +1054,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         if( bDone )
                         {
                             SfxStringItem aName( SID_FILE_NAME, aFileName );
-                            SfxStringItem aReferer( SID_REFERER, aEmptyStr );
+                            SfxStringItem aReferer( SID_REFERER, aEmptyOUStr );
                             SfxViewShell* pViewShell = SfxViewShell::GetFirst();
                             while(pViewShell)
                             {
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index fa6cba6a62b3..ce96cc86a2df 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -183,7 +183,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
                 }
 
                 pFontItem = new SvxFontItem(aFont.GetFamily(), aFont.GetName(),
-                                            aEmptyStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich);
+                                            aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich);
             }
             else
             {
@@ -200,7 +200,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
                     eLanguage,
                     DEFAULTFONT_FLAGS_ONLYONE );
                 pFontItem = new SvxFontItem(aLangDefFont.GetFamily(), aLangDefFont.GetName(),
-                                    aEmptyStr, aLangDefFont.GetPitch(), aLangDefFont.GetCharSet(), nFontWhich);
+                                    aEmptyOUStr, aLangDefFont.GetPitch(), aLangDefFont.GetCharSet(), nFontWhich);
             }
             pDoc->SetDefault(*pFontItem);
             if( !bHTMLTemplSet )
@@ -268,7 +268,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
                                                     nFontWhich, sal_False ) )
                 {
                     pColl->SetFmtAttr(SvxFontItem(aFont.GetFamily(), aFont.GetName(),
-                                                  aEmptyStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
+                                                  aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
                 }
             }
             sal_Int32 nFontHeight = pStdFont->GetFontHeight( static_cast< sal_Int8 >(aFontIdPoolId[nIdx]), 0, eLanguage );
@@ -495,7 +495,7 @@ sal_Bool  SwDocShell::Load( SfxMedium& rMedium )
                     if( ReadXML )
                     {
                         ReadXML->SetOrganizerMode( sal_True );
-                        SwReader aRdr( rMedium, aEmptyStr, pDoc );
+                        SwReader aRdr( rMedium, aEmptyOUStr, pDoc );
                         nErr = aRdr.Read( *ReadXML );
                         ReadXML->SetOrganizerMode( sal_False );
                     }
@@ -520,7 +520,7 @@ sal_Bool  SwDocShell::Load( SfxMedium& rMedium )
                     {
                         // set Doc's DocInfo at DocShell-Medium
                         SAL_INFO( "sw.ui", "before ReadDocInfo" );
-                        SwReader aRdr( rMedium, aEmptyStr, pDoc );
+                        SwReader aRdr( rMedium, aEmptyOUStr, pDoc );
                         SAL_INFO( "sw.ui", "before Read" );
                         nErr = aRdr.Read( *pReader );
                         SAL_INFO( "sw.ui", "after Read" );
@@ -586,7 +586,7 @@ sal_Bool  SwDocShell::LoadFrom( SfxMedium& rMedium )
                 if( ReadXML )
                 {
                     ReadXML->SetOrganizerMode( sal_True );
-                    SwReader aRdr( rMedium, aEmptyStr, pDoc );
+                    SwReader aRdr( rMedium, aEmptyOUStr, pDoc );
                     nErr = aRdr.Read( *ReadXML );
                     ReadXML->SetOrganizerMode( sal_False );
                 }
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 5d74c1c49919..d24c85aac1c7 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -442,7 +442,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
                 switch(nSlot)
                 {
                     case SID_STYLE_EDIT:
-                        nRet = Edit(aParam, aEmptyStr, nFamily, nMask, sal_False, OString(), pActShell );
+                        nRet = Edit(aParam, aEmptyOUStr, nFamily, nMask, sal_False, OString(), pActShell );
                         break;
                     case SID_STYLE_DELETE:
                         nRet = Delete(aParam, nFamily);
@@ -641,7 +641,7 @@ sal_uInt16 SwDocShell::Edit(
                         respectively "".*/
                     if( pColl->IsAssignedToListLevelOfOutlineStyle())
                     {
-                        SwNumRuleItem aItem(aEmptyStr);
+                        SwNumRuleItem aItem(aEmptyOUStr);
                         pDStyle->GetCollection()->SetFmtAttr( aItem );
                         pDStyle->GetCollection()->SetAttrOutlineLevel( 0 );
                     }
@@ -1249,7 +1249,7 @@ void SwDocShell::FormatPage(
     const OString& rPageId,
     SwWrtShell& rActShell )
 {
-    Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, rPageId, &rActShell);
+    Edit( rPage, aEmptyOUStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, rPageId, &rActShell);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index f2c31ec6f975..4759a0ed7bcc 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -138,7 +138,7 @@ static SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc,
             if( p && !p->IsDefault() )
                 pStyle->PresetParent( p->GetName() );
             else
-                pStyle->PresetParent( aEmptyStr );
+                pStyle->PresetParent( aEmptyOUStr );
         }
         else
             pStyle->SetPhysical(sal_False);
@@ -174,7 +174,7 @@ static SwTxtFmtColl* lcl_FindParaFmt(  SwDoc& rDoc,
             if( pColl->DerivedFrom() && !pColl->DerivedFrom()->IsDefault() )
                 pStyle->PresetParent( pColl->DerivedFrom()->GetName() );
             else
-                pStyle->PresetParent( aEmptyStr );
+                pStyle->PresetParent( aEmptyOUStr );
 
             SwTxtFmtColl& rNext = pColl->GetNextTxtFmtColl();
             pStyle->PresetFollow(rNext.GetName());
@@ -246,7 +246,7 @@ static const SwPageDesc* lcl_FindPageDesc( SwDoc&  rDoc,
             if(pDesc->GetFollow())
                 pStyle->PresetFollow(pDesc->GetFollow()->GetName());
             else
-                pStyle->PresetParent( aEmptyStr );
+                pStyle->PresetParent( aEmptyOUStr );
         }
         else
             pStyle->SetPhysical(sal_False);
@@ -277,7 +277,7 @@ static const SwNumRule* lcl_FindNumRule(   SwDoc&  rDoc,
         if(pRule)
         {
             pStyle->SetPhysical(sal_True);
-            pStyle->PresetParent( aEmptyStr );
+            pStyle->PresetParent( aEmptyOUStr );
         }
         else
             pStyle->SetPhysical(sal_False);
@@ -2036,7 +2036,7 @@ void  SwDocStyleSheet::SetHelpId( const OUString& r, sal_uLong nId )
 // methods for DocStyleSheetPool
 SwDocStyleSheetPool::SwDocStyleSheetPool( SwDoc& rDocument, sal_Bool bOrg )
 : SfxStyleSheetBasePool( rDocument.GetAttrPool() )
-, mxStyleSheet( new SwDocStyleSheet( rDocument, aEmptyStr, this, SFX_STYLE_FAMILY_CHAR, 0 ) )
+, mxStyleSheet( new SwDocStyleSheet( rDocument, aEmptyOUStr, this, SFX_STYLE_FAMILY_CHAR, 0 ) )
 , rDoc( rDocument )
 {
     bOrganizer = bOrg;
@@ -2061,8 +2061,8 @@ SfxStyleSheetBase&   SwDocStyleSheetPool::Make( const OUString&   rName,
                                                 sal_uInt16          _nMask)
 {
     mxStyleSheet->PresetName(rName);
-    mxStyleSheet->PresetParent(aEmptyStr);
-    mxStyleSheet->PresetFollow(aEmptyStr);
+    mxStyleSheet->PresetParent(aEmptyOUStr);
+    mxStyleSheet->PresetFollow(aEmptyOUStr);
     mxStyleSheet->SetMask(_nMask) ;
     mxStyleSheet->SetFamily(eFam);
     mxStyleSheet->SetPhysical(sal_True);
@@ -2389,8 +2389,8 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const OUString& rName,
 SwStyleSheetIterator::SwStyleSheetIterator( SwDocStyleSheetPool* pBase,
                                 SfxStyleFamily eFam, sal_uInt16 n )
     : SfxStyleSheetIterator( pBase, eFam, n ),
-    mxIterSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyStr, pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ),
-    mxStyleSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyStr, pBase, SFX_STYLE_FAMILY_CHAR, 0 ) )
+    mxIterSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyOUStr, pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ),
+    mxStyleSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyOUStr, pBase, SFX_STYLE_FAMILY_CHAR, 0 ) )
 {
     bFirstCalled = sal_False;
     nLastPos = 0;