diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-01-15 13:01:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-15 13:26:10 +0000 |
| commit | b0c72cb92cab00f9e030b4d5c29e5376dcf457ac (patch) | |
| tree | 13e79f40102438c9463f442d1b78a7f8e3bd77cb | |
| parent | e34dfee7aac32df393a62a13c36fa13f8a6e9589 (diff) | |
starting chopping out aEmptyOUStr
Change-Id: I4d944018bb471d78d6ebb3604d445b90899ea893
83 files changed, 225 insertions, 226 deletions
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 1f035a9ddb0f..6bafd28f6501 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -134,7 +134,7 @@ public: TYPEINFO(); SwNumRuleItem() - : SfxStringItem( RES_PARATR_NUMRULE, aEmptyOUStr ) {} + : SfxStringItem( RES_PARATR_NUMRULE, OUString() ) {} SwNumRuleItem( const OUString& rRuleName ) : SfxStringItem( RES_PARATR_NUMRULE, rRuleName ) {} diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 6fdc483f072a..038530161f4e 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( aEmptyOUStr, SwSbxValue(), 0 ) + : aErrExpr( OUString(), SwSbxValue(), 0 ) , nCommandPos(0) , rDoc( rD ) , pLclData( m_aSysLocale.GetLocaleDataPtr() ) @@ -656,8 +656,8 @@ SwCalcOper SwCalc::GetToken() { // Parse any token. ParseResult aRes = pCharClass->parseAnyToken( sCommand, nCommandPos, - coStartFlags, aEmptyOUStr, - coContFlags, aEmptyOUStr ); + coStartFlags, OUString(), + coContFlags, OUString()); bool bSetError = true; sal_Int32 nRealStt = nCommandPos + aRes.LeadingWhiteSpace; diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index bf6620e358df..4f49d27e116d 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -503,14 +503,14 @@ void _InitCore() aAttrTab[ RES_CHRATR_DUMMY3 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_CHRATR_DUMMY3 ); - aAttrTab[ RES_TXTATR_REFMARK - POOLATTR_BEGIN ] = new SwFmtRefMark( aEmptyOUStr ); + aAttrTab[ RES_TXTATR_REFMARK - POOLATTR_BEGIN ] = new SwFmtRefMark( OUString() ); aAttrTab[ RES_TXTATR_TOXMARK - POOLATTR_BEGIN ] = new SwTOXMark; aAttrTab[ RES_TXTATR_META - POOLATTR_BEGIN ] = SwFmtMeta::CreatePoolDefault(RES_TXTATR_META); aAttrTab[ RES_TXTATR_METAFIELD - POOLATTR_BEGIN ] = SwFmtMeta::CreatePoolDefault(RES_TXTATR_METAFIELD); aAttrTab[ RES_TXTATR_AUTOFMT- POOLATTR_BEGIN ] = new SwFmtAutoFmt; aAttrTab[ RES_TXTATR_INETFMT - POOLATTR_BEGIN ] = new SwFmtINetFmt( OUString(), OUString() ); aAttrTab[ RES_TXTATR_CHARFMT- POOLATTR_BEGIN ] = new SwFmtCharFmt( 0 ); - aAttrTab[ RES_TXTATR_CJK_RUBY - POOLATTR_BEGIN ] = new SwFmtRuby( aEmptyOUStr ); + aAttrTab[ RES_TXTATR_CJK_RUBY - POOLATTR_BEGIN ] = new SwFmtRuby( OUString() ); aAttrTab[ RES_TXTATR_UNKNOWN_CONTAINER - POOLATTR_BEGIN ] = new SvXMLAttrContainerItem( RES_TXTATR_UNKNOWN_CONTAINER ); aAttrTab[ RES_TXTATR_INPUTFIELD - POOLATTR_BEGIN ] = new SwFmtFld( RES_TXTATR_INPUTFIELD ); @@ -537,7 +537,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( aEmptyOUStr ); + aAttrTab[ RES_PARATR_NUMRULE - POOLATTR_BEGIN ] = new SwNumRuleItem( OUString() ); 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 ); @@ -550,7 +550,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, aEmptyOUStr ); + aAttrTab[ RES_PARATR_LIST_ID - POOLATTR_BEGIN ] = new SfxStringItem( RES_PARATR_LIST_ID, OUString() ); 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 ); @@ -602,8 +602,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, aEmptyOUStr ); - aAttrTab[ RES_FRMATR_CONDITIONAL_STYLE_NAME - POOLATTR_BEGIN ] = new SfxStringItem( RES_FRMATR_CONDITIONAL_STYLE_NAME, aEmptyOUStr ); + aAttrTab[ RES_FRMATR_STYLE_NAME - POOLATTR_BEGIN ] = new SfxStringItem( RES_FRMATR_STYLE_NAME, OUString()); + aAttrTab[ RES_FRMATR_CONDITIONAL_STYLE_NAME - POOLATTR_BEGIN ] = new SfxStringItem( RES_FRMATR_CONDITIONAL_STYLE_NAME, OUString() ); 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); @@ -629,7 +629,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( aEmptyOUStr ); + aAttrTab[ RES_BOXATR_FORMULA- POOLATTR_BEGIN ] = new SwTblBoxFormula( OUString() ); aAttrTab[ RES_BOXATR_VALUE- POOLATTR_BEGIN ] = new SwTblBoxValue; aAttrTab[ RES_UNKNOWNATR_CONTAINER- POOLATTR_BEGIN ] = diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 12d5bb96d9d2..4900f69d3c49 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -1661,7 +1661,7 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool bUseDocInfo ) if( pTmp ) { SwRedlineData aRedlnData( nsRedlineType_t::REDLINE_DELETE, nAuthor, aTimeStamp, - aEmptyOUStr, 0, 0 ); + OUString(), 0, 0 ); do { // #i65201#: Expand again, see comment above. if( pTmp->GetPoint()->nContent == 0 ) @@ -1713,7 +1713,7 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool bUseDocInfo ) } } while( pInsRing != ( pTmp = (SwPaM*)pTmp->GetNext() )); SwRedlineData aRedlnData( nsRedlineType_t::REDLINE_INSERT, nAuthor, aTimeStamp, - aEmptyOUStr, 0, 0 ); + OUString(), 0, 0 ); // combine consecutive if( pTmp->GetNext() != pInsRing ) diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index c19ffc33d8ea..b5ae2c6d9604 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(aEmptyOUStr); + xDocProps->setTemplateName(OUString()); ::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 4b906e81b7be..790e236afc54 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( aEmptyOUStr, GetDfltFrmFmt() ); + pFmt = MakeDrawFrmFmt( OUString(), GetDfltFrmFmt() ); if( pSet ) // Set a few more attributes pFmt->SetFmtAttr( *pSet ); @@ -383,7 +383,7 @@ SwFrmFmt *SwDoc::CopyLayoutFmt( SwXFrame::GetOrCreateSdrObject(pFormat); } else - pDest = MakeDrawFrmFmt( aEmptyOUStr, pDest ); + pDest = MakeDrawFrmFmt( OUString(), pDest ); // Copy all other or new attributes pDest->CopyAttrs( rSource ); @@ -861,7 +861,7 @@ SwDrawFrmFmt* SwDoc::Insert( const SwPaM &rRg, const SfxItemSet* pFlyAttrSet, SwFrmFmt* pDefFmt ) { - SwDrawFrmFmt *pFmt = MakeDrawFrmFmt( aEmptyOUStr, + SwDrawFrmFmt *pFmt = MakeDrawFrmFmt( OUString(), 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, aEmptyOUStr, SVX_NUM_ARABIC); + SwSetExpField aFld( (SwSetExpFieldType*)pType, OUString(), 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, aEmptyOUStr, SVX_NUM_ARABIC ); + SwSetExpField aFld( (SwSetExpFieldType*)pType, OUString(), SVX_NUM_ARABIC ); if( bOrderNumberingFirst ) nIdx = 0; SwFmtFld aFmt( aFld ); diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 078fe1d63489..09556026f410 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -197,7 +197,7 @@ OUString SwSortTxtElement::GetKey(sal_uInt16 nId) const { SwTxtNode* pTxtNd = aPos.GetNode().GetTxtNode(); if( !pTxtNd ) - return aEmptyOUStr; + return OUString(); // for TextNodes const OUString& rStr = pTxtNd->GetTxt(); diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 2080812722cf..de4ccae0faae 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -78,7 +78,7 @@ struct LinkStruct sal_Int32 nStartTextPos, nEndTextPos; LinkStruct( const OUString& rURL, sal_Int32 nStart, sal_Int32 nEnd ) - : aINetFmt( rURL, aEmptyOUStr), + : aINetFmt( rURL, OUString()), 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, aEmptyOUStr, rFmt ) + , SwSection( TOX_CONTENT_SECTION, OUString(), rFmt ) { SetProtect( rBase.IsProtected() ); SetSectionName( GetTOXName() ); @@ -1296,7 +1296,7 @@ void SwTOXBaseSection::UpdateSequence( const SwTxtNode* pOwnChapterNode ) void SwTOXBaseSection::UpdateAuthorities( const SwTOXInternational& rIntl ) { SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc(); - SwFieldType* pAuthFld = pDoc->GetFldType(RES_AUTHORITY, aEmptyOUStr, false); + SwFieldType* pAuthFld = pDoc->GetFldType(RES_AUTHORITY, OUString(), false); if(!pAuthFld) return; diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index fb4abbfcd37b..900859691116 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( aEmptyOUStr ); + pFont->SetStyleName( OUString() ); 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 23d63b7c1ebf..b05d8e408f4f 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1261,7 +1261,7 @@ namespace numfunc { delete mpFont; - mpFont = new Font( msFontname, aEmptyOUStr, Size( 0, 14 ) ); + mpFont = new Font( msFontname, OUString(), 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 72a94ec4bd4b..8ea3789e1bd9 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -146,7 +146,7 @@ static void lcl_SetDfltFont( sal_uInt16 nFntType, SfxItemSet& rSet ) nLng, DEFAULTFONT_FLAGS_ONLYONE ) ); rSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), - aEmptyOUStr, aFnt.GetPitch(), + OUString(), aFnt.GetPitch(), aFnt.GetCharSet(), aArr[n].nResFntId )); } } @@ -175,7 +175,7 @@ static void lcl_SetDfltFont( sal_uInt16 nLatinFntType, sal_uInt16 nCJKFntType, nLng, DEFAULTFONT_FLAGS_ONLYONE ) ); rSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), - aEmptyOUStr, aFnt.GetPitch(), + OUString(), aFnt.GetPitch(), aFnt.GetCharSet(), aArr[n].nResFntId )); } } @@ -459,7 +459,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage ) nLng, DEFAULTFONT_FLAGS_ONLYONE ) ); aSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), - aEmptyOUStr, aFnt.GetPitch(), + OUString(), aFnt.GetPitch(), aFnt.GetCharSet(), *(pArr+1) )); } @@ -1952,7 +1952,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId ) aFmt.SetFirstLineIndent( - nOffs ); } - aFmt.SetSuffix( aEmptyOUStr ); + aFmt.SetSuffix( OUString() ); 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 da0f9f683af7..74e6525c82f2 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( aEmptyOUStr, OUString(), xWrt ); + ::GetASCWriter( OUString(), OUString(), xWrt ); break; case FORMAT_RTF: // mba: no BaseURL for data exchange - ::GetRTFWriter( aEmptyOUStr, OUString(), xWrt ); + ::GetRTFWriter( OUString(), OUString(), xWrt ); break; } diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 5f0203231ff7..126733a683a4 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( aEmptyOUStr, LANGUAGE_SYSTEM, + pFmt->SetValueFormat( OUString(), LANGUAGE_SYSTEM, ::GetAppLanguage() ); } } @@ -1171,7 +1171,7 @@ sal_Bool SwTableAutoFmtTbl::Load( SvStream& rStream ) for( sal_uInt16 i = 0; i < nAnz; ++i ) { - pNew = new SwTableAutoFmt( aEmptyOUStr ); + pNew = new SwTableAutoFmt( OUString() ); bRet = pNew->Load( rStream, aVersions ); if( bRet ) { diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index a2e1f0c916e0..8d13aff802d7 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 aEmptyOUStr; + return OUString(); } aNdIdx++; if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() ) { bEnde = true; - return aEmptyOUStr; + return OUString(); } else pNewNd = &aNdIdx.GetNode(); @@ -325,7 +325,7 @@ OUString SwAutoFormat::GoNextPara() if( pNewNd->IsEndNode() ) { bEnde = true; - return aEmptyOUStr; + return OUString(); } else if( pNewNd->IsTableNode() ) aNdIdx = *pNewNd->EndOfSectionNode(); @@ -1778,7 +1778,7 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl ) DelPrevPara(); DeleteCurrentParagraph( true, false ); - DeleteCurNxtPara( aEmptyOUStr ); + DeleteCurNxtPara( OUString() ); aDelPam.DeleteMark(); aDelPam.GetPoint()->nNode = aNdIdx.GetIndex() + 1; diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 87b81dee61ea..150177d03434 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -162,7 +162,7 @@ sal_Bool SwGrfNode::ReRead( nNewType = OBJECT_CLIENT_DDE; else { - sfx2::MakeLnkName( sCmd, 0, rGrfName, aEmptyOUStr, &rFltName ); + sfx2::MakeLnkName( sCmd, 0, rGrfName, OUString(), &rFltName ); nNewType = OBJECT_CLIENT_GRF; } diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index a5c9748682f2..2a0ed6e2cccf 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 ( aEmptyOUStr, GetBaseURL(), xWrt); + ::GetXMLWriter ( OUString(), 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 c35212645a26..8fa212c520fb 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 aEmptyOUStr; + return OUString(); } diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 3495ac069e2b..57551f76335d 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -1900,7 +1900,7 @@ OUString SwTableBox::GetName() const if( !pSttNd ) // box without content? { // search for the next first box? - return aEmptyOUStr; + return OUString(); } const SwTable& rTbl = pSttNd->FindTableNode()->GetTable(); diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index bfb4c2752865..2379f6d45316 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -1596,7 +1596,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // if ( pPDFExtOutDevData->GetIsExportNotes() ) { - SwFieldType* pType = mrSh.GetFldType( RES_POSTITFLD, aEmptyOUStr ); + SwFieldType* pType = mrSh.GetFldType( RES_POSTITFLD, OUString() ); SwIterator<SwFmtFld,SwFieldType> aIter( *pType ); for( SwFmtFld* pFirst = aIter.First(); pFirst; ) { @@ -1832,7 +1832,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // // REFERENCES // - SwFieldType* pType = mrSh.GetFldType( RES_GETREFFLD, aEmptyOUStr ); + SwFieldType* pType = mrSh.GetFldType( RES_GETREFFLD, OUString() ); SwIterator<SwFmtFld,SwFieldType> aIter( *pType ); for( SwFmtFld* pFirst = aIter.First(); pFirst; ) { diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx index 306377acd6c7..2e972de409e8 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(), aEmptyOUStr, aEmptyOUStr, - rNote.GetTarget(), aEmptyOUStr, sal_True, sal_False ); + IMapRectangleObject aObj( aRect, rNote.GetURL(), OUString(), OUString(), + rNote.GetTarget(), OUString(), sal_True, sal_False ); pMap->InsertIMapObject( aObj ); } } diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index b32a30155065..30718a9c7f04 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 aEmptyOUStr; + return OUString(); } void SwTOXSortTabBase::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index 258bed3ca831..5979af163de2 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -431,7 +431,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( aEmptyOUStr ); + SvStorageRef aRef = new SvStorage( OUString() ); SwOLEObj& rSwOLE = (SwOLEObj&)((SwOLENode*)pCNd)->GetOLEObj(); // temporary storage until object is inserted @@ -833,7 +833,7 @@ void SwUndoReRead::SetAndSave(::sw::UndoRedoContext & rContext) } else { - pGrfNd->ReRead( aEmptyOUStr, aEmptyOUStr, pOldGrf, 0, sal_True ); + pGrfNd->ReRead( OUString(), OUString(), pOldGrf, 0, sal_True ); delete pOldGrf; } diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 1bb47aadb745..f35688a86eaf 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -1630,7 +1630,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, aEmptyOUStr, aData); + m_pImpl->m_pProps->sPar3, OUString(), aData); } break; case SW_SERVICE_FIELDTYPE_DATABASE_NUM_SET: @@ -1835,7 +1835,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) SwAuthorityFieldType const type(pDoc); pFld = new SwAuthorityField(static_cast<SwAuthorityFieldType*>( pDoc->InsertFldType(type)), - aEmptyOUStr ); + OUString()); if (m_pImpl->m_pProps->aPropSeq.getLength()) { uno::Any aVal; diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index cb90da131095..abdf5eea7bbb 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -461,7 +461,7 @@ lcl_setRubyCharstyle(SfxItemSet & rItemSet, uno::Any const& rValue) } if (!pRuby.get()) { - pRuby.reset(new SwFmtRuby(aEmptyOUStr)); + pRuby.reset(new SwFmtRuby(OUString())); } OUString sStyle; SwStyleNameMapper::FillUIName(sTmp, sStyle, diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index 06a975379d37..5b05d046438a 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -868,7 +868,7 @@ throw( uno::RuntimeException ) if (!pUnoCrsr) throw uno::RuntimeException(); - setString(aEmptyOUStr); + setString(OUString()); pUnoCrsr->Remove(this); } diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 95d554a8f472..fc28a3ceb163 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -1512,11 +1512,11 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) { if (m_pImpl->m_bIsDescriptor) { - m_pImpl->m_pProps->m_sCondition = aEmptyOUStr; + m_pImpl->m_pProps->m_sCondition = OUString(); } else { - pSectionData->SetCondition(aEmptyOUStr); + pSectionData->SetCondition(OUString()); } } break; diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 2cda585801a4..6dac4baba735 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1990,7 +1990,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( pSetBrush = new SvxBrushItem(*pOrigBrush); } else - pSetBrush = new SvxBrushItem(aEmptyOUStr, aEmptyOUStr, GPOS_AREA, RES_BACKGROUND); + pSetBrush = new SvxBrushItem(OUString(), OUString(), GPOS_AREA, RES_BACKGROUND); } pSetBrush->PutValue( pData->aVal, MID_GRAPHIC_URL ); } @@ -2009,7 +2009,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( pSetBrush = new SvxBrushItem(*pOrigBrush); } else - pSetBrush = new SvxBrushItem(aEmptyOUStr, aEmptyOUStr, GPOS_AREA, RES_BACKGROUND); + pSetBrush = new SvxBrushItem(OUString(), OUString(), 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 df5249d262ab..7c27d16133d0 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1985,7 +1985,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(aEmptyOUStr); + pRuby = new SwFmtRuby(OUString()); OUString sStyle; SwStyleNameMapper::FillUIName(sTmp, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); pRuby->SetCharFmtName( sTmp ); diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 9f8ad7ea6aa3..161a289150ef 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -606,7 +606,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (bAbsorb && !bAttribute) { - xRange->setString(aEmptyOUStr); + xRange->setString(OUString()); } uno::Reference< text::XTextRange > xTempRange = (bAttribute && bAbsorb) ? xRange : xRange->getStart(); diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index ddc685595c86..3f13b5031458 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(), - aEmptyOUStr, aTextFont.GetPitch(), aTextFont.GetCharSet(), RES_CHRATR_FONT ); + OUString(), 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/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index d617de8dccfb..76f8fef62e46 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, aEmptyOUStr, pTemplate ); + SwReader aRdr( aMedium, OUString(), pTemplate ); aRdr.Read( *ReadXML ); ReadXML->SetOrganizerMode( sal_False ); diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index fac9a06ca54c..5958c7561942 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -654,7 +654,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwRedlineData aData(rFltRedline.eTypePrev, rFltRedline.nAutorNoPrev, rFltRedline.aStampPrev, - aEmptyOUStr, + OUString(), 0 ); pDoc->AppendRedline(new SwRangeRedline(aData, aRegion), true); @@ -662,7 +662,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwRedlineData aData(rFltRedline.eType, rFltRedline.nAutorNo, rFltRedline.aStamp, - aEmptyOUStr, + OUString(), 0 ); pDoc->AppendRedline( new SwRangeRedline(aData, aRegion), true ); @@ -1192,7 +1192,7 @@ SwFltShell& SwFltShell::AddError( const sal_Char* pErr ) SwFltShell& SwFltShell::operator << (Graphic& rGraphic) { // embedded Grafik !! - GetDoc().Insert(*pPaM, aEmptyOUStr, aEmptyOUStr, &rGraphic, NULL, NULL, NULL); + GetDoc().Insert(*pPaM, OUString(), OUString(), &rGraphic, NULL, NULL, NULL); return *this; } diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx index b6520db52c2e..6630d8f261be 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( static_cast<SwInputFieldType*>(rOut.GetSysFldType( RES_INPUTFLD )), - aEmptyOUStr, sFormel, + OUString(), sFormel, INP_TXT, 0, false ); 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, aEmptyOUStr, ePitch, eCharSet, RES_CHRATR_FONT); + return SvxFontItem(eFamily, aName, OUString(), ePitch, eCharSet, RES_CHRATR_FONT); } /////////////////////////////////////////////////////////////////// Dop diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index af6e1e28c90d..328bc73c5e0a 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, aEmptyOUStr, + pFltRedline->nAutorNoPrev, pFltRedline->aStampPrev, OUString(), 0); mrDoc.AppendRedline(new SwRangeRedline(aData, aRegion), true); } SwRedlineData aData(pFltRedline->eType, pFltRedline->nAutorNo, - pFltRedline->aStamp, aEmptyOUStr, 0); + pFltRedline->aStamp, OUString(), 0); SwRangeRedline *const pNewRedline(new SwRangeRedline(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 e605bc079805..fbf7bf0c65c9 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -557,7 +557,7 @@ void WW8Export::DoCheckBox(uno::Reference<beans::XPropertySet> xPropSet) aFFData.Write(pDataStrm); - OutputField(0, ww::eFORMCHECKBOX, aEmptyOUStr, WRITEFIELD_CLOSE); + OutputField(0, ww::eFORMCHECKBOX, OUString(), WRITEFIELD_CLOSE); } void WW8Export::DoFormText(const SwInputField * pFld) @@ -590,7 +590,7 @@ void WW8Export::DoFormText(const SwInputField * pFld) aFFData.setStatus(pFld->GetToolTip()); aFFData.Write(pDataStrm); - OutputField(0, ww::eFORMTEXT, aEmptyOUStr, WRITEFIELD_CMD_END); + OutputField(0, ww::eFORMTEXT, OUString(), WRITEFIELD_CMD_END); const OUString fieldStr( pFld->ExpandField(true) ); SwWW8Writer::WriteString16(Strm(), fieldStr, false); @@ -605,7 +605,7 @@ void WW8Export::DoFormText(const SwInputField * pFld) pChpPlc->AppendFkpEntry(Strm().Tell(), sizeof( aArr2 ), aArr2 ); - OutputField(0, ww::eFORMTEXT, aEmptyOUStr, WRITEFIELD_CLOSE); + OutputField(0, ww::eFORMTEXT, OUString(), WRITEFIELD_CLOSE); } PlcDrawObj::~PlcDrawObj() @@ -1061,7 +1061,7 @@ void WW8Export::AppendFlyInFlys(const sw::Frame& rFrmFmt, } if (rFrmFmt.IsInline()) - OutputField(0, ww::eSHAPE, aEmptyOUStr, WRITEFIELD_CLOSE); + OutputField(0, ww::eSHAPE, OUString(), WRITEFIELD_CLOSE); } MSWord_SdrAttrIter::MSWord_SdrAttrIter( MSWordExportBase& rWr, @@ -1409,7 +1409,7 @@ void WW8Export::WriteOutliner(const OutlinerParaObject& rParaObj, sal_uInt8 nTyp bAnyWrite = 0 != nPara; if( !bAnyWrite ) - WriteStringAsPara( aEmptyOUStr ); + WriteStringAsPara( OUString() ); } void WinwordAnchoring::WriteData( EscherEx& rEx ) const @@ -3220,7 +3220,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, aEmptyOUStr, WRITEFIELD_END | WRITEFIELD_CLOSE); + rWW8Wrt.OutputField(0, ww::eCONTROL, OUString(), WRITEFIELD_END | WRITEFIELD_CLOSE); return true; } diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index f101c1ed1a5e..0b0000550ae0 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -765,7 +765,7 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, sal_Int32 /*nPos*/, void WW8AttributeOutput::EndRuby() { m_rWW8Export.WriteChar( ')' ); - m_rWW8Export.OutputField( 0, ww::eEQ, aEmptyOUStr, WRITEFIELD_END | WRITEFIELD_CLOSE ); + m_rWW8Export.OutputField( 0, ww::eEQ, OUString(), WRITEFIELD_END | WRITEFIELD_CLOSE ); } /*#i15387# Better ideas welcome*/ @@ -1011,7 +1011,7 @@ bool WW8AttributeOutput::EndURL() if ( !m_rWW8Export.bWrtWW8 ) return false; - m_rWW8Export.OutputField( 0, ww::eHYPERLINK, aEmptyOUStr, WRITEFIELD_CLOSE ); + m_rWW8Export.OutputField( 0, ww::eHYPERLINK, OUString(), WRITEFIELD_CLOSE ); return true; } @@ -2588,7 +2588,7 @@ void WW8AttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeIn void WW8AttributeOutput::EmptyParagraph() { - m_rWW8Export.WriteStringAsPara( aEmptyOUStr ); + m_rWW8Export.WriteStringAsPara( OUString() ); } bool MSWordExportBase::NoPageBreakSection( const SfxItemSet* pSet ) diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 40731e16137e..1dc12174589c 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1232,7 +1232,7 @@ void WW8_WrPlcSepx::WriteFtnEndTxt( WW8Export& rWrt, sal_uLong nCpStt ) { pTxtPos->Append( nCpStt ); rWrt.WriteStringAsPara( rInfo.aErgoSum ); - rWrt.WriteStringAsPara( aEmptyOUStr ); + rWrt.WriteStringAsPara( OUString() ); nCpStt = rWrt.Fc2Cp( rWrt.Strm().Tell() ); } else if( rWrt.bWrtWW8 ) @@ -1242,7 +1242,7 @@ void WW8_WrPlcSepx::WriteFtnEndTxt( WW8Export& rWrt, sal_uLong nCpStt ) { pTxtPos->Append( nCpStt ); rWrt.WriteStringAsPara( rInfo.aQuoVadis ); - rWrt.WriteStringAsPara( aEmptyOUStr ); + rWrt.WriteStringAsPara( OUString() ); nCpStt = rWrt.Fc2Cp( rWrt.Strm().Tell() ); } else if( rWrt.bWrtWW8 ) @@ -1306,7 +1306,7 @@ void WW8_WrPlcSepx::OutHeaderFooter( WW8Export& rWrt, bool bHeader, { pTxtPos->Append( rCpPos ); rWrt.WriteHeaderFooterText( rFmt, bHeader); - rWrt.WriteStringAsPara( aEmptyOUStr ); // CR ans Ende ( sonst mault WW ) + rWrt.WriteStringAsPara( OUString() ); // CR ans Ende ( sonst mault WW ) rCpPos = rWrt.Fc2Cp( rWrt.Strm().Tell() ); } else if ( rWrt.bWrtWW8 ) @@ -1314,8 +1314,8 @@ void WW8_WrPlcSepx::OutHeaderFooter( WW8Export& rWrt, bool bHeader, pTxtPos->Append( rCpPos ); if ((bHeader? rWrt.bHasHdr : rWrt.bHasFtr) && nBreakCode!=0) { - rWrt.WriteStringAsPara( aEmptyOUStr ); // Empty paragraph for empty header/footer - rWrt.WriteStringAsPara( aEmptyOUStr ); // a CR that WW8 needs for end of the stream + rWrt.WriteStringAsPara( OUString() ); // Empty paragraph for empty header/footer + rWrt.WriteStringAsPara( OUString() ); // a CR that WW8 needs for end of the stream rCpPos = rWrt.Fc2Cp( rWrt.Strm().Tell() ); } } @@ -1923,7 +1923,7 @@ bool WW8_WrPlcSepx::WriteKFTxt( WW8Export& rWrt ) ++nCpEnd; pTxtPos->Append( nCpEnd + 1 ); // End of last Header/Footer for PlcfHdd - rWrt.WriteStringAsPara( aEmptyOUStr ); // CR ans Ende ( sonst mault WW ) + rWrt.WriteStringAsPara( OUString() ); // CR ans Ende ( sonst mault WW ) } rWrt.pFldHdFt->Finish( nCpEnd, rWrt.pFib->ccpText + rWrt.pFib->ccpFtn ); rWrt.pFib->ccpHdr = nCpEnd - nCpStart; @@ -2227,7 +2227,7 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp, } // CR at end of one textbox text ( otherwise WW gpft :-( ) - rWrt.WriteStringAsPara( aEmptyOUStr ); + rWrt.WriteStringAsPara( OUString() ); } break; @@ -2255,7 +2255,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( aEmptyOUStr ); + rWrt.WriteStringAsPara( OUString() ); 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 e20674b9f302..7c1cf7f4449e 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, aEmptyOUStr, *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ) == GRFILTER_OK ) + if( rGF.ImportGraphic( aGr1, OUString(), *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ) == GRFILTER_OK ) { Graphic aGr2; delete pGraphicStream; pGraphicStream = ::utl::UcbStreamHelper::CreateStream( aCnt.GetGraphicStream( pRet->GetObjRef() ) ); - if( rGF.ImportGraphic( aGr2, aEmptyOUStr, *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ) == GRFILTER_OK ) + if( rGF.ImportGraphic( aGr2, OUString(), *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, aEmptyOUStr, + OutputField(0, ww::eEMBED, OUString(), 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, aEmptyOUStr, *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ) == GRFILTER_OK ) + if( rGF.ImportGraphic( aGr, OUString(), *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 c7c67c780b62..a834683e503c 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2332,7 +2332,7 @@ void AttributeOutputBase::EndTOX( const SwSection& rSect,bool bCareEnd ) if ( pTOX ) { ww::eField eCode = TOX_INDEX == pTOX->GetType() ? ww::eINDEX : ww::eTOC; - GetExport( ).OutputField( 0, eCode, aEmptyOUStr, WRITEFIELD_CLOSE ); + GetExport( ).OutputField( 0, eCode, OUString(), WRITEFIELD_CLOSE ); } GetExport( ).bInWriteTOX = false; if (bCareEnd) diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index a8962e972422..d365f3cab25b 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( aEmptyOUStr ); + rBlocks.SetBaseURL( OUString() ); 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 c59897f6543e..10b7e6c9cf95 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -209,7 +209,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( aEmptyOUStr, aCol ) ); + rSet.Put( XLineColorItem( OUString(), aCol ) ); rSet.Put( XLineWidthItem( SVBT16ToShort( rL.lnpw ) ) ); // LinienDicke if( SVBT16ToShort( rL.lnps ) >= 1 @@ -226,7 +226,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( aEmptyOUStr, aD ) ); + rSet.Put( XLineDashItem( OUString(), aD ) ); }else{ rSet.Put( XLineStyleItem( XLINE_SOLID ) ); // noetig fuer TextBox } @@ -262,7 +262,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(aEmptyOUStr, WW8TransCol(rFill.dlpcBg))); + rSet.Put(XFillColorItem(OUString(), WW8TransCol(rFill.dlpcBg))); } else { // Brush -> Farbmischung @@ -274,7 +274,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( aEmptyOUStr, aB ) ); + rSet.Put( XFillColorItem( OUString(), aB ) ); } } } @@ -290,7 +290,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( aEmptyOUStr, ::basegfx::B2DPolyPolygon(aPolygon) ) ); + rSet.Put( XLineEndItem( OUString(), ::basegfx::B2DPolyPolygon(aPolygon) ) ); sal_uInt16 nSiz = SVBT16ToShort( rLt.lnpw ) * ( ( aSB >> 2 & 0x3 ) + ( aSB >> 4 & 0x3 ) ); if( nSiz < 220 ) nSiz = 220; @@ -305,7 +305,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( aEmptyOUStr, ::basegfx::B2DPolyPolygon(aPolygon) ) ); + rSet.Put( XLineStartItem( OUString(), ::basegfx::B2DPolyPolygon(aPolygon) ) ); sal_uInt16 nSiz = SVBT16ToShort( rLt.lnpw ) * ( ( aEB >> 2 & 0x3 ) + ( aEB >> 4 & 0x3 ) ); if( nSiz < 220 ) nSiz = 220; @@ -942,7 +942,7 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(OUString &rString, WW8_CP pRet->SetOutlinerMode( OUTLINERMODE_TEXTOBJECT ); delete pTemporaryText; - mpDrawEditEngine->SetText( aEmptyOUStr ); + mpDrawEditEngine->SetText( OUString() ); mpDrawEditEngine->SetParaAttribs(0, mpDrawEditEngine->GetEmptyItemSet()); //Strip out fields, leaving the result @@ -1160,7 +1160,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( aEmptyOUStr ); + mpDrawEditEngine->SetText( OUString() ); mpDrawEditEngine->SetParaAttribs(0, mpDrawEditEngine->GetEmptyItemSet()); } @@ -2995,7 +2995,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject, // as a linked graphic - if (GRAPHIC_NONE == eType || CanUseRemoteLink(aGrfName)) { - pRetFrmFmt = rDoc.Insert(*pPaM, aGrfName, aEmptyOUStr, 0, + pRetFrmFmt = rDoc.Insert(*pPaM, aGrfName, OUString(), 0, &rFlySet, &aGrSet, NULL); bDone = true; } @@ -3003,7 +3003,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject, if (!bDone) { const Graphic& rGraph = pGrf->GetGraphic(); - pRetFrmFmt = rDoc.Insert(*pPaM, aEmptyOUStr, aEmptyOUStr, &rGraph, + pRetFrmFmt = rDoc.Insert(*pPaM, OUString(), OUString(), &rGraph, &rFlySet, &aGrSet, NULL); } } diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index e63038c8200c..6c54dbccbe95 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, aEmptyOUStr, rSrc, + return 0 == GraphicFilter::GetGraphicFilter().ImportGraphic(rGraphic, OUString(), 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, aEmptyOUStr, pGraph, + SwFlyFrmFmt* pFlyFmt = rDoc.Insert(*pPaM, rFileName, OUString(), 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, aEmptyOUStr, pGraph, &aFlySet, + pFlyFmt = rDoc.Insert( *pPaM, rFileName, OUString(), pGraph, &aFlySet, &rGrfSet, NULL); } @@ -663,7 +663,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, if (!pRet) { - pRet = rDoc.Insert(*pPaM, aEmptyOUStr, aEmptyOUStr, + pRet = rDoc.Insert(*pPaM, OUString(), OUString(), &rGraph, &aAttrSet, &aGrSet, NULL ); } } diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index e7f7e4d6667a..aaf1b445e9f8 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -260,7 +260,7 @@ public: bool bParaAutoAfter; // For Auto Spacing after a paragraph SwWW8StyInf() : - sWWStyleName( aEmptyOUStr ), + sWWStyleName( OUString() ), nWWStyleId( 0 ), eLTRFontSrcCharSet(0), eRTLFontSrcCharSet(0), diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index d09db9762626..0adb29940afa 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -193,7 +193,7 @@ public: const WW8_TCell* GetAktWWCell() const { return pAktWWCell; } short GetAktCol() const { return nAktCol; } // find name of numrule valid for current WW-COL - const OUString& GetNumRuleName() const; + OUString GetNumRuleName() const; void SetNumRuleName( const OUString& rName ); sw::util::RedlineStack* getOldRedlineStack(){ return mpOldRedlineStack; } @@ -3302,20 +3302,19 @@ sal_uInt16 WW8TabDesc::GetLogicalWWCol() const // returns number of col as INDIC } // find name of numrule valid for current WW-COL -const OUString& WW8TabDesc::GetNumRuleName() const +OUString WW8TabDesc::GetNumRuleName() const { sal_uInt16 nCol = GetLogicalWWCol(); if (nCol < aNumRuleNames.size()) return aNumRuleNames[nCol]; - else - return aEmptyOUStr; + return OUString(); } 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(aEmptyOUStr); + aNumRuleNames.push_back(OUString()); aNumRuleNames[nCol] = rName; } diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index be0ca0f0040d..0532bd0adfbb 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, aEmptyOUStr, aEmptyOUStr, &aGraph, pFlySet, + pFmt = rDoc.Insert(*pPaM, OUString(), OUString(), &aGraph, pFlySet, pGrfSet, NULL); } delete pTempSet; diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 5b88475ebe01..93dc8b357cc6 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -1126,7 +1126,7 @@ OUString SwWW8ImplReader::GetFieldResult( WW8FieldDesc* pF ) WW8_CP nStart = pF->nSRes; // result start long nL = pF->nLRes; // result length if( !nL ) - return aEmptyOUStr; // no result + return OUString(); // no result if( nL > MAX_FIELDLEN ) nL = MAX_FIELDLEN; // MaxLength, by quoting @@ -1323,7 +1323,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, aEmptyOUStr, + SwSetExpField aFld( (SwSetExpFieldType*)pNumFldType, OUString(), GetNumberPara( rStr ) ); aFld.SetValue( ++nFldNum ); rDoc.InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 ); @@ -1392,7 +1392,7 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, OUString& rStr ) SwSetExpFieldType* pFT = (SwSetExpFieldType*)rDoc.InsertFldType( SwSetExpFieldType( &rDoc, aSequenceName, nsSwGetSetExpType::GSE_SEQ ) ); - SwSetExpField aFld( pFT, aEmptyOUStr, eNumFormat ); + SwSetExpField aFld( pFT, OUString(), eNumFormat ); //#i120654# Add bHidden for /h flag (/h: Hide the field result.) if (bHidden) @@ -1818,7 +1818,7 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, OUString& rStr ) { if (!aName.isEmpty()) // Font Name set ? { - SvxFontItem aFont(FAMILY_DONTKNOW, aName, aEmptyOUStr, + SvxFontItem aFont(FAMILY_DONTKNOW, aName, OUString(), PITCH_DONTKNOW, RTL_TEXTENCODING_SYMBOL, RES_CHRATR_FONT); NewAttr(aFont); // new Font } @@ -2309,7 +2309,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, - aEmptyOUStr, + OUString(), 0, // Graphic* &aFlySet, 0, 0); // SwFrmFmt* @@ -2434,7 +2434,7 @@ eF_ResT SwWW8ImplReader::Read_F_DBNext( WW8FieldDesc*, OUString& ) { SwDBNextSetFieldType aN; SwFieldType* pFT = rDoc.InsertFldType( aN ); - SwDBNextSetField aFld( (SwDBNextSetFieldType*)pFT, aEmptyOUStr, aEmptyOUStr, + SwDBNextSetField aFld( (SwDBNextSetFieldType*)pFT, OUString(), OUString(), SwDBData() ); // Datenbank: Nichts rDoc.InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 ); return FLD_OK; @@ -2630,7 +2630,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, - aEmptyOUStr,PITCH_DONTKNOW,RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT); + OUString(), 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); @@ -2856,7 +2856,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, aEmptyOUStr ); + SwTOXBase* pBase = new SwTOXBase( pType, aOrigForm, nCreateOf, OUString() ); 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 728384055919..e2b7ea400339 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, rtl_TextEncoding eDstCharSet = eSrcCharSet; - SvxFontItem aFont( eFamily, aName, aEmptyOUStr, ePitch, eDstCharSet, nWhich); + SvxFontItem aFont( eFamily, aName, OUString(), ePitch, eDstCharSet, nWhich); if( bSetEnums ) { diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 65834bc07b4e..d7599fca43ea 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -140,7 +140,7 @@ static SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc, if( p && !p->IsDefault() ) pStyle->PresetParent( p->GetName() ); else - pStyle->PresetParent( aEmptyOUStr ); + pStyle->PresetParent( OUString() ); } else pStyle->SetPhysical(sal_False); @@ -176,7 +176,7 @@ static SwTxtFmtColl* lcl_FindParaFmt( SwDoc& rDoc, if( pColl->DerivedFrom() && !pColl->DerivedFrom()->IsDefault() ) pStyle->PresetParent( pColl->DerivedFrom()->GetName() ); else - pStyle->PresetParent( aEmptyOUStr ); + pStyle->PresetParent( OUString() ); SwTxtFmtColl& rNext = pColl->GetNextTxtFmtColl(); pStyle->PresetFollow(rNext.GetName()); @@ -213,7 +213,7 @@ static SwFrmFmt* lcl_FindFrmFmt( SwDoc& rDoc, if( pFmt->DerivedFrom() && !pFmt->DerivedFrom()->IsDefault() ) pStyle->PresetParent( pFmt->DerivedFrom()->GetName() ); else - pStyle->PresetParent( aEmptyOUStr ); + pStyle->PresetParent( OUString() ); } else pStyle->SetPhysical(sal_False); @@ -248,7 +248,7 @@ static const SwPageDesc* lcl_FindPageDesc( SwDoc& rDoc, if(pDesc->GetFollow()) pStyle->PresetFollow(pDesc->GetFollow()->GetName()); else - pStyle->PresetParent( aEmptyOUStr ); + pStyle->PresetParent( OUString() ); } else pStyle->SetPhysical(sal_False); @@ -279,7 +279,7 @@ static const SwNumRule* lcl_FindNumRule( SwDoc& rDoc, if(pRule) { pStyle->SetPhysical(sal_True); - pStyle->PresetParent( aEmptyOUStr ); + pStyle->PresetParent( OUString() ); } else pStyle->SetPhysical(sal_False); @@ -2111,7 +2111,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, aEmptyOUStr, this, SFX_STYLE_FAMILY_CHAR, 0 ) ) +, mxStyleSheet( new SwDocStyleSheet( rDocument, OUString(), this, SFX_STYLE_FAMILY_CHAR, 0 ) ) , rDoc( rDocument ) { bOrganizer = bOrg; @@ -2136,8 +2136,8 @@ SfxStyleSheetBase& SwDocStyleSheetPool::Make( const OUString& rName, sal_uInt16 _nMask) { mxStyleSheet->PresetName(rName); - mxStyleSheet->PresetParent(aEmptyOUStr); - mxStyleSheet->PresetFollow(aEmptyOUStr); + mxStyleSheet->PresetParent(OUString()); + mxStyleSheet->PresetFollow(OUString()); mxStyleSheet->SetMask(_nMask) ; mxStyleSheet->SetFamily(eFam); mxStyleSheet->SetPhysical(sal_True); @@ -2373,7 +2373,7 @@ bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam, mxStyleSheet->PresetFollow( ((SwTxtFmtColl*)pFmt)-> GetNextTxtFmtColl().GetName() ); else - mxStyleSheet->PresetFollow( aEmptyOUStr ); + mxStyleSheet->PresetFollow( OUString() ); Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *(mxStyleSheet.get()) ) ); @@ -2464,8 +2464,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(), aEmptyOUStr, pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ), - mxStyleSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyOUStr, pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ) + mxIterSheet( new SwDocStyleSheet( pBase->GetDoc(), OUString(), pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ), + mxStyleSheet( new SwDocStyleSheet( pBase->GetDoc(), OUString(), pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ) { bFirstCalled = sal_False; nLastPos = 0; diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx index 03e1a0d49e83..99a8ebe1bf0a 100644 --- a/sw/source/ui/docvw/PostItMgr.cxx +++ b/sw/source/ui/docvw/PostItMgr.cxx @@ -1131,7 +1131,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, aEmptyOUStr,false); + SwFieldType* pType = mpView->GetDocShell()->GetDoc()->GetFldType(RES_POSTITFLD, OUString(),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 0cf02b65f1d2..8d5dd5dee43b 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -3803,7 +3803,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) rBnd.Invalidate(SID_ATTR_POSITION); } rBnd.Invalidate(SID_ATTR_SIZE); - const SfxStringItem aCell( SID_TABLE_CELL, aEmptyOUStr ); + const SfxStringItem aCell( SID_TABLE_CELL, OUString() ); rBnd.SetState( aCell ); } } diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 8785f6ed03c1..3e0acd623a08 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(aEmptyOUStr); - m_pValueED->SetText(aEmptyOUStr); + m_pNameED->SetText(OUString()); + m_pValueED->SetText(OUString()); } if(bDropDown) ListEnableHdl(0); diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 54efc4d5176a..72615a1989ae 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -853,8 +853,8 @@ sal_Bool SwFldMgr::InsertFld( pType, rData.sPar1, // author rData.sPar2, // content - aEmptyOUStr, // author's initials - aEmptyOUStr, // name + OUString(), // author's initials + OUString(), // name DateTime(DateTime::SYSTEM) ); pFld = pPostItField; } @@ -1238,7 +1238,7 @@ sal_Bool SwFldMgr::InsertFld( if(pTyp) { SwSetExpField* pExpFld = - new SwSetExpField(pTyp, aEmptyOUStr, nFormatId); + new SwSetExpField(pTyp, OUString(), nFormatId); // Don't change type of SwSetExpFieldType: sal_uInt16 nOldSubType = pExpFld->GetSubType(); diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 162b83a50afc..9e416951a34c 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(aEmptyOUStr); - m_pValueED->SetText(aEmptyOUStr); + m_pNameED->SetText(OUString()); + m_pValueED->SetText(OUString()); } m_pValueED->SetDropEnable(false); @@ -275,8 +275,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) { if (pBox) // only when interacting via mouse { - m_pNameED->SetText(aEmptyOUStr); - m_pValueED->SetText(aEmptyOUStr); + m_pNameED->SetText(OUString()); + m_pValueED->SetText(OUString()); } } bValue = bName = bNumFmt = bInvisible = sal_True; @@ -348,8 +348,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) { if (!IsFldEdit()) { - m_pNameED->SetText(aEmptyOUStr); - m_pValueED->SetText(aEmptyOUStr); + m_pNameED->SetText(OUString()); + m_pValueED->SetText(OUString()); } 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(aEmptyOUStr); + m_pNameED->SetText(OUString()); if (nSelPos != 0 && nSelPos != LISTBOX_ENTRY_NOTFOUND) { @@ -509,8 +509,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) break; case TYP_GETREFPAGEFLD: - m_pNameED->SetText(aEmptyOUStr); - m_pValueED->SetText(aEmptyOUStr); + m_pNameED->SetText(OUString()); + m_pValueED->SetText(OUString()); break; } @@ -696,7 +696,7 @@ sal_uInt16 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId) if (!bSpecialFmt) { m_pNumFormatLB->SetDefFormat(GetCurField()->GetFormat()); - sOldNumSel = aEmptyOUStr; + sOldNumSel = OUString(); } 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 f59a477de216..430f9cbe4a97 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(aEmptyOUStr); + m_pEditED->SetText(OUString()); m_pUrlRB->Check(); } else { m_pEditED->SetText(pFld->GetPar2()); - m_pUrlED->SetText(aEmptyOUStr); + m_pUrlED->SetText(OUString()); 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 9532ce199fa0..7ed1227b9293 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -1206,17 +1206,17 @@ void SwColumnPage::Update() } else { - aEd3.SetText(aEmptyOUStr); - aDistEd2.SetText(aEmptyOUStr); + aEd3.SetText(OUString()); + aDistEd2.SetText(OUString()); } } else { - aEd1.SetText(aEmptyOUStr); - aEd2.SetText(aEmptyOUStr); - aEd3.SetText(aEmptyOUStr); - aDistEd1.SetText(aEmptyOUStr); - aDistEd2.SetText(aEmptyOUStr); + aEd1.SetText(OUString()); + aEd2.SetText(OUString()); + aEd3.SetText(OUString()); + aDistEd1.SetText(OUString()); + aDistEd2.SetText(OUString()); } UpdateColMgr(0); } diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 85f710539468..c68f4caf730f 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, aEmptyOUStr )); + SwStyleNameMapper::GetUIName( nPoolId, OUString() )); } // aFormatBox @@ -250,8 +250,8 @@ void SwCaptionDialog::Apply() OUString aName( m_pCategoryBox->GetText() ); if ( aName == m_sNone ) { - aOpt.SetCategory( aEmptyOUStr ); - aOpt.SetNumSeparator( aEmptyOUStr ); + aOpt.SetCategory( OUString() ); + aOpt.SetNumSeparator( OUString() ); } else { @@ -273,7 +273,7 @@ IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, Button*, pButton ) { OUString sFldTypeName = m_pCategoryBox->GetText(); if(sFldTypeName == m_sNone) - sFldTypeName = aEmptyOUStr; + sFldTypeName = OUString(); SwSequenceOptionDialog aDlg( pButton, rView, sFldTypeName ); aDlg.SetApplyBorderAndShadow(bCopyAttributes); aDlg.SetCharacterStyle( sCharacterStyle ); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 6e4f6d05d949..c76cce8a8650 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 aEmptyOUStr; + return OUString(); 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(aEmptyOUStr); + m_pPhoneticED0->SetText(OUString()); 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(aEmptyOUStr); - m_pPhoneticED1->SetText(aEmptyOUStr); - m_pPhoneticED2->SetText(aEmptyOUStr); + m_pKey2DCB->SetText(OUString()); + m_pPhoneticED1->SetText(OUString()); + m_pPhoneticED2->SetText(OUString()); 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(aEmptyOUStr); + m_pPhoneticED2->SetText(OUString()); 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, aEmptyOUStr); + pSh->GetFldType(RES_AUTHORITY, OUString()); 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] = aEmptyOUStr; + m_sFields[i] = OUString(); } 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, aEmptyOUStr); + pSh->GetFldType(RES_AUTHORITY, OUString()); 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, aEmptyOUStr, 0 ); + SwInsertFld_Data aData(TYP_AUTHORITY, 0, sFields, OUString(), 0 ); aMgr.InsertFld( aData ); } else if(aMgr.GetCurFld()) { - aMgr.UpdateCurFld(0, sFields, aEmptyOUStr); + aMgr.UpdateCurFld(0, sFields, OUString()); } } if(!bNewEntry) @@ -1374,7 +1374,7 @@ IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, RadioButton*, pButton) else { const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) - pSh->GetFldType(RES_AUTHORITY, aEmptyOUStr); + pSh->GetFldType(RES_AUTHORITY, OUString()); 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, aEmptyOUStr); + pSh->GetFldType(RES_AUTHORITY, OUString()); 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, aEmptyOUStr); + rSh.GetFldType(RES_AUTHORITY, OUString()); 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, aEmptyOUStr); + rWrtSh.GetFldType(RES_AUTHORITY, OUString()); if(pFType) { const SwAuthEntry* pEntry = pFType->GetEntryByIdentifier( diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 3d77891ef2dd..d93b0f841043 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -759,7 +759,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) { uno::Reference< linguistic2::XDictionary > xDictionary( SvxGetIgnoreAllList(), uno::UNO_QUERY ); linguistic::AddEntryToDic( xDictionary, - m_xSpellAlt->getWord(), sal_False, aEmptyOUStr, LANGUAGE_NONE ); + m_xSpellAlt->getWord(), sal_False, OUString(), LANGUAGE_NONE ); } else if ((MN_DICTIONARIES_START <= nId && nId <= MN_DICTIONARIES_END) || nId == MN_ADD_TO_DIC_SINGLE) { @@ -781,7 +781,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) if (xDic.is()) { - sal_Int16 nAddRes = linguistic::AddEntryToDic( xDic, aWord, sal_False, aEmptyOUStr, LANGUAGE_NONE ); + sal_Int16 nAddRes = linguistic::AddEntryToDic( xDic, aWord, sal_False, OUString(), 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 93e74980dd3e..4d19c1a1da6c 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(aEmptyOUStr); + m_pBookmarkBox->SetText(OUString()); 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, aEmptyOUStr ); + rSh.SetBookmark( KeyCode(), sEntry, OUString() ); 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 38e544c61999..cc0c6d7615ba 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, aEmptyOUStr )); + m_pPageTemplBox->InsertEntry(SwStyleNameMapper::GetUIName( i, OUString() )); sal_uInt16 nCount = pSh->GetPageDescCnt(); for(i = 0; i < nCount; ++i) diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index ea915d15ab6e..51b9614b49e6 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(aEmptyOUStr); + m_pStartEdit->SetText(OUString()); if(bSamePrefix) m_pPrefixED->SetText(aNumFmtArr[0]->GetPrefix()); else - m_pPrefixED->SetText(aEmptyOUStr); + m_pPrefixED->SetText(OUString()); if(bSameSuffix) m_pSuffixED->SetText(aNumFmtArr[0]->GetSuffix()); else - m_pSuffixED->SetText(aEmptyOUStr); + m_pSuffixED->SetText(OUString()); if(bSameCharFmt) { @@ -507,7 +507,7 @@ void SwOutlineSettingsTabPage::Update() } else { - m_pAllLevelNF->SetText(aEmptyOUStr); + m_pAllLevelNF->SetText(OUString()); } } else @@ -538,7 +538,7 @@ void SwOutlineSettingsTabPage::Update() } else { - m_pAllLevelNF->SetText(aEmptyOUStr); + m_pAllLevelNF->SetText(OUString()); 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] = aEmptyOUStr; + pCollNames[nTmpLevel] = OUString(); else { pCollNames[nTmpLevel] = aCollName; // template already in use? for( i = 0; i < MAXLEVEL; ++i) if(i != nTmpLevel && pCollNames[i] == aCollName ) - pCollNames[i] = aEmptyOUStr; + pCollNames[i] = OUString(); } // 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), aEmptyOUStr )); + static_cast< sal_uInt16 >(RES_POOLCOLL_HEADLINE1 + i), OUString())); m_pLevelLB->InsertEntry( OUString::number(i + 1) ); } OUString sStr("1 - "); diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 60c8c5c30bff..1ce307aff932 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -893,8 +893,8 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( &rView.GetEditWin() ); - pDlg->Insert( SOT_FORMAT_STRING, aEmptyOUStr ); - pDlg->Insert( SOT_FORMAT_RTF, aEmptyOUStr ); + pDlg->Insert( SOT_FORMAT_STRING, OUString() ); + pDlg->Insert( SOT_FORMAT_RTF, OUString() ); TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &rView.GetEditWin() ) ); diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 4b5d9f80aa4c..9720fcabf536 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -971,7 +971,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) const PolyPolygon aPoly( pDlg->GetPolyPolygon() ); rSh.SetGraphicPolygon( &aPoly ); if ( pDlg->IsGraphicChanged() ) - rSh.ReRead( aEmptyOUStr, aEmptyOUStr, &pDlg->GetGraphic()); + rSh.ReRead( OUString(), OUString(), &pDlg->GetGraphic()); rSh.EndAction(); } } diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 00e49bf7ac27..07efba61600a 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -90,7 +90,7 @@ namespace virtual void Update( Graphic& aGraphic ) { - m_pShell->ReRead(aEmptyOUStr, aEmptyOUStr, (const Graphic*) &aGraphic); + m_pShell->ReRead(OUString(), OUString(), (const Graphic*) &aGraphic); } }; } @@ -161,7 +161,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) aCrop.SetBottom( MM100_TO_TWIP( aScaledCropedRectangle.Bottom() )); Graphic aCompressedGraphic( aDialog.GetCompressedGraphic() ); - rSh.ReRead(aEmptyOUStr, aEmptyOUStr, (const Graphic*) &aCompressedGraphic); + rSh.ReRead(OUString(), OUString(), (const Graphic*) &aCompressedGraphic); rSh.SetAttrItem(aCrop); @@ -579,7 +579,7 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq ) GraphicObject aFilterObj( *pFilterObj ); if( SVX_GRAPHICFILTER_ERRCODE_NONE == SvxGraphicFilter::ExecuteGrfFilterSlot( rReq, aFilterObj )) - GetShell().ReRead( aEmptyOUStr, aEmptyOUStr, + GetShell().ReRead( OUString(), OUString(), &aFilterObj.GetGraphic() ); } } @@ -800,7 +800,7 @@ void SwGrfShell::ExecuteRotation(SfxRequest &rReq) Graphic aGraphic = *rShell.GetGraphic(); GraphicNativeTransform aTransform(aGraphic); aTransform.rotate(aRotation); - rShell.ReRead(aEmptyOUStr, aEmptyOUStr, (const Graphic*) &aGraphic); + rShell.ReRead(OUString(), OUString(), (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 c19ba32b57b5..80579cc1b3af 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -367,7 +367,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) // --> suggestion has to be removed before GetView().GetEditWin().StopQuickHelp(); - SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, aEmptyOUStr, 0); + SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, OUString(), 0); aFldMgr.InsertFld( aData ); rSh.Push(); @@ -378,7 +378,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) if (pPostIt) { - SwFieldType* pType = rSh.GetDoc()->GetFldType(RES_POSTITFLD, aEmptyOUStr,false); + SwFieldType* pType = rSh.GetDoc()->GetFldType(RES_POSTITFLD, OUString(), false); SwIterator<SwFmtFld,SwFieldType> aIter( *pType ); SwFmtFld* pSwFmtFld = aIter.First(); while( pSwFmtFld ) @@ -597,7 +597,7 @@ FIELD_INSERT: if(!nInsertFormat) nInsertFormat = aFldMgr.GetDefaultFormat(nInsertType, bIsText, rSh.GetNumberFormatter()); SwInsertFld_Data aData(nInsertType, nInsertSubType, - aEmptyOUStr, aEmptyOUStr, nInsertFormat); + OUString(), OUString(), nInsertFormat); aFldMgr.InsertFld(aData); rReq.Done(); } diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 2a97cdb36421..5a3a2367c7f2 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -587,7 +587,7 @@ void SwTextShell::Execute(SfxRequest &rReq) if ( pItem ) { OUString sName = ((SfxStringItem*)pItem)->GetValue(); - rWrtSh.SetBookmark( KeyCode(), sName, aEmptyOUStr ); + rWrtSh.SetBookmark( KeyCode(), sName, OUString() ); } else { @@ -764,7 +764,7 @@ void SwTextShell::Execute(SfxRequest &rReq) } if( !bDelSel && aFldMgr.GetCurFld() && TYP_FORMELFLD == aFldMgr.GetCurTypeId() ) - aFldMgr.UpdateCurFld( aFldMgr.GetCurFld()->GetFormat(), aEmptyOUStr, sFormula ); + aFldMgr.UpdateCurFld( aFldMgr.GetCurFld()->GetFormat(), OUString(), sFormula ); else if( !sFormula.isEmpty() ) { if( rWrtSh.IsCrsrInTbl() ) @@ -778,7 +778,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, aEmptyOUStr, sFormula, nSysNumFmt); + SwInsertFld_Data aData(TYP_FORMELFLD, nsSwGetSetExpType::GSE_FORMULA, OUString(), sFormula, nSysNumFmt); aFldMgr.InsertFld(aData); } } diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx index 703e89bf9920..8bda1565b497 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, aEmptyOUStr, 0); + SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, OUString(), 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 4614e2b93cdc..46901353c322 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( aEmptyOUStr ); + m_aFieldArr[i].SetText( OUString() ); m_pTextArr[i]->Disable(); i++; } diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 0651d155cb53..ce7566d22574 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 ( aEmptyOUStr ), + aCurData ( OUString() ), aVD ( *this ), aScriptedText ( aVD ), bFitWidth ( sal_False ), diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 1af32ed76c9c..0dd3fee00c7d 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -1426,7 +1426,7 @@ IMPL_LINK( SwPagePreview, EndScrollHdl, SwScrollbar *, pScrollbar ) if( !pScrollbar->IsHoriScroll() ) // scroll vertically { if ( Help::IsQuickHelpEnabled() ) - Help::ShowQuickHelp(pScrollbar, Rectangle(), aEmptyOUStr, 0); + Help::ShowQuickHelp(pScrollbar, Rectangle(), OUString(), 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 04aba5d8d7c2..10615b9ed5bd 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -1702,7 +1702,7 @@ void SwView::ScannerEventHdl( const EventObject& /*rEventObject*/ ) if( !!aScanBmp ) { Graphic aGrf(aScanBmp); - m_pWrtShell->Insert( aEmptyOUStr, aEmptyOUStr, aGrf ); + m_pWrtShell->Insert( OUString(), OUString(), aGrf ); } } } diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index e6b413bce645..94e57386e3b2 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( aEmptyOUStr, aEmptyOUStr, aGraphic, &aFrameManager ); + rShell.Insert( OUString(), OUString(), 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, aEmptyOUStr, bAsLink, &GraphicFilter::GetGraphicFilter() ); + nError = InsertGraphic( aFileName, OUString(), bAsLink, &GraphicFilter::GetGraphicFilter() ); if ( rSh.IsFrmSelected() ) { SwFrmFmt* pFmt = pDoc->FindFrmFmtByName( sGraphicFormat ); diff --git a/sw/source/ui/uiview/viewdlg2.cxx b/sw/source/ui/uiview/viewdlg2.cxx index 7d4e80933f5c..dcfb8333e31f 100644 --- a/sw/source/ui/uiview/viewdlg2.cxx +++ b/sw/source/ui/uiview/viewdlg2.cxx @@ -167,7 +167,7 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt) GetWrtShell().InsertLabel( eT, pOpt->GetCaption(), - !pOpt->IgnoreSeqOpts() ? aEmptyOUStr : pOpt->GetSeparator(), + !pOpt->IgnoreSeqOpts() ? OUString() : pOpt->GetSeparator(), pOpt->GetNumSeparator(), !pOpt->GetPos(), nID, diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index 5bc5146e4ebb..58e6e8ed31fb 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, aEmptyOUStr, m_pEditWin, + SfxErrorContext aContext( ERRCTX_SVX_LINGU_HYPHENATION, OUString(), 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, aEmptyOUStr, m_pEditWin, + SfxErrorContext aContext( ERRCTX_SVX_LINGU_THESAURUS, OUString(), 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 219f73313eaf..7c7dc1e2b351 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(), aEmptyOUStr, 0); + Help::ShowQuickHelp(pScrollbar, Rectangle(), OUString(), 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 4436f73d91ff..bcf09c7077ba 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -776,7 +776,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions ) SearchOptions aSearchOpt( m_pSrchItem->GetSearchOptions() ); aSearchOpt.Locale = GetAppLanguageTag().getLocale(); if( !bDoReplace ) - aSearchOpt.replaceString = aEmptyOUStr; + aSearchOpt.replaceString = OUString(); 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 f75af83666d5..4099eb998802 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -402,7 +402,7 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const pGlosGroup->SetBaseURL( aTemp.GetMainURL(INetURLObject::NO_DECODE)); } else - pGlosGroup->SetBaseURL( aEmptyOUStr ); + pGlosGroup->SetBaseURL( OUString() ); sal_uInt16 nRet; if( pOnlyTxt ) @@ -700,8 +700,8 @@ void SwXAutoTextGroup::removeVetoableChangeListener( void SwXAutoTextGroup::Invalidate() { pGlossaries = 0; - sName = aEmptyOUStr; - m_sGroupName = aEmptyOUStr; + sName = OUString(); + m_sGroupName = OUString(); } OUString SwXAutoTextGroup::getImplementationName(void) throw( uno::RuntimeException ) diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index dadb401cbc3f..946325022e68 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 = aEmptyOUStr; + rText = OUString(); return ePres; } default:;//prevent warning diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 00d1f839af38..47357c004e28 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -264,7 +264,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) pMarkAccess->getBookmarksBegin(), pMarkAccess->getBookmarksEnd(), &lcl_IsUiVisibleBookmark)); - sTypeToken = aEmptyOUStr; + sTypeToken = OUString(); bEdit = true; } break; @@ -406,14 +406,14 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) } } } - sTypeToken = aEmptyOUStr; + sTypeToken = OUString(); bEdit = true; nOldMemberCount = nMemberCount; } break; case CONTENT_TYPE_DRAWOBJECT: { - sTypeToken = aEmptyOUStr; + sTypeToken = OUString(); nMemberCount = 0; SdrModel* pModel = pWrtShell->getIDocumentDrawModelAccess()->GetDrawModel(); if(pModel) @@ -2871,7 +2871,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) } else { - Help::ShowQuickHelp( this, Rectangle(), aEmptyOUStr, 0 ); + Help::ShowQuickHelp( this, Rectangle(), OUString(), 0 ); bCallBase = false; } } diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx index 3d0b3a1c213f..fabf1197952c 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 = aEmptyOUStr; + pGroup->sLongNames = pGroup->sShortNames = OUString(); if(pBlock) pGroup->sTitle = pBlock->GetName(); diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 512d0bd6b663..870f752432bc 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, aEmptyOUStr); + SfxStringItem aFollow(SID_ATTR_PAGE_EXT1, OUString()); 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 09b505e7e840..5e82fed05ad2 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 = aEmptyOUStr; + sPreviewZoom = OUString(); SvxZoomStatusBarControl::StateChanged(nSID, eState, pState); } } diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx index 6a277ed7ba4d..68811c399b2b 100644 --- a/sw/source/ui/wrtsh/wrtsh2.cxx +++ b/sw/source/ui/wrtsh/wrtsh2.cxx @@ -520,7 +520,7 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk, if( EXCHG_IN_ACTION_MOVE == nAction && pIns ) { aSection = SwSectionData(*pIns); - aSection.SetLinkFileName( aEmptyOUStr ); + aSection.SetLinkFileName( OUString() ); aSection.SetType( CONTENT_SECTION ); aSection.SetProtectFlag( false ); |