converting remaining usage of String in SW to OUString

Change-Id: Iaaa3812412dc880eb9d08144219ebe428007884e
author: Noel Grandin <noel@peralex.com> 2013-10-16 11:18:56 +0200
committer: Noel Grandin <noel@peralex.com> 2013-10-18 09:59:25 +0200
commit: 8051bb7e18ccae0f639e65dfa86bcc18a5fb9108 (patch)
tree: bc2d6c98c3161c4530a6e97bf0b3aa65b6284185 /sw
parent: b4d116ef8f0b405fd9b12967766b138c21605489 (diff)
160 files changed, 559 insertions, 566 deletions
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 69384cc875ff..b6b5543d21eb 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -135,7 +135,7 @@ public:
     TYPEINFO();
 
     SwNumRuleItem()
-        : SfxStringItem( RES_PARATR_NUMRULE, aEmptyStr ) {}
+        : SfxStringItem( RES_PARATR_NUMRULE, aEmptyOUStr ) {}
 
     SwNumRuleItem( const OUString& rRuleName )
         : SfxStringItem( RES_PARATR_NUMRULE, rRuleName ) {}
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 786769a5947e..1426b0260768 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -45,7 +45,6 @@ namespace utl{
 
 class Size;
 class ResMgr;
-class String;
 class SwPathFinder;
 class Graphic;
 class OutputDevice;
@@ -81,8 +80,7 @@ const SwTwips lMinBorder = 1134;
 #define GAPBETWEENPAGES 284L
 
 // Constant strings.
-SW_DLLPUBLIC extern String aEmptyStr;    // ""
-SW_DLLPUBLIC extern OUString aEmptyOUStr;  // remove once aEmptyStr can be changed to OUString
+SW_DLLPUBLIC extern OUString aEmptyOUStr;  // remove once aEmptyOUStr can be changed to OUString
 SW_DLLPUBLIC extern OUString aDotStr;      // '.'
 
 // For inserting of captions (what and where to insert).
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 0cbad1413391..c1a7d5f9640d 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -124,7 +124,7 @@ void SwDocTest::testFileNameFields()
     aTempFile.EnableKillingFile();
 
     INetURLObject aTempFileURL(aTempFile.GetURL());
-    String sFileURL = aTempFileURL.GetMainURL(INetURLObject::NO_DECODE);
+    OUString sFileURL = aTempFileURL.GetMainURL(INetURLObject::NO_DECODE);
     SfxMedium aDstMed(sFileURL, STREAM_STD_READWRITE);
 
     SfxFilter aFilter(
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 0c3fb28989f2..4bce88845fac 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -241,8 +241,8 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
             if( pSrcDoc != pDstDoc &&
                 SFX_ITEM_SET == GetItemState( RES_PARATR_NUMRULE, sal_False, &pItem ) )
             {
-                const String& rNm = ((SwNumRuleItem*)pItem)->GetValue();
-                if( rNm.Len() )
+                const OUString& rNm = ((SwNumRuleItem*)pItem)->GetValue();
+                if( !rNm.isEmpty() )
                 {
                     SwNumRule* pDestRule = pDstDoc->FindNumRulePtr( rNm );
                     if( pDestRule )
@@ -265,7 +265,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
                 {
                     const SwList* pList = pSrcDoc->getListByName( sListId );
                     // copy list style, if needed
-                    const String sDefaultListStyleName =
+                    const OUString sDefaultListStyleName =
                                             pList->GetDefaultListStyleName();
                     // #i92811#
                     const SwNumRule* pDstDocNumRule =
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index b7ccf6fc8d00..399d9c103e87 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -229,7 +229,7 @@ static double lcl_ConvertToDateValue( SwDoc& rDoc, sal_Int32 nDate )
 }
 
 SwCalc::SwCalc( SwDoc& rD )
-    : aErrExpr( aEmptyStr, SwSbxValue(), 0 )
+    : aErrExpr( aEmptyOUStr, SwSbxValue(), 0 )
     , nCommandPos(0)
     , rDoc( rD )
     , pLclData( m_aSysLocale.GetLocaleDataPtr() )
@@ -326,7 +326,7 @@ SwCalc::SwCalc( SwDoc& rD )
     const SwDocStat& rDocStat = rDoc.GetDocStat();
 
     SwSbxValue nVal;
-    String sTmpStr;
+    OUString sTmpStr;
     sal_uInt16 n;
 
     for( n = 0; n < 25; ++n )
@@ -347,15 +347,15 @@ SwCalc::SwCalc( SwDoc& rD )
 
     SvtUserOptions& rUserOptions = SW_MOD()->GetUserOptions();
 
-    ((SwCalcExp*)VarTable[ aHashValue[ 11 ] ])->nValue.PutString( (String)rUserOptions.GetFirstName() );
-    ((SwCalcExp*)VarTable[ aHashValue[ 12 ] ])->nValue.PutString( (String)rUserOptions.GetLastName() );
-    ((SwCalcExp*)VarTable[ aHashValue[ 13 ] ])->nValue.PutString( (String)rUserOptions.GetID() );
+    ((SwCalcExp*)VarTable[ aHashValue[ 11 ] ])->nValue.PutString( rUserOptions.GetFirstName() );
+    ((SwCalcExp*)VarTable[ aHashValue[ 12 ] ])->nValue.PutString( rUserOptions.GetLastName() );
+    ((SwCalcExp*)VarTable[ aHashValue[ 13 ] ])->nValue.PutString( rUserOptions.GetID() );
 
     for( n = 0; n < 11; ++n )
         ((SwCalcExp*)VarTable[ aHashValue[ n + 14 ] ])->nValue.PutString(
-                                        (String)rUserOptions.GetToken( aAdrToken[ n ] ));
+                                        rUserOptions.GetToken( aAdrToken[ n ] ));
 
-    nVal.PutString( (String)rUserOptions.GetToken( aAdrToken[ 11 ] ));
+    nVal.PutString( rUserOptions.GetToken( aAdrToken[ 11 ] ));
     sTmpStr = OUString::createFromAscii(sNTypeTab[25]);
     VarTable[ aHashValue[ 25 ] ]->pNext = new SwCalcExp( sTmpStr, nVal, 0 );
 
@@ -512,17 +512,17 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, sal_uInt16 ins )
     }
 
     // At this point the "real" case variable has to be used
-    String sTmpName( rStr );
+    OUString sTmpName( rStr );
     ::ReplacePoint( sTmpName );
 
     if( !ins )
     {
         SwNewDBMgr *pMgr = rDoc.GetNewDBMgr();
 
-        String sDBName(GetDBName( sTmpName ));
-        String sSourceName(sDBName.GetToken(0, DB_DELIM));
-        String sTableName(sDBName.GetToken(0).GetToken(1, DB_DELIM));
-        if( pMgr && sSourceName.Len() && sTableName.Len() &&
+        OUString sDBName(GetDBName( sTmpName ));
+        OUString sSourceName(sDBName.getToken(0, DB_DELIM));
+        OUString sTableName(sDBName.getToken(0, ';').getToken(1, DB_DELIM));
+        if( pMgr && !sSourceName.isEmpty() && !sTableName.isEmpty() &&
             pMgr->OpenDataSource(sSourceName, sTableName, -1, false))
         {
             OUString sColumnName( GetColumnName( sTmpName ));
@@ -580,10 +580,10 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, sal_uInt16 ins )
                             SwFieldType::GetTypeStr( TYP_DBSETNUMBERFLD ) ))
     {
         SwNewDBMgr *pMgr = rDoc.GetNewDBMgr();
-        String sDBName(GetDBName( sTmpName ));
-        String sSourceName(sDBName.GetToken(0, DB_DELIM));
-        String sTableName(sDBName.GetToken(0).GetToken(1, DB_DELIM));
-        if( pMgr && sSourceName.Len() && sTableName.Len() &&
+        OUString sDBName(GetDBName( sTmpName ));
+        OUString sSourceName(sDBName.getToken(0, DB_DELIM));
+        OUString sTableName(sDBName.getToken(0, ';').getToken(1, DB_DELIM));
+        if( pMgr && !sSourceName.isEmpty() && !sTableName.isEmpty() &&
             pMgr->OpenDataSource(sSourceName, sTableName, -1, false) &&
             !pMgr->IsInMerge())
         {
@@ -656,8 +656,8 @@ SwCalcOper SwCalc::GetToken()
     {
         // Parse any token.
         ParseResult aRes = pCharClass->parseAnyToken( sCommand, nCommandPos,
-                                                      coStartFlags, aEmptyStr,
-                                                      coContFlags, aEmptyStr );
+                                                      coStartFlags, aEmptyOUStr,
+                                                      coContFlags, aEmptyOUStr );
 
         bool bSetError = true;
         sal_Int32 nRealStt = nCommandPos + aRes.LeadingWhiteSpace;
@@ -669,12 +669,12 @@ SwCalcOper SwCalc::GetToken()
         }
         else if( aRes.TokenType & KParseType::IDENTNAME )
         {
-            String aName( sCommand.copy( nRealStt,
+            OUString aName( sCommand.copy( nRealStt,
                             aRes.EndPos - nRealStt ) );
             //#101436#: The variable may contain a database name. It must not be
             // converted to lower case! Instead all further comparisons must be
             // done case-insensitive
-            String sLowerCaseName = pCharClass->lowercase( aName );
+            OUString sLowerCaseName = pCharClass->lowercase( aName );
             // catch currency symbol
             if( sLowerCaseName == sCurrSym )
             {
@@ -713,18 +713,18 @@ SwCalcOper SwCalc::GetToken()
         }
         else if ( aRes.TokenType & KParseType::DOUBLE_QUOTE_STRING )
         {
-            nNumberValue.PutString( String( aRes.DequotedNameOrString ));
+            nNumberValue.PutString( aRes.DequotedNameOrString );
             eCurrOper = CALC_NUMBER;
             bSetError = false;
         }
         else if( aRes.TokenType & KParseType::ONE_SINGLE_CHAR )
         {
-            String aName( sCommand.copy( nRealStt,
+            OUString aName( sCommand.copy( nRealStt,
                               aRes.EndPos - nRealStt ));
-            if( 1 == aName.Len() )
+            if( 1 == aName.getLength() )
             {
                 bSetError = false;
-                sal_Unicode ch = aName.GetChar( 0 );
+                sal_Unicode ch = aName[0];
                 switch( ch )
                 {
                 case ';':
@@ -819,11 +819,11 @@ SwCalcOper SwCalc::GetToken()
         }
         else if( aRes.TokenType & KParseType::BOOLEAN )
         {
-            String aName( sCommand.copy( nRealStt,
+            OUString aName( sCommand.copy( nRealStt,
                                          aRes.EndPos - nRealStt ));
-            if( aName.Len() )
+            if( !aName.isEmpty() )
             {
-                sal_Unicode ch = aName.GetChar(0);
+                sal_Unicode ch = aName[0];
 
                 bSetError = true;
                 if ('<' == ch || '>' == ch)
@@ -833,9 +833,9 @@ SwCalcOper SwCalc::GetToken()
                     SwCalcOper eTmp2 = ('<' == ch) ? CALC_LEQ : CALC_GEQ;
                     eCurrOper = ('<' == ch) ? CALC_LES : CALC_GRE;
 
-                    if( 2 == aName.Len() && '=' == aName.GetChar(1) )
+                    if( 2 == aName.getLength() && '=' == aName[1] )
                         eCurrOper = eTmp2;
-                    else if( 1 != aName.Len() )
+                    else if( 1 != aName.getLength() )
                         bSetError = true;
                 }
             }
@@ -970,7 +970,7 @@ SwCalcOper SwCalc::GetToken()
 
         case '[':
             {
-                String aStr;
+                OUString aStr;
                 bool bIgnore = false;
                 do {
                     while( 0 != ( ch = NextCh( sCommand, nCommandPos  )) &&
@@ -986,7 +986,7 @@ SwCalcOper SwCalc::GetToken()
                     if( !bIgnore )
                         break;
 
-                    aStr.SetChar( aStr.Len() - 1, ch );
+                    aStr.SetChar( aStr.getLength() - 1, ch );
                 } while( ch );
 
                 aVarName = aStr;
@@ -1026,7 +1026,7 @@ SwCalcOper SwCalc::GetToken()
                 if( ch )
                     --nCommandPos;
 
-                String aStr( sCommand.copy( nStt, nCommandPos-nStt ));
+                OUString aStr( sCommand.copy( nStt, nCommandPos-nStt ));
                 aStr = pCharClass->lowercase( aStr );
 
                 // catch currency symbol
@@ -1482,8 +1482,8 @@ OUString SwCalc::GetDBName(const OUString& rName)
             return rName.copy( 0, nPos );
     }
     SwDBData aData = rDoc.GetDBData();
-    String sRet = aData.sDataSource;
-    sRet += DB_DELIM;
+    OUString sRet = aData.sDataSource;
+    sRet += OUString(DB_DELIM);
     sRet += aData.sCommand;
     return sRet;
 }
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 8f99c80c0ff3..c0498d497ca6 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -504,10 +504,10 @@ void _InitCore()
 
     aAttrTab[ RES_TXTATR_AUTOFMT- POOLATTR_BEGIN ] =        new SwFmtAutoFmt;
     aAttrTab[ RES_TXTATR_INETFMT - POOLATTR_BEGIN ] =       new SwFmtINetFmt( OUString(), OUString() );
-    aAttrTab[ RES_TXTATR_REFMARK - POOLATTR_BEGIN ] =       new SwFmtRefMark( aEmptyStr );
+    aAttrTab[ RES_TXTATR_REFMARK - POOLATTR_BEGIN ] =       new SwFmtRefMark( aEmptyOUStr );
     aAttrTab[ RES_TXTATR_TOXMARK - POOLATTR_BEGIN ] =       new SwTOXMark;
     aAttrTab[ RES_TXTATR_CHARFMT- POOLATTR_BEGIN ] =        new SwFmtCharFmt( 0 );
-    aAttrTab[ RES_TXTATR_CJK_RUBY - POOLATTR_BEGIN ] =      new SwFmtRuby( aEmptyStr );
+    aAttrTab[ RES_TXTATR_CJK_RUBY - POOLATTR_BEGIN ] =      new SwFmtRuby( aEmptyOUStr );
     aAttrTab[ RES_TXTATR_UNKNOWN_CONTAINER - POOLATTR_BEGIN ] = new SvXMLAttrContainerItem( RES_TXTATR_UNKNOWN_CONTAINER );
     aAttrTab[ RES_TXTATR_META - POOLATTR_BEGIN ] =      SwFmtMeta::CreatePoolDefault(RES_TXTATR_META);
     aAttrTab[ RES_TXTATR_METAFIELD - POOLATTR_BEGIN ] = SwFmtMeta::CreatePoolDefault(RES_TXTATR_METAFIELD);
@@ -536,7 +536,7 @@ void _InitCore()
 
     aAttrTab[ RES_PARATR_DROP- POOLATTR_BEGIN ] =           new SwFmtDrop;
     aAttrTab[ RES_PARATR_REGISTER - POOLATTR_BEGIN ] =      new SwRegisterItem( sal_False );
-    aAttrTab[ RES_PARATR_NUMRULE - POOLATTR_BEGIN ] =       new SwNumRuleItem( aEmptyStr );
+    aAttrTab[ RES_PARATR_NUMRULE - POOLATTR_BEGIN ] =       new SwNumRuleItem( aEmptyOUStr );
 
     aAttrTab[ RES_PARATR_SCRIPTSPACE - POOLATTR_BEGIN ] =   new SvxScriptSpaceItem( sal_True, RES_PARATR_SCRIPTSPACE );
     aAttrTab[ RES_PARATR_HANGINGPUNCTUATION - POOLATTR_BEGIN ] = new SvxHangingPunctuationItem( sal_True, RES_PARATR_HANGINGPUNCTUATION );
@@ -549,7 +549,7 @@ void _InitCore()
     aAttrTab[ RES_PARATR_RSID - POOLATTR_BEGIN ] =          new SvxRsidItem( 0, RES_PARATR_RSID );
     aAttrTab[ RES_PARATR_GRABBAG - POOLATTR_BEGIN ] =       new SfxGrabBagItem( RES_PARATR_GRABBAG );
 
-    aAttrTab[ RES_PARATR_LIST_ID - POOLATTR_BEGIN ] =       new SfxStringItem( RES_PARATR_LIST_ID, aEmptyStr );
+    aAttrTab[ RES_PARATR_LIST_ID - POOLATTR_BEGIN ] =       new SfxStringItem( RES_PARATR_LIST_ID, aEmptyOUStr );
     aAttrTab[ RES_PARATR_LIST_LEVEL - POOLATTR_BEGIN ] =    new SfxInt16Item( RES_PARATR_LIST_LEVEL, 0 );
     aAttrTab[ RES_PARATR_LIST_ISRESTART - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_LIST_ISRESTART, sal_False );
     aAttrTab[ RES_PARATR_LIST_RESTARTVALUE - POOLATTR_BEGIN ] = new SfxInt16Item( RES_PARATR_LIST_RESTARTVALUE, 1 );
@@ -601,8 +601,8 @@ void _InitCore()
             new SwFmtWrapInfluenceOnObjPos( text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
 
     aAttrTab[ RES_AUTO_STYLE - POOLATTR_BEGIN ] =           new SwFmtAutoFmt( RES_AUTO_STYLE );
-    aAttrTab[ RES_FRMATR_STYLE_NAME - POOLATTR_BEGIN ] =    new SfxStringItem( RES_FRMATR_STYLE_NAME, aEmptyStr );
-    aAttrTab[ RES_FRMATR_CONDITIONAL_STYLE_NAME - POOLATTR_BEGIN ] = new SfxStringItem( RES_FRMATR_CONDITIONAL_STYLE_NAME, aEmptyStr );
+    aAttrTab[ RES_FRMATR_STYLE_NAME - POOLATTR_BEGIN ] =    new SfxStringItem( RES_FRMATR_STYLE_NAME, aEmptyOUStr );
+    aAttrTab[ RES_FRMATR_CONDITIONAL_STYLE_NAME - POOLATTR_BEGIN ] = new SfxStringItem( RES_FRMATR_CONDITIONAL_STYLE_NAME, aEmptyOUStr );
     aAttrTab[ RES_FILL_STYLE - POOLATTR_BEGIN ] = new XFillStyleItem(XFILL_SOLID, RES_FILL_STYLE);
     aAttrTab[ RES_FILL_GRADIENT - POOLATTR_BEGIN ] = new XFillGradientItem(RES_FILL_GRADIENT);
     aAttrTab[ RES_FRMATR_GRABBAG - POOLATTR_BEGIN ] = new SfxGrabBagItem(RES_FRMATR_GRABBAG);
@@ -628,7 +628,7 @@ void _InitCore()
     aAttrTab[ RES_GRFATR_DUMMY5 - POOLATTR_BEGIN ] =        new SfxBoolItem( RES_GRFATR_DUMMY5 );
 
     aAttrTab[ RES_BOXATR_FORMAT- POOLATTR_BEGIN ] =         new SwTblBoxNumFormat;
-    aAttrTab[ RES_BOXATR_FORMULA- POOLATTR_BEGIN ] =        new SwTblBoxFormula( aEmptyStr );
+    aAttrTab[ RES_BOXATR_FORMULA- POOLATTR_BEGIN ] =        new SwTblBoxFormula( aEmptyOUStr );
     aAttrTab[ RES_BOXATR_VALUE- POOLATTR_BEGIN ] =          new SwTblBoxValue;
 
     aAttrTab[ RES_UNKNOWNATR_CONTAINER- POOLATTR_BEGIN ] =
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index 9f559d38f483..0e6b2acf2ac4 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -47,8 +47,7 @@
 
 using namespace com::sun::star;
 
-String aEmptyStr;    // constant string
-OUString aEmptyOUStr;  // remove once aEmptyStr can be changed to OUString
+OUString aEmptyOUStr;  // remove once aEmptyOUStr can be changed to OUString
 OUString aDotStr('.'); // constant string
 
 IMPL_FIXEDMEMPOOL_NEWDEL( SwAttrSet )
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 80043920507f..b7823fc925fb 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -177,7 +177,7 @@ void SwAutoCompleteWord_Impl::RemoveDocument(const SwDoc& rDoc)
 
 SwAutoCompleteString::SwAutoCompleteString(
             const OUString& rStr, xub_StrLen const nPos, xub_StrLen const nLen)
-    : editeng::IAutoCompleteString(String(rStr, nPos, nLen))
+    : editeng::IAutoCompleteString(rStr.copy(nPos, nLen))
 {
 #if OSL_DEBUG_LEVEL > 0
     ++nSwAutoCompleteStringCount;
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 0749420a8f8d..fd603b3d0874 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1658,7 +1658,7 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool bUseDocInfo )
     if( pTmp )
     {
         SwRedlineData aRedlnData( nsRedlineType_t::REDLINE_DELETE, nAuthor, aTimeStamp,
-                                    aEmptyStr, 0, 0 );
+                                    aEmptyOUStr, 0, 0 );
         do {
             // #i65201#: Expand again, see comment above.
             if( pTmp->GetPoint()->nContent == 0 )
@@ -1710,7 +1710,7 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool bUseDocInfo )
             }
         } while( pInsRing != ( pTmp = (SwPaM*)pTmp->GetNext() ));
         SwRedlineData aRedlnData( nsRedlineType_t::REDLINE_INSERT, nAuthor, aTimeStamp,
-                                    aEmptyStr, 0, 0 );
+                                    aEmptyOUStr, 0, 0 );
 
         // combine consecutive
         if( pTmp->GetNext() != pInsRing )
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index ea1a3f9aeafb..aa10eef1ebad 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -176,7 +176,7 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
 
                 if( i >= nSize )        // not found
                 {
-                    ((String&)rFldNm) = sSrch;
+                    ((OUString&)rFldNm) = sSrch;
                     break;      // exit while loop
                 }
                 ++nNum;
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index db0b4963e411..76adc1e2d489 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2349,7 +2349,7 @@ bool SwDoc::DontExpandFmt( const SwPosition& rPos, bool bFlag )
 
 SwTableBoxFmt* SwDoc::MakeTableBoxFmt()
 {
-    SwTableBoxFmt* pFmt = new SwTableBoxFmt( GetAttrPool(), aEmptyStr,
+    SwTableBoxFmt* pFmt = new SwTableBoxFmt( GetAttrPool(), aEmptyOUStr,
                                                 mpDfltFrmFmt );
     SetModified();
     return pFmt;
@@ -2357,7 +2357,7 @@ SwTableBoxFmt* SwDoc::MakeTableBoxFmt()
 
 SwTableLineFmt* SwDoc::MakeTableLineFmt()
 {
-    SwTableLineFmt* pFmt = new SwTableLineFmt( GetAttrPool(), aEmptyStr,
+    SwTableLineFmt* pFmt = new SwTableLineFmt( GetAttrPool(), aEmptyOUStr,
                                                 mpDfltFrmFmt );
     SetModified();
     return pFmt;
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 48e90d880e2e..310213dc1668 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -277,7 +277,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                         xDPS->getDocumentProperties());
                     OSL_ENSURE(xDocProps.is(), "Doc has no DocumentProperties");
                     // the GlobalDoc is the template
-                    xDocProps->setTemplateName(aEmptyStr);
+                    xDocProps->setTemplateName(aEmptyOUStr);
                     ::util::DateTime uDT(aTmplDate.GetNanoSec(),
                         aTmplDate.GetSec(), aTmplDate.GetMin(),
                         aTmplDate.GetHour(), aTmplDate.GetDay(),
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index bdc899d6db05..fb5b4178a0ac 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -165,7 +165,7 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
 
     case RND_DRAW_OBJECT:
         {
-            pFmt = MakeDrawFrmFmt( aEmptyStr, GetDfltFrmFmt() );
+            pFmt = MakeDrawFrmFmt( aEmptyOUStr, GetDfltFrmFmt() );
             if( pSet )      // Set a few more attributes
                 pFmt->SetFmtAttr( *pSet );
 
@@ -381,7 +381,7 @@ SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource,
         SwXFrame::GetOrCreateSdrObject(pFormat);
     }
     else
-        pDest = MakeDrawFrmFmt( aEmptyStr, pDest );
+        pDest = MakeDrawFrmFmt( aEmptyOUStr, pDest );
 
     // Copy all other or new attributes
     pDest->CopyAttrs( rSource );
@@ -859,7 +859,7 @@ SwDrawFrmFmt* SwDoc::Insert( const SwPaM &rRg,
                              const SfxItemSet* pFlyAttrSet,
                              SwFrmFmt* pDefFmt )
 {
-    SwDrawFrmFmt *pFmt = MakeDrawFrmFmt( aEmptyStr,
+    SwDrawFrmFmt *pFmt = MakeDrawFrmFmt( aEmptyOUStr,
                                         pDefFmt ? pDefFmt : GetDfltFrmFmt() );
 
     const SwFmtAnchor* pAnchor = 0;
@@ -1395,7 +1395,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
         // Insert field
         if(pType)
         {
-            SwSetExpField aFld( (SwSetExpFieldType*)pType, aEmptyStr, SVX_NUM_ARABIC);
+            SwSetExpField aFld( (SwSetExpFieldType*)pType, aEmptyOUStr, SVX_NUM_ARABIC);
             if( bOrderNumberingFirst )
                 nIdx = 0;
             SwFmtFld aFmt( aFld );
@@ -1687,7 +1687,7 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
         // insert field
         if ( pType )
         {
-            SwSetExpField aFld( (SwSetExpFieldType*)pType, aEmptyStr, SVX_NUM_ARABIC );
+            SwSetExpField aFld( (SwSetExpFieldType*)pType, aEmptyOUStr, SVX_NUM_ARABIC );
             if( bOrderNumberingFirst )
                 nIdx = 0;
             SwFmtFld aFmt( aFld );
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index ad2f7aa0afb8..10b0387769d5 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1322,7 +1322,7 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
 
     SwRegHistory aRegH( pUndo ? pUndo->GetHistory() : 0 );
 
-    SwNumRuleItem aEmptyRule( aEmptyStr );
+    SwNumRuleItem aEmptyRule( aEmptyOUStr );
     const SwNode* pOutlNd = 0;
     for( ; nStt <= nEnd; ++nStt )
     {
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 915c19936da0..040fec2447ce 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -2124,7 +2124,7 @@ bool SwDoc::AcceptRedline( const SwPaM& rPam, bool bCallDelete )
         {
             SwRewriter aRewriter;
             aRewriter.AddRule(UndoArg1, OUString::number(nRet));
-            aTmpStr = aRewriter.Apply(String(SW_RES(STR_N_REDLINES)));
+            aTmpStr = aRewriter.Apply(OUString(SW_RES(STR_N_REDLINES)));
         }
 
         SwRewriter aRewriter;
@@ -2234,7 +2234,7 @@ bool SwDoc::RejectRedline( const SwPaM& rPam, bool bCallDelete )
         {
             SwRewriter aRewriter;
             aRewriter.AddRule(UndoArg1, OUString::number(nRet));
-            aTmpStr = aRewriter.Apply(String(SW_RES(STR_N_REDLINES)));
+            aTmpStr = aRewriter.Apply(OUString(SW_RES(STR_N_REDLINES)));
         }
 
         SwRewriter aRewriter;
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index f1d61109331c..6e5f7cdc676a 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -78,7 +78,7 @@ struct LinkStruct
     xub_StrLen nStartTextPos, nEndTextPos;
 
     LinkStruct( const OUString& rURL, xub_StrLen nStart, xub_StrLen nEnd )
-        : aINetFmt( rURL, aEmptyStr),
+        : aINetFmt( rURL, aEmptyOUStr),
         nStartTextPos( nStart),
         nEndTextPos(nEnd) {}
 };
@@ -706,7 +706,7 @@ static const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl =
 
 SwTOXBaseSection::SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFmt & rFmt)
     : SwTOXBase( rBase )
-    , SwSection( TOX_CONTENT_SECTION, aEmptyStr, rFmt )
+    , SwSection( TOX_CONTENT_SECTION, aEmptyOUStr, rFmt )
 {
     SetProtect( rBase.IsProtected() );
     SetSectionName( GetTOXName() );
@@ -1289,7 +1289,7 @@ void SwTOXBaseSection::UpdateSequence( const SwTxtNode* pOwnChapterNode )
 void SwTOXBaseSection::UpdateAuthorities( const SwTOXInternational& rIntl )
 {
     SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc();
-    SwFieldType* pAuthFld = pDoc->GetFldType(RES_AUTHORITY, aEmptyStr, false);
+    SwFieldType* pAuthFld = pDoc->GetFldType(RES_AUTHORITY, aEmptyOUStr, false);
     if(!pAuthFld)
         return;
 
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 2dc66fede04e..be240163a7fe 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -640,7 +640,7 @@ void SwTxtFmtColl::AssignToListLevelOfOutlineStyle(const int nAssignedListLevel)
         {
             if ( pDerivedTxtFmtColl->GetItemState( RES_PARATR_NUMRULE, sal_False ) == SFX_ITEM_DEFAULT )
             {
-                SwNumRuleItem aItem(aEmptyStr);
+                SwNumRuleItem aItem(aEmptyOUStr);
                 pDerivedTxtFmtColl->SetFmtAttr( aItem );
             }
             if ( pDerivedTxtFmtColl->GetItemState( RES_PARATR_OUTLINELEVEL, sal_False ) == SFX_ITEM_DEFAULT )
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 0f74b0aedd09..2ea85fbf7102 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -95,7 +95,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const OUString &rText,
     {
         pFont = new Font();
         pFont->SetWeight( WEIGHT_BOLD );
-        pFont->SetStyleName( aEmptyStr );
+        pFont->SetStyleName( aEmptyOUStr );
         pFont->SetName(OUString("Arial Unicode"));
         pFont->SetFamily( FAMILY_SWISS );
         pFont->SetTransparent( sal_True );
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 726c884a45fc..718a3ca1c782 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1232,7 +1232,7 @@ namespace numfunc
     {
         delete mpFont;
 
-        mpFont = new Font( msFontname, aEmptyStr, Size( 0, 14 ) );
+        mpFont = new Font( msFontname, aEmptyOUStr, Size( 0, 14 ) );
         mpFont->SetWeight( meFontWeight );
         mpFont->SetItalic( meFontItalic );
         mpFont->SetCharSet( RTL_TEXTENCODING_SYMBOL );
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 54a0bead3e74..fcd92544608b 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -144,7 +144,7 @@ static void lcl_SetDfltFont( sal_uInt16 nFntType, SfxItemSet& rSet )
                                 nLng, DEFAULTFONT_FLAGS_ONLYONE ) );
 
         rSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(),
-                            aEmptyStr, aFnt.GetPitch(),
+                            aEmptyOUStr, aFnt.GetPitch(),
                             aFnt.GetCharSet(), aArr[n].nResFntId ));
     }
 }
@@ -173,7 +173,7 @@ static void lcl_SetDfltFont( sal_uInt16 nLatinFntType, sal_uInt16 nCJKFntType,
                                 nLng, DEFAULTFONT_FLAGS_ONLYONE ) );
 
         rSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(),
-                            aEmptyStr, aFnt.GetPitch(),
+                            aEmptyOUStr, aFnt.GetPitch(),
                             aFnt.GetCharSet(), aArr[n].nResFntId ));
     }
 }
@@ -453,7 +453,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
                                             nLng, DEFAULTFONT_FLAGS_ONLYONE ) );
 
                     aSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(),
-                                            aEmptyStr, aFnt.GetPitch(),
+                                            aEmptyOUStr, aFnt.GetPitch(),
                                             aFnt.GetCharSet(), *(pArr+1) ));
                 }
 
@@ -1947,7 +1947,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
                 aFmt.SetFirstLineIndent( - nOffs );
             }
 
-            aFmt.SetSuffix( aEmptyStr );
+            aFmt.SetSuffix( aEmptyOUStr );
             for( n = 3; n < MAXLEVEL; ++n )
             {
                 aFmt.SetStart( n+1 );
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index 7d02cd14c984..de8a8a5e20e2 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -47,12 +47,12 @@ sal_Bool SwServerObject::GetData( uno::Any & rData,
     switch( SotExchange::GetFormatIdFromMimeType( rMimeType ) )
     {
     case FORMAT_STRING:
-        ::GetASCWriter( aEmptyStr, OUString(), xWrt );
+        ::GetASCWriter( aEmptyOUStr, OUString(), xWrt );
         break;
 
     case FORMAT_RTF:
         // mba: no BaseURL for data exchange
-        ::GetRTFWriter( aEmptyStr, OUString(), xWrt );
+        ::GetRTFWriter( aEmptyOUStr, OUString(), xWrt );
         break;
     }
 
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index eaf76687fcb3..cfb57994d4a8 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -741,7 +741,7 @@ void SwTableAutoFmt::UpdateFromSet( sal_uInt8 nPos,
         else
         {
             // default
-            pFmt->SetValueFormat( aEmptyStr, LANGUAGE_SYSTEM,
+            pFmt->SetValueFormat( aEmptyOUStr, LANGUAGE_SYSTEM,
                                   ::GetAppLanguage() );
         }
     }
@@ -1171,7 +1171,7 @@ sal_Bool SwTableAutoFmtTbl::Load( SvStream& rStream )
 
                 for( sal_uInt16 i = 0; i < nAnz; ++i )
                 {
-                    pNew = new SwTableAutoFmt( aEmptyStr );
+                    pNew = new SwTableAutoFmt( aEmptyOUStr );
                     bRet = pNew->Load( rStream, aVersions );
                     if( bRet )
                     {
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 16ca510e9d15..3b554a7fba50 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -41,7 +41,7 @@ using namespace com::sun::star;
 
 // Constructor
 
-const String GetPalettePath()
+const OUString GetPalettePath()
 {
     SvtPathOptions aPathOpt;
     return aPathOpt.GetPalettePath();
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 5c3d8cd059cd..e9b76a72f63c 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -306,14 +306,14 @@ OUString SwAutoFormat::GoNextPara()
         if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() )
         {
             bEnde = true;
-            return aEmptyStr;
+            return aEmptyOUStr;
         }
 
         aNdIdx++;
         if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() )
         {
             bEnde = true;
-            return aEmptyStr;
+            return aEmptyOUStr;
         }
         else
             pNewNd = &aNdIdx.GetNode();
@@ -325,7 +325,7 @@ OUString SwAutoFormat::GoNextPara()
         if( pNewNd->IsEndNode() )
         {
             bEnde = true;
-            return aEmptyStr;
+            return aEmptyOUStr;
         }
         else if( pNewNd->IsTableNode() )
             aNdIdx = *pNewNd->EndOfSectionNode();
@@ -1776,7 +1776,7 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl )
         DelPrevPara();
 
         DeleteCurrentParagraph( true, false );
-        DeleteCurNxtPara( aEmptyStr );
+        DeleteCurNxtPara( aEmptyOUStr );
 
         aDelPam.DeleteMark();
         aDelPam.GetPoint()->nNode = aNdIdx.GetIndex() + 1;
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index daa05e1b2ae5..d5cc720c9fa1 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1086,7 +1086,7 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
     {
         // then there are RefFields in the DescDox - so all RefFields in the SourceDoc
         // need to be converted to have unique IDs for both documents
-        _RefIdsMap aFntMap( aEmptyStr );
+        _RefIdsMap aFntMap( aEmptyOUStr );
         _RefIdsMaps aFldMap;
 
         SwIterator<SwFmtFld,SwFieldType> aIter( *this );
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 893a259dc7e8..d35e3b961f26 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -1132,7 +1132,7 @@ sal_Bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_u
     }
     MovePage( fnPageCurr, fnPageStart );
     SwPaM aCpyPam( *GetCrsr()->GetPoint() );
-    String sStartingPageDesc = GetPageDesc( GetCurPageDesc()).GetName();
+    OUString sStartingPageDesc = GetPageDesc( GetCurPageDesc()).GetName();
     SwPageDesc* pDesc = rToFill.FindPageDescByName( sStartingPageDesc, sal_True );
     if( pDesc )
         rToFill.ChgCurPageDesc( *pDesc );
@@ -1480,7 +1480,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
 
                     if(GRAPHIC_NONE != rGraphic.GetType() && GRAPHIC_DEFAULT != rGraphic.GetType())
                     {
-                        aSet.Put(XFillBitmapItem(String(), rGraphic));
+                        aSet.Put(XFillBitmapItem(OUString(), rGraphic));
                         aSet.Put(XFillStyleItem(XFILL_BITMAP));
                     }
                 }
@@ -1563,7 +1563,7 @@ sal_Bool SwFEShell::Paste( const Graphic &rGrf )
         SfxItemSet aSet(GetAttrPool(), XATTR_FILLSTYLE, XATTR_FILLBITMAP);
 
         aSet.Put(XFillStyleItem(XFILL_BITMAP));
-        aSet.Put(XFillBitmapItem(aEmptyStr, rGrf));
+        aSet.Put(XFillBitmapItem(aEmptyOUStr, rGrf));
         pView->SetAttributes(aSet, false);
     }
     return bRet;
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 4c96a49132c7..648ed1e5e5d9 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1975,7 +1975,7 @@ void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt,
 
         for (aIt = aTmpSpzArray.begin(); aIt != aTmpSpzArray.end(); ++aIt)
         {
-            const String aString = (*aIt)->GetName();
+            const OUString aString = (*aIt)->GetName();
 
             /* rFmt is not a vaild successor or predecessor of
                itself */
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index ef84d5d45f6a..5dc05fd179dc 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -161,7 +161,7 @@ sal_Bool SwGrfNode::ReRead(
                     nNewType = OBJECT_CLIENT_DDE;
                 else
                 {
-                    sfx2::MakeLnkName( sCmd, 0, rGrfName, aEmptyStr, &rFltName );
+                    sfx2::MakeLnkName( sCmd, 0, rGrfName, aEmptyOUStr, &rFltName );
                     nNewType = OBJECT_CLIENT_GRF;
                 }
 
@@ -345,9 +345,9 @@ void SwGrfNode::onGraphicChanged()
 
     if(pFlyFmt)
     {
-        String aName;
-        String aTitle;
-        String aDesc;
+        OUString aName;
+        OUString aTitle;
+        OUString aDesc;
         const SvgDataPtr& rSvgDataPtr = GetGrf().getSvgData();
 
         if(rSvgDataPtr.get())
@@ -372,12 +372,12 @@ void SwGrfNode::onGraphicChanged()
             }
         }
 
-        if(aTitle.Len())
+        if(!aTitle.isEmpty())
         {
             SetTitle(aTitle);
         }
 
-        if(aDesc.Len())
+        if(!aDesc.isEmpty())
         {
             SetDescription(aDesc);
         }
@@ -447,7 +447,7 @@ Size SwGrfNode::GetTwipSize() const
 sal_Bool SwGrfNode::ImportGraphic( SvStream& rStrm )
 {
     Graphic aGraphic;
-    const String aURL(maGrfObj.GetUserData());
+    const OUString aURL(maGrfObj.GetUserData());
 
     if(!GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, aURL, rStrm))
     {
@@ -695,7 +695,7 @@ void SwGrfNode::InsertLink( const OUString& rGrfName, const OUString& rFltName )
         if( rFltName == "DDE" )
         {
             sal_Int32 nTmp = 0;
-            String sApp, sTopic, sItem;
+            OUString sApp, sTopic, sItem;
             sApp = rGrfName.getToken( 0, sfx2::cTokenSeparator, nTmp );
             sTopic = rGrfName.getToken( 0, sfx2::cTokenSeparator, nTmp );
             sItem = rGrfName.copy( nTmp );
diff --git a/sw/source/core/inc/unofldmid.h b/sw/source/core/inc/unofldmid.h
index 588101bf7545..b95941852072 100644
--- a/sw/source/core/inc/unofldmid.h
+++ b/sw/source/core/inc/unofldmid.h
@@ -21,7 +21,6 @@
 
 #include <tools/solar.h>
 
-class String;
 namespace com { namespace sun { namespace star { namespace uno {
     class Any;
 } } } }
@@ -55,8 +54,6 @@ namespace com { namespace sun { namespace star { namespace uno {
 
 #define FIELD_PROP_TEXT             34
 
-String& GetString( const com::sun::star::uno::Any&, String& rStr );
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index 9e355f345e7f..ae174d2a75b2 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -162,7 +162,7 @@ static sal_Bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount )
         bRet = sal_True;
         for ( sal_uInt16 i = 0; i < nCount; ++i )
         {
-            SwFrmFmt *pFmt = pDoc->MakeFrmFmt( aEmptyStr, pDoc->GetDfltFrmFmt());
+            SwFrmFmt *pFmt = pDoc->MakeFrmFmt( aEmptyOUStr, pDoc->GetDfltFrmFmt());
             SwColumnFrm *pTmp = new SwColumnFrm( pFmt, pCont );
             pTmp->SetMaxFtnHeight( nMax );
             pTmp->Paste( pCont );
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index bd1f89c1a95f..d2cf32f2bf81 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2155,7 +2155,7 @@ void DrawGraphic( const SvxBrushItem *pBrush,
     {
         const BitmapEx& rBmp = ViewShell::GetReplacementBitmap( false );
         Font aTmp( pOutDev->GetFont() );
-        Graphic::DrawEx( pOutDev, aEmptyStr, aTmp, rBmp, rOrg.Pos(), rOrg.SSize() );
+        Graphic::DrawEx( pOutDev, aEmptyOUStr, aTmp, rBmp, rOrg.Pos(), rOrg.SSize() );
     }
 }
 
@@ -3642,7 +3642,7 @@ void SwColumnFrm::PaintBreak( ) const
                             aFontSize, aFont, false, false );
 
                     Rectangle aTextRect;
-                    pOut->GetTextBoundRect( aTextRect, String( aBreakText ) );
+                    pOut->GetTextBoundRect( aTextRect, aBreakText );
                     long nTextOff = ( nWidth - aTextRect.GetWidth() ) / 2;
 
                     basegfx::B2DHomMatrix aTextMatrix( basegfx::tools::createScaleTranslateB2DHomMatrix(
@@ -7173,7 +7173,7 @@ const Font& SwPageFrm::GetEmptyPageFont()
         pEmptyPgFont = new Font;
         pEmptyPgFont->SetSize( Size( 0, 80 * 20 )); // == 80 pt
         pEmptyPgFont->SetWeight( WEIGHT_BOLD );
-        pEmptyPgFont->SetStyleName( aEmptyStr );
+        pEmptyPgFont->SetStyleName( aEmptyOUStr );
         pEmptyPgFont->SetName(OUString("Helvetica"));
         pEmptyPgFont->SetFamily( FAMILY_SWISS );
         pEmptyPgFont->SetTransparent( sal_True );
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 93665043db1d..a5c9748682f2 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -342,7 +342,7 @@ sal_uLong SwXMLTextBlocks::PutBlock( SwPaM& , const OUString& )
     nFlags |= nCommitFlags;
 
     WriterRef xWrt;
-    ::GetXMLWriter ( aEmptyStr, GetBaseURL(), xWrt);
+    ::GetXMLWriter ( aEmptyOUStr, GetBaseURL(), xWrt);
     SwWriter aWriter (xRoot, *pDoc );
 
     xWrt->bBlock = sal_True;
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index a339db7c88b6..8b308a95493d 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -318,7 +318,7 @@ OUString SwTextBlocks::GetLongName( sal_uInt16 n ) const
 {
     if( pImp )
         return pImp->GetLongName( n );
-    return aEmptyStr;
+    return aEmptyOUStr;
 }
 
 
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index bf575031553f..5e3c57a7d289 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -77,7 +77,7 @@ SV_IMPL_REF( SwServerObject )
 
 #define COLFUZZY 20
 
-void ChgTextToNum( SwTableBox& rBox, const String& rTxt, const Color* pCol,
+void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
                     sal_Bool bChgAlign,sal_uLong nNdPos );
 //----------------------------------
 
@@ -164,17 +164,17 @@ void SwTableBox::setDummyFlag( bool bDummy )
 }
 
 //JP 15.09.98: Bug 55741 - Keep tabs (front and rear)
-static String& lcl_TabToBlankAtSttEnd( String& rTxt )
+static OUString& lcl_TabToBlankAtSttEnd( OUString& rTxt )
 {
     sal_Unicode c;
     xub_StrLen n;
 
-    for( n = 0; n < rTxt.Len() && ' ' >= ( c = rTxt.GetChar( n )); ++n )
+    for( n = 0; n < rTxt.getLength() && ' ' >= ( c = rTxt[n] ); ++n )
         if( '\x9' == c )
-            rTxt.SetChar( n, ' ' );
-    for( n = rTxt.Len(); n && ' ' >= ( c = rTxt.GetChar( --n )); )
+            rTxt = rTxt.replaceAt( n, 1, " " );
+    for( n = rTxt.getLength(); n && ' ' >= ( c = rTxt[--n] ); )
         if( '\x9' == c )
-            rTxt.SetChar( n, ' ' );
+            rTxt = rTxt.replaceAt( n, 1, " " );
     return rTxt;
 }
 
@@ -1346,13 +1346,13 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew,
 |*
 |*************************************************************************/
 
-static bool lcl_IsValidRowName( const String& rStr )
+static bool lcl_IsValidRowName( const OUString& rStr )
 {
     bool bIsValid = true;
-    xub_StrLen nLen = rStr.Len();
+    xub_StrLen nLen = rStr.getLength();
     for (xub_StrLen i = 0;  i < nLen && bIsValid;  ++i)
     {
-        const sal_Unicode cChar = rStr.GetChar(i);
+        const sal_Unicode cChar = rStr[i];
         if (cChar < '0' || cChar > '9')
             bIsValid = false;
     }
@@ -1900,7 +1900,7 @@ OUString SwTableBox::GetName() const
     if( !pSttNd )       // box without content?
     {
         // search for the next first box?
-        return aEmptyStr;
+        return aEmptyOUStr;
     }
 
     const SwTable& rTbl = pSttNd->FindTableNode()->GetTable();
@@ -2018,13 +2018,13 @@ void SwTable::SetHTMLTableLayout( SwHTMLTableLayout *p )
     pHTMLLayout = p;
 }
 
-void ChgTextToNum( SwTableBox& rBox, const String& rTxt, const Color* pCol,
+void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
                     sal_Bool bChgAlign )
 {
     sal_uLong nNdPos = rBox.IsValidNumTxtNd( sal_True );
     ChgTextToNum( rBox,rTxt,pCol,bChgAlign,nNdPos);
 }
-void ChgTextToNum( SwTableBox& rBox, const String& rTxt, const Color* pCol,
+void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
                     sal_Bool bChgAlign,sal_uLong nNdPos )
 {
 
@@ -2087,15 +2087,15 @@ void ChgTextToNum( SwTableBox& rBox, const String& rTxt, const Color* pCol,
         if( pTNd->GetTxt() != rTxt )
         {
             // Exchange text. Bugfix to keep Tabs (front and back!)
-            const String& rOrig = pTNd->GetTxt();
+            const OUString& rOrig = pTNd->GetTxt();
             xub_StrLen n;
 
-            for( n = 0; n < rOrig.Len() && '\x9' == rOrig.GetChar( n ); ++n )
+            for( n = 0; n < rOrig.getLength() && '\x9' == rOrig[n]; ++n )
                 ;
-            for( ; n < rOrig.Len() && '\x01' == rOrig.GetChar( n ); ++n )
+            for( ; n < rOrig.getLength() && '\x01' == rOrig[n]; ++n )
                 ;
             SwIndex aIdx( pTNd, n );
-            for( n = rOrig.Len(); n && '\x9' == rOrig.GetChar( --n ); )
+            for( n = rOrig.getLength(); n && '\x9' == rOrig[--n]; )
                 ;
             n -= aIdx.GetIndex() - 1;
 
@@ -2107,7 +2107,7 @@ void ChgTextToNum( SwTableBox& rBox, const String& rTxt, const Color* pCol,
 
             if( !pDoc->IsIgnoreRedline() && !pDoc->GetRedlineTbl().empty() )
             {
-                SwPaM aTemp(*pTNd, 0, *pTNd, rOrig.Len());
+                SwPaM aTemp(*pTNd, 0, *pTNd, rOrig.getLength());
                 pDoc->DeleteRedline(aTemp, true, USHRT_MAX);
             }
 
@@ -2118,7 +2118,7 @@ void ChgTextToNum( SwTableBox& rBox, const String& rTxt, const Color* pCol,
 
             if( pDoc->IsRedlineOn() )
             {
-                SwPaM aTemp(*pTNd, 0, *pTNd, rTxt.Len());
+                SwPaM aTemp(*pTNd, 0, *pTNd, rTxt.getLength());
                 pDoc->AppendRedline(new SwRedline(nsRedlineType_t::REDLINE_INSERT, aTemp), true);
             }
         }
@@ -2148,7 +2148,7 @@ void ChgNumToText( SwTableBox& rBox, sal_uLong nFmt )
         if( NUMBERFORMAT_TEXT != nFmt )
         {
             // special text format:
-            String sTmp, sTxt( pTNd->GetTxt() );
+            OUString sTmp, sTxt( pTNd->GetTxt() );
             OUString sTempIn(sTxt);
             OUString sTempOut;
             pDoc->GetNumberFormatter()->GetOutputString( sTempIn, nFmt, sTempOut, &pCol );
@@ -2157,7 +2157,7 @@ void ChgNumToText( SwTableBox& rBox, sal_uLong nFmt )
             if( sTxt != sTmp )
             {
                 // exchange text
-                SwIndex aIdx( pTNd, sTxt.Len() );
+                SwIndex aIdx( pTNd, sTxt.getLength() );
                 // Reset DontExpand-Flags before exchange, to retrigger expansion
                 pTNd->DontExpandFmt( aIdx, false, false );
                 aIdx = 0;
@@ -2340,9 +2340,9 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                             if( ULONG_MAX != nNdPos )
                             {
                                 sal_uInt32 nTmpFmtIdx = nNewFmt;
-                                String aTxt( GetDoc()->GetNodes()[ nNdPos ]
+                                OUString aTxt( GetDoc()->GetNodes()[ nNdPos ]
                                                 ->GetTxtNode()->GetRedlineTxt());
-                                if( !aTxt.Len() )
+                                if( aTxt.isEmpty() )
                                     bChgTxt = false;
                                 else
                                 {
@@ -2361,7 +2361,7 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                                         {
                                             if( NUMBERFORMAT_NUMBER ==
                                                 pNumFmtr->GetType( nTmpFmt ))
-                                                aTxt += '%';
+                                                aTxt += "%";
 
                                             bIsNumFmt = pNumFmtr->IsNumberFormat(
                                                         aTxt, nTmpFmtIdx, fVal );
@@ -2427,11 +2427,11 @@ sal_Bool SwTableBox::HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex,
     sal_uLong nNdPos = IsValidNumTxtNd( sal_True );
     if( ULONG_MAX != nNdPos )
     {
-        String aTxt( pSttNd->GetNodes()[ nNdPos ]->GetTxtNode()->
+        OUString aTxt( pSttNd->GetNodes()[ nNdPos ]->GetTxtNode()->
                             GetRedlineTxt() );
         // Keep Tabs
         lcl_TabToBlankAtSttEnd( aTxt );
-        rIsEmptyTxtNd = 0 == aTxt.Len();
+        rIsEmptyTxtNd = aTxt.isEmpty();
         SvNumberFormatter* pNumFmtr = GetFrmFmt()->GetDoc()->GetNumberFormatter();
 
         const SfxPoolItem* pItem;
@@ -2446,7 +2446,7 @@ sal_Bool SwTableBox::HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex,
                 sal_uInt32 nTmpFmt = 0;
                 if( pNumFmtr->IsNumberFormat( aTxt, nTmpFmt, rNum ) &&
                     NUMBERFORMAT_NUMBER == pNumFmtr->GetType( nTmpFmt ))
-                    aTxt += '%';
+                    aTxt += "%";
             }
         }
         else
@@ -2612,7 +2612,7 @@ void SwTableBox::ActualiseValueBox()
             OUString sNewTxt;
             pNumFmtr->GetOutputString( fVal, nFmtId, sNewTxt, &pCol );
 
-            const String& rTxt = pSttNd->GetNodes()[ nNdPos ]->GetTxtNode()->GetTxt();
+            const OUString& rTxt = pSttNd->GetNodes()[ nNdPos ]->GetTxtNode()->GetTxt();
             if( rTxt != sNewTxt )
                 ChgTextToNum( *this, sNewTxt, pCol, sal_False ,nNdPos);
         }
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 12800b1ec56f..a4516b40e8a2 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1589,7 +1589,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
         //
         if ( pPDFExtOutDevData->GetIsExportNotes() )
         {
-            SwFieldType* pType = mrSh.GetFldType( RES_POSTITFLD, aEmptyStr );
+            SwFieldType* pType = mrSh.GetFldType( RES_POSTITFLD, aEmptyOUStr );
             SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
             for( SwFmtFld* pFirst = aIter.First(); pFirst; )
             {
@@ -1825,7 +1825,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
         //
         // REFERENCES
         //
-        SwFieldType* pType = mrSh.GetFldType( RES_GETREFFLD, aEmptyStr );
+        SwFieldType* pType = mrSh.GetFldType( RES_GETREFFLD, aEmptyOUStr );
         SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
         for( SwFmtFld* pFirst = aIter.First(); pFirst; )
         {
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index d3b36a56bf17..8a70fca97f93 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -488,7 +488,7 @@ sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, sal_Bool bCheck ) const
                 {
                     pFnt->SetFamily( FAMILY_DONTKNOW, SW_LATIN );
                     pFnt->SetName( numfunc::GetDefBulletFontname(), SW_LATIN );
-                    pFnt->SetStyleName( aEmptyStr, SW_LATIN );
+                    pFnt->SetStyleName( aEmptyOUStr, SW_LATIN );
                     pFnt->SetCharSet( RTL_TEXTENCODING_SYMBOL, SW_LATIN );
                 }
                 pFnt->SetVertical( 0, IsVertical() );
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 0e8db3d7715b..52a0b170f305 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -822,7 +822,7 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rP
         m_pFnt = new SwFont( *pOldFnt );
         m_pFnt->SetFamily( FAMILY_DONTKNOW, m_pFnt->GetActual() );
         m_pFnt->SetName( numfunc::GetDefBulletFontname(), m_pFnt->GetActual() );
-        m_pFnt->SetStyleName( aEmptyStr, m_pFnt->GetActual() );
+        m_pFnt->SetStyleName( aEmptyOUStr, m_pFnt->GetActual() );
         m_pFnt->SetCharSet( RTL_TEXTENCODING_SYMBOL, m_pFnt->GetActual() );
     }
 
@@ -1799,7 +1799,7 @@ SwDefFontSave::SwDefFontSave( const SwTxtSizeInfo &rInf )
         {
             pNewFnt->SetFamily( FAMILY_DONTKNOW, pFnt->GetActual() );
             pNewFnt->SetName( numfunc::GetDefBulletFontname(), pFnt->GetActual() );
-            pNewFnt->SetStyleName( aEmptyStr, pFnt->GetActual() );
+            pNewFnt->SetStyleName( aEmptyOUStr, pFnt->GetActual() );
             pNewFnt->SetCharSet( RTL_TEXTENCODING_SYMBOL, pFnt->GetActual() );
             pNewFnt->SetFixKerning( 0 );
         }
diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx
index fa4298350767..306377acd6c7 100644
--- a/sw/source/core/text/noteurl.cxx
+++ b/sw/source/core/text/noteurl.cxx
@@ -60,8 +60,8 @@ void SwNoteURL::FillImageMap( ImageMap *pMap, const Point &rPos,
             aSwRect -= rPos;
             Rectangle aRect( OutputDevice::LogicToLogic( aSwRect.SVRect(),
                                                          rMap, aMap ) );
-            IMapRectangleObject aObj( aRect, rNote.GetURL(), aEmptyStr, aEmptyStr,
-                                      rNote.GetTarget(), aEmptyStr, sal_True, sal_False );
+            IMapRectangleObject aObj( aRect, rNote.GetURL(), aEmptyOUStr, aEmptyOUStr,
+                                      rNote.GetTarget(), aEmptyOUStr, sal_True, sal_False );
             pMap->InsertIMapObject( aObj );
         }
     }
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 41700777fd8a..0f38d195f022 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -189,7 +189,7 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd,
 
 OUString SwTOXSortTabBase::GetURL() const
 {
-    return aEmptyStr;
+    return aEmptyOUStr;
 }
 
 void SwTOXSortTabBase::FillText( SwTxtNode& rNd, const SwIndex& rInsPos,
@@ -695,15 +695,15 @@ OUString SwTOXTable::GetURL() const
 {
     const SwNode* pNd = aTOXSources[0].pNd;
     if (!pNd)
-        return String();
+        return OUString();
 
     pNd = pNd->FindTableNode();
     if (!pNd)
-        return String();
+        return OUString();
 
     const OUString sName = ((SwTableNode*)pNd)->GetTable().GetFrmFmt()->GetName();
     if ( sName.isEmpty() )
-        return String();
+        return OUString();
 
     return "#" + sName + OUString(cMarkSeparator) + "table";
 }
@@ -719,13 +719,13 @@ SwTOXAuthority::SwTOXAuthority( const SwCntntNode& rNd,
 
 sal_uInt16 SwTOXAuthority::GetLevel() const
 {
-    String sText(((SwAuthorityField*)m_rField.GetFld())->
+    OUString sText(((SwAuthorityField*)m_rField.GetFld())->
                         GetFieldText(AUTH_FIELD_AUTHORITY_TYPE));
     //#i18655# the level '0' is the heading level therefor the values are incremented here
     sal_uInt16 nRet = 1;
     if( pTOXIntl->IsNumeric( sText ) )
     {
-        nRet = (sal_uInt16)sText.ToInt32();
+        nRet = (sal_uInt16)sText.toInt32();
         nRet++;
     }
     //illegal values are also set to 'ARTICLE' as non-numeric values are
@@ -734,7 +734,7 @@ sal_uInt16 SwTOXAuthority::GetLevel() const
     return nRet;
 }
 
-static String lcl_GetText(SwFmtFld const& rField)
+static OUString lcl_GetText(SwFmtFld const& rField)
 {
     return rField.GetFld()->ExpandField(true);
 }
@@ -748,17 +748,17 @@ void    SwTOXAuthority::FillText( SwTxtNode& rNd,
                         const SwIndex& rInsPos, sal_uInt16 nAuthField ) const
 {
     SwAuthorityField* pField = (SwAuthorityField*)m_rField.GetFld();
-    String sText;
+    OUString sText;
     if(AUTH_FIELD_IDENTIFIER == nAuthField)
     {
         sText = lcl_GetText(m_rField);
         const SwAuthorityFieldType* pType = (const SwAuthorityFieldType*)pField->GetTyp();
         sal_Unicode cChar = pType->GetPrefix();
         if(cChar && cChar != ' ')
-            sText.Erase(0, 1);
+            sText = sText.copy(1);
         cChar = pType->GetSuffix();
         if(cChar && cChar != ' ')
-            sText.Erase(sText.Len() - 1, 1);
+            sText = sText.copy(0, sText.getLength() - 1);
     }
     else if(AUTH_FIELD_AUTHORITY_TYPE == nAuthField)
     {
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index eef49fafef49..9ed61d325147 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -1405,7 +1405,7 @@ xub_StrLen SwSubFont::_GetCrsrOfst( SwDrawTextInfo& rInf )
             nCrsr = pLastFont->GetCrsrOfst( rInf );
         else
         {
-            String aTmp = CalcCaseMap( rInf.GetText() );
+            OUString aTmp = CalcCaseMap( rInf.GetText() );
             rInf.SetText( aTmp );
             nCrsr = pLastFont->GetCrsrOfst( rInf );
         }
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 6576dcc64164..ad571cc0e644 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1613,7 +1613,7 @@ namespace
     {
         xub_StrLen              nStart;
         xub_StrLen              nLen;
-        String                  sChanged;
+        OUString                sChanged;
         Sequence< sal_Int32 >   aOffsets;
     };
 }
@@ -1853,7 +1853,7 @@ void SwTxtNode::TransliterateText(
                 // call to ReplaceTextOnly
                 swTransliterationChgData & rData =
                     aChanges[ aChanges.size() - 1 - i ];
-                nSum = nSum + rData.sChanged.Len() - rData.nLen;
+                nSum = nSum + rData.sChanged.getLength() - rData.nLen;
                 if (nSum > TXTNODE_MAX)
                 {
                     SAL_WARN("sw.core", "SwTxtNode::ReplaceTextOnly: "
diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx
index 0fe565b70f31..8de36ee0f995 100644
--- a/sw/source/core/undo/SwUndoField.cxx
+++ b/sw/source/core/undo/SwUndoField.cxx
@@ -98,7 +98,7 @@ void SwUndoFieldFromDoc::DoImpl()
         pDoc->UpdateFld(pTxtFld, *pNewField, pHnt, bUpdate);
         SwFmtFld* pDstFmtFld = (SwFmtFld*)&pTxtFld->GetFld();
 
-        if ( pDoc->GetFldType(RES_POSTITFLD, aEmptyStr,false) == pDstFmtFld->GetFld()->GetTyp() )
+        if ( pDoc->GetFldType(RES_POSTITFLD, aEmptyOUStr,false) == pDstFmtFld->GetFld()->GetTyp() )
             pDoc->GetDocShell()->Broadcast( SwFmtFldHint( pDstFmtFld, SWFMTFLD_INSERTED ) );
     }
 }
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 0b57739a4475..ac685dd9d8c3 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -452,7 +452,7 @@ void SwUndoInsert::RepeatImpl(::sw::RepeatContext & rContext)
     case ND_OLENODE:
         {
             // StarView does not yet provide an option to copy a StarOBJ
-            SvStorageRef aRef = new SvStorage( aEmptyStr );
+            SvStorageRef aRef = new SvStorage( aEmptyOUStr );
             SwOLEObj& rSwOLE = (SwOLEObj&)((SwOLENode*)pCNd)->GetOLEObj();
 
             // temporary storage until object is inserted
@@ -854,7 +854,7 @@ void SwUndoReRead::SetAndSave(::sw::UndoRedoContext & rContext)
     }
     else
     {
-        pGrfNd->ReRead( aEmptyStr, aEmptyStr, pOldGrf, 0, sal_True );
+        pGrfNd->ReRead( aEmptyOUStr, aEmptyOUStr, pOldGrf, 0, sal_True );
         delete pOldGrf;
     }
 
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 1493b37c3aad..7dbf55092221 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -791,7 +791,7 @@ uno::Reference< uno::XInterface >   SwXServiceProvider::MakeInstance(sal_uInt16
         break;
         case SW_SERVICE_FIELDMASTER_BIBLIOGRAPHY:
         {
-            SwFieldType* pType = pDoc->GetFldType(RES_AUTHORITY, aEmptyStr, sal_True);
+            SwFieldType* pType = pDoc->GetFldType(RES_AUTHORITY, aEmptyOUStr, sal_True);
             if(!pType)
             {
                 SwAuthorityFieldType aType(pDoc);
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index ddf185aa7898..f5fc29112263 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1624,7 +1624,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
             aData.nCommandType = m_pImpl->m_pProps->nSHORT1;
             SwFieldType* pFldType = pDoc->GetSysFldType(RES_DBNEXTSETFLD);
             pFld = new SwDBNextSetField((SwDBNextSetFieldType*)pFldType,
-                    m_pImpl->m_pProps->sPar3, aEmptyStr, aData);
+                    m_pImpl->m_pProps->sPar3, aEmptyOUStr, aData);
         }
         break;
         case SW_SERVICE_FIELDTYPE_DATABASE_NUM_SET:
@@ -1828,7 +1828,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
             SwAuthorityFieldType const type(pDoc);
             pFld = new SwAuthorityField(static_cast<SwAuthorityFieldType*>(
                         pDoc->InsertFldType(type)),
-                    aEmptyStr );
+                    aEmptyOUStr );
             if (m_pImpl->m_pProps->aPropSeq.getLength())
             {
                 uno::Any aVal;
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index fa0dc91961a9..7af7f7ccb6da 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1932,7 +1932,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
 //                {
 //                    SwNodeIndex aIdx(*pIdx, 1);
 //                    SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
-//                    pNoTxt->SetAlternateText(aEmptyStr);
+//                    pNoTxt->SetAlternateText(aEmptyOUStr);
 //                }
 //            }
             // New attribute Title
@@ -1943,7 +1943,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
                         "unexpected type of <pFmt> --> crash" );
                 // assure that <SdrObject> instance exists.
                 GetOrCreateSdrObject( pFlyFmt );
-                pFlyFmt->GetDoc()->SetFlyFrmTitle( *(pFlyFmt), aEmptyStr );
+                pFlyFmt->GetDoc()->SetFlyFrmTitle( *(pFlyFmt), aEmptyOUStr );
             }
             // New attribute Description
             else if( FN_UNO_DESCRIPTION == pEntry->nWID )
@@ -1953,7 +1953,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
                         "unexpected type of <pFmt> --> crash" );
                 // assure that <SdrObject> instance exists.
                 GetOrCreateSdrObject( pFlyFmt );
-                pFlyFmt->GetDoc()->SetFlyFrmDescription( *(pFlyFmt), aEmptyStr );
+                pFlyFmt->GetDoc()->SetFlyFrmDescription( *(pFlyFmt), aEmptyOUStr );
             }
             else
             {
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 8e93ef6d29c0..bae978929244 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -460,7 +460,7 @@ lcl_setRubyCharstyle(SfxItemSet & rItemSet, uno::Any const& rValue)
     }
     if (!pRuby.get())
     {
-        pRuby.reset(new SwFmtRuby(aEmptyStr));
+        pRuby.reset(new SwFmtRuby(aEmptyOUStr));
     }
     OUString sStyle;
     SwStyleNameMapper::FillUIName(sTmp, sStyle,
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index 4386311abfc4..a50a61c53783 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -857,7 +857,7 @@ throw( uno::RuntimeException )
     if (!pUnoCrsr)
         throw uno::RuntimeException();
 
-    setString(aEmptyStr);
+    setString(aEmptyOUStr);
     pUnoCrsr->Remove(this);
 }
 
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index f7ea3a3f63a0..d7a6e66768b4 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -1511,11 +1511,11 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
         {
             if (m_pImpl->m_bIsDescriptor)
             {
-                m_pImpl->m_pProps->m_sCondition = aEmptyStr;
+                m_pImpl->m_pProps->m_sCondition = aEmptyOUStr;
             }
             else
             {
-                pSectionData->SetCondition(aEmptyStr);
+                pSectionData->SetCondition(aEmptyOUStr);
             }
         }
         break;
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index c6508d1112fb..e5d532472abd 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1991,7 +1991,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
                             pSetBrush = new SvxBrushItem(*pOrigBrush);
                         }
                         else
-                            pSetBrush = new SvxBrushItem(aEmptyStr, aEmptyStr, GPOS_AREA, RES_BACKGROUND);
+                            pSetBrush = new SvxBrushItem(aEmptyOUStr, aEmptyOUStr, GPOS_AREA, RES_BACKGROUND);
                     }
                     pSetBrush->PutValue( pData->aVal, MID_GRAPHIC_URL );
                 }
@@ -2010,7 +2010,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
                                 pSetBrush = new SvxBrushItem(*pOrigBrush);
                             }
                             else
-                                pSetBrush = new SvxBrushItem(aEmptyStr, aEmptyStr, GPOS_AREA, RES_BACKGROUND);
+                                pSetBrush = new SvxBrushItem(aEmptyOUStr, aEmptyOUStr, GPOS_AREA, RES_BACKGROUND);
                         }
 
                         BitmapEx aBmp = VCLUnoHelper::GetBitmap( *pBitmap );
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index b39be8eb7414..334387e6ac53 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1978,7 +1978,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                     if(SFX_ITEM_SET == rStyleSet.GetItemState( RES_TXTATR_CJK_RUBY, sal_True, &pItem ) )
                         pRuby = new SwFmtRuby(*((SwFmtRuby*)pItem));
                     if(!pRuby)
-                        pRuby = new SwFmtRuby(aEmptyStr);
+                        pRuby = new SwFmtRuby(aEmptyOUStr);
                     OUString sStyle;
                     SwStyleNameMapper::FillUIName(sTmp, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
                     pRuby->SetCharFmtName( sTmp );
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 4e700540271b..a79e33ee919a 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -477,7 +477,7 @@ int sw_CompareCellRanges(
  * @param nRow row index (0-based)
  * @return the cell name
  */
-String sw_GetCellName( sal_Int32 nColumn, sal_Int32 nRow )
+OUString sw_GetCellName( sal_Int32 nColumn, sal_Int32 nRow )
 {
 #if OSL_DEBUG_LEVEL > 0
     {
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 5107e865c0a4..c712ba124bbe 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -605,7 +605,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
 
     if (bAbsorb && !bAttribute)
     {
-        xRange->setString(aEmptyStr);
+        xRange->setString(aEmptyOUStr);
     }
     uno::Reference< text::XTextRange > xTempRange =
         (bAttribute && bAbsorb) ? xRange : xRange->getStart();
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index 17f798352263..8fe6678c8db1 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -106,7 +106,7 @@ bool SwASC_AttrIter::OutAttr( xub_StrLen nSwPos )
             if ( pHt->HasDummyChar() && nSwPos == *pHt->GetStart() )
             {
                 bRet = true;
-                String sOut;
+                OUString sOut;
                 switch( pHt->Which() )
                 {
                 case RES_TXTATR_FIELD:
@@ -128,7 +128,7 @@ bool SwASC_AttrIter::OutAttr( xub_StrLen nSwPos )
                     }
                     break;
                 }
-                if( sOut.Len() )
+                if( !sOut.isEmpty() )
                     rWrt.Strm().WriteUnicodeOrByteText( sOut );
             }
             else if( nSwPos < *pHt->GetStart() )
@@ -157,10 +157,10 @@ static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
 
     if( !nStrPos && rWrt.bExportPargraphNumbering )
     {
-        String numString( rNd.GetNumString() );
-        if (numString.Len())
+        OUString numString( rNd.GetNumString() );
+        if (!numString.isEmpty())
         {
-            numString.Append(' ');
+            numString += " ";
             rWrt.Strm().WriteUnicodeOrByteText(numString);
         }
     }
@@ -180,7 +180,7 @@ static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
 
         if( !aAttrIter.OutAttr( nStrPos ))
         {
-            String aOutStr( aStr.copy( nStrPos, nNextAttr - nStrPos ) );
+            OUString aOutStr( aStr.copy( nStrPos, nNextAttr - nStrPos ) );
             if ( !bExportSoftHyphens )
                 aOutStr = comphelper::string::remove(aOutStr, CHAR_SOFTHYPHEN);
 
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 6617fff44c03..3cb94f937feb 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -116,7 +116,7 @@ SwASCIIParser::SwASCIIParser(SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
         if( pDoc->getPrinter( false ) )
             aTextFont = pDoc->getPrinter( false )->GetFontMetric( aTextFont );
         SvxFontItem aFont( aTextFont.GetFamily(), aTextFont.GetName(),
-                           aEmptyStr, aTextFont.GetPitch(), aTextFont.GetCharSet(), RES_CHRATR_FONT );
+                           aEmptyOUStr, aTextFont.GetPitch(), aTextFont.GetCharSet(), RES_CHRATR_FONT );
         pItemSet->Put( aFont );
         pItemSet->Put( aFont, RES_CHRATR_CJK_FONT );
         pItemSet->Put( aFont, RES_CHRATR_CTL_FONT );
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 7848fc133592..06c14cf1f0a9 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -738,7 +738,7 @@ void GetWW8Writer( const OUString& rFltName, const OUString& rBaseURL, WriterRef
 #endif
 }
 
-typedef sal_uLong ( SAL_CALL *SaveOrDel )( SfxObjectShell&, SotStorage&, sal_Bool, const String& );
+typedef sal_uLong ( SAL_CALL *SaveOrDel )( SfxObjectShell&, SotStorage&, sal_Bool, const OUString& );
 typedef sal_uLong ( SAL_CALL *GetSaveWarning )( SfxObjectShell& );
 
 sal_uLong SaveOrDelMSVBAStorage( SfxObjectShell& rDoc, SotStorage& rStor, sal_Bool bSaveInto, const OUString& rStorageName )
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index ea629791d979..3d40cb8456d4 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -520,7 +520,7 @@ SwDoc* Reader::GetTemplateDoc()
 
                         ReadXML->SetOrganizerMode( sal_True );
                         SfxMedium aMedium( aFileName, sal_False );
-                        SwReader aRdr( aMedium, aEmptyStr, pTemplate );
+                        SwReader aRdr( aMedium, aEmptyOUStr, pTemplate );
                         aRdr.Read( *ReadXML );
                         ReadXML->SetOrganizerMode( sal_False );
 
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 1aa393f98675..701f3820da9e 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1154,7 +1154,7 @@ void SwHTMLWriter::PrepareFontList( const SvxFontItem& rFontItem,
                                     OUString& rNames,
                                     sal_Unicode cQuote, sal_Bool bGeneric )
 {
-    rNames = aEmptyStr;
+    rNames = aEmptyOUStr;
     const OUString& rName = rFontItem.GetFamilyName();
     sal_Bool bContainsKeyword = sal_False;
     if( !rName.isEmpty() )
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 273a3d19fccf..83d04f8bbd0e 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -303,7 +303,7 @@ void SwHTMLWriter::OutBasic()
             const OUString& rModName = pModule->GetName();
             Strm() << SAL_NEWLINE_STRING;   // nicht einruecken!
             HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), pModule->GetSource(),
-                                     sLang, eType, aEmptyStr,
+                                     sLang, eType, aEmptyOUStr,
                                      &rLibName, &rModName,
                                      eDestEnc, &aNonConvertableCharacters );
         }
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 6391500734fe..e404c1c8ab7b 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -369,7 +369,7 @@ void SwCSS1Parser::SetTableTxtColl( sal_Bool bHeader )
     SvxCSS1MapEntry *pStyleEntry = GetTag( sTag );
     if( pStyleEntry )
     {
-        pColl = GetTxtFmtColl( nPoolId, aEmptyStr );
+        pColl = GetTxtFmtColl( nPoolId, aEmptyOUStr );
         SetTxtCollAttrs( pColl, pStyleEntry->GetItemSet(),
                          pStyleEntry->GetPropertyInfo(), this );
     }
@@ -379,7 +379,7 @@ void SwCSS1Parser::SetTableTxtColl( sal_Bool bHeader )
     if( pStyleEntry )
     {
         if( !pColl )
-            pColl = GetTxtFmtColl( nPoolId, aEmptyStr );
+            pColl = GetTxtFmtColl( nPoolId, aEmptyOUStr );
         SetTxtCollAttrs( pColl, pStyleEntry->GetItemSet(),
                          pStyleEntry->GetPropertyInfo(), this );
     }
@@ -912,7 +912,7 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
                 nPoolCollId = RES_POOLCOLL_FOOTNOTE;
 
             if( nPoolCollId )
-                aClass = aEmptyStr;
+                aClass = aEmptyOUStr;
             else
                 nPoolCollId = RES_POOLCOLL_TEXT;
         }
@@ -998,7 +998,7 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
             // ein X:first-line { float: left; ... }
 
             // Die Vorlage Suchen bzw. Anlegen
-            SwTxtFmtColl *pColl = GetTxtFmtColl( nPoolCollId, aEmptyStr );
+            SwTxtFmtColl *pColl = GetTxtFmtColl( nPoolCollId, aEmptyOUStr );
             SwTxtFmtColl* pParentColl = 0;
             if( !aClass.isEmpty() )
             {
@@ -1094,7 +1094,7 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
     if( pNext )
         return sal_True;
 
-    SwCharFmt *pCFmt = GetChrFmt( static_cast< sal_uInt16 >(nToken2), aEmptyStr );
+    SwCharFmt *pCFmt = GetChrFmt( static_cast< sal_uInt16 >(nToken2), aEmptyOUStr );
     if( pCFmt )
     {
         SwCharFmt *pParentCFmt = 0;
@@ -1279,12 +1279,12 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( sal_uInt16 nTxtColl,
         if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdendnote) )
         {
             nTxtColl = RES_POOLCOLL_ENDNOTE;
-            aClass = aEmptyStr;
+            aClass = aEmptyOUStr;
         }
         else if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdfootnote) )
         {
             nTxtColl = RES_POOLCOLL_FOOTNOTE;
-            aClass = aEmptyStr;
+            aClass = aEmptyOUStr;
         }
     }
 
@@ -1846,7 +1846,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const OUString& rIn )
     SwPageDesc *pMasterPageDesc =
         pDoc->GetPageDescFromPool( RES_POOLPAGE_HTML, false );
 
-    SvxCSS1MapEntry *pPageEntry = GetPage( aEmptyStr, false );
+    SvxCSS1MapEntry *pPageEntry = GetPage( aEmptyOUStr, false );
     if( pPageEntry )
     {
         // @page (wirkt auf alle Seiten, die es schon gibt
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index d4efcd17f068..4d512ce68421 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -242,7 +242,7 @@ static void PutEEPoolItem( SfxItemSet &rEEItemSet,
         {
             const SvxBrushItem& rBrushItem = (const SvxBrushItem&)rSwItem;
             rEEItemSet.Put( XFillStyleItem(XFILL_SOLID) );
-            rEEItemSet.Put( XFillColorItem(aEmptyStr,
+            rEEItemSet.Put( XFillColorItem(aEmptyOUStr,
                             rBrushItem.GetColor()) );
         }
         break;
@@ -454,7 +454,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
     if( bBGColor )
     {
         aItemSet.Put( XFillStyleItem(XFILL_SOLID) );
-        aItemSet.Put( XFillColorItem(aEmptyStr, aBGColor) );
+        aItemSet.Put( XFillColorItem(aEmptyOUStr, aBGColor) );
     }
 
     // Styles parsen (funktioniert hier nur fuer Attribute, die auch
@@ -823,7 +823,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
     sal_uInt32 nFrmFlags = HTML_FRMOPTS_MARQUEE;
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
         nFrmFlags |= HTML_FRMOPTS_MARQUEE_CSS1;
-    OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyStr, nFrmFlags );
+    OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyOUStr, nFrmFlags );
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
         rHTMLWrt.OutCSS1_FrmFmtOptions( rFmt, nFrmFlags, &rSdrObject );
 
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 3d63aeb8fa40..9c62e7df45d7 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -644,7 +644,7 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag
 
     SwPostItField aPostItFld(
                     (SwPostItFieldType*)pDoc->GetSysFldType( RES_POSTITFLD ),
-                    aEmptyStr, aComment, aEmptyStr, aEmptyStr, DateTime( DateTime::SYSTEM ) );
+                    aEmptyOUStr, aComment, aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) );
     InsertAttr( SwFmtFld( aPostItFld ) );
 
     if( bMoveFwd )
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 44ce5192c611..fa1771d55af1 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -1374,7 +1374,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
                                 : HTML_FRMOPTS_MULTICOL;
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
         nFrmFlags |= HTML_FRMOPTS_MULTICOL_CSS1;
-    rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, nFrmFlags );
+    rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyOUStr, nFrmFlags );
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
         rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags );
 
@@ -1422,7 +1422,7 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
     rWrt.Strm() << sOut.makeStringAndClear().getStr();
 
     // ALIGN, WIDTH, HEIGHT
-    OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, HTML_FRMOPTS_SPACER );
+    OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyOUStr, HTML_FRMOPTS_SPACER );
 
     rWrt.Strm() << '>';
     if( !aEndTags.isEmpty() )
@@ -1459,7 +1459,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
     sal_uLong nFrmFlags = HTML_FRMOPTS_DIV;
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_BORDER_NONE ) )
        nFrmFlags |= HTML_FRMOPT_S_NOBORDER;
-    OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, nFrmFlags );
+    OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyOUStr, nFrmFlags );
     rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags );
     rWrt.Strm() << '>';
 
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index bb83f2f25c3d..cdee63a85206 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -239,7 +239,7 @@ public:
     void ReleaseShape() { xShape = 0; }
 
     OUString& GetText() { return sText; }
-    void EraseText() { sText = aEmptyStr; }
+    void EraseText() { sText = aEmptyOUStr; }
 
     std::vector<OUString>& GetStringList() { return aStringList; }
     void EraseStringList()
@@ -2578,7 +2578,7 @@ void SwHTMLParser::InsertSelectOption()
     }
 
     sal_uInt16 nEntryCnt = pFormImpl->GetStringList().size();
-    pFormImpl->GetStringList().push_back(aEmptyStr);
+    pFormImpl->GetStringList().push_back(aEmptyOUStr);
     pFormImpl->GetValueList().push_back(aValue);
     if( bLBEntrySelected )
     {
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 126aede7e12a..61cf6a2a5585 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -1077,7 +1077,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
     }
     OString aEndTags;
     if( nFrmOpts != 0 )
-        aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyStr, nFrmOpts );
+        aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyOUStr, nFrmOpts );
 
     if( rHTMLWrt.bCfgOutStyles )
     {
@@ -1139,7 +1139,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
                         if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0))
                             eFamily = (FontFamily)*(sal_Int16*) aTmp.getValue();
                     }
-                    SvxFontItem aItem( eFamily, aFName, aEmptyStr, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT );
+                    SvxFontItem aItem( eFamily, aFName, aEmptyOUStr, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT );
                     aItemSet.Put( aItem );
                 }
             }
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index a9828dc5c656..6afdc96cb3f3 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -46,7 +46,7 @@ struct SwHTMLFootEndNote_Impl
 sal_Int32 lcl_html_getNextPart( OUString& rPart, const OUString& rContent,
                              sal_Int32 nPos )
 {
-    rPart = aEmptyStr;
+    rPart = aEmptyOUStr;
     sal_Int32 nLen = rContent.getLength();
     if( nPos >= nLen )
     {
@@ -193,7 +193,7 @@ void SwHTMLParser::InsertFootEndNote( const OUString& rName, sal_Bool bEndNote,
     pFootEndNoteImpl->sName = pFootEndNoteImpl->sName.toAsciiUpperCase();
     pFootEndNoteImpl->bEndNote = bEndNote;
     pFootEndNoteImpl->bFixed = bFixed;
-    pFootEndNoteImpl->sContent = aEmptyStr;
+    pFootEndNoteImpl->sContent = aEmptyOUStr;
 }
 
 void SwHTMLParser::FinishFootEndNote()
@@ -215,8 +215,8 @@ void SwHTMLParser::FinishFootEndNote()
         pFootEndNoteImpl->aTxtFtns.push_back( pTxtFtn );
         pFootEndNoteImpl->aNames.push_back(pFootEndNoteImpl->sName);
     }
-    pFootEndNoteImpl->sName = aEmptyStr;
-    pFootEndNoteImpl->sContent = aEmptyStr;
+    pFootEndNoteImpl->sName = aEmptyOUStr;
+    pFootEndNoteImpl->sContent = aEmptyOUStr;
     pFootEndNoteImpl->bFixed = sal_False;
 }
 
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 9de0987c5ec0..b720d4bb1376 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -695,7 +695,7 @@ IMAGE_SETEVENT:
 
     Graphic aEmptyGrf;
     aEmptyGrf.SetDefaultType();
-    SwFrmFmt *pFlyFmt = pDoc->Insert( *pPam, sGrfNm, aEmptyStr, &aEmptyGrf,
+    SwFrmFmt *pFlyFmt = pDoc->Insert( *pPam, sGrfNm, aEmptyOUStr, &aEmptyGrf,
                                       &aFrmSet, NULL, NULL );
     SwGrfNode *pGrfNd = pDoc->GetNodes()[ pFlyFmt->GetCntnt().GetCntntIdx()
                                   ->GetIndex()+1 ]->GetGrfNode();
@@ -1161,7 +1161,7 @@ ANCHOR_SETEVENT:
         if( bEnAnchor || bFtnAnchor || bFtnEnSymbol )
         {
             aFtnName = sHRef.copy( 1 );
-            aClass = aStrippedClass = aName = aEmptyStr;
+            aClass = aStrippedClass = aName = aEmptyOUStr;
             bHasHRef = sal_False;
         }
     }
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 0cde1f113971..71f800261f73 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -642,7 +642,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
 
         // Insert fly frame. If the are columns, the fly frame's name is not
         // the sections name but a generated one.
-        OUString aFlyName( aEmptyStr );
+        OUString aFlyName( aEmptyOUStr );
         if( nCols < 2 )
         {
             aFlyName = aId;
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index dc7293a0deb4..ac47bbcd54e1 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1077,7 +1077,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
 
     pBGBrush = pParser->CreateBrushItem(
                     pOptions->bBGColor ? &(pOptions->aBGColor) : 0,
-                    pOptions->aBGImage, aEmptyStr, aEmptyStr, aEmptyStr );
+                    pOptions->aBGImage, aEmptyOUStr, aEmptyOUStr, aEmptyOUStr );
 
     pContext = 0;
     pParentContents = 0;
@@ -3295,7 +3295,7 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
         nToken = HTML_TABLEDATA_ON;
         nColl = RES_POOLCOLL_TABLE;
     }
-    _HTMLAttrContext *pCntxt = new _HTMLAttrContext( nToken, nColl, aEmptyStr, sal_True );
+    _HTMLAttrContext *pCntxt = new _HTMLAttrContext( nToken, nColl, aEmptyOUStr, sal_True );
     if( SVX_ADJUST_END != eAdjust )
         rParser.InsertAttr( &rParser.aAttrTab.pAdjust, SvxAdjustItem(eAdjust, RES_PARATR_ADJUST),
                             pCntxt );
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index ce50d4395ca5..7272b35c0bb3 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -3919,12 +3919,12 @@ void SwHTMLParser::NewPara()
 
     // Styles parsen (Class nicht beruecksichtigen. Das geht nur, solange
     // keine der CSS1-Properties der Klasse hart formatiert werden muss!!!)
-    if( HasStyleOptions( aStyle, aId, aEmptyStr, &aLang, &aDir ) )
+    if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
     {
         SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
         SvxCSS1PropertyInfo aPropInfo;
 
-        if( ParseStyleOptions( aStyle, aId, aEmptyStr, aItemSet, aPropInfo, &aLang, &aDir ) )
+        if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) )
         {
             OSL_ENSURE( aClass.isEmpty() || !pCSS1Parser->GetClass( aClass ),
                     "Class wird nicht beruecksichtigt" );
@@ -4054,12 +4054,12 @@ void SwHTMLParser::NewHeading( int nToken )
     _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken), nTxtColl, aClass );
 
     // Styles parsen (zu Class siehe auch NewPara)
-    if( HasStyleOptions( aStyle, aId, aEmptyStr, &aLang, &aDir ) )
+    if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
     {
         SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
         SvxCSS1PropertyInfo aPropInfo;
 
-        if( ParseStyleOptions( aStyle, aId, aEmptyStr, aItemSet, aPropInfo, &aLang, &aDir ) )
+        if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) )
         {
             OSL_ENSURE( aClass.isEmpty() || !pCSS1Parser->GetClass( aClass ),
                     "Class wird nicht beruecksichtigt" );
@@ -4162,7 +4162,7 @@ void SwHTMLParser::NewTxtFmtColl( int nToken, sal_uInt16 nColl )
         // Diese beiden Tags werden jetzt auf die PRE-Vorlage gemappt.
         // Fuer dem Fall, dass ein CLASS angegeben ist, loeschen wir
         // es damit wir nicht die CLASS der PRE-Vorlage bekommen.
-        aClass = aEmptyStr;
+        aClass = aEmptyOUStr;
     case HTML_BLOCKQUOTE_ON:
     case HTML_BLOCKQUOTE30_ON:
     case HTML_PREFORMTXT_ON:
@@ -4188,12 +4188,12 @@ void SwHTMLParser::NewTxtFmtColl( int nToken, sal_uInt16 nColl )
     _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken), nColl, aClass );
 
     // Styles parsen (zu Class siehe auch NewPara)
-    if( HasStyleOptions( aStyle, aId, aEmptyStr, &aLang, &aDir ) )
+    if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
     {
         SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
         SvxCSS1PropertyInfo aPropInfo;
 
-        if( ParseStyleOptions( aStyle, aId, aEmptyStr, aItemSet, aPropInfo, &aLang, &aDir ) )
+        if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) )
         {
             OSL_ENSURE( aClass.isEmpty() || !pCSS1Parser->GetClass( aClass ),
                     "Class wird nicht beruecksichtigt" );
@@ -4330,7 +4330,7 @@ void SwHTMLParser::NewDefList()
 
         // und den der DT-Vorlage des aktuellen Levels
         SvxLRSpaceItem rLRSpace =
-            pCSS1Parser->GetTxtFmtColl( RES_POOLCOLL_HTML_DD, aEmptyStr )
+            pCSS1Parser->GetTxtFmtColl( RES_POOLCOLL_HTML_DD, aEmptyOUStr )
                        ->GetLRSpace();
         nLeft = nLeft + static_cast< sal_uInt16 >(rLRSpace.GetTxtLeft());
     }
@@ -4688,7 +4688,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
             if( RES_POOLCOLL_HTML_DD == nTopColl )
             {
                 const SvxLRSpaceItem& rDTLRSpace = pCSS1Parser
-                    ->GetTxtFmtColl( RES_POOLCOLL_HTML_DT, aEmptyStr )
+                    ->GetTxtFmtColl( RES_POOLCOLL_HTML_DT, aEmptyOUStr )
                     ->GetLRSpace();
                 nLeft -= rDTLRSpace.GetTxtLeft();
                 nRight -= rDTLRSpace.GetRight();
@@ -4811,12 +4811,12 @@ void SwHTMLParser::NewCharFmt( int nToken )
 
 
     // Styles parsen (zu Class siehe auch NewPara)
-    if( HasStyleOptions( aStyle, aId, aEmptyStr, &aLang, &aDir ) )
+    if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
     {
         SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
         SvxCSS1PropertyInfo aPropInfo;
 
-        if( ParseStyleOptions( aStyle, aId, aEmptyStr, aItemSet, aPropInfo, &aLang, &aDir ) )
+        if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) )
         {
             OSL_ENSURE( aClass.isEmpty() || !pCSS1Parser->GetClass( aClass ),
                     "Class wird nicht beruecksichtigt" );
@@ -5286,7 +5286,7 @@ void SwHTMLParser::InsertHorzRule()
 
     // ... und in einem Kontext merken
     _HTMLAttrContext *pCntxt =
-        new _HTMLAttrContext( HTML_HORZRULE, RES_POOLCOLL_HTML_HR, aEmptyStr );
+        new _HTMLAttrContext( HTML_HORZRULE, RES_POOLCOLL_HTML_HR, aEmptyOUStr );
 
     PushContext( pCntxt );
 
@@ -5457,7 +5457,7 @@ void SwHTMLParser::ParseMoreMetaOptions()
 
     SwPostItField aPostItFld(
         (SwPostItFieldType*)pDoc->GetSysFldType( RES_POSTITFLD ),
-        aEmptyStr, sText.makeStringAndClear(), aEmptyStr, aEmptyStr, DateTime( DateTime::SYSTEM ) );
+        aEmptyOUStr, sText.makeStringAndClear(), aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) );
     SwFmtFld aFmtFld( aPostItFld );
     InsertAttr( aFmtFld );
 }
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 8a40faf88aea..8be21f28d95d 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -651,7 +651,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
                     SwRedlineData aData(rFltRedline.eTypePrev,
                                         rFltRedline.nAutorNoPrev,
                                         rFltRedline.aStampPrev,
-                                        aEmptyStr,
+                                        aEmptyOUStr,
                                         0
                                         );
                     pDoc->AppendRedline(new SwRedline(aData, aRegion), true);
@@ -659,7 +659,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
                 SwRedlineData aData(rFltRedline.eType,
                                     rFltRedline.nAutorNo,
                                     rFltRedline.aStamp,
-                                    aEmptyStr,
+                                    aEmptyOUStr,
                                     0
                                     );
                 pDoc->AppendRedline( new SwRedline(aData, aRegion), true );
@@ -1183,7 +1183,7 @@ SwFltShell& SwFltShell::AddError( const sal_Char* pErr )
 SwFltShell& SwFltShell::operator << (Graphic& rGraphic)
 {
     // embedded Grafik !!
-    GetDoc().Insert(*pPaM, aEmptyStr, aEmptyStr, &rGraphic, NULL, NULL, NULL);
+    GetDoc().Insert(*pPaM, aEmptyOUStr, aEmptyOUStr, &rGraphic, NULL, NULL, NULL);
     return *this;
 }
 
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 372734fd967d..610233a877fc 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -916,7 +916,7 @@ oncemore:
         case 39: // fillin command
             pField = new SwInputField(
                 (SwInputFieldType*)rOut.GetSysFldType( RES_INPUTFLD ),
-                aEmptyStr, sFormel,
+                aEmptyOUStr, sFormel,
                 INP_TXT, 0 );       // sichtbar ( geht z.Zt. nicht anders )
         break;
         case 51: // macro button
@@ -1472,7 +1472,7 @@ SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode)
         }
     }
 // nun koennen wir den font basteln: .........................
-    return SvxFontItem(eFamily, aName, aEmptyStr, ePitch, eCharSet, RES_CHRATR_FONT);
+    return SvxFontItem(eFamily, aName, aEmptyOUStr, ePitch, eCharSet, RES_CHRATR_FONT);
 }
 
 /////////////////////////////////////////////////////////////////// Dop
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 08c68a074be8..84de3bf8fbb5 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -742,14 +742,14 @@ namespace sw
                 if (USHRT_MAX != pFltRedline->nAutorNoPrev)
                 {
                     SwRedlineData aData(pFltRedline->eTypePrev,
-                        pFltRedline->nAutorNoPrev, pFltRedline->aStampPrev, aEmptyStr,
+                        pFltRedline->nAutorNoPrev, pFltRedline->aStampPrev, aEmptyOUStr,
                         0);
 
                     mrDoc.AppendRedline(new SwRedline(aData, aRegion), true);
                 }
 
                 SwRedlineData aData(pFltRedline->eType, pFltRedline->nAutorNo,
-                        pFltRedline->aStamp, aEmptyStr, 0);
+                        pFltRedline->aStamp, aEmptyOUStr, 0);
 
                 SwRedline *const pNewRedline(new SwRedline(aData, aRegion));
                 // the point node may be deleted in AppendRedline, so park
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index da36ef3b8242..f10cd83e762f 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -338,7 +338,7 @@ void WW8Export::DoCheckBox(uno::Reference<beans::XPropertySet> xPropSet)
 
     aFFData.Write(pDataStrm);
 
-    OutputField(0, ww::eFORMCHECKBOX, aEmptyStr, WRITEFIELD_CLOSE);
+    OutputField(0, ww::eFORMCHECKBOX, aEmptyOUStr, WRITEFIELD_CLOSE);
 }
 
 void WW8Export::DoFormText(const SwInputField * pFld)
@@ -371,7 +371,7 @@ void WW8Export::DoFormText(const SwInputField * pFld)
     aFFData.setStatus(pFld->GetToolTip());
     aFFData.Write(pDataStrm);
 
-    OutputField(0, ww::eFORMTEXT, aEmptyStr, WRITEFIELD_CMD_END);
+    OutputField(0, ww::eFORMTEXT, aEmptyOUStr, WRITEFIELD_CMD_END);
 
     OUString const fieldStr( pFld->ExpandField(true) );
     SwWW8Writer::WriteString16(Strm(), fieldStr, false);
@@ -387,7 +387,7 @@ void WW8Export::DoFormText(const SwInputField * pFld)
     pChpPlc->AppendFkpEntry(Strm().Tell(),
                 sizeof( aArr2 ), aArr2 );
 
-    OutputField(0, ww::eFORMTEXT, aEmptyStr, WRITEFIELD_CLOSE);
+    OutputField(0, ww::eFORMTEXT, aEmptyOUStr, WRITEFIELD_CLOSE);
 }
 
 PlcDrawObj::~PlcDrawObj()
@@ -843,7 +843,7 @@ void WW8Export::AppendFlyInFlys(const sw::Frame& rFrmFmt,
     }
 
     if (rFrmFmt.IsInline())
-        OutputField(0, ww::eSHAPE, aEmptyStr, WRITEFIELD_CLOSE);
+        OutputField(0, ww::eSHAPE, aEmptyOUStr, WRITEFIELD_CLOSE);
 }
 
 MSWord_SdrAttrIter::MSWord_SdrAttrIter( MSWordExportBase& rWr,
@@ -1195,7 +1195,7 @@ void WW8Export::WriteOutliner(const OutlinerParaObject& rParaObj, sal_uInt8 nTyp
 
     bAnyWrite = 0 != nPara;
     if( !bAnyWrite )
-        WriteStringAsPara( aEmptyStr );
+        WriteStringAsPara( aEmptyOUStr );
 }
 
 void WinwordAnchoring::WriteData( EscherEx& rEx ) const
@@ -3002,7 +3002,7 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb
     rWW8Wrt.pChpPlc->AppendFkpEntry(rWW8Wrt.Strm().Tell(),sizeof(aSpecOLE),
         aSpecOLE);
     rWW8Wrt.WriteChar( 0x1 );
-    rWW8Wrt.OutputField(0, ww::eCONTROL, aEmptyStr, WRITEFIELD_END | WRITEFIELD_CLOSE);
+    rWW8Wrt.OutputField(0, ww::eCONTROL, aEmptyOUStr, WRITEFIELD_END | WRITEFIELD_CLOSE);
     return true;
 }
 
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 1eeda8665719..8c608f7e78af 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -756,7 +756,7 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen /*nPos*/,
 void WW8AttributeOutput::EndRuby()
 {
     m_rWW8Export.WriteChar( ')' );
-    m_rWW8Export.OutputField( 0, ww::eEQ, aEmptyStr, WRITEFIELD_END | WRITEFIELD_CLOSE );
+    m_rWW8Export.OutputField( 0, ww::eEQ, aEmptyOUStr, WRITEFIELD_END | WRITEFIELD_CLOSE );
 }
 
 /*#i15387# Better ideas welcome*/
@@ -1002,7 +1002,7 @@ bool WW8AttributeOutput::EndURL()
     if ( !m_rWW8Export.bWrtWW8 )
         return false;
 
-    m_rWW8Export.OutputField( 0, ww::eHYPERLINK, aEmptyStr, WRITEFIELD_CLOSE );
+    m_rWW8Export.OutputField( 0, ww::eHYPERLINK, aEmptyOUStr, WRITEFIELD_CLOSE );
 
     return true;
 }
@@ -2401,7 +2401,7 @@ void WW8AttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeIn
 
 void WW8AttributeOutput::EmptyParagraph()
 {
-    m_rWW8Export.WriteStringAsPara( aEmptyStr );
+    m_rWW8Export.WriteStringAsPara( aEmptyOUStr );
 }
 
 bool MSWordExportBase::NoPageBreakSection( const SfxItemSet* pSet )
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 850a6ea509b4..8d40b97c23f2 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1221,7 +1221,7 @@ void WW8_WrPlcSepx::WriteFtnEndTxt( WW8Export& rWrt, sal_uLong nCpStt )
         {
             pTxtPos->Append( nCpStt );
             rWrt.WriteStringAsPara( rInfo.aErgoSum );
-            rWrt.WriteStringAsPara( aEmptyStr );
+            rWrt.WriteStringAsPara( aEmptyOUStr );
             nCpStt = rWrt.Fc2Cp( rWrt.Strm().Tell() );
         }
         else if( rWrt.bWrtWW8 )
@@ -1231,7 +1231,7 @@ void WW8_WrPlcSepx::WriteFtnEndTxt( WW8Export& rWrt, sal_uLong nCpStt )
         {
             pTxtPos->Append( nCpStt );
             rWrt.WriteStringAsPara( rInfo.aQuoVadis );
-            rWrt.WriteStringAsPara( aEmptyStr );
+            rWrt.WriteStringAsPara( aEmptyOUStr );
             nCpStt = rWrt.Fc2Cp( rWrt.Strm().Tell() );
         }
         else if( rWrt.bWrtWW8 )
@@ -1295,7 +1295,7 @@ void WW8_WrPlcSepx::OutHeaderFooter( WW8Export& rWrt, bool bHeader,
     {
         pTxtPos->Append( rCpPos );
         rWrt.WriteHeaderFooterText( rFmt, bHeader);
-        rWrt.WriteStringAsPara( aEmptyStr ); // CR ans Ende ( sonst mault WW )
+        rWrt.WriteStringAsPara( aEmptyOUStr ); // CR ans Ende ( sonst mault WW )
         rCpPos = rWrt.Fc2Cp( rWrt.Strm().Tell() );
     }
     else if ( rWrt.bWrtWW8 )
@@ -1303,8 +1303,8 @@ void WW8_WrPlcSepx::OutHeaderFooter( WW8Export& rWrt, bool bHeader,
         pTxtPos->Append( rCpPos );
         if ((bHeader? rWrt.bHasHdr : rWrt.bHasFtr) && nBreakCode!=0)
         {
-            rWrt.WriteStringAsPara( aEmptyStr ); // Empty paragraph for empty header/footer
-            rWrt.WriteStringAsPara( aEmptyStr ); // a CR that WW8 needs for end of the stream
+            rWrt.WriteStringAsPara( aEmptyOUStr ); // Empty paragraph for empty header/footer
+            rWrt.WriteStringAsPara( aEmptyOUStr ); // a CR that WW8 needs for end of the stream
             rCpPos = rWrt.Fc2Cp( rWrt.Strm().Tell() );
         }
     }
@@ -1910,7 +1910,7 @@ bool WW8_WrPlcSepx::WriteKFTxt( WW8Export& rWrt )
             ++nCpEnd;
             pTxtPos->Append( nCpEnd + 1 );  // End of last Header/Footer for PlcfHdd
 
-            rWrt.WriteStringAsPara( aEmptyStr ); // CR ans Ende ( sonst mault WW )
+            rWrt.WriteStringAsPara( aEmptyOUStr ); // CR ans Ende ( sonst mault WW )
         }
         rWrt.pFldHdFt->Finish( nCpEnd, rWrt.pFib->ccpText + rWrt.pFib->ccpFtn );
         rWrt.pFib->ccpHdr = nCpEnd - nCpStart;
@@ -2195,7 +2195,7 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
                 }
 
                 // CR at end of one textbox text ( otherwise WW gpft :-( )
-                rWrt.WriteStringAsPara( aEmptyStr );
+                rWrt.WriteStringAsPara( aEmptyOUStr );
             }
             break;
 
@@ -2223,7 +2223,7 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
 
     pTxtPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
     // CR ans Ende ( sonst mault WW )
-    rWrt.WriteStringAsPara( aEmptyStr );
+    rWrt.WriteStringAsPara( aEmptyOUStr );
 
     WW8_CP nCpEnd = rWrt.Fc2Cp( rWrt.Strm().Tell() );
     pTxtPos->Append( nCpEnd );
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index fbca287233f0..2b00b75a016b 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -173,13 +173,13 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet,
                 {
                     Graphic aGr1;
                     GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
-                    if( rGF.ImportGraphic( aGr1, aEmptyStr, *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ) == GRFILTER_OK )
+                    if( rGF.ImportGraphic( aGr1, aEmptyOUStr, *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ) == GRFILTER_OK )
                     {
                         Graphic aGr2;
                         delete pGraphicStream;
                         pGraphicStream =
                                 ::utl::UcbStreamHelper::CreateStream( aCnt.GetGraphicStream( pRet->GetObjRef() ) );
-                        if( rGF.ImportGraphic( aGr2, aEmptyStr, *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ) == GRFILTER_OK )
+                        if( rGF.ImportGraphic( aGr2, aEmptyOUStr, *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ) == GRFILTER_OK )
                         {
                             if ( aGr1 == aGr2 )
                                 bGraphicNeeded = false;
@@ -329,7 +329,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
                     OutGrf(*mpParentFrame);
                 }
 
-                OutputField(0, ww::eEMBED, aEmptyStr,
+                OutputField(0, ww::eEMBED, aEmptyOUStr,
                     WRITEFIELD_END | WRITEFIELD_CLOSE);
 
                 if (bEndCR) //No newline in inline case
@@ -936,7 +936,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
                 {
                     Graphic aGr;
                     GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
-                    if( rGF.ImportGraphic( aGr, aEmptyStr, *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ) == GRFILTER_OK )
+                    if( rGF.ImportGraphic( aGr, aEmptyOUStr, *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ) == GRFILTER_OK )
                     {
                         //TODO/LATER: do we really want to use GDIMetafile?!
                         GDIMetaFile aMtf;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 528615ebedc3..00690bd79e3c 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2308,7 +2308,7 @@ void AttributeOutputBase::EndTOX( const SwSection& rSect )
     if ( pTOX )
     {
         ww::eField eCode = TOX_INDEX == pTOX->GetType() ? ww::eINDEX : ww::eTOC;
-        GetExport( ).OutputField( 0, eCode, aEmptyStr, WRITEFIELD_CLOSE );
+        GetExport( ).OutputField( 0, eCode, aEmptyOUStr, WRITEFIELD_CLOSE );
     }
     GetExport( ).bInWriteTOX = false;
 }
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 831566ad9866..44fc3c9fc15b 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -94,7 +94,7 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks,
                 URIHelper::GetMaybeFileHdl()));
     }
     else
-        rBlocks.SetBaseURL( aEmptyStr );
+        rBlocks.SetBaseURL( aEmptyOUStr );
 
     SwNodeIndex aDocEnd( pD->GetNodes().GetEndOfContent() );
     SwNodeIndex aStart( *aDocEnd.GetNode().StartOfSectionNode(), 1 );
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 1e310b7d98b9..3ebfce2c6590 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -206,7 +206,7 @@ static void SetStdAttr( SfxItemSet& rSet, WW8_DP_LINETYPE& rL,
         rSet.Put( XLineStyleItem( XLINE_NONE ) );
     }else{                                          // sichtbar
         Color aCol( WW8TransCol( rL.lnpc ) );           // LinienFarbe
-        rSet.Put( XLineColorItem( aEmptyStr, aCol ) );
+        rSet.Put( XLineColorItem( aEmptyOUStr, aCol ) );
         rSet.Put( XLineWidthItem( SVBT16ToShort( rL.lnpw ) ) );
                                                     // LinienDicke
         if( SVBT16ToShort( rL.lnps ) >= 1
@@ -223,7 +223,7 @@ static void SetStdAttr( SfxItemSet& rSet, WW8_DP_LINETYPE& rL,
             case 3: break;                      // Dash Dot
             case 4: aD.SetDots( 2 ); break;     // Dash Dot Dot
             }
-            rSet.Put( XLineDashItem( aEmptyStr, aD ) );
+            rSet.Put( XLineDashItem( aEmptyOUStr, aD ) );
         }else{
             rSet.Put( XLineStyleItem( XLINE_SOLID ) );  // noetig fuer TextBox
         }
@@ -259,7 +259,7 @@ static void SetFill( SfxItemSet& rSet, WW8_DP_FILL& rFill )
         if (nPat <= 1 || ((sizeof(nPatA)/sizeof(nPatA[0])) <= nPat))
         {
             // Solid Background or unknown
-            rSet.Put(XFillColorItem(aEmptyStr, WW8TransCol(rFill.dlpcBg)));
+            rSet.Put(XFillColorItem(aEmptyOUStr, WW8TransCol(rFill.dlpcBg)));
         }
         else
         {                                      // Brush -> Farbmischung
@@ -271,7 +271,7 @@ static void SetFill( SfxItemSet& rSet, WW8_DP_FILL& rFill )
                         + (sal_uLong)aB.GetGreen() * ( 100 - nPatA[nPat] ) ) / 100 ) );
             aB.SetBlue( (sal_uInt8)( ( (sal_uLong)aF.GetBlue() * nPatA[nPat]
                         + (sal_uLong)aB.GetBlue() * ( 100 - nPatA[nPat] ) ) / 100 ) );
-            rSet.Put( XFillColorItem( aEmptyStr, aB ) );
+            rSet.Put( XFillColorItem( aEmptyOUStr, aB ) );
         }
     }
 }
@@ -287,7 +287,7 @@ static void SetLineEndAttr( SfxItemSet& rSet, WW8_DP_LINEEND& rLe,
         aPolygon.append(::basegfx::B2DPoint(100.0, 0.0));
         aPolygon.append(::basegfx::B2DPoint(200.0, 330.0));
         aPolygon.setClosed(true);
-        rSet.Put( XLineEndItem( aEmptyStr, ::basegfx::B2DPolyPolygon(aPolygon) ) );
+        rSet.Put( XLineEndItem( aEmptyOUStr, ::basegfx::B2DPolyPolygon(aPolygon) ) );
         sal_uInt16 nSiz = SVBT16ToShort( rLt.lnpw )
                         * ( ( aSB >> 2 & 0x3 ) + ( aSB >> 4 & 0x3 ) );
         if( nSiz < 220 ) nSiz = 220;
@@ -302,7 +302,7 @@ static void SetLineEndAttr( SfxItemSet& rSet, WW8_DP_LINEEND& rLe,
         aPolygon.append(::basegfx::B2DPoint(100.0, 0.0));
         aPolygon.append(::basegfx::B2DPoint(200.0, 330.0));
         aPolygon.setClosed(true);
-        rSet.Put( XLineStartItem( aEmptyStr, ::basegfx::B2DPolyPolygon(aPolygon) ) );
+        rSet.Put( XLineStartItem( aEmptyOUStr, ::basegfx::B2DPolyPolygon(aPolygon) ) );
         sal_uInt16 nSiz = SVBT16ToShort( rLt.lnpw )
                         * ( ( aEB >> 2 & 0x3 ) + ( aEB >> 4 & 0x3 ) );
         if( nSiz < 220 ) nSiz = 220;
@@ -939,7 +939,7 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(OUString &rString, WW8_CP
         pRet->SetOutlinerMode( OUTLINERMODE_TEXTOBJECT );
         delete pTemporaryText;
 
-        mpDrawEditEngine->SetText( aEmptyStr );
+        mpDrawEditEngine->SetText( aEmptyOUStr );
         mpDrawEditEngine->SetParaAttribs(0, mpDrawEditEngine->GetEmptyItemSet());
 
         //Strip out fields, leaving the result
@@ -1157,7 +1157,7 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
         // Vorgehen: Text loeschen = auf 1 Absatz reduzieren
         // und an diesem Absatz die Absatzattribute und Styles loeschen
         // (Empfehlung JOE)
-        mpDrawEditEngine->SetText( aEmptyStr );
+        mpDrawEditEngine->SetText( aEmptyOUStr );
         mpDrawEditEngine->SetParaAttribs(0, mpDrawEditEngine->GetEmptyItemSet());
     }
 
@@ -2954,7 +2954,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
             // as a linked graphic -
             if (GRAPHIC_NONE == eType || CanUseRemoteLink(aGrfName))
             {
-                pRetFrmFmt = rDoc.Insert(*pPaM, aGrfName, aEmptyStr, 0,
+                pRetFrmFmt = rDoc.Insert(*pPaM, aGrfName, aEmptyOUStr, 0,
                     &rFlySet, &aGrSet, NULL);
                 bDone = true;
             }
@@ -2962,7 +2962,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
         if (!bDone)
         {
             const Graphic& rGraph = pGrf->GetGraphic();
-            pRetFrmFmt = rDoc.Insert(*pPaM, aEmptyStr, aEmptyStr, &rGraph,
+            pRetFrmFmt = rDoc.Insert(*pPaM, aEmptyOUStr, aEmptyOUStr, &rGraph,
                 &rFlySet, &aGrSet, NULL);
         }
     }
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index d95637342aa1..59017201287e 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -242,7 +242,7 @@ extern void WW8PicShadowToReal(  WW8_PIC_SHADOW*  pPicS,  WW8_PIC*  pPic );
 
 bool SwWW8ImplReader::GetPictGrafFromStream(Graphic& rGraphic, SvStream& rSrc)
 {
-    return 0 == GraphicFilter::GetGraphicFilter().ImportGraphic(rGraphic, aEmptyStr, rSrc,
+    return 0 == GraphicFilter::GetGraphicFilter().ImportGraphic(rGraphic, aEmptyOUStr, rSrc,
         GRFILTER_FORMAT_DONTKNOW);
 }
 
@@ -369,7 +369,7 @@ SwFlyFrmFmt* SwWW8ImplReader::MakeGrafNotInCntnt(const WW8PicDesc& rPD,
 
     aFlySet.Put( SwFmtFrmSize( ATT_FIX_SIZE, nWidth, nHeight ) );
 
-    SwFlyFrmFmt* pFlyFmt = rDoc.Insert(*pPaM, rFileName, aEmptyStr, pGraph,
+    SwFlyFrmFmt* pFlyFmt = rDoc.Insert(*pPaM, rFileName, aEmptyOUStr, pGraph,
         &aFlySet, &rGrfSet, NULL);
 
     // Damit die Frames bei Einfuegen in existierendes Doc erzeugt werden:
@@ -397,7 +397,7 @@ SwFrmFmt* SwWW8ImplReader::MakeGrafInCntnt(const WW8_PIC& rPic,
     if( !pFlyFmt )                          // dann eben als Graphic
     {
 
-        pFlyFmt = rDoc.Insert( *pPaM, rFileName, aEmptyStr, pGraph, &aFlySet,
+        pFlyFmt = rDoc.Insert( *pPaM, rFileName, aEmptyOUStr, pGraph, &aFlySet,
             &rGrfSet, NULL);
     }
 
@@ -663,7 +663,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
 
                             if (!pRet)
                             {
-                                pRet = rDoc.Insert(*pPaM, aEmptyStr, aEmptyStr,
+                                pRet = rDoc.Insert(*pPaM, aEmptyOUStr, aEmptyOUStr,
                                     &rGraph, &aAttrSet, &aGrSet, NULL );
                             }
                         }
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index bb20928b91ef..775137e213ab 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -256,7 +256,7 @@ public:
     bool bParaAutoAfter;    // For Auto Spacing after a paragraph
 
     SwWW8StyInf() :
-        sWWStyleName( aEmptyStr ),
+        sWWStyleName( aEmptyOUStr ),
         nWWStyleId( 0 ),
         eLTRFontSrcCharSet(0),
         eRTLFontSrcCharSet(0),
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 66c2b9941740..88d30f29a793 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3316,7 +3316,7 @@ void WW8TabDesc::SetNumRuleName( const OUString& rName )
 {
     sal_uInt16 nCol = GetLogicalWWCol();
     for (sal_uInt16 nSize = static_cast< sal_uInt16 >(aNumRuleNames.size()); nSize <= nCol; ++nSize)
-        aNumRuleNames.push_back(aEmptyStr);
+        aNumRuleNames.push_back(aEmptyOUStr);
     aNumRuleNames[nCol] = rName;
 }
 
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 2888fa342aaf..9e877ad84b74 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2024,7 +2024,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
                 // here a paragraph is being directly formated
 
                 // empty the numbering/list style applied to the current paragraph
-                SwNumRuleItem aEmptyRule( aEmptyStr );
+                SwNumRuleItem aEmptyRule( aEmptyOUStr );
                 pTxtNode->SetAttr( aEmptyRule );
 
                 // create an empty SvxLRSpaceItem
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index c863024c532a..e71bfa86854d 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -301,7 +301,7 @@ SwFrmFmt* SwWW8ImplReader::ImportOle(const Graphic* pGrf,
                 GRAPHIC_BITMAP == aGraph.GetType()
             )
     {
-        pFmt = rDoc.Insert(*pPaM, aEmptyStr, aEmptyStr, &aGraph, pFlySet,
+        pFmt = rDoc.Insert(*pPaM, aEmptyOUStr, aEmptyOUStr, &aGraph, pFlySet,
             pGrfSet, NULL);
     }
     delete pTempSet;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 85acc2a5abcb..ba481f3853f6 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -283,7 +283,7 @@ OUString FindPara( const OUString& rStr, sal_Unicode cToken, sal_Unicode cToken2
     xub_StrLen n2;                                          // end
     xub_StrLen n = FindParaStart( rStr, cToken, cToken2 );  // start
     if( STRING_NOTFOUND == n )
-        return aEmptyStr;
+        return aEmptyOUStr;
 
     if(    rStr[ n ] == '"'
         || rStr[ n ] == 132 )
@@ -353,7 +353,7 @@ bool SwWW8ImplReader::ForceFieldLanguage(SwField &rFld, sal_uInt16 nLang)
     return bRet;
 }
 
-String GetWordDefaultDateStringAsUS(SvNumberFormatter* pFormatter, sal_uInt16 nLang)
+OUString GetWordDefaultDateStringAsUS(SvNumberFormatter* pFormatter, sal_uInt16 nLang)
 {
     //Get the system date in the correct final language layout, convert to
     //a known language and modify the 2 digit year part to be 4 digit, and
@@ -1100,7 +1100,7 @@ OUString SwWW8ImplReader::GetFieldResult( WW8FieldDesc* pF )
     WW8_CP nStart = pF->nSRes;              // result start
     long nL = pF->nLRes;                    // result length
     if( !nL )
-        return aEmptyStr;                   // no result
+        return aEmptyOUStr;                   // no result
 
     if( nL > MAX_FIELDLEN )
         nL = MAX_FIELDLEN;                  // MaxLength, by quoting
@@ -1297,7 +1297,7 @@ eF_ResT SwWW8ImplReader::Read_F_ANumber( WW8FieldDesc*, OUString& rStr )
         SwSetExpFieldType aT( &rDoc, OUString("AutoNr"), nsSwGetSetExpType::GSE_SEQ );
         pNumFldType = rDoc.InsertFldType( aT );
     }
-    SwSetExpField aFld( (SwSetExpFieldType*)pNumFldType, aEmptyStr,
+    SwSetExpField aFld( (SwSetExpFieldType*)pNumFldType, aEmptyOUStr,
                         GetNumberPara( rStr ) );
     aFld.SetValue( ++nFldNum );
     rDoc.InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 );
@@ -1366,7 +1366,7 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, OUString& rStr )
 
     SwSetExpFieldType* pFT = (SwSetExpFieldType*)rDoc.InsertFldType(
                         SwSetExpFieldType( &rDoc, aSequenceName, nsSwGetSetExpType::GSE_SEQ ) );
-    SwSetExpField aFld( pFT, aEmptyStr, eNumFormat );
+    SwSetExpField aFld( pFT, aEmptyOUStr, eNumFormat );
 
     //#i120654# Add bHidden for /h flag (/h: Hide the field result.)
     if (bHidden)
@@ -1792,7 +1792,7 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, OUString& rStr )
     {
         if (!aName.isEmpty())                           // Font Name set ?
         {
-            SvxFontItem aFont(FAMILY_DONTKNOW, aName, aEmptyStr,
+            SvxFontItem aFont(FAMILY_DONTKNOW, aName, aEmptyOUStr,
                 PITCH_DONTKNOW, RTL_TEXTENCODING_SYMBOL, RES_CHRATR_FONT);
             NewAttr(aFont);                       // new Font
         }
@@ -2249,7 +2249,7 @@ eF_ResT SwWW8ImplReader::Read_F_IncludePicture( WW8FieldDesc*, OUString& rStr )
         aFlySet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
         pFlyFmtOfJustInsertedGraphic = rDoc.Insert( *pPaM,
                                                     aGrfName,
-                                                    aEmptyStr,
+                                                    aEmptyOUStr,
                                                     0,          // Graphic*
                                                     &aFlySet,
                                                     0, 0);         // SwFrmFmt*
@@ -2374,7 +2374,7 @@ eF_ResT SwWW8ImplReader::Read_F_DBNext( WW8FieldDesc*, OUString& )
 {
     SwDBNextSetFieldType aN;
     SwFieldType* pFT = rDoc.InsertFldType( aN );
-    SwDBNextSetField aFld( (SwDBNextSetFieldType*)pFT, aEmptyStr, aEmptyStr,
+    SwDBNextSetField aFld( (SwDBNextSetFieldType*)pFT, aEmptyOUStr, aEmptyOUStr,
                             SwDBData() );       // Datenbank: Nichts
     rDoc.InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 );
     return FLD_OK;
@@ -2570,7 +2570,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
             pFmt = rDoc.MakeCharFmt(aNm,(SwCharFmt*)rDoc.GetDfltCharFmt());
             SvxFontHeightItem aHeightItem(nFontSize*10, 100, RES_CHRATR_FONTSIZE);
             SvxFontItem aFontItem(FAMILY_DONTKNOW,sFontName,
-                aEmptyStr,PITCH_DONTKNOW,RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT);
+                aEmptyOUStr,PITCH_DONTKNOW,RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT);
             aHeightItem.SetWhich(GetWhichOfScript(RES_CHRATR_FONTSIZE,nScript));
             aFontItem.SetWhich(GetWhichOfScript(RES_CHRATR_FONT,nScript));
             pFmt->SetFmtAttr(aHeightItem);
@@ -2803,7 +2803,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
 
     const SwTOXType* pType = rDoc.GetTOXType( eTox, 0 );
     SwForm aOrigForm(eTox);
-    SwTOXBase* pBase = new SwTOXBase( pType, aOrigForm, nCreateOf, aEmptyStr );
+    SwTOXBase* pBase = new SwTOXBase( pType, aOrigForm, nCreateOf, aEmptyOUStr );
     pBase->SetProtected(maSectionManager.CurrentSectionIsProtected());
     switch( eTox ){
     case TOX_INDEX:
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 28ca3db10130..61b5e2d30ea7 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3475,7 +3475,7 @@ bool SwWW8ImplReader::SetNewFontAttr(sal_uInt16 nFCode, bool bSetEnums,
 
     CharSet eDstCharSet = eSrcCharSet;
 
-    SvxFontItem aFont( eFamily, aName, aEmptyStr, ePitch, eDstCharSet, nWhich);
+    SvxFontItem aFont( eFamily, aName, aEmptyOUStr, ePitch, eDstCharSet, nWhich);
 
     if( bSetEnums )
     {
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 3d4af07228f2..55c2d5b2fcf2 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1743,7 +1743,7 @@ public:
     void UpdateIndex( sal_uInt8 grpfIhdt );
 };
 
-void SwapQuotesInField(String &rFmt);
+void SwapQuotesInField(OUString &rFmt);
 
 Word2CHPX ReadWord2Chpx(SvStream &rSt, sal_Size nOffset, sal_uInt8 nSize);
 std::vector<sal_uInt8> ChpxToSprms(const Word2CHPX &rChpx);
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index fa929e1bcc7a..940b9ce098e4 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1570,13 +1570,13 @@ void SwXMLTableContext::InsertColumn( sal_Int32 nWidth2, bool bRelWidth2,
             pColumnDefaultCellStyleNames = new std::vector<OUString>;
             sal_uLong nCount = aColumnWidths.size() - 1;
             while( nCount-- )
-                pColumnDefaultCellStyleNames->push_back(String());
+                pColumnDefaultCellStyleNames->push_back(OUString());
         }
 
         if(pDfltCellStyleName)
             pColumnDefaultCellStyleNames->push_back(*pDfltCellStyleName);
         else
-            pColumnDefaultCellStyleNames->push_back(String());
+            pColumnDefaultCellStyleNames->push_back(OUString());
     }
 }
 
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;
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index c3e9bc0ca303..3b9d182b2f74 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -185,7 +185,7 @@ void SwDropCapsPict::InitPrinter( void )
 ****************************************************************************/
 
 
-String GetDefaultString(sal_uInt16 nChars)
+OUString GetDefaultString(sal_uInt16 nChars)
 {
     OUString aStr;
     for (sal_uInt16 i = 0; i < nChars; i++)
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 1b1bf46569c9..62be5df055ea 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -726,11 +726,11 @@ void SwCaptionOptPage::SaveEntry(SvTreeListEntry* pEntry)
         pOpt->UseCaption() = m_pCheckLB->IsChecked((sal_uInt16)m_pCheckLB->GetModel()->GetAbsPos(pEntry));
         OUString aName( m_pCategoryBox->GetText() );
         if (aName == m_sNone)
-            pOpt->SetCategory(aEmptyStr);
+            pOpt->SetCategory(aEmptyOUStr);
         else
             pOpt->SetCategory(comphelper::string::strip(aName, ' '));
         pOpt->SetNumType((sal_uInt16)(sal_uLong)m_pFormatBox->GetEntryData(m_pFormatBox->GetSelectEntryPos()));
-        pOpt->SetCaption(m_pTextEdit->IsEnabled() ? m_pTextEdit->GetText() : OUString(aEmptyStr) );
+        pOpt->SetCaption(m_pTextEdit->IsEnabled() ? m_pTextEdit->GetText() : OUString(aEmptyOUStr) );
         pOpt->SetPos(m_pPosBox->GetSelectEntryPos());
         sal_uInt16 nPos = m_pLbLevel->GetSelectEntryPos();
         sal_uInt16 nLevel = ( nPos > 0 && nPos != LISTBOX_ENTRY_NOTFOUND ) ? nPos - 1 : MAXLEVEL;
@@ -738,7 +738,7 @@ void SwCaptionOptPage::SaveEntry(SvTreeListEntry* pEntry)
         pOpt->SetSeparator(m_pEdDelim->GetText());
         pOpt->SetNumSeparator( m_pNumberingSeparatorED->GetText());
         if(!m_pCharStyleLB->GetSelectEntryPos())
-            pOpt->SetCharacterStyle(aEmptyStr);
+            pOpt->SetCharacterStyle(aEmptyOUStr);
         else
             pOpt->SetCharacterStyle(m_pCharStyleLB->GetSelectEntry());
         pOpt->CopyAttributes() = m_pApplyBorderCB->IsChecked();
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 784a9b533b3a..7cdca6a5c1a9 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -600,7 +600,7 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType,
         aFont = pPrt->GetFontMetric( aFont );
     SwTxtFmtColl *pColl = pWrtShell->GetTxtCollFromPool(nType);
     pColl->SetFmtAttr(SvxFontItem(aFont.GetFamily(), aFont.GetName(),
-                aEmptyStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
+                aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
 }
 
 static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType,
@@ -678,7 +678,7 @@ sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& )
             if( pPrinter )
                 aFont = pPrinter->GetFontMetric( aFont );
             pWrtShell->SetDefault(SvxFontItem(aFont.GetFamily(), aFont.GetName(),
-                                  aEmptyStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
+                                  aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
             SwTxtFmtColl *pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_STANDARD);
             pColl->ResetFmtAttr(nFontWhich);
             bMod = true;
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index ab31828fd496..39230e634044 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -525,7 +525,7 @@ IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEnt
         }
         sTable = pThis->m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1);
         if(sTable == pThis->m_sConnecting)
-           pThis->m_pListLB->SetEntryText(String(), pSelect, ITEMID_TABLE - 1);
+           pThis->m_pListLB->SetEntryText(OUString(), pSelect, ITEMID_TABLE - 1);
     }
     pThis->m_pEditPB->Enable(pUserData && !pUserData->sURL.isEmpty() &&
                     SWUnoHelper::UCB_IsFile( pUserData->sURL ) && //#i97577#
@@ -619,7 +619,7 @@ void SwAddressListDialog::DetectTablesAndQueries(
             if( pUserData->xColumnsSupplier.is() )
                 m_pListLB->SetEntryText(m_aDBData.sCommand, pSelect, ITEMID_TABLE - 1);
             else
-                m_pListLB->SetEntryText(String(), pSelect, ITEMID_TABLE - 1);
+                m_pListLB->SetEntryText(OUString(), pSelect, ITEMID_TABLE - 1);
         }
         OUString sCommand = m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1);
         m_pOK->Enable(pSelect && !sCommand.isEmpty());
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index cd8d8688b984..2a3d397a4226 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1230,7 +1230,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
             aDBFormatData.aLocale = LanguageTag( rSh.GetCurLang() ).getLocale();
             SwDBNextSetField aNxtDBFld( (SwDBNextSetFieldType*)rSh.
                                         GetFldType( 0, RES_DBNEXTSETFLD ),
-                                        OUString("1"), aEmptyStr, aDBData );
+                                        OUString("1"), aEmptyOUStr, aDBData );
 
 
             bool bSetCrsr = true;
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index a9466e648545..5d8a8df461d4 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -874,7 +874,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
             SfxMedium* pOrig = pSourceShell->GetView().GetDocShell()->GetMedium();
             OUString sSourceDocumentURL(pOrig->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ));
             const SfxFilter* pSfxFlt = SwIoSystem::GetFileFilter(
-                                                    sSourceDocumentURL, ::aEmptyStr );
+                                                    sSourceDocumentURL, ::aEmptyOUStr );
             const SfxFilter* pStoreToFilter = pSfxFlt;
             SfxFilterContainer* pFilterContainer = SwDocShell::Factory().GetFilterContainer();
             const OUString* pStoreToFilterOptions = 0;
@@ -956,7 +956,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                 aPrtMonDlg.Show();
 
             // Progress, to prohibit KeyInputs
-            SfxProgress aProgress(pSourrceDocSh, ::aEmptyStr, 1);
+            SfxProgress aProgress(pSourrceDocSh, ::aEmptyOUStr, 1);
 
             // lock all dispatchers
             SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst(pSourrceDocSh);
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 7164f0f6317d..9f1bbb53791c 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -506,7 +506,7 @@ void  SwSendMailDialog::SendMails()
     uno::Reference< mail::XSmtpService > xSmtpServer =
                 SwMailMergeHelper::ConnectToSmtpServer( *m_pConfigItem,
                                             m_pImpl->xConnectedInMailService,
-                                            aEmptyStr, aEmptyStr, this );
+                                            aEmptyOUStr, aEmptyOUStr, this );
     bool bIsLoggedIn = xSmtpServer.is() && xSmtpServer->isConnected();
     LeaveWait();
     if(!bIsLoggedIn)
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 13dfa038d541..a2b04213c2b6 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -382,13 +382,13 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
                     }
                     else
                     {
-                        SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sExpression, aEmptyStr, 0, &rShell );
+                        SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sExpression, aEmptyOUStr, 0, &rShell );
                         aFldMgr.InsertFld( aData );
                     }
                 }
                 else
                 {
-                    SwInsertFld_Data aData(TYP_DBFLD, 0, sDB, aEmptyStr, 0, &rShell );
+                    SwInsertFld_Data aData(TYP_DBFLD, 0, sDB, aEmptyOUStr, 0, &rShell );
                     aFldMgr.InsertFld( aData );
                 }
             }
@@ -400,7 +400,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
             {
                 if(bHideEmptyParagraphs)
                 {
-                    SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyStr, 0, &rShell );
+                    SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyOUStr, 0, &rShell );
                     aFldMgr.InsertFld( aData );
                 }
                 sHideParagraphsExpression = "";
@@ -410,7 +410,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
         }
         if(bHideEmptyParagraphs && !sHideParagraphsExpression.isEmpty())
         {
-            SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyStr, 0, &rShell );
+            SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyOUStr, 0, &rShell );
             aFldMgr.InsertFld( aData );
         }
     }
@@ -571,12 +571,12 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
                     if(bHideEmptyParagraphs && !sHideParagraphsExpression.isEmpty())
                     {
                         OUString sComplete = "(" + sCondition + ") OR (" + sHideParagraphsExpression + ")";
-                        SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sComplete, aEmptyStr, 0, &rShell );
+                        SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sComplete, aEmptyOUStr, 0, &rShell );
                         aFldMgr.InsertFld( aData );
                     }
                     else
                     {
-                        SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sCondition, aEmptyStr, 0, &rShell );
+                        SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sCondition, aEmptyOUStr, 0, &rShell );
                         aFldMgr.InsertFld( aData );
                     }
                     //now the text has to be inserted
@@ -604,7 +604,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
                                 }
                             }
                             sDB += sConvertedColumn;
-                            SwInsertFld_Data aData(TYP_DBFLD, 0, sDB, aEmptyStr, 0, &rShell );
+                            SwInsertFld_Data aData(TYP_DBFLD, 0, sDB, aEmptyOUStr, 0, &rShell );
                             aFldMgr.InsertFld( aData );
                         }
                         else
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index a3f3d95c6439..673f0189b8fb 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -416,7 +416,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
             bRet = sal_False;
             if (aPasswdDlg.Execute())
             {
-                String sNewPasswd( aPasswdDlg.GetPassword() );
+                OUString sNewPasswd( aPasswdDlg.GetPassword() );
                 ::com::sun::star::uno::Sequence <sal_Int8 > aNewPasswd;
                 SvPasswordHelper::GetHashPassword( aNewPasswd, sNewPasswd );
                 if (SvPasswordHelper::CompareHashPassword(
@@ -591,7 +591,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
 
         bool bHidden            = true;
         bool bProtect           = true;
-        String sCondition;
+        OUString sCondition;
         bool bFirst             = true;
         bool bFileValid         = true;
         bool bFile              = true;
@@ -614,7 +614,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
             }
             else
             {
-                String sTemp(rData.GetCondition());
+                OUString sTemp(rData.GetCondition());
                 if(sCondition != sTemp)
                     bConditionValid = sal_False;
                 bHiddenValid      = (bHidden == rData.IsHidden());
@@ -687,11 +687,11 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
         m_pCurName->SetText(pBox->GetEntryText(pEntry));
         m_pCurName->Enable();
         m_pDismiss->Enable();
-        String aFile = pRepr->GetFile();
-        String sSub = pRepr->GetSubRegion();
+        OUString aFile = pRepr->GetFile();
+        OUString sSub = pRepr->GetSubRegion();
         m_bSubRegionsFilled = false;
         m_pSubRegionED->Clear();
-        if(aFile.Len()||sSub.Len())
+        if( !aFile.isEmpty() || !sSub.isEmpty() )
         {
             m_pFileCB->Check(true);
             m_pFileNameED->SetText(aFile);
@@ -997,9 +997,9 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox )
                 pSectRepr->SetContent(sal_False);
             else
             {
-                pSectRepr->SetFile(aEmptyStr);
-                pSectRepr->SetSubRegion(aEmptyStr);
-                pSectRepr->GetSectionData().SetLinkFilePassword(aEmptyStr);
+                pSectRepr->SetFile(aEmptyOUStr);
+                pSectRepr->SetSubRegion(aEmptyOUStr);
+                pSectRepr->GetSectionData().SetLinkFilePassword(aEmptyOUStr);
             }
 
             pEntry = m_pTree->NextSelected(pEntry);
@@ -1179,8 +1179,8 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit )
         }
         else
         {
-            String sTmp(pEdit->GetText());
-            if(sTmp.Len())
+            OUString sTmp(pEdit->GetText());
+            if(!sTmp.isEmpty())
             {
                 SfxMedium* pMedium = rSh.GetView().GetDocShell()->GetMedium();
                 INetURLObject aAbs;
@@ -1190,7 +1190,7 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit )
                     aAbs, sTmp, URIHelper::GetMaybeFileHdl() );
             }
             pSectRepr->SetFile( sTmp );
-            pSectRepr->GetSectionData().SetLinkFilePassword( aEmptyStr );
+            pSectRepr->GetSectionData().SetLinkFilePassword( aEmptyOUStr );
         }
     }
     else
@@ -1272,7 +1272,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox )
                 aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM);
                 if(RET_OK == aPasswdDlg.Execute())
                 {
-                    String sNewPasswd( aPasswdDlg.GetPassword() );
+                    OUString sNewPasswd( aPasswdDlg.GetPassword() );
                     if( aPasswdDlg.GetConfirm() == sNewPasswd )
                     {
                         SvPasswordHelper::GetHashPassword( pRepr->GetTempPasswd(), sNewPasswd );
@@ -1344,7 +1344,7 @@ IMPL_LINK( SwEditRegionDlg, ConditionEditHdl, Edit *, pEdit )
 
 IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg )
 {
-    String sFileName, sFilterName, sPassword;
+    OUString sFileName, sFilterName, sPassword;
     if ( _pFileDlg->GetError() == ERRCODE_NONE )
     {
         SfxMedium* pMedium = m_pDocInserter->CreateMedium();
@@ -1521,10 +1521,10 @@ short   SwInsertSectionTabDialog::Ok()
         aRequest.AppendItem(SfxBoolItem( FN_PARAM_REGION_EDIT_IN_READONLY,
                     m_pSectionData->IsEditInReadonlyFlag()));
 
-        String sLinkFileName( m_pSectionData->GetLinkFileName() );
-        aRequest.AppendItem(SfxStringItem( FN_PARAM_1, sLinkFileName.GetToken( 0, sfx2::cTokenSeparator )));
-        aRequest.AppendItem(SfxStringItem( FN_PARAM_2, sLinkFileName.GetToken( 1, sfx2::cTokenSeparator )));
-        aRequest.AppendItem(SfxStringItem( FN_PARAM_3, sLinkFileName.GetToken( 2, sfx2::cTokenSeparator )));
+        OUString sLinkFileName( m_pSectionData->GetLinkFileName() );
+        aRequest.AppendItem(SfxStringItem( FN_PARAM_1, sLinkFileName.getToken( 0, sfx2::cTokenSeparator )));
+        aRequest.AppendItem(SfxStringItem( FN_PARAM_2, sLinkFileName.getToken( 1, sfx2::cTokenSeparator )));
+        aRequest.AppendItem(SfxStringItem( FN_PARAM_3, sLinkFileName.getToken( 2, sfx2::cTokenSeparator )));
         aRequest.Done();
     }
     return nRet;
@@ -1628,10 +1628,10 @@ sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
     {
         aSection.SetPassword(m_aNewPasswd);
     }
-    String sFileName = m_pFileNameED->GetText();
-    String sSubRegion = m_pSubRegionED->GetText();
+    OUString sFileName = m_pFileNameED->GetText();
+    OUString sSubRegion = m_pSubRegionED->GetText();
     sal_Bool bDDe = m_pDDECB->IsChecked();
-    if(m_pFileCB->IsChecked() && (sFileName.Len() || sSubRegion.Len() || bDDe))
+    if(m_pFileCB->IsChecked() && (!sFileName.isEmpty() || !sSubRegion.isEmpty() || bDDe))
     {
         OUString aLinkFile;
         if( bDDe )
@@ -1646,7 +1646,7 @@ sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
         }
         else
         {
-            if(sFileName.Len())
+            if(!sFileName.isEmpty())
             {
                 SfxMedium* pMedium = m_pWrtSh->GetView().GetDocShell()->GetMedium();
                 INetURLObject aAbs;
@@ -1716,7 +1716,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
             aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM);
             if(RET_OK == aPasswdDlg.Execute())
             {
-                String sNewPasswd( aPasswdDlg.GetPassword() );
+                OUString sNewPasswd( aPasswdDlg.GetPassword() );
                 if( aPasswdDlg.GetConfirm() == sNewPasswd )
                 {
                     SvPasswordHelper::GetHashPassword( m_aNewPasswd, sNewPasswd );
@@ -1737,8 +1737,8 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
 
 IMPL_LINK_NOARG_INLINE_START(SwInsertSectionTabPage, NameEditHdl)
 {
-    String  aName=m_pCurName->GetText();
-    GetTabDialog()->GetOKButton().Enable(aName.Len() && m_pCurName->GetEntryPos( aName ) == USHRT_MAX);
+    OUString aName = m_pCurName->GetText();
+    GetTabDialog()->GetOKButton().Enable(!aName.isEmpty() && m_pCurName->GetEntryPos( aName ) == USHRT_MAX);
     return 0;
 }
 IMPL_LINK_NOARG_INLINE_END(SwInsertSectionTabPage, NameEditHdl)
@@ -1830,7 +1830,7 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil
         }
     }
     else
-        m_sFilterName = m_sFilePasswd = aEmptyStr;
+        m_sFilterName = m_sFilePasswd = aEmptyOUStr;
 
     Application::SetDefDialogParent( m_pOldDefDlgParent );
     return 0;
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index d69d31be79d7..257be043a101 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -501,8 +501,8 @@ sal_Bool SwGlossaryHdl::Expand( const OUString& rShortName,
     }
     else
     {
-        SvxMacro aStartMacro(aEmptyStr, aEmptyStr, STARBASIC);
-        SvxMacro aEndMacro(aEmptyStr, aEmptyStr, STARBASIC);
+        SvxMacro aStartMacro(aEmptyOUStr, aEmptyOUStr, STARBASIC);
+        SvxMacro aEndMacro(aEmptyOUStr, aEmptyOUStr, STARBASIC);
         GetMacros( aShortName, aStartMacro, aEndMacro, pGlossary );
 
         // StartAction must not be before HasSelection and DelRight,
@@ -546,8 +546,8 @@ bool SwGlossaryHdl::InsertGlossary(const OUString &rName)
     if (!pGlos)
         return false;
 
-    SvxMacro aStartMacro(aEmptyStr, aEmptyStr, STARBASIC);
-    SvxMacro aEndMacro(aEmptyStr, aEmptyStr, STARBASIC);
+    SvxMacro aStartMacro(aEmptyOUStr, aEmptyOUStr, STARBASIC);
+    SvxMacro aEndMacro(aEmptyOUStr, aEmptyOUStr, STARBASIC);
     GetMacros( rName, aStartMacro, aEndMacro, pGlos );
 
     // StartAction must not be before HasSelection and DelRight,
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 8b94fdf255f8..d3344b2ad09a 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -145,7 +145,7 @@ using namespace nsTransferBufferType;
 
 class SwTrnsfrDdeLink : public ::sfx2::SvBaseLink
 {
-    String sName;
+    OUString sName;
     ::sfx2::SvLinkSourceRef refObj;
     SwTransferable& rTrnsfr;
     SwDocShell* pDocShell;
@@ -471,9 +471,9 @@ sal_Bool SwTransferable::GetData( const DataFlavor& rFlavor )
             if( rURL.GetMap() )
                 pImageMap = new ImageMap( *rURL.GetMap() );
             else if( !rURL.GetURL().isEmpty() )
-                pTargetURL = new INetImage( aEmptyStr, rURL.GetURL(),
+                pTargetURL = new INetImage( aEmptyOUStr, rURL.GetURL(),
                                             rURL.GetTargetFrameName(),
-                                            aEmptyStr, Size() );
+                                            aEmptyOUStr, Size() );
         }
     }
 
@@ -662,7 +662,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
                 // write document storage
                 pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, sal_False );
                 // mba: no BaseURL for clipboard
-                SfxMedium aMedium( xWorkStore, String() );
+                SfxMedium aMedium( xWorkStore, OUString() );
                 bRet = pEmbObj->DoSaveObjectAs( aMedium, sal_False );
                 pEmbObj->DoSaveCompleted();
 
@@ -706,15 +706,15 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
         break;
 
     case SWTRANSFER_OBJECTTYPE_HTML:
-        GetHTMLWriter( aEmptyStr, String(), xWrt );
+        GetHTMLWriter( aEmptyOUStr, OUString(), xWrt );
         break;
 
     case SWTRANSFER_OBJECTTYPE_RTF:
-        GetRTFWriter( aEmptyStr, String(), xWrt );
+        GetRTFWriter( aEmptyOUStr, OUString(), xWrt );
         break;
 
     case SWTRANSFER_OBJECTTYPE_STRING:
-        GetASCWriter( aEmptyStr, String(), xWrt );
+        GetASCWriter( aEmptyOUStr, OUString(), xWrt );
         if( xWrt.Is() )
         {
             SwAsciiOptions aAOpt;
@@ -978,7 +978,7 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
         {
             pTargetURL = new INetImage( sGrfNm, rURL.GetURL(),
                                         rURL.GetTargetFrameName(),
-                                        aEmptyStr, Size() );
+                                        aEmptyOUStr, Size() );
             AddFormat( SOT_FORMATSTR_ID_INET_IMAGE );
         }
     }
@@ -1667,7 +1667,7 @@ int SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
         rSh.SetChgLnk( Link() );
 
         const SwPosition& rInsPos = *rSh.GetCrsr()->Start();
-        SwReader aReader( *pStream, aEmptyStr, String(), *rSh.GetCrsr() );
+        SwReader aReader( *pStream, aEmptyOUStr, OUString(), *rSh.GetCrsr() );
         rSh.SaveTblBoxCntnt( &rInsPos );
         if( IsError( aReader.Read( *pRead )) )
             nResId = ERR_CLPBRD_READ;
@@ -1753,7 +1753,7 @@ int SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
     if( pRead )
     {
         SwPaM &rPAM = *rSh.GetCrsr();
-        SwReader aReader( xStore, aEmptyStr, rPAM );
+        SwReader aReader( xStore, aEmptyOUStr, rPAM );
         if( !IsError( aReader.Read( *pRead )) )
             nRet = 1;
         else if( bMsg )
@@ -1919,7 +1919,7 @@ int SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
             //!!! check at FileSystem - only then it make sense to test graphics !!!
             Graphic aGraphic;
             GraphicFilter &rFlt = GraphicFilter::GetGraphicFilter();
-            nRet = GRFILTER_OK == GraphicFilter::LoadGraphic( sURL, aEmptyStr, aGraphic, &rFlt );
+            nRet = GRFILTER_OK == GraphicFilter::LoadGraphic( sURL, aEmptyOUStr, aGraphic, &rFlt );
 
             if( nRet )
             {
@@ -1930,29 +1930,29 @@ int SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
                 {
                 case SW_PASTESDR_INSERT:
                     SwTransferable::SetSelInShell( rSh, sal_False, pPt );
-                    rSh.Insert( sURL, aEmptyStr, aGraphic );
+                    rSh.Insert( sURL, aEmptyOUStr, aGraphic );
                     break;
 
                 case SW_PASTESDR_REPLACE:
                     if( rSh.IsObjSelected() )
                     {
-                        rSh.ReplaceSdrObj( sURL, aEmptyStr, &aGraphic );
+                        rSh.ReplaceSdrObj( sURL, aEmptyOUStr, &aGraphic );
                         Point aPt( pPt ? *pPt : rSh.GetCrsrDocPos() );
                         SwTransferable::SetSelInShell( rSh, sal_True, &aPt );
                     }
                     else
-                        rSh.ReRead( sURL, aEmptyStr, &aGraphic );
+                        rSh.ReRead( sURL, aEmptyOUStr, &aGraphic );
                     break;
 
                 case SW_PASTESDR_SETATTR:
                     if( rSh.IsObjSelected() )
                         rSh.Paste( aGraphic );
                     else if( OBJCNT_GRF == rSh.GetObjCntTypeOfSelection() )
-                        rSh.ReRead( sURL, aEmptyStr, &aGraphic );
+                        rSh.ReRead( sURL, aEmptyOUStr, &aGraphic );
                     else
                     {
                         SwTransferable::SetSelInShell( rSh, sal_False, pPt );
-                        rSh.Insert( sURL, aEmptyStr, aGraphic );
+                        rSh.Insert( sURL, aEmptyOUStr, aGraphic );
                     }
                     break;
                 default:
@@ -2064,7 +2064,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
 
     SwFieldType* pTyp = 0;
     sal_uInt16 i = 1,j;
-    String aName;
+    OUString aName;
     sal_Bool bAlreadyThere = sal_False, bDoublePaste = sal_False;
     sal_uInt16 nSize = rWrtShell.GetFldTypeCount();
     const ::utl::TransliterationWrapper& rColl = ::GetAppCmpStrIgnore();
@@ -2077,7 +2077,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
             pTyp = rWrtShell.GetFldType( j );
             if( RES_DDEFLD == pTyp->Which() )
             {
-                String sTmp( ((SwDDEFieldType*)pTyp)->GetCmd() );
+                OUString sTmp( ((SwDDEFieldType*)pTyp)->GetCmd() );
                 if( rColl.isEqual( sTmp, aCmd ) &&
                     sfx2::LINKUPDATE_ALWAYS == ((SwDDEFieldType*)pTyp)->GetType() )
                 {
@@ -2120,11 +2120,11 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
                  ( 1 < comphelper::string::getTokenCount(aExpand, '\n') ||
                        comphelper::string::getTokenCount(aExpand, '\t') ) )
             {
-                String sTmp( aExpand );
+                OUString sTmp( aExpand );
                 xub_StrLen nRows = comphelper::string::getTokenCount(sTmp, '\n');
                 if( nRows )
                     --nRows;
-                sTmp = sTmp.GetToken( 0, '\n' );
+                sTmp = sTmp.getToken( 0, '\n' );
                 xub_StrLen nCols = comphelper::string::getTokenCount(sTmp, '\t');
 
                 // at least one column & row must be there
@@ -2274,7 +2274,7 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
     {
         //!!! check at FileSystem - only then it makes sense to test the graphics !!!
         GraphicFilter &rFlt = GraphicFilter::GetGraphicFilter();
-        nRet = GRFILTER_OK == GraphicFilter::LoadGraphic( aBkmk.GetURL(), aEmptyStr,
+        nRet = GRFILTER_OK == GraphicFilter::LoadGraphic( aBkmk.GetURL(), aEmptyOUStr,
                                             aGraphic, &rFlt );
 
         if( !nRet && SW_PASTESDR_SETATTR == nAction &&
@@ -2302,7 +2302,7 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
         //Check and Perform rotation if needed
         lclCheckAndPerformRotation(aGraphic);
 
-        String sURL;
+        OUString sURL;
         if( rSh.GetView().GetDocShell()->ISA(SwWebDocShell) )
             sURL = aBkmk.GetURL();
 
@@ -2310,18 +2310,18 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
         {
         case SW_PASTESDR_INSERT:
             SwTransferable::SetSelInShell( rSh, sal_False, pPt );
-            rSh.Insert( sURL, aEmptyStr, aGraphic );
+            rSh.Insert( sURL, aEmptyOUStr, aGraphic );
         break;
 
         case SW_PASTESDR_REPLACE:
             if( rSh.IsObjSelected() )
             {
-                rSh.ReplaceSdrObj( sURL, aEmptyStr, &aGraphic );
+                rSh.ReplaceSdrObj( sURL, aEmptyOUStr, &aGraphic );
                 Point aPt( pPt ? *pPt : rSh.GetCrsrDocPos() );
                 SwTransferable::SetSelInShell( rSh, sal_True, &aPt );
             }
             else
-                rSh.ReRead( sURL, aEmptyStr, &aGraphic );
+                rSh.ReRead( sURL, aEmptyOUStr, &aGraphic );
             break;
 
         case SW_PASTESDR_SETATTR:
@@ -2340,11 +2340,11 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
             else if( rSh.IsObjSelected() )
                 rSh.Paste( aGraphic );
             else if( OBJCNT_GRF == rSh.GetObjCntTypeOfSelection() )
-                rSh.ReRead( sURL, aEmptyStr, &aGraphic );
+                rSh.ReRead( sURL, aEmptyOUStr, &aGraphic );
             else
             {
                 SwTransferable::SetSelInShell( rSh, sal_False, pPt );
-                rSh.Insert( aBkmk.GetURL(), aEmptyStr, aGraphic );
+                rSh.Insert( aBkmk.GetURL(), aEmptyOUStr, aGraphic );
             }
             break;
         default:
@@ -2374,7 +2374,7 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
         if( pStream != NULL  &&
             !pStream->GetError()  &&
             // mba: no BaseURL for clipboard functionality
-            aMap.Read( *pStream, IMAP_FORMAT_DETECT, String() ) == IMAP_ERR_OK &&
+            aMap.Read( *pStream, IMAP_FORMAT_DETECT, OUString() ) == IMAP_ERR_OK &&
             aMap.GetIMapObjectCount() )
         {
             SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
@@ -2476,7 +2476,7 @@ int SwTransferable::_PasteFileName( TransferableDataHelper& rData,
             INetURLObject aMediaURL;
 
             aMediaURL.SetSmartURL( sFile );
-            const String aMediaURLStr( aMediaURL.GetMainURL( INetURLObject::NO_DECODE ) );
+            const OUString aMediaURLStr( aMediaURL.GetMainURL( INetURLObject::NO_DECODE ) );
 
             if( ::avmedia::MediaWindow::isMediaURL( aMediaURLStr ) )
             {
@@ -2490,10 +2490,10 @@ int SwTransferable::_PasteFileName( TransferableDataHelper& rData,
                 sal_Bool bIsURLFile = SwTransferable::_CheckForURLOrLNKFile( rData, sFile, &sDesc );
 
                 //Own FileFormat? --> insert, not for StarWriter/Web
-                String sFileURL = URIHelper::SmartRel2Abs(INetURLObject(), sFile, Link(), false );
+                OUString sFileURL = URIHelper::SmartRel2Abs(INetURLObject(), sFile, Link(), false );
                 const SfxFilter* pFlt = SW_PASTESDR_SETATTR == nAction
                         ? 0 : SwIoSystem::GetFileFilter(
-                        sFileURL, aEmptyStr );
+                        sFileURL, aEmptyOUStr );
                 if( pFlt && !rSh.GetView().GetDocShell()->ISA(SwWebDocShell) )
                 {
                 // and then pull up the insert-region-dialog by PostUser event
@@ -2662,7 +2662,7 @@ int SwTransferable::_PasteFileList( TransferableDataHelper& rData,
         aFileList.Count() )
     {
         sal_uInt16 nAct = bLink ? SW_PASTESDR_SETATTR : SW_PASTESDR_INSERT;
-        String sFlyNm;
+        OUString sFlyNm;
         // iterate over the filelist
         for( sal_uLong n = 0, nEnd = aFileList.Count(); n < nEnd; ++n )
         {
@@ -2681,7 +2681,7 @@ int SwTransferable::_PasteFileList( TransferableDataHelper& rData,
                 nRet = 1;
             }
         }
-        if( sFlyNm.Len() )
+        if( !sFlyNm.isEmpty() )
             rSh.GotoFly( sFlyNm );
     }
     else if( bMsg )
@@ -2850,7 +2850,7 @@ int SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData
             }
             pDlg->SetObjName( pClipboard->aObjDesc.maClassName,
                                 SW_RES( nResId ) );
-            pDlg->Insert( SOT_FORMATSTR_ID_EMBED_SOURCE, aEmptyStr );
+            pDlg->Insert( SOT_FORMATSTR_ID_EMBED_SOURCE, aEmptyOUStr );
         }
     }
     else
@@ -2860,9 +2860,9 @@ int SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData
                                 SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aDesc );
 
         if( SwTransferable::_TestAllowedFormat( rData, SOT_FORMATSTR_ID_EMBED_SOURCE, nDest ))
-            pDlg->Insert( SOT_FORMATSTR_ID_EMBED_SOURCE, aEmptyStr );
+            pDlg->Insert( SOT_FORMATSTR_ID_EMBED_SOURCE, aEmptyOUStr );
         if( SwTransferable::_TestAllowedFormat( rData, SOT_FORMATSTR_ID_LINK_SOURCE, nDest ))
-            pDlg->Insert( SOT_FORMATSTR_ID_LINK_SOURCE, aEmptyStr );
+            pDlg->Insert( SOT_FORMATSTR_ID_LINK_SOURCE, aEmptyOUStr );
     }
 
     if( SwTransferable::_TestAllowedFormat( rData, SOT_FORMATSTR_ID_LINK, nDest ))
@@ -2870,7 +2870,7 @@ int SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData
 
     for( sal_uInt16* pIds = aPasteSpecialIds; *pIds; ++pIds )
         if( SwTransferable::_TestAllowedFormat( rData, *pIds, nDest ))
-            pDlg->Insert( *pIds, aEmptyStr );
+            pDlg->Insert( *pIds, aEmptyOUStr );
 
     sal_uLong nFormat = pDlg->GetFormat( rData.GetTransferable() );
 
@@ -2934,7 +2934,7 @@ void SwTransferable::FillClipFmtItem( const SwWrtShell& rSh,
 
     for( sal_uInt16* pIds = aPasteSpecialIds; *pIds; ++pIds )
         if( SwTransferable::_TestAllowedFormat( rData, *pIds, nDest ))
-            rToFill.AddClipbrdFormat( *pIds, aEmptyStr );
+            rToFill.AddClipbrdFormat( *pIds, aEmptyOUStr );
 }
 
 void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
@@ -3068,7 +3068,7 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
         {
             pTargetURL = new INetImage( sGrfNm, rURL.GetURL(),
                                         rURL.GetTargetFrameName(),
-                                        aEmptyStr, Size() );
+                                        aEmptyOUStr, Size() );
             AddFormat( SOT_FORMATSTR_ID_INET_IMAGE );
         }
     }
@@ -3564,11 +3564,11 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
                 rSh.ResetModified();
         }
         else
-            sName.Erase();
+            sName = "";
         rSh.DoUndo( bUndo );
     }
 
-    if( sName.Len() &&
+    if( !sName.isEmpty() &&
         0 != ( pDocShell = rSh.GetDoc()->GetDocShell() ) )
     {
         // then we create our "server" and connect to it
@@ -3577,7 +3577,7 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
         {
             refObj->AddConnectAdvise( this );
             refObj->AddDataAdvise( this,
-                            aEmptyStr,
+                            aEmptyOUStr,
                             ADVISEMODE_NODATA | ADVISEMODE_ONLYONCE );
             nOldTimeOut = refObj->GetUpdateTimeout();
             refObj->SetUpdateTimeout( 0 );
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index ef6ad1fe2b4b..9ee999d5f63d 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -1113,7 +1113,7 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons
 void SwPostItMgr::AddPostIts(bool bCheckExistance, bool bFocus)
 {
     bool bEmpty = mvPostItFlds.empty();
-    SwFieldType* pType = mpView->GetDocShell()->GetDoc()->GetFldType(RES_POSTITFLD, aEmptyStr,false);
+    SwFieldType* pType = mpView->GetDocShell()->GetDoc()->GetFldType(RES_POSTITFLD, aEmptyOUStr,false);
     SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
     SwFmtFld* pSwFmtFld = aIter.First();
     while(pSwFmtFld)
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 0dd867e8f1b4..6bc42f15ebc6 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -3715,7 +3715,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                 rBnd.Invalidate(SID_ATTR_POSITION);
             }
             rBnd.Invalidate(SID_ATTR_SIZE);
-            const SfxStringItem aCell( SID_TABLE_CELL, aEmptyStr );
+            const SfxStringItem aCell( SID_TABLE_CELL, aEmptyOUStr );
             rBnd.SetState( aCell );
         }
     }
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index b421d92bb4ad..41de9e189674 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -63,7 +63,7 @@ SW_DLLPUBLIC OUString MakeSender()
         if (sToken == "COMPANY")
         {
             xub_StrLen nOldLen = sRet.getLength();
-            sRet += (String)rUserOpt.GetCompany();
+            sRet += rUserOpt.GetCompany();
             bLastLength = sRet.getLength() != nOldLen;
         }
         else if (sToken == "CR")
@@ -73,19 +73,19 @@ SW_DLLPUBLIC OUString MakeSender()
             bLastLength = true;
         }
         else if (sToken == "FIRSTNAME")
-            sRet += (String)rUserOpt.GetFirstName();
+            sRet += rUserOpt.GetFirstName();
         else if (sToken == "LASTNAME")
-            sRet += (String)rUserOpt.GetLastName();
+            sRet += rUserOpt.GetLastName();
         else if (sToken == "ADDRESS")
-            sRet += (String)rUserOpt.GetStreet();
+            sRet += rUserOpt.GetStreet();
         else if (sToken == "COUNTRY")
-            sRet += (String)rUserOpt.GetCountry();
+            sRet += rUserOpt.GetCountry();
         else if (sToken == "POSTALCODE")
-            sRet += (String)rUserOpt.GetZip();
+            sRet += rUserOpt.GetZip();
         else if (sToken == "CITY")
-            sRet += (String)rUserOpt.GetCity();
+            sRet += rUserOpt.GetCity();
         else if (sToken == "STATEPROV")
-            sRet += (String)rUserOpt.GetState();
+            sRet += rUserOpt.GetState();
         else if (!sToken.isEmpty()) //spaces
             sRet += sToken;
     }
@@ -95,7 +95,7 @@ SW_DLLPUBLIC OUString MakeSender()
 SwEnvItem::SwEnvItem() :
     SfxPoolItem(FN_ENVELOP)
 {
-    aAddrText       = aEmptyStr;
+    aAddrText       = aEmptyOUStr;
     bSend           = sal_True;
     aSendText       = MakeSender();
     lSendFromLeft   = 566; // 1 cm
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index 8a384ed13fd4..5d41c5085ed2 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -113,7 +113,7 @@ IMPL_LINK_NOARG(SwVisitingCardPage, FrameControlInitializedHdl)
     SvTreeListEntry* pSel = m_pAutoTextLB->FirstSelected();
     OUString sEntry;
     if( pSel )
-        sEntry = *(String*)pSel->GetUserData();
+        sEntry = *(OUString*)pSel->GetUserData();
     uno::Reference< text::XTextCursor > & xCrsr = pExampleFrame->GetTextCursor();
     OUString uEntry(sEntry);
 
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index d53463bd8f76..4115bc6f12be 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -97,7 +97,7 @@ void SwChangeDBDlg::FillDBPopup()
     const SwDBData& rDBData = pSh->GetDBData();
     OUString sDBName(rDBData.sDataSource);
     OUString sTableName(rDBData.sCommand);
-    m_pAvailDBTLB->Select(sDBName, sTableName, aEmptyStr);
+    m_pAvailDBTLB->Select(sDBName, sTableName, aEmptyOUStr);
 
     std::vector<OUString> aAllDBNames;
 
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index c359e716a126..863a71522326 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -141,7 +141,7 @@ void SwFldDBPage::Reset(const SfxItemSet&)
             if(pSh)
             {
                 SwDBData aTmp(pSh->GetDBData());
-                m_pDatabaseTLB->Select(aTmp.sDataSource, aTmp.sCommand, aEmptyStr);
+                m_pDatabaseTLB->Select(aTmp.sDataSource, aTmp.sCommand, aEmptyOUStr);
             }
         }
     }
@@ -368,11 +368,11 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
 
         if (!IsFldEdit())
         {
-            m_pValueED->SetText(aEmptyStr);
+            m_pValueED->SetText(aEmptyOUStr);
             if (bCond)
                 m_pConditionED->SetText(OUString("TRUE"));
             else
-                m_pConditionED->SetText(aEmptyStr);
+                m_pConditionED->SetText(aEmptyOUStr);
         }
 
         CheckInsert();
@@ -499,7 +499,7 @@ void SwFldDBPage::ActivateMailMergeAddress()
     m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos( (const void*) nData ));
     m_pTypeLB->GetSelectHdl().Call(m_pTypeLB);
     const SwDBData& rData = SW_MOD()->GetDBConfig()->GetAddressSource();
-    m_pDatabaseTLB->Select(rData.sDataSource, rData.sCommand, aEmptyStr);
+    m_pDatabaseTLB->Select(rData.sDataSource, rData.sCommand, aEmptyOUStr);
 }
 
 void SwFldDBPage::SetWrtShell(SwWrtShell& rSh)
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 2dfcb30c4ba9..cc7c14d67810 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -444,7 +444,7 @@ sal_Bool SwFldDokInfPage::FillItemSet(SfxItemSet& )
         nOldFormat != nFormat || m_pFixedCB->GetState() != m_pFixedCB->GetSavedValue()
         || (DI_CUSTOM == nSubType && !aName.equals( m_sOldCustomFieldName )))
     {
-        InsertFld(nTypeId, nSubType, aName, aEmptyStr, nFormat,
+        InsertFld(nTypeId, nSubType, aName, aEmptyOUStr, nFormat,
                 ' ', m_pFormatLB->IsAutomaticLanguage());
     }
 
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index b40f0d7f8290..464542d17ed5 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -352,7 +352,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
                             m_pValueED->SetText(
                                 OUString::number(nOff + 1) );
                         else
-                            m_pValueED->SetText(aEmptyStr);
+                            m_pValueED->SetText(aEmptyOUStr);
                     }
                     else
                         m_pValueED->SetText(((SwPageNumberField*)GetCurField())->GetUserString());
@@ -532,7 +532,7 @@ IMPL_LINK_NOARG(SwFldDokPage, FormatHdl)
             m_pValueFT->SetText( sNewTxt );
 
         if (sOldTxt != m_pValueFT->GetText())
-            m_pValueED->SetText( aEmptyStr );
+            m_pValueED->SetText( aEmptyOUStr );
     }
 
     return 0;
@@ -624,7 +624,7 @@ sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& )
         m_pLevelED->GetText() != m_pLevelED->GetSavedValue() ||
         m_pDateOffsetED->GetText() != m_pDateOffsetED->GetSavedValue())
     {
-        InsertFld( nTypeId, nSubType, aEmptyStr, aVal, nFormat, ' ', m_pNumFormatLB->IsAutomaticLanguage() );
+        InsertFld( nTypeId, nSubType, aEmptyOUStr, aVal, nFormat, ' ', m_pNumFormatLB->IsAutomaticLanguage() );
     }
 
     return sal_False;
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 99bc62da0813..8785f6ed03c1 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -265,8 +265,8 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
         }
         else
         {
-            m_pNameED->SetText(aEmptyStr);
-            m_pValueED->SetText(aEmptyStr);
+            m_pNameED->SetText(aEmptyOUStr);
+            m_pValueED->SetText(aEmptyOUStr);
         }
         if(bDropDown)
             ListEnableHdl(0);
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index e7b7c4423e44..f349fefaa68a 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -845,7 +845,7 @@ sal_Bool SwFldMgr::InsertFld(  const SwInsertFld_Data& rData, SwPaM *pPam )
         case TYP_POSTITFLD:
         {
             SwPostItFieldType* pType = (SwPostItFieldType*)pCurShell->GetFldType(0, RES_POSTITFLD);
-            pFld = new SwPostItField(pType, rData.sPar1, rData.sPar2, aEmptyStr, aEmptyStr, DateTime( DateTime::SYSTEM ));
+            pFld = new SwPostItField(pType, rData.sPar1, rData.sPar2, aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ));
             break;
         }
         case TYP_SCRIPTFLD:
@@ -1202,7 +1202,7 @@ sal_Bool SwFldMgr::InsertFld(  const SwInsertFld_Data& rData, SwPaM *pPam )
                 if(pTyp)
                 {
                     SwSetExpField* pExpFld =
-                        new SwSetExpField(pTyp, aEmptyStr, nFormatId);
+                        new SwSetExpField(pTyp, aEmptyOUStr, nFormatId);
 
                     // Don't change type of SwSetExpFieldType:
                     sal_uInt16 nOldSubType = pExpFld->GetSubType();
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 5b5ea20e4e25..7777b975606f 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -359,8 +359,8 @@ IMPL_LINK_NOARG(SwFldRefPage, TypeHdl)
         if ( ( !IsFldEdit() || m_pSelectionLB->GetEntryCount() ) &&
              nOld != LISTBOX_ENTRY_NOTFOUND )
         {
-            m_pNameED->SetText(aEmptyStr);
-            m_pValueED->SetText(aEmptyStr);
+            m_pNameED->SetText(aEmptyOUStr);
+            m_pValueED->SetText(aEmptyOUStr);
         }
 
         switch (nTypeId)
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 06267bc62907..162b83a50afc 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -199,8 +199,8 @@ IMPL_LINK_NOARG(SwFldVarPage, TypeHdl)
         bInit = sal_True;
         if (nOld != LISTBOX_ENTRY_NOTFOUND)
         {
-            m_pNameED->SetText(aEmptyStr);
-            m_pValueED->SetText(aEmptyStr);
+            m_pNameED->SetText(aEmptyOUStr);
+            m_pValueED->SetText(aEmptyOUStr);
         }
 
         m_pValueED->SetDropEnable(false);
@@ -275,8 +275,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
             {
                 if (pBox)   // only when interacting via mouse
                 {
-                    m_pNameED->SetText(aEmptyStr);
-                    m_pValueED->SetText(aEmptyStr);
+                    m_pNameED->SetText(aEmptyOUStr);
+                    m_pValueED->SetText(aEmptyOUStr);
                 }
             }
             bValue = bName = bNumFmt = bInvisible = sal_True;
@@ -348,8 +348,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
             {
                 if (!IsFldEdit())
                 {
-                    m_pNameED->SetText(aEmptyStr);
-                    m_pValueED->SetText(aEmptyStr);
+                    m_pNameED->SetText(aEmptyOUStr);
+                    m_pValueED->SetText(aEmptyOUStr);
                 }
 
                 if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
@@ -497,7 +497,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                 m_pValueFT->SetText( SW_RESSTR( STR_OFFSET ));
 
                 if (IsFldEdit() || pBox)    // only when interacting via mouse
-                    m_pNameED->SetText(aEmptyStr);
+                    m_pNameED->SetText(aEmptyOUStr);
 
                 if (nSelPos != 0 && nSelPos != LISTBOX_ENTRY_NOTFOUND)
                 {
@@ -509,8 +509,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
             break;
 
         case TYP_GETREFPAGEFLD:
-            m_pNameED->SetText(aEmptyStr);
-            m_pValueED->SetText(aEmptyStr);
+            m_pNameED->SetText(aEmptyOUStr);
+            m_pValueED->SetText(aEmptyOUStr);
             break;
     }
 
@@ -696,7 +696,7 @@ sal_uInt16 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
             if (!bSpecialFmt)
             {
                 m_pNumFormatLB->SetDefFormat(GetCurField()->GetFormat());
-                sOldNumSel = aEmptyStr;
+                sOldNumSel = aEmptyOUStr;
             }
             else
                 if (nTypeId == TYP_GETFLD || nTypeId == TYP_FORMELFLD)
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 04f639db7498..5dcbd0dd14a2 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -167,13 +167,13 @@ void SwJavaEditDialog::CheckTravel()
                     sURL = aINetURL.PathToFileName();
             }
             m_pUrlED->SetText(sURL);
-            m_pEditED->SetText(aEmptyStr);
+            m_pEditED->SetText(aEmptyOUStr);
             m_pUrlRB->Check();
         }
         else
         {
             m_pEditED->SetText(pFld->GetPar2());
-            m_pUrlED->SetText(aEmptyStr);
+            m_pUrlED->SetText(aEmptyOUStr);
             m_pEditRB->Check();
         }
         m_pTypeED->SetText(pFld->GetPar1());
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 8f826deae88c..d9b16fe4a764 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -1182,17 +1182,17 @@ void SwColumnPage::Update()
         }
         else
         {
-            aEd3.SetText(aEmptyStr);
-            aDistEd2.SetText(aEmptyStr);
+            aEd3.SetText(aEmptyOUStr);
+            aDistEd2.SetText(aEmptyOUStr);
         }
     }
     else
     {
-        aEd1.SetText(aEmptyStr);
-        aEd2.SetText(aEmptyStr);
-        aEd3.SetText(aEmptyStr);
-        aDistEd1.SetText(aEmptyStr);
-        aDistEd2.SetText(aEmptyStr);
+        aEd1.SetText(aEmptyOUStr);
+        aEd2.SetText(aEmptyOUStr);
+        aEd3.SetText(aEmptyOUStr);
+        aDistEd1.SetText(aEmptyOUStr);
+        aDistEd2.SetText(aEmptyOUStr);
     }
     UpdateColMgr(0);
 }
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 33dd37cd00ed..85f710539468 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -188,7 +188,7 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) :
             m_pCategoryBox->SetText( sString );
         else
             m_pCategoryBox->SetText(
-                    SwStyleNameMapper::GetUIName( nPoolId, aEmptyStr ));
+                    SwStyleNameMapper::GetUIName( nPoolId, aEmptyOUStr ));
     }
 
     // aFormatBox
@@ -250,8 +250,8 @@ void SwCaptionDialog::Apply()
     OUString aName( m_pCategoryBox->GetText() );
     if ( aName == m_sNone )
     {
-        aOpt.SetCategory( aEmptyStr );
-        aOpt.SetNumSeparator( aEmptyStr );
+        aOpt.SetCategory( aEmptyOUStr );
+        aOpt.SetNumSeparator( aEmptyOUStr );
     }
     else
     {
@@ -273,7 +273,7 @@ IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, Button*, pButton )
 {
     OUString sFldTypeName = m_pCategoryBox->GetText();
     if(sFldTypeName == m_sNone)
-        sFldTypeName = aEmptyStr;
+        sFldTypeName = aEmptyOUStr;
     SwSequenceOptionDialog  aDlg( pButton, rView, sFldTypeName );
     aDlg.SetApplyBorderAndShadow(bCopyAttributes);
     aDlg.SetCharacterStyle( sCharacterStyle );
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index f4777778d767..ca224be6e09f 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2548,7 +2548,7 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl)
         m_pBmpWin->MirrorVert(sal_False);
 
         Graphic aGraphic;
-        GraphicFilter::LoadGraphic( pGrfDlg->GetPath(), aEmptyStr, aGraphic );
+        GraphicFilter::LoadGraphic( pGrfDlg->GetPath(), aEmptyOUStr, aGraphic );
         m_pBmpWin->SetGraphic(aGraphic);
 
         sal_Bool bEnable = GRAPHIC_BITMAP      == aGraphic.GetType() ||
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());
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 138ca4623bdf..45378966c308 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -775,7 +775,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
     {
         uno::Reference< linguistic2::XDictionary > xDictionary( SvxGetIgnoreAllList(), uno::UNO_QUERY );
         linguistic::AddEntryToDic( xDictionary,
-                xSpellAlt->getWord(), sal_False, aEmptyStr, LANGUAGE_NONE );
+                xSpellAlt->getWord(), sal_False, aEmptyOUStr, LANGUAGE_NONE );
     }
     else if ((MN_DICTIONARIES_START <= nId && nId <= MN_DICTIONARIES_END) || nId == MN_ADD_TO_DIC_SINGLE)
     {
@@ -797,7 +797,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
 
             if (xDic.is())
             {
-                sal_Int16 nAddRes = linguistic::AddEntryToDic( xDic, aWord, sal_False, aEmptyStr, LANGUAGE_NONE );
+                sal_Int16 nAddRes = linguistic::AddEntryToDic( xDic, aWord, sal_False, aEmptyOUStr, LANGUAGE_NONE );
                 // save modified user-dictionary if it is persistent
                 uno::Reference< frame::XStorable >  xSavDic( xDic, uno::UNO_QUERY );
                 if (xSavDic.is())
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 68106224af1f..d84684739dce 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -77,7 +77,7 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl)
     for (sal_uInt16 i = m_pBookmarkBox->GetSelectEntryCount(); i; i-- )
         m_pBookmarkBox->RemoveEntryAt(m_pBookmarkBox->GetSelectEntryPos(i - 1));
 
-    m_pBookmarkBox->SetText(aEmptyStr);
+    m_pBookmarkBox->SetText(aEmptyOUStr);
     m_pDeleteBtn->Enable(sal_False);   // no further entries there
 
     m_pOkBtn->Enable();            // the OK handler deletes
@@ -111,7 +111,7 @@ void SwInsertBookmarkDlg::Apply()
         OUString sEntry(comphelper::string::remove(m_pBookmarkBox->GetText(),
             m_pBookmarkBox->GetMultiSelectionSeparator()));
 
-        rSh.SetBookmark( KeyCode(), sEntry, aEmptyStr );
+        rSh.SetBookmark( KeyCode(), sEntry, aEmptyOUStr );
         rReq.AppendItem( SfxStringItem( FN_INSERT_BOOKMARK, sEntry ) );
         rReq.Done();
     }
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 5026981f720f..38e544c61999 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -204,7 +204,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
 
         // page
     for( i = RES_POOLPAGE_BEGIN; i < RES_POOLPAGE_END; ++i )
-        m_pPageTemplBox->InsertEntry(SwStyleNameMapper::GetUIName( i, aEmptyStr ));
+        m_pPageTemplBox->InsertEntry(SwStyleNameMapper::GetUIName( i, aEmptyOUStr ));
 
     sal_uInt16 nCount = pSh->GetPageDescCnt();
     for(i = 0; i < nCount; ++i)
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 6d5277536072..ddf69f7ef366 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -273,7 +273,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton  )
     if(!m_pGroupTLB->First())
         pButton->Enable(sal_False);
     //the content must be deleted - otherwise the new handler would be called in Apply()
-    m_pNameED->SetText(aEmptyStr);
+    m_pNameED->SetText(aEmptyOUStr);
     return 0;
 }
 
@@ -294,7 +294,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl)
     for (OUVector_t::iterator it(m_InsertedArr.begin());
             it != m_InsertedArr.end(); ++it)
     {
-        if (String(*it) == sEntry)
+        if (*it == sEntry)
         {
             m_InsertedArr.erase(it);
             m_InsertedArr.push_back(sNewName);
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 9a2f7efc2623..b939e4ad409b 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -264,7 +264,7 @@ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox )
         ShowAutoText(::GetCurrGlosGroup(), m_pShortNameEdit->GetText());
     }
     else
-        ShowAutoText(aEmptyStr, aEmptyStr);
+        ShowAutoText(aEmptyOUStr, aEmptyOUStr);
     // update controls
     NameModify(m_pShortNameEdit);
     if( SfxRequest::HasMacroRecorder( pSh->GetView().GetViewFrame() ) )
@@ -510,8 +510,8 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
     {
         SfxItemSet aSet( pSh->GetAttrPool(), RES_FRMMACRO, RES_FRMMACRO, SID_EVENTCONFIG, SID_EVENTCONFIG, 0 );
 
-        SvxMacro aStart(aEmptyStr, aEmptyStr, STARBASIC);
-        SvxMacro aEnd(aEmptyStr, aEmptyStr, STARBASIC);
+        SvxMacro aStart(aEmptyOUStr, aEmptyOUStr, STARBASIC);
+        SvxMacro aEnd(aEmptyOUStr, aEmptyOUStr, STARBASIC);
         pGlossaryHdl->GetMacros(m_pShortNameEdit->GetText(), aStart, aEnd );
 
         SvxMacroItem aItem(RES_FRMMACRO);
diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx
index 5c8bc94c5b13..c7d43825ddb1 100644
--- a/sw/source/ui/misc/glshell.cxx
+++ b/sw/source/ui/misc/glshell.cxx
@@ -101,8 +101,8 @@ static sal_Bool lcl_Save( SwWrtShell& rSh, const OUString& rGroupName,
     const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
     SwTextBlocks * pBlock = ::GetGlossaries()->GetGroupDoc( rGroupName );
 
-    SvxMacro aStart(aEmptyStr, aEmptyStr);
-    SvxMacro aEnd(aEmptyStr, aEmptyStr);
+    SvxMacro aStart(aEmptyOUStr, aEmptyOUStr);
+    SvxMacro aEnd(aEmptyOUStr, aEmptyOUStr);
     SwGlossaryHdl* pGlosHdl;
 
     pGlosHdl = rSh.GetView().GetGlosHdl();
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index e017c689af51..db8ac851c63c 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -273,11 +273,11 @@ void SwNumPositionTabPage::InitControls()
     if(bSameDist)
         m_pDistNumMF->SetValue(m_pDistNumMF->Normalize(aNumFmtArr[nLvl]->GetCharTextDistance()), FUNIT_TWIP);
     else
-        m_pDistNumMF->SetText(aEmptyStr);
+        m_pDistNumMF->SetText(aEmptyOUStr);
     if(bSameIndent)
         m_pIndentMF->SetValue(m_pIndentMF->Normalize(-aNumFmtArr[nLvl]->GetFirstLineOffset()), FUNIT_TWIP);
     else
-        m_pIndentMF->SetText(aEmptyStr);
+        m_pIndentMF->SetText(aEmptyOUStr);
 
     if(bSameAdjust)
     {
@@ -323,14 +323,14 @@ void SwNumPositionTabPage::InitControls()
         }
         else
         {
-            m_pListtabMF->SetText(aEmptyStr);
+            m_pListtabMF->SetText(aEmptyOUStr);
         }
     }
     else
     {
         m_pListtabFT->Enable( false );
         m_pListtabMF->Enable( false );
-        m_pListtabMF->SetText(aEmptyStr);
+        m_pListtabMF->SetText(aEmptyOUStr);
     }
 
     if ( bSameAlignAt )
@@ -342,7 +342,7 @@ void SwNumPositionTabPage::InitControls()
     }
     else
     {
-        m_pAlignedAtMF->SetText(aEmptyStr);
+        m_pAlignedAtMF->SetText(aEmptyOUStr);
     }
 
     if ( bSameIndentAt )
@@ -352,11 +352,11 @@ void SwNumPositionTabPage::InitControls()
     }
     else
     {
-        m_pIndentAtMF->SetText(aEmptyStr);
+        m_pIndentAtMF->SetText(aEmptyOUStr);
     }
 
     if(sal_True == bSetDistEmpty)
-        m_pDistBorderMF->SetText(aEmptyStr);
+        m_pDistBorderMF->SetText(aEmptyOUStr);
 
     bInInintControl = sal_False;
 }
@@ -686,7 +686,7 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
 
     SetModified();
     if(!m_pDistBorderMF->IsEnabled())
-        m_pDistBorderMF->SetText(aEmptyStr);
+        m_pDistBorderMF->SetText(aEmptyOUStr);
 
     return 0;
 }
@@ -724,7 +724,7 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox )
     if(bSetValue)
         m_pDistBorderMF->SetValue(m_pDistBorderMF->Normalize(nValue), FUNIT_TWIP);
     else
-        m_pDistBorderMF->SetText(aEmptyStr);
+        m_pDistBorderMF->SetText(aEmptyOUStr);
     m_pDistBorderMF->Enable(bOn || bSingleSelection||0 != pOutlineDlg);
     bLastRelative = bOn;
     return 0;
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 1e997d135b63..6947ff451a10 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -478,15 +478,15 @@ void    SwOutlineSettingsTabPage::Update()
         if(bSameStart)
             m_pStartEdit->SetValue(aNumFmtArr[0]->GetStart());
         else
-            m_pStartEdit->SetText(aEmptyStr);
+            m_pStartEdit->SetText(aEmptyOUStr);
         if(bSamePrefix)
             m_pPrefixED->SetText(aNumFmtArr[0]->GetPrefix());
         else
-            m_pPrefixED->SetText(aEmptyStr);
+            m_pPrefixED->SetText(aEmptyOUStr);
         if(bSameSuffix)
             m_pSuffixED->SetText(aNumFmtArr[0]->GetSuffix());
         else
-            m_pSuffixED->SetText(aEmptyStr);
+            m_pSuffixED->SetText(aEmptyOUStr);
 
         if(bSameCharFmt)
         {
@@ -507,7 +507,7 @@ void    SwOutlineSettingsTabPage::Update()
         }
         else
         {
-            m_pAllLevelNF->SetText(aEmptyStr);
+            m_pAllLevelNF->SetText(aEmptyOUStr);
         }
     }
     else
@@ -538,7 +538,7 @@ void    SwOutlineSettingsTabPage::Update()
         }
         else
         {
-            m_pAllLevelNF->SetText(aEmptyStr);
+            m_pAllLevelNF->SetText(aEmptyOUStr);
             m_pAllLevelNF->Enable(sal_False);
             m_pAllLevelFT->Enable(sal_False);
         }
@@ -600,14 +600,14 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, ListBox *, pBox )
         pCollNames[i] = aSaveCollNames[i];
 
     if(aCollName == aNoFmtName)
-        pCollNames[nTmpLevel] = aEmptyStr;
+        pCollNames[nTmpLevel] = aEmptyOUStr;
     else
     {
         pCollNames[nTmpLevel] = aCollName;
                 // template already in use?
         for( i = 0; i < MAXLEVEL; ++i)
             if(i != nTmpLevel && pCollNames[i] == aCollName )
-                pCollNames[i] = aEmptyStr;
+                pCollNames[i] = aEmptyOUStr;
     }
 
     // search the oldname and put it into the current entries
@@ -760,7 +760,7 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
     for( i = 0; i < MAXLEVEL; ++i )
     {
         m_pCollBox->InsertEntry( SwStyleNameMapper::GetUIName(
-                                    static_cast< sal_uInt16 >(RES_POOLCOLL_HEADLINE1 + i), aEmptyStr ));
+                                    static_cast< sal_uInt16 >(RES_POOLCOLL_HEADLINE1 + i), aEmptyOUStr ));
         m_pLevelLB->InsertEntry( OUString::number(i + 1) );
     }
     OUString sStr("1 - ");
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 21b9272d80d5..298058b0de2b 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -793,7 +793,7 @@ void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept )
             SwRewriter aRewriter;
             aRewriter.AddRule(UndoArg1,
                               OUString::number(aRedlines.size()));
-            aTmpStr = aRewriter.Apply(String(SW_RES(STR_N_REDLINES)));
+            aTmpStr = aRewriter.Apply(OUString(SW_RES(STR_N_REDLINES)));
         }
 
         SwRewriter aRewriter;
@@ -896,7 +896,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, FilterChangedHdl)
     if (pFilterTP->IsAction())
         sFilterAction = pFilterTP->GetLbAction()->GetSelectEntry();
     else
-        sFilterAction = aEmptyStr;
+        sFilterAction = aEmptyOUStr;
 
     Init();
 
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index 76f6a511f37e..1f08fbabb0a6 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -63,7 +63,7 @@ SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind )
     pWrtShell(0),
     pView(0),
     pBindings(pBind),
-    aAktTableName(aEmptyStr)
+    aAktTableName(aEmptyOUStr)
     , m_bDoesUndo(true)
     , m_bResetUndo(false)
     , m_bCallUndo(false)
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index d01c5947dd8c..69916e6b1be7 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -894,8 +894,8 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq)
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( &rView.GetEditWin() );
 
-                pDlg->Insert( SOT_FORMAT_STRING, aEmptyStr );
-                pDlg->Insert( SOT_FORMAT_RTF,    aEmptyStr );
+                pDlg->Insert( SOT_FORMAT_STRING, aEmptyOUStr );
+                pDlg->Insert( SOT_FORMAT_RTF,    aEmptyOUStr );
 
                 TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &rView.GetEditWin() ) );
 
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index e4823c5d24c7..2926d96353cf 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -961,7 +961,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                     const PolyPolygon aPoly( pDlg->GetPolyPolygon() );
                     rSh.SetGraphicPolygon( &aPoly );
                     if ( pDlg->IsGraphicChanged() )
-                        rSh.ReRead( aEmptyStr, aEmptyStr, &pDlg->GetGraphic());
+                        rSh.ReRead( aEmptyOUStr, aEmptyOUStr, &pDlg->GetGraphic());
                     rSh.EndAction();
                 }
             }
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 566ecd9bdfde..cf21daafd252 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -89,7 +89,7 @@ namespace
 
         virtual void Update( Graphic& aGraphic )
         {
-            m_pShell->ReRead(aEmptyStr, aEmptyStr, (const Graphic*) &aGraphic);
+            m_pShell->ReRead(aEmptyOUStr, aEmptyOUStr, (const Graphic*) &aGraphic);
         }
     };
 }
@@ -160,7 +160,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
                     aCrop.SetBottom( MM100_TO_TWIP( aScaledCropedRectangle.Bottom() ));
 
                     Graphic aCompressedGraphic( aDialog.GetCompressedGraphic() );
-                    rSh.ReRead(aEmptyStr, aEmptyStr, (const Graphic*) &aCompressedGraphic);
+                    rSh.ReRead(aEmptyOUStr, aEmptyOUStr, (const Graphic*) &aCompressedGraphic);
 
                     rSh.SetAttr(aCrop);
 
@@ -570,7 +570,7 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq )
                     GraphicObject aFilterObj( *pFilterObj );
                     if( SVX_GRAPHICFILTER_ERRCODE_NONE ==
                         SvxGraphicFilter::ExecuteGrfFilterSlot( rReq, aFilterObj ))
-                        GetShell().ReRead( aEmptyStr, aEmptyStr,
+                        GetShell().ReRead( aEmptyOUStr, aEmptyOUStr,
                                            &aFilterObj.GetGraphic() );
                 }
             }
@@ -786,7 +786,7 @@ void SwGrfShell::ExecuteRotation(SfxRequest &rReq)
     Graphic aGraphic = *rShell.GetGraphic();
     GraphicNativeTransform aTransform(aGraphic);
     aTransform.rotate(aRotation);
-    rShell.ReRead(aEmptyStr, aEmptyStr, (const Graphic*) &aGraphic);
+    rShell.ReRead(aEmptyOUStr, aEmptyOUStr, (const Graphic*) &aGraphic);
 
     SwFlyFrmAttrMgr aManager(false, &rShell, rShell.IsFrmSelected() ? FRMMGR_TYPE_NONE : FRMMGR_TYPE_GRF);
     Size aSize(aManager.GetSize().Height(), aManager.GetSize().Width());
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index c027e9f26fab..0637abce40dc 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -356,7 +356,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                     // --> suggestion has to be removed before
                     GetView().GetEditWin().StopQuickHelp();
 
-                    SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, aEmptyStr, 0);
+                    SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, aEmptyOUStr, 0);
                     aFldMgr.InsertFld(aData, &aSaved);
 
                     rSh.Push();
@@ -367,7 +367,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
 
                 if (pPostIt)
                 {
-                    SwFieldType* pType = rSh.GetDoc()->GetFldType(RES_POSTITFLD, aEmptyStr,false);
+                    SwFieldType* pType = rSh.GetDoc()->GetFldType(RES_POSTITFLD, aEmptyOUStr,false);
                     SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
                     SwFmtFld* pSwFmtFld = aIter.First();
                     while( pSwFmtFld )
@@ -586,7 +586,7 @@ FIELD_INSERT:
                 if(!nInsertFormat)
                     nInsertFormat = aFldMgr.GetDefaultFormat(nInsertType, bIsText, rSh.GetNumberFormatter());
                 SwInsertFld_Data aData(nInsertType, nInsertSubType,
-                                    aEmptyStr, aEmptyStr, nInsertFormat);
+                                    aEmptyOUStr, aEmptyOUStr, nInsertFormat);
                 aFldMgr.InsertFld(aData);
                 rReq.Done();
             }
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index add6747cd2fd..d0b2fbce227e 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -266,11 +266,11 @@ static short lcl_AskRedlineMode(Window *pWin)
                         BUTTONDIALOG_OKBUTTON |
                         BUTTONDIALOG_FOCUSBUTTON;
 
-    aQBox.AddButton(String(SW_RES(STR_REDLINE_ACCEPT_ALL)), RET_OK, nBtnFlags);
+    aQBox.AddButton(OUString(SW_RES(STR_REDLINE_ACCEPT_ALL)), RET_OK, nBtnFlags);
     aQBox.GetPushButton( RET_OK )->SetHelpId(HID_AUTOFORMAT_ACCEPT);
-    aQBox.AddButton(String(SW_RES(STR_REDLINE_REJECT_ALL)), RET_CANCEL, BUTTONDIALOG_CANCELBUTTON);
+    aQBox.AddButton(OUString(SW_RES(STR_REDLINE_REJECT_ALL)), RET_CANCEL, BUTTONDIALOG_CANCELBUTTON);
     aQBox.GetPushButton( RET_CANCEL )->SetHelpId(HID_AUTOFORMAT_REJECT  );
-    aQBox.AddButton(String(SW_RES(STR_REDLINE_EDIT)), 2, 0);
+    aQBox.AddButton(OUString(SW_RES(STR_REDLINE_EDIT)), 2, 0);
     aQBox.GetPushButton( 2 )->SetHelpId(HID_AUTOFORMAT_EDIT_CHG);
     aQBox.SetButtonHelpText( RET_OK, OUString() );
 
@@ -583,7 +583,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             if ( pItem )
             {
                 OUString sName = ((SfxStringItem*)pItem)->GetValue();
-                rWrtSh.SetBookmark( KeyCode(), sName, aEmptyStr );
+                rWrtSh.SetBookmark( KeyCode(), sName, aEmptyOUStr );
             }
             else
             {
@@ -760,7 +760,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 }
 
                 if( !bDelSel && aFldMgr.GetCurFld() && TYP_FORMELFLD == aFldMgr.GetCurTypeId() )
-                    aFldMgr.UpdateCurFld( aFldMgr.GetCurFld()->GetFormat(), aEmptyStr, sFormula );
+                    aFldMgr.UpdateCurFld( aFldMgr.GetCurFld()->GetFormat(), aEmptyOUStr, sFormula );
                 else if( !sFormula.isEmpty() )
                 {
                     if( rWrtSh.IsCrsrInTbl() )
@@ -774,7 +774,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     {
                         SvNumberFormatter* pFormatter = rWrtSh.GetNumberFormatter();
                         sal_uLong nSysNumFmt = pFormatter->GetFormatIndex( NF_NUMBER_STANDARD, LANGUAGE_SYSTEM);
-                        SwInsertFld_Data aData(TYP_FORMELFLD, nsSwGetSetExpType::GSE_FORMULA, aEmptyStr, sFormula, nSysNumFmt);
+                        SwInsertFld_Data aData(TYP_FORMELFLD, nsSwGetSetExpType::GSE_FORMULA, aEmptyOUStr, sFormula, nSysNumFmt);
                         aFldMgr.InsertFld(aData);
                     }
                 }
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx
index 1b66e8d0bc4f..703e89bf9920 100644
--- a/sw/source/ui/shells/textsh2.cxx
+++ b/sw/source/ui/shells/textsh2.cxx
@@ -206,7 +206,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
                 sDBName += sColumnName;
 
                 SwFldMgr aFldMgr(GetShellPtr());
-                SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyStr, 0);
+                SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyOUStr, 0);
                 if(pConnectionItem)
                     aData.aDBConnection = ((SfxUsrAnyItem*)pConnectionItem)->GetValue();
                 if(pColumnItem)
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index b6b3df327957..41fa3dcec582 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -806,7 +806,7 @@ void  SwTableColumnPage::Reset( const SfxItemSet& )
         i = nNoOfVisibleCols;
         while( i < MET_FIELDS )
         {
-            m_aFieldArr[i].SetText( aEmptyStr );
+            m_aFieldArr[i].SetText( aEmptyOUStr );
             m_pTextArr[i]->Disable();
             i++;
         }
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 47f4ff9ea8a5..96912e3280cf 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -493,7 +493,7 @@ IMPL_LINK_NOARG_INLINE_END(SwAutoFormatDlg, OkHdl)
 
 AutoFmtPreview::AutoFmtPreview(Window* pParent) :
         Window          ( pParent ),
-        aCurData        ( aEmptyStr ),
+        aCurData        ( aEmptyOUStr ),
         aVD             ( *this ),
         aScriptedText   ( aVD ),
         bFitWidth       ( sal_False ),
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index a594d09160bd..3f39d51284f7 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1457,7 +1457,7 @@ IMPL_LINK( SwPagePreview, EndScrollHdl, SwScrollbar *, pScrollbar )
     if( !pScrollbar->IsHoriScroll() )       // scroll vertically
     {
         if ( Help::IsQuickHelpEnabled() )
-            Help::ShowQuickHelp(pScrollbar, Rectangle(), aEmptyStr, 0);
+            Help::ShowQuickHelp(pScrollbar, Rectangle(), aEmptyOUStr, 0);
         if ( GetViewShell()->PagePreviewLayout()->DoesPreviewLayoutRowsFitIntoWindow() )
         {
             // Scroll how many pages ??
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index e775097cc320..9bf32b3c5420 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -1708,7 +1708,7 @@ void SwView::ScannerEventHdl( const EventObject& /*rEventObject*/ )
                 if( !!aScanBmp )
                 {
                     Graphic aGrf(aScanBmp);
-                    m_pWrtShell->Insert( aEmptyStr, aEmptyStr, aGrf );
+                    m_pWrtShell->Insert( aEmptyOUStr, aEmptyOUStr, aGrf );
                 }
             }
         }
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 811b892cf09f..eae1397718ff 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -253,7 +253,7 @@ int SwView::InsertGraphic( const OUString &rPath, const OUString &rFilter,
         }
         else
         {
-            rShell.Insert( aEmptyStr, aEmptyStr, aGraphic, &aFrameManager );
+            rShell.Insert( aEmptyOUStr, aEmptyOUStr, aGraphic, &aFrameManager );
         }
 
         // it is too late after "EndAction" because the Shell can already be destroyed.
@@ -431,7 +431,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
 
         // format not equal to current filter (with autodetection)
         if( nError == GRFILTER_FORMATERROR )
-            nError = InsertGraphic( aFileName, aEmptyStr, bAsLink, &GraphicFilter::GetGraphicFilter() );
+            nError = InsertGraphic( aFileName, aEmptyOUStr, bAsLink, &GraphicFilter::GetGraphicFilter() );
         if ( rSh.IsFrmSelected() )
         {
             SwFrmFmt* pFmt = pDoc->FindFrmFmtByName( sGraphicFormat );
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index e3108cdf6826..64fb3968a8af 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -423,7 +423,7 @@ void SwView::HyphenateDocument()
         return;
     }
 
-    SfxErrorContext aContext( ERRCTX_SVX_LINGU_HYPHENATION, aEmptyStr, m_pEditWin,
+    SfxErrorContext aContext( ERRCTX_SVX_LINGU_HYPHENATION, aEmptyOUStr, m_pEditWin,
          RID_SVXERRCTX, &DIALOG_MGR() );
 
     Reference< XHyphenator >  xHyph( ::GetHyphenator() );
@@ -546,7 +546,7 @@ void SwView::StartThesaurus()
     if (!IsValidSelectionForThesaurus())
         return;
 
-    SfxErrorContext aContext( ERRCTX_SVX_LINGU_THESAURUS, aEmptyStr, m_pEditWin,
+    SfxErrorContext aContext( ERRCTX_SVX_LINGU_THESAURUS, aEmptyOUStr, m_pEditWin,
          RID_SVXERRCTX, &DIALOG_MGR() );
 
     // Determine language
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index cc1a90143d87..4d2a58a3c23f 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -734,7 +734,7 @@ IMPL_LINK( SwView, EndScrollHdl, SwScrollbar *, pScrollbar )
         if(nPgNum)
         {
             nPgNum = 0;
-            Help::ShowQuickHelp(pScrollbar, Rectangle(), aEmptyStr, 0);
+            Help::ShowQuickHelp(pScrollbar, Rectangle(), aEmptyOUStr, 0);
         }
         Point aPos( m_aVisArea.TopLeft() );
         bool bBorder = IsDocumentBorder();
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 416e03cc7f7d..c92d90a78d50 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -735,7 +735,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions )
     SearchOptions aSearchOpt( m_pSrchItem->GetSearchOptions() );
     aSearchOpt.Locale = GetAppLanguageTag().getLocale();
     if( !bDoReplace )
-        aSearchOpt.replaceString = aEmptyStr;
+        aSearchOpt.replaceString = aEmptyOUStr;
 
     sal_uLong nFound;
     if( aSrchSet.Count() || ( pReplSet && pReplSet->Count() ))
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index dcb8ee93e45a..5ad584626976 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -407,7 +407,7 @@ uno::Reference< text::XAutoTextEntry >  SwXAutoTextGroup::insertNewByName(const
             pGlosGroup->SetBaseURL( aTemp.GetMainURL(INetURLObject::NO_DECODE));
         }
         else
-            pGlosGroup->SetBaseURL( aEmptyStr );
+            pGlosGroup->SetBaseURL( aEmptyOUStr );
 
         sal_uInt16 nRet;
         if( pOnlyTxt )
@@ -705,8 +705,8 @@ void SwXAutoTextGroup::removeVetoableChangeListener(
 void SwXAutoTextGroup::Invalidate()
 {
     pGlossaries = 0;
-    sName = aEmptyStr;
-    m_sGroupName = aEmptyStr;
+    sName = aEmptyOUStr;
+    m_sGroupName = aEmptyOUStr;
 }
 
 OUString SwXAutoTextGroup::getImplementationName(void) throw( uno::RuntimeException )
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index 17bbe74be71d..572e0584319d 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -184,7 +184,7 @@ SfxItemPresentation SwFmtRuby::GetPresentation( SfxItemPresentation ePres,
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             {
-                rText = aEmptyStr;
+                rText = aEmptyOUStr;
                 return ePres;
             }
         default:;//prevent warning
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index fed67deea916..cb60d4385b5e 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -262,7 +262,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
                 pMarkAccess->getBookmarksBegin(),
                 pMarkAccess->getBookmarksEnd(),
                 &lcl_IsUiVisibleBookmark));
-            sTypeToken = aEmptyStr;
+            sTypeToken = aEmptyOUStr;
             bEdit = true;
         }
         break;
@@ -404,14 +404,14 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
                     }
                 }
             }
-            sTypeToken = aEmptyStr;
+            sTypeToken = aEmptyOUStr;
             bEdit = true;
             nOldMemberCount = nMemberCount;
         }
         break;
         case CONTENT_TYPE_DRAWOBJECT:
         {
-            sTypeToken = aEmptyStr;
+            sTypeToken = aEmptyOUStr;
             nMemberCount = 0;
             SdrModel* pModel = pWrtShell->getIDocumentDrawModelAccess()->GetDrawModel();
             if(pModel)
@@ -2509,7 +2509,7 @@ void  SwContentTree::RequestHelp( const HelpEvent& rHEvt )
             }
             else
             {
-                Help::ShowQuickHelp( this, Rectangle(), aEmptyStr, 0 );
+                Help::ShowQuickHelp( this, Rectangle(), aEmptyOUStr, 0 );
                 bCallBase = false;
             }
         }
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index 9434d2a2a69f..a82f7d1a46f2 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -1297,9 +1297,8 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* _pContent, const Sequen
             OUString sFileName(pFileNames[nFile]);
             INetURLObject aFileUrl;
             aFileUrl.SetSmartURL( sFileName );
-            OUString sSectionName(String(aFileUrl.GetLastName(
-                INetURLObject::DECODE_UNAMBIGUOUS)).GetToken(0,
-                sfx2::cTokenSeparator));
+            OUString sSectionName(aFileUrl.GetLastName(
+                INetURLObject::DECODE_UNAMBIGUOUS).getToken(0, sfx2::cTokenSeparator));
             sal_uInt16 nSectCount = rSh.GetSectionFmtCount();
             OUString sTempSectionName(sSectionName);
             sal_uInt16 nAddNumber = 0;
diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx
index a566448976db..3d0b3a1c213f 100644
--- a/sw/source/ui/utlui/gloslst.cxx
+++ b/sw/source/ui/utlui/gloslst.cxx
@@ -361,7 +361,7 @@ void SwGlossaryList::FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGlossaries)
 {
     SwTextBlocks*   pBlock = pGlossaries->GetGroupDoc(pGroup->sName);
     pGroup->nCount = pBlock ? pBlock->GetCount() : 0;
-    pGroup->sLongNames = pGroup->sShortNames = aEmptyStr;
+    pGroup->sLongNames = pGroup->sShortNames = aEmptyOUStr;
     if(pBlock)
         pGroup->sTitle = pBlock->GetName();
 
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index ea045f2f14c2..d3f3f9697d01 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -220,7 +220,7 @@ ShellResource::ShellResource()
     aHyperlinkClick = aHyperlinkClick.replaceAll("%s", aModStr);
 
     for(sal_uInt16 i = 0; i < nCount; ++i)
-        aDocInfoLst.push_back(String(SW_RESSTR(FLD_DOCINFO_BEGIN + i)));
+        aDocInfoLst.push_back(OUString(SW_RESSTR(FLD_DOCINFO_BEGIN + i)));
 
     FreeResource();
 }
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index cad7a92aeab1..8b6534cca4eb 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -1162,7 +1162,7 @@ OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
                 rData.HasFormat( nFmt = SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR ) ||
                 rData.HasFormat( nFmt = SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ))
     {
-        INetBookmark aBkmk( aEmptyStr, aEmptyStr );
+        INetBookmark aBkmk( aEmptyOUStr, aEmptyOUStr );
         rData.GetINetBookmark( nFmt, aBkmk );
         sFileName = aBkmk.GetURL();
     }
diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx
index 110cd439b316..26281cfe4c7e 100644
--- a/sw/source/ui/utlui/uitool.cxx
+++ b/sw/source/ui/utlui/uitool.cxx
@@ -436,7 +436,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
     rSet.Put( aBoxInfo );
 
 
-    SfxStringItem aFollow(SID_ATTR_PAGE_EXT1, aEmptyStr);
+    SfxStringItem aFollow(SID_ATTR_PAGE_EXT1, aEmptyOUStr);
     if(rPageDesc.GetFollow())
         aFollow.SetValue(rPageDesc.GetFollow()->GetName());
     rSet.Put(aFollow);
diff --git a/sw/source/ui/utlui/zoomctrl.cxx b/sw/source/ui/utlui/zoomctrl.cxx
index d64360aaab88..09b505e7e840 100644
--- a/sw/source/ui/utlui/zoomctrl.cxx
+++ b/sw/source/ui/utlui/zoomctrl.cxx
@@ -51,7 +51,7 @@ void SwZoomControl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
     }
     else
     {
-        sPreviewZoom = aEmptyStr;
+        sPreviewZoom = aEmptyOUStr;
         SvxZoomStatusBarControl::StateChanged(nSID, eState, pState);
     }
 }
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 041e5177df48..264806c63f2d 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -454,7 +454,7 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk,
         if( EXCHG_IN_ACTION_MOVE == nAction && pIns )
         {
             aSection = SwSectionData(*pIns);
-            aSection.SetLinkFileName( aEmptyStr );
+            aSection.SetLinkFileName( aEmptyOUStr );
             aSection.SetType( CONTENT_SECTION );
             aSection.SetProtectFlag( false );
author	Noel Grandin <noel@peralex.com>	2013-10-16 11:18:56 +0200
committer	Noel Grandin <noel@peralex.com>	2013-10-18 09:59:25 +0200
commit	8051bb7e18ccae0f639e65dfa86bcc18a5fb9108 (patch)
tree	bc2d6c98c3161c4530a6e97bf0b3aa65b6284185 /sw
parent	b4d116ef8f0b405fd9b12967766b138c21605489 (diff)