diff options
56 files changed, 185 insertions, 184 deletions
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index a89413ccfa7d..0206535fcd37 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -80,9 +80,6 @@ const SwTwips lMinBorder = 1134; //TODO: Replace with SwViewOption::defDocumentBorder #define DOCUMENTBORDER 284 -// Constant strings. -SW_DLLPUBLIC extern OUString aEmptyOUStr; // remove once aEmptyOUStr can be changed to OUString - // For inserting of captions (what and where to insert). // It's here because it is not big enough to justify its own hxx // and does not seem to fit somewhere else. diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx index 7e83817497f1..c86f93fa1a94 100644 --- a/sw/source/core/bastyp/swtypes.cxx +++ b/sw/source/core/bastyp/swtypes.cxx @@ -46,8 +46,6 @@ using namespace com::sun::star; -OUString aEmptyOUStr; // remove once aEmptyOUStr can be changed to OUString - Size GetGraphicSizeTwip(const Graphic& rGraphic, vcl::RenderContext* pOutDev) { const MapMode aMapTwip(MapUnit::MapTwip); diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 852cd0c8ff48..8e67ea7e17ec 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -1334,7 +1334,7 @@ void SwDoc::DelNumRules(const SwPaM& rPam, SwRootFrame const*const pLayout) SwRegHistory aRegH( pUndo ? pUndo->GetHistory() : nullptr ); - SwNumRuleItem aEmptyRule( aEmptyOUStr ); + SwNumRuleItem aEmptyRule; const SwNode* pOutlNd = nullptr; for( ; nStt <= nEnd; ++nStt ) { diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index 2fd4585ec7e7..be268424e35d 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -607,7 +607,7 @@ void SwTextFormatColl::AssignToListLevelOfOutlineStyle(const int nAssignedListLe { if ( pDerivedTextFormatColl->GetItemState( RES_PARATR_NUMRULE, false ) == SfxItemState::DEFAULT ) { - SwNumRuleItem aItem(aEmptyOUStr); + SwNumRuleItem aItem; pDerivedTextFormatColl->SetFormatAttr( aItem ); } if ( pDerivedTextFormatColl->GetItemState( RES_PARATR_OUTLINELEVEL, false ) == SfxItemState::DEFAULT ) diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index c62300e8ece9..0dc39d1beb05 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -1384,7 +1384,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( aEmptyOUStr ); + RefIdsMap aFntMap = RefIdsMap(OUString()); std::vector<std::unique_ptr<RefIdsMap>> aFieldMap; SwIterator<SwFormatField,SwFieldType> aIter( *this ); diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx index efb776eaaef4..3a695b136734 100644 --- a/sw/source/core/layout/colfrm.cxx +++ b/sw/source/core/layout/colfrm.cxx @@ -158,7 +158,7 @@ static bool lcl_AddColumns( SwLayoutFrame *pCont, sal_uInt16 nCount ) ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo()); for ( sal_uInt16 i = 0; i < nCount; ++i ) { - SwFrameFormat *pFormat = pDoc->MakeFrameFormat(aEmptyOUStr, pDoc->GetDfltFrameFormat()); + SwFrameFormat *pFormat = pDoc->MakeFrameFormat(OUString(), pDoc->GetDfltFrameFormat()); SwColumnFrame *pTmp = new SwColumnFrame( pFormat, pCont ); pTmp->SetMaxFootnoteHeight( nMax ); pTmp->Paste( pCont ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index c20b483d225d..b3c1c8b0cc63 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2111,7 +2111,7 @@ void DrawGraphic( { const BitmapEx& rBmp = rSh.GetReplacementBitmap(false); vcl::Font aTmp( pOutDev->GetFont() ); - Graphic::DrawEx( pOutDev, aEmptyOUStr, aTmp, rBmp, rOrg.Pos(), rOrg.SSize() ); + Graphic::DrawEx(pOutDev, OUString(), aTmp, rBmp, rOrg.Pos(), rOrg.SSize()); } } @@ -6977,7 +6977,7 @@ const vcl::Font& SwPageFrame::GetEmptyPageFont() vcl::Font tmp; tmp.SetFontSize( Size( 0, 80 * 20 )); // == 80 pt tmp.SetWeight( WEIGHT_BOLD ); - tmp.SetStyleName( aEmptyOUStr ); + tmp.SetStyleName(OUString()); tmp.SetFamilyName("Helvetica"); tmp.SetFamily( FAMILY_SWISS ); tmp.SetTransparent( true ); diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index d459595c8a06..66c742f0a7d2 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -498,7 +498,7 @@ bool SwTextFrame::PaintEmpty( const SwRect &rRect, bool bCheck ) const { pFnt->SetFamily( FAMILY_DONTKNOW, SwFontScript::Latin ); pFnt->SetName( numfunc::GetDefBulletFontname(), SwFontScript::Latin ); - pFnt->SetStyleName( aEmptyOUStr, SwFontScript::Latin ); + pFnt->SetStyleName(OUString(), SwFontScript::Latin); pFnt->SetCharSet( RTL_TEXTENCODING_SYMBOL, SwFontScript::Latin ); } pFnt->SetVertical( 0, IsVertical() ); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 25d2b4a60b3d..febc786e7fc2 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -832,7 +832,7 @@ static void lcl_DrawSpecial( const SwTextPaintInfo& rInf, const SwLinePortion& r SwFont tmp( *pOldFnt ); tmp.SetFamily( FAMILY_DONTKNOW, tmp.GetActual() ); tmp.SetName( numfunc::GetDefBulletFontname(), tmp.GetActual() ); - tmp.SetStyleName( aEmptyOUStr, tmp.GetActual() ); + tmp.SetStyleName(OUString(), tmp.GetActual()); tmp.SetCharSet( RTL_TEXTENCODING_SYMBOL, tmp.GetActual() ); return tmp; }(); diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx index fabc4f8e1380..be56087bd4e4 100644 --- a/sw/source/core/undo/SwUndoField.cxx +++ b/sw/source/core/undo/SwUndoField.cxx @@ -96,7 +96,7 @@ void SwUndoFieldFromDoc::DoImpl() pDoc->getIDocumentFieldsAccess().UpdateField(pTextField, *pNewField, pHint, bUpdate); SwFormatField* pDstFormatField = const_cast<SwFormatField*>(&pTextField->GetFormatField()); - if ( pDoc->getIDocumentFieldsAccess().GetFieldType(SwFieldIds::Postit, aEmptyOUStr, false) == pDstFormatField->GetField()->GetTyp() ) + if (pDoc->getIDocumentFieldsAccess().GetFieldType(SwFieldIds::Postit, OUString(), false) == pDstFormatField->GetField()->GetTyp()) pDoc->GetDocShell()->Broadcast( SwFormatFieldHint( pDstFormatField, SwFormatFieldHintWhich::INSERTED ) ); } } diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index d12bb74f5f8e..7a4432c285ff 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -782,7 +782,7 @@ SwXServiceProvider::MakeInstance(SwServiceType nObjectType, SwDoc & rDoc) break; case SwServiceType::FieldMasterBibliography: { - SwFieldType* pType = rDoc.getIDocumentFieldsAccess().GetFieldType(SwFieldIds::TableOfAuthorities, aEmptyOUStr, true); + SwFieldType* pType = rDoc.getIDocumentFieldsAccess().GetFieldType(SwFieldIds::TableOfAuthorities, OUString(), true); if(!pType) { SwAuthorityFieldType aType(&rDoc); diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 84504a532f37..a6edcfd6d31f 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -2462,7 +2462,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) SwFlyFrameFormat& rFlyFormat = dynamic_cast<SwFlyFrameFormat&>(*pFormat); // assure that <SdrObject> instance exists. GetOrCreateSdrObject(rFlyFormat); - rFlyFormat.GetDoc()->SetFlyFrameTitle(rFlyFormat, aEmptyOUStr); + rFlyFormat.GetDoc()->SetFlyFrameTitle(rFlyFormat, OUString()); } // New attribute Description else if( FN_UNO_DESCRIPTION == pEntry->nWID ) @@ -2470,7 +2470,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) SwFlyFrameFormat& rFlyFormat = dynamic_cast<SwFlyFrameFormat&>(*pFormat); // assure that <SdrObject> instance exists. GetOrCreateSdrObject(rFlyFormat); - rFlyFormat.GetDoc()->SetFlyFrameDescription(rFlyFormat, aEmptyOUStr); + rFlyFormat.GetDoc()->SetFlyFrameDescription(rFlyFormat, OUString()); } else { diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 7dc44e6d23f0..331f0014c718 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -1091,7 +1091,7 @@ void SwHTMLWriter::PrepareFontList( const SvxFontItem& rFontItem, OUString& rNames, sal_Unicode cQuote, bool bGeneric ) { - rNames = aEmptyOUStr; + rNames.clear(); const OUString& rName = rFontItem.GetFamilyName(); bool bContainsKeyword = false; if( !rName.isEmpty() ) diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 158884433ab1..47e26cbcb7fd 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -292,7 +292,7 @@ void SwHTMLWriter::OutBasic() const OUString& rModName = pModule->GetName(); Strm().WriteCharPtr( SAL_NEWLINE_STRING ); // don't indent! HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), pModule->GetSource(), - sLang, STARBASIC, aEmptyOUStr, + sLang, STARBASIC, OUString(), &rLibName, &rModName, m_eDestEnc, &m_aNonConvertableCharacters ); } diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index cd94832ce815..1c885c108132 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -353,7 +353,7 @@ void SwCSS1Parser::SetTableTextColl( bool bHeader ) SvxCSS1MapEntry *pStyleEntry = GetTag( sTag ); if( pStyleEntry ) { - pColl = GetTextFormatColl( nPoolId, aEmptyOUStr ); + pColl = GetTextFormatColl(nPoolId, OUString()); SetTextCollAttrs( pColl, pStyleEntry->GetItemSet(), pStyleEntry->GetPropertyInfo(), this ); } @@ -363,7 +363,7 @@ void SwCSS1Parser::SetTableTextColl( bool bHeader ) if( pStyleEntry ) { if( !pColl ) - pColl = GetTextFormatColl( nPoolId, aEmptyOUStr ); + pColl = GetTextFormatColl(nPoolId, OUString()); SetTextCollAttrs( pColl, pStyleEntry->GetItemSet(), pStyleEntry->GetPropertyInfo(), this ); } @@ -893,7 +893,7 @@ void SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector, nPoolCollId = RES_POOLCOLL_FOOTNOTE; if( nPoolCollId ) - aClass = aEmptyOUStr; + aClass.clear(); else nPoolCollId = RES_POOLCOLL_TEXT; } @@ -978,7 +978,7 @@ void SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector, // either not a composed selector or a X:first-line { float: left; ... } // search resp. create the style - SwTextFormatColl *pColl = GetTextFormatColl( nPoolCollId, aEmptyOUStr ); + SwTextFormatColl* pColl = GetTextFormatColl(nPoolCollId, OUString()); SwTextFormatColl* pParentColl = nullptr; if( !aClass.isEmpty() ) { @@ -1072,7 +1072,7 @@ void SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector, if( pNext ) return; - SwCharFormat *pCFormat = GetChrFormat( nToken2, aEmptyOUStr ); + SwCharFormat* pCFormat = GetChrFormat(nToken2, OUString()); if( pCFormat ) { SwCharFormat *pParentCFormat = nullptr; @@ -1252,12 +1252,12 @@ SwTextFormatColl *SwCSS1Parser::GetTextFormatColl( sal_uInt16 nTextColl, if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdendnote) ) { nTextColl = RES_POOLCOLL_ENDNOTE; - aClass = aEmptyOUStr; + aClass.clear(); } else if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdfootnote) ) { nTextColl = RES_POOLCOLL_FOOTNOTE; - aClass = aEmptyOUStr; + aClass.clear(); } } @@ -1798,7 +1798,7 @@ bool SwCSS1Parser::ParseStyleSheet( const OUString& rIn ) SwPageDesc *pMasterPageDesc = m_pDoc->getIDocumentStylePoolAccess().GetPageDescFromPool( RES_POOLPAGE_HTML, false ); - SvxCSS1MapEntry *pPageEntry = GetPage( aEmptyOUStr, false ); + SvxCSS1MapEntry* pPageEntry = GetPage(OUString(), false); if( pPageEntry ) { // @page (affects all already existing pages) diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index 9843075560ea..0b1bde84b298 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -231,7 +231,7 @@ static void PutEEPoolItem( SfxItemSet &rEEItemSet, { const SvxBrushItem& rBrushItem = static_cast<const SvxBrushItem&>(rSwItem); rEEItemSet.Put( XFillStyleItem(drawing::FillStyle_SOLID) ); - rEEItemSet.Put( XFillColorItem(aEmptyOUStr, + rEEItemSet.Put(XFillColorItem(OUString(), rBrushItem.GetColor()) ); } break; @@ -438,7 +438,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) if( bBGColor ) { aItemSet.Put( XFillStyleItem(drawing::FillStyle_SOLID) ); - aItemSet.Put( XFillColorItem(aEmptyOUStr, aBGColor) ); + aItemSet.Put(XFillColorItem(OUString(), aBGColor)); } // parse styles (is here only possible for attributes, which also diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx index b6f071c869c4..9b4f06e029e5 100644 --- a/sw/source/filter/html/htmldrawwriter.cxx +++ b/sw/source/filter/html/htmldrawwriter.cxx @@ -273,7 +273,7 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt, HtmlFrmOpts nFrameFlags = HTML_FRMOPTS_MARQUEE; if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) ) nFrameFlags |= HTML_FRMOPTS_MARQUEE_CSS1; - OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrameFlags ); + OString aEndTags = rHTMLWrt.OutFrameFormatOptions(rFormat, OUString(), nFrameFlags); if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) ) rHTMLWrt.OutCSS1_FrameFormatOptions( rFormat, nFrameFlags, &rSdrObject ); diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index da9211de08dc..db7edb38a868 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -636,7 +636,7 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag SwPostItField aPostItField( static_cast<SwPostItFieldType*>(m_xDoc->getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::Postit )), - aEmptyOUStr, aComment, aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) ); + OUString(), aComment, OUString(), OUString(), DateTime(DateTime::SYSTEM)); InsertAttr( SwFormatField( aPostItField ), false ); if( bMoveFwd ) diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 3d74a9e7976e..589aa2510cc1 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -1614,7 +1614,7 @@ static Writer & OutHTML_FrameFormatAsMulticol( Writer& rWrt, HtmlFrmOpts nFrameFlags = HTML_FRMOPTS_MULTICOL; if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr ) nFrameFlags |= HTML_FRMOPTS_MULTICOL_CSS1; - rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrameFlags ); + rHTMLWrt.OutFrameFormatOptions(rFrameFormat, OUString(), nFrameFlags); if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr ) rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrameFlags ); @@ -1662,7 +1662,7 @@ static Writer& OutHTML_FrameFormatAsSpacer( Writer& rWrt, const SwFrameFormat& r rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); // ALIGN, WIDTH, HEIGHT - OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, HTML_FRMOPTS_SPACER ); + OString aEndTags = rHTMLWrt.OutFrameFormatOptions(rFrameFormat, OUString(), HTML_FRMOPTS_SPACER); rWrt.Strm().WriteChar( '>' ); if( !aEndTags.isEmpty() ) @@ -1699,7 +1699,7 @@ static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt, HtmlFrmOpts nFrameFlags = HTML_FRMOPTS_DIV; if( rHTMLWrt.IsHTMLMode( HTMLMODE_BORDER_NONE ) ) nFrameFlags |= HtmlFrmOpts::SNoBorder; - OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrameFlags ); + OString aEndTags = rHTMLWrt.OutFrameFormatOptions(rFrameFormat, OUString(), nFrameFlags); rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrameFlags ); rWrt.Strm().WriteChar( '>' ); diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 08989acfa370..c4bd7f94afaf 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -243,7 +243,7 @@ public: void SetShape( const uno::Reference< drawing::XShape >& r ) { m_xShape = r; } OUString& GetText() { return m_sText; } - void EraseText() { m_sText = aEmptyOUStr; } + void EraseText() { m_sText.clear(); } std::vector<OUString>& GetStringList() { return m_aStringList; } void EraseStringList() @@ -2449,7 +2449,7 @@ void SwHTMLParser::InsertSelectOption() } sal_uInt16 nEntryCnt = m_pFormImpl->GetStringList().size(); - m_pFormImpl->GetStringList().push_back(aEmptyOUStr); + m_pFormImpl->GetStringList().push_back(OUString()); m_pFormImpl->GetValueList().push_back(aValue); if( m_bLBEntrySelected ) { diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index b3f2d6088c00..573663220d3a 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -1045,7 +1045,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, } OString aEndTags; if( nFrameOpts != HtmlFrmOpts::NONE ) - aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrameOpts ); + aEndTags = rHTMLWrt.OutFrameFormatOptions(rFormat, OUString(), nFrameOpts); if( rHTMLWrt.m_bCfgOutStyles ) { @@ -1101,7 +1101,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, if( auto n = o3tl::tryAccess<sal_Int16>(aTmp2) ) eFamily = static_cast<FontFamily>(*n); } - SvxFontItem aItem( eFamily, *aFName, aEmptyOUStr, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT ); + SvxFontItem aItem(eFamily, *aFName, OUString(), 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 cfab31225bc6..f7c35ed61272 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -35,7 +35,7 @@ static sal_Int32 lcl_html_getNextPart( OUString& rPart, const OUString& rContent, sal_Int32 nPos ) { - rPart = aEmptyOUStr; + rPart.clear(); sal_Int32 nLen = rContent.getLength(); if( nPos >= nLen ) { @@ -182,7 +182,7 @@ void SwHTMLParser::InsertFootEndNote( const OUString& rName, bool bEndNote, m_pFootEndNoteImpl->sName = m_pFootEndNoteImpl->sName.toAsciiUpperCase(); m_pFootEndNoteImpl->bEndNote = bEndNote; m_pFootEndNoteImpl->bFixed = bFixed; - m_pFootEndNoteImpl->sContent = aEmptyOUStr; + m_pFootEndNoteImpl->sContent.clear(); } void SwHTMLParser::FinishFootEndNote() @@ -201,8 +201,8 @@ void SwHTMLParser::FinishFootEndNote() // In header and footer no footnotes can be inserted. if (pTextFootnote) m_pFootEndNoteImpl->aTextFootnotes.push_back(SwHTMLTextFootnote(m_pFootEndNoteImpl->sName,pTextFootnote)); - m_pFootEndNoteImpl->sName = aEmptyOUStr; - m_pFootEndNoteImpl->sContent = aEmptyOUStr; + m_pFootEndNoteImpl->sName.clear(); + m_pFootEndNoteImpl->sContent.clear(); m_pFootEndNoteImpl->bFixed = false; } diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 04ad57da0013..ba1d99f99456 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -788,7 +788,7 @@ IMAGE_SETEVENT: // passing empty sGrfNm here, means we don't want the graphic to be linked SwFrameFormat *const pFlyFormat = m_xDoc->getIDocumentContentOperations().InsertGraphic( - *m_pPam, sGrfNm, aEmptyOUStr, &aGraphic, + *m_pPam, sGrfNm, OUString(), &aGraphic, &aFrameSet, nullptr, nullptr); SwGrfNode *pGrfNd = m_xDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx() ->GetIndex()+1 ]->GetGrfNode(); @@ -1264,7 +1264,9 @@ ANCHOR_SETEVENT: if( bEnAnchor || bFootnoteAnchor || bFootnoteEnSymbol ) { aFootnoteName = sHRef.copy( 1 ); - aClass = aStrippedClass = aName = aEmptyOUStr; + aClass.clear(); + aStrippedClass.clear(); + aName.clear(); bHasHRef = false; } } diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index f33b7d1bf75c..8ebd982fd635 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( aEmptyOUStr ); + OUString aFlyName; if( nCols < 2 ) { aFlyName = aId; diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 28f1e5d3cac1..384932beb194 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -1007,7 +1007,7 @@ void HTMLTable::InitCtor(const HTMLTableOptions& rOptions) m_xBackgroundBrush.reset(m_pParser->CreateBrushItem( rOptions.bBGColor ? &(rOptions.aBGColor) : nullptr, - rOptions.aBGImage, aEmptyOUStr, aEmptyOUStr, aEmptyOUStr)); + rOptions.aBGImage, OUString(), OUString(), OUString())); m_pContext = nullptr; m_xParentContents.reset(); @@ -2998,7 +2998,7 @@ CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable const *pCurTabl nToken = HtmlTokenId::TABLEDATA_ON; nColl = RES_POOLCOLL_TABLE; } - std::unique_ptr<HTMLAttrContext> xCntxt(new HTMLAttrContext(nToken, nColl, aEmptyOUStr, true)); + std::unique_ptr<HTMLAttrContext> xCntxt(new HTMLAttrContext(nToken, nColl, OUString(), true)); if( SvxAdjust::End != eAdjust ) rParser.InsertAttr(&rParser.m_xAttrTab->pAdjust, SvxAdjustItem(eAdjust, RES_PARATR_ADJUST), xCntxt.get()); diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 4d7905a203f3..aa453421f05b 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -3923,12 +3923,12 @@ void SwHTMLParser::NewPara() // parse styles (Don't consider class. This is only possible as long as none of // the CSS1 properties of the class must be formatted hard!!!) - if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) ) + if (HasStyleOptions(aStyle, aId, OUString(), &aLang, &aDir)) { SfxItemSet aItemSet( m_xDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() ); SvxCSS1PropertyInfo aPropInfo; - if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) ) + if (ParseStyleOptions(aStyle, aId, OUString(), aItemSet, aPropInfo, &aLang, &aDir)) { OSL_ENSURE( aClass.isEmpty() || !m_pCSS1Parser->GetClass( aClass ), "Class is not considered" ); @@ -4057,12 +4057,12 @@ void SwHTMLParser::NewHeading( HtmlTokenId nToken ) std::unique_ptr<HTMLAttrContext> xCntxt(new HTMLAttrContext(nToken, nTextColl, aClass)); // parse styles (regarding class see also NewPara) - if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) ) + if (HasStyleOptions(aStyle, aId, OUString(), &aLang, &aDir)) { SfxItemSet aItemSet( m_xDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() ); SvxCSS1PropertyInfo aPropInfo; - if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) ) + if (ParseStyleOptions(aStyle, aId, OUString(), aItemSet, aPropInfo, &aLang, &aDir)) { OSL_ENSURE( aClass.isEmpty() || !m_pCSS1Parser->GetClass( aClass ), "Class is not considered" ); @@ -4166,7 +4166,7 @@ void SwHTMLParser::NewTextFormatColl( HtmlTokenId nToken, sal_uInt16 nColl ) // These both tags will be mapped to the PRE style. For the case that a // a CLASS exists we will delete it so that we don't get the CLASS of // the PRE style. - aClass = aEmptyOUStr; + aClass.clear(); [[fallthrough]]; case HtmlTokenId::BLOCKQUOTE_ON: case HtmlTokenId::BLOCKQUOTE30_ON: @@ -4193,12 +4193,12 @@ void SwHTMLParser::NewTextFormatColl( HtmlTokenId nToken, sal_uInt16 nColl ) std::unique_ptr<HTMLAttrContext> xCntxt(new HTMLAttrContext(nToken, nColl, aClass)); // parse styles (regarding class see also NewPara) - if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) ) + if (HasStyleOptions(aStyle, aId, OUString(), &aLang, &aDir)) { SfxItemSet aItemSet( m_xDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() ); SvxCSS1PropertyInfo aPropInfo; - if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) ) + if (ParseStyleOptions(aStyle, aId, OUString(), aItemSet, aPropInfo, &aLang, &aDir)) { OSL_ENSURE( aClass.isEmpty() || !m_pCSS1Parser->GetClass( aClass ), "Class is not considered" ); @@ -4333,7 +4333,7 @@ void SwHTMLParser::NewDefList() // and the one of the DT-style of the current level SvxLRSpaceItem rLRSpace = - m_pCSS1Parser->GetTextFormatColl( RES_POOLCOLL_HTML_DD, aEmptyOUStr ) + m_pCSS1Parser->GetTextFormatColl(RES_POOLCOLL_HTML_DD, OUString()) ->GetLRSpace(); nLeft = nLeft + static_cast< sal_uInt16 >(rLRSpace.GetTextLeft()); } @@ -4553,7 +4553,7 @@ void SwHTMLParser::SetTextCollAttrs( HTMLAttrContext *pContext ) SwTextFormatColl *pCollToSet = nullptr; // the style to set SfxItemSet *pItemSet = nullptr; // set of hard attributes sal_uInt16 nTopColl = pContext ? pContext->GetTextFormatColl() : 0; - const OUString& rTopClass = pContext ? pContext->GetClass() : aEmptyOUStr; + const OUString rTopClass = pContext ? pContext->GetClass() : OUString(); sal_uInt16 nDfltColl = RES_POOLCOLL_TEXT; bool bInPRE=false; // some context info @@ -4681,7 +4681,7 @@ void SwHTMLParser::SetTextCollAttrs( HTMLAttrContext *pContext ) if( RES_POOLCOLL_HTML_DD == nTopColl ) { const SvxLRSpaceItem& rDTLRSpace = m_pCSS1Parser - ->GetTextFormatColl( RES_POOLCOLL_HTML_DT, aEmptyOUStr ) + ->GetTextFormatColl(RES_POOLCOLL_HTML_DT, OUString()) ->GetLRSpace(); nLeft -= rDTLRSpace.GetTextLeft(); nRight -= rDTLRSpace.GetRight(); @@ -4799,12 +4799,12 @@ void SwHTMLParser::NewCharFormat( HtmlTokenId nToken ) OSL_ENSURE( pCFormat, "No character format found for token" ); // parse styles (regarding class see also NewPara) - if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) ) + if (HasStyleOptions(aStyle, aId, OUString(), &aLang, &aDir)) { SfxItemSet aItemSet( m_xDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() ); SvxCSS1PropertyInfo aPropInfo; - if( ParseStyleOptions( aStyle, aId, aEmptyOUStr, aItemSet, aPropInfo, &aLang, &aDir ) ) + if (ParseStyleOptions(aStyle, aId, OUString(), aItemSet, aPropInfo, &aLang, &aDir)) { OSL_ENSURE( aClass.isEmpty() || !m_pCSS1Parser->GetClass( aClass ), "Class is not considered" ); @@ -5259,7 +5259,7 @@ void SwHTMLParser::InsertHorzRule() // ...and save in a context std::unique_ptr<HTMLAttrContext> xCntxt( - new HTMLAttrContext(HtmlTokenId::HORZRULE, RES_POOLCOLL_HTML_HR, aEmptyOUStr)); + new HTMLAttrContext(HtmlTokenId::HORZRULE, RES_POOLCOLL_HTML_HR, OUString())); PushContext(xCntxt); @@ -5427,7 +5427,7 @@ void SwHTMLParser::ParseMoreMetaOptions() SwPostItField aPostItField( static_cast<SwPostItFieldType*>(m_xDoc->getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::Postit )), - aEmptyOUStr, sText.makeStringAndClear(), aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) ); + OUString(), sText.makeStringAndClear(), OUString(), OUString(), DateTime(DateTime::SYSTEM)); SwFormatField aFormatField( aPostItField ); InsertAttr( aFormatField, false ); } diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 012755119be2..9777bba56ff1 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2003,7 +2003,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData, // here a paragraph is being directly formatted // empty the numbering/list style applied to the current paragraph - SwNumRuleItem aEmptyRule( aEmptyOUStr ); + SwNumRuleItem aEmptyRule; pTextNode->SetAttr( aEmptyRule ); // create an empty SvxLRSpaceItem diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index b6b02eb1c928..a03266d63b08 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -419,7 +419,7 @@ bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet ) SwPostItMode::InMargins; const OUString sFax = m_xFaxLB->get_active_text(); - aAddPrinterAttr.m_sFaxName = sNone == sFax ? aEmptyOUStr : sFax; + aAddPrinterAttr.m_sFaxName = sNone == sFax ? OUString() : sFax; rCoreSet->Put(aAddPrinterAttr); } return bAttrModified; @@ -614,7 +614,7 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, aFont = pPrt->GetFontMetric( aFont ); SwTextFormatColl *pColl = pWrtShell->GetTextCollFromPool(nType); pColl->SetFormatAttr(SvxFontItem(aFont.GetFamilyType(), aFont.GetFamilyName(), - aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); + OUString(), aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); } static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, @@ -690,7 +690,7 @@ bool SwStdFontTabPage::FillItemSet( SfxItemSet* ) if( pPrinter ) aFont = pPrinter->GetFontMetric( aFont ); m_pWrtShell->SetDefault(SvxFontItem(aFont.GetFamilyType(), aFont.GetFamilyName(), - aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); + OUString(), aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); SwTextFormatColl *pColl = m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_STANDARD); pColl->ResetFormatAttr(nFontWhich); bMod = true; diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index dc7dcc2755df..6fb80114c077 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -389,7 +389,7 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame( } else { - SwInsertField_Data aData(TYP_DBFLD, 0, sDB, aEmptyOUStr, 0, &rShell ); + SwInsertField_Data aData(TYP_DBFLD, 0, sDB, OUString(), 0, &rShell); aFieldMgr.InsertField( aData ); } } @@ -401,7 +401,7 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame( { if(bHideEmptyParagraphs) { - SwInsertField_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyOUStr, 0, &rShell ); + SwInsertField_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, OUString(), 0, &rShell); aFieldMgr.InsertField( aData ); } sHideParagraphsExpression.clear(); @@ -411,7 +411,7 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame( } if(bHideEmptyParagraphs && !sHideParagraphsExpression.isEmpty()) { - SwInsertField_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyOUStr, 0, &rShell ); + SwInsertField_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, OUString(), 0, &rShell); aFieldMgr.InsertField( aData ); } } @@ -551,12 +551,12 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig if(bHideEmptyParagraphs && !sHideParagraphsExpression.isEmpty()) { OUString sComplete = "(" + sCondition + ") OR (" + sHideParagraphsExpression + ")"; - SwInsertField_Data aData(TYP_HIDDENPARAFLD, 0, sComplete, aEmptyOUStr, 0, &rShell ); + SwInsertField_Data aData(TYP_HIDDENPARAFLD, 0, sComplete, OUString(), 0, &rShell); aFieldMgr.InsertField( aData ); } else { - SwInsertField_Data aData(TYP_HIDDENPARAFLD, 0, sCondition, aEmptyOUStr, 0, &rShell ); + SwInsertField_Data aData(TYP_HIDDENPARAFLD, 0, sCondition, OUString(), 0, &rShell); aFieldMgr.InsertField( aData ); } //now the text has to be inserted @@ -585,7 +585,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig } SwInsertField_Data aData(TYP_DBFLD, 0, sDBName + sConvertedColumn, - aEmptyOUStr, 0, &rShell ); + OUString(), 0, &rShell); aFieldMgr.InsertField( aData ); } else diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 3e2910cb1b73..d0cd3fbd820f 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -412,7 +412,7 @@ void SwSendMailDialog::SendMails() uno::Reference< mail::XSmtpService > xSmtpServer = SwMailMergeHelper::ConnectToSmtpServer( *m_pConfigItem, m_pImpl->xConnectedInMailService, - aEmptyOUStr, aEmptyOUStr, GetFrameWeld() ); + OUString(), OUString(), GetFrameWeld()); bool bIsLoggedIn = xSmtpServer.is() && xSmtpServer->isConnected(); LeaveWait(); if(!bIsLoggedIn) diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 7bb95d4a83af..783e2b0b1f2b 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -997,9 +997,9 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, Button *, pButton, void ) pSectRepr->SetContent(false); else { - pSectRepr->SetFile(aEmptyOUStr); - pSectRepr->SetSubRegion(aEmptyOUStr); - pSectRepr->GetSectionData().SetLinkFilePassword(aEmptyOUStr); + pSectRepr->SetFile(OUString()); + pSectRepr->SetSubRegion(OUString()); + pSectRepr->GetSectionData().SetLinkFilePassword(OUString()); } pEntry = m_pTree->NextSelected(pEntry); @@ -1178,7 +1178,7 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit&, rEdit, void ) aAbs, sTmp, URIHelper::GetMaybeFileHdl() ); } pSectRepr->SetFile( sTmp ); - pSectRepr->GetSectionData().SetLinkFilePassword( aEmptyOUStr ); + pSectRepr->GetSectionData().SetLinkFilePassword(OUString()); } } else @@ -1810,7 +1810,10 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil } } else - m_sFilterName = m_sFilePasswd = aEmptyOUStr; + { + m_sFilterName.clear(); + m_sFilePasswd.clear(); + } } SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet) diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index fa054f251539..3cda5bbb3a50 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -87,7 +87,7 @@ void SwChangeDBDlg::FillDBPopup() Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference<XDatabaseContext> xDBContext = DatabaseContext::create(xContext); const SwDBData& rDBData = pSh->GetDBData(); - m_pAvailDBTLB->Select(rDBData.sDataSource, rDBData.sCommand, aEmptyOUStr); + m_pAvailDBTLB->Select(rDBData.sDataSource, rDBData.sCommand, OUString()); std::vector<OUString> aAllDBNames; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 166dcddec941..dff301af6ce1 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -166,7 +166,7 @@ void SwFieldDBPage::Reset(const SfxItemSet*) if(pSh) { SwDBData aTmp(pSh->GetDBData()); - m_pDatabaseTLB->Select(aTmp.sDataSource, aTmp.sCommand, aEmptyOUStr); + m_pDatabaseTLB->Select(aTmp.sDataSource, aTmp.sCommand, OUString()); } } } @@ -411,11 +411,11 @@ void SwFieldDBPage::TypeHdl( ListBox const * pBox ) if (!IsFieldEdit()) { - m_pValueED->SetText(aEmptyOUStr); + m_pValueED->SetText(OUString()); if (bCond) m_pConditionED->SetText("TRUE"); else - m_pConditionED->SetText(aEmptyOUStr); + m_pConditionED->SetText(OUString()); } CheckInsert(); @@ -530,7 +530,7 @@ void SwFieldDBPage::ActivateMailMergeAddress() m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos( reinterpret_cast<const void*>( TYP_DBFLD ) )); m_pTypeLB->GetSelectHdl().Call(*m_pTypeLB); const SwDBData& rData = SW_MOD()->GetDBConfig()->GetAddressSource(); - m_pDatabaseTLB->Select(rData.sDataSource, rData.sCommand, aEmptyOUStr); + m_pDatabaseTLB->Select(rData.sDataSource, rData.sCommand, OUString()); } void SwFieldDBPage::SetWrtShell(SwWrtShell& rSh) diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 5eafa45d4a36..05e0bfcd4f45 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -459,7 +459,7 @@ bool SwFieldDokInfPage::FillItemSet(SfxItemSet* ) nOldFormat != nFormat || m_pFixedCB->IsValueChangedFromSaved() || (DI_CUSTOM == nSubType && aName != m_sOldCustomFieldName )) { - InsertField(TYP_DOCINFOFLD, nSubType, aName, aEmptyOUStr, nFormat, + InsertField(TYP_DOCINFOFLD, nSubType, aName, OUString(), nFormat, ' ', m_pFormatLB->IsAutomaticLanguage()); } diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 74f41938e8b3..c267d8ba8995 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -374,7 +374,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void) m_pValueED->SetText( OUString::number(nOff + 1) ); else - m_pValueED->SetText(aEmptyOUStr); + m_pValueED->SetText(OUString()); } else m_pValueED->SetText(static_cast<SwPageNumberField*>(GetCurField())->GetUserString()); @@ -550,7 +550,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, ListBox&, void) m_pValueFT->SetText( sNewText ); if (sOldText != m_pValueFT->GetText()) - m_pValueED->SetText( aEmptyOUStr ); + m_pValueED->SetText(OUString()); } } @@ -640,7 +640,7 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* ) m_pLevelED->IsValueChangedFromSaved() || m_pDateOffsetED->IsValueChangedFromSaved()) { - InsertField( nTypeId, nSubType, aEmptyOUStr, aVal, nFormat, ' ', m_pNumFormatLB->IsAutomaticLanguage() ); + InsertField(nTypeId, nSubType, OUString(), aVal, nFormat, ' ', m_pNumFormatLB->IsAutomaticLanguage()); } return false; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index bc9790a6aefb..1b37b588d4c5 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -402,9 +402,9 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void) if ( ( !IsFieldEdit() || m_pSelectionLB->GetEntryCount() ) && nOld != LISTBOX_ENTRY_NOTFOUND ) { - m_pNameED->SetText(aEmptyOUStr); - m_pValueED->SetText(aEmptyOUStr); - m_pFilterED->SetText(aEmptyOUStr); + m_pNameED->SetText(OUString()); + m_pValueED->SetText(OUString()); + m_pFilterED->SetText(OUString()); } switch (nTypeId) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 0dd57e26b893..17a97d48e5e2 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -270,7 +270,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet& if(TOX_AUTHORITIES == m_eCurrentTOXType.eType) { const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>( - m_rWrtShell.GetFieldType(SwFieldIds::TableOfAuthorities, aEmptyOUStr)); + m_rWrtShell.GetFieldType(SwFieldIds::TableOfAuthorities, OUString())); if(pFType) { OUString sBrackets; @@ -408,7 +408,7 @@ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType) if(TOX_AUTHORITIES == eType.eType) { const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>( - m_rWrtShell.GetFieldType(SwFieldIds::TableOfAuthorities, aEmptyOUStr)); + m_rWrtShell.GetFieldType(SwFieldIds::TableOfAuthorities, OUString())); if(pFType) { m_vTypeData[nIndex].m_pDescription->SetAuthBrackets(OUStringLiteral1(pFType->GetPrefix()) + @@ -933,7 +933,7 @@ void SwTOXSelectTabPage::ApplyTOXDescription() if (rDesc.GetTitle()) m_xTitleED->set_text(*rDesc.GetTitle()); else - m_xTitleED->set_text(aEmptyOUStr); + m_xTitleED->set_text(OUString()); m_xTitleED->save_value(); } @@ -1087,7 +1087,7 @@ void SwTOXSelectTabPage::FillTOXDescription() if(m_xFromFileCB->get_active()) rDesc.SetAutoMarkURL(sAutoMarkURL); else - rDesc.SetAutoMarkURL(aEmptyOUStr); + rDesc.SetAutoMarkURL(OUString()); } break; case TOX_ILLUSTRATIONS: @@ -1116,7 +1116,7 @@ void SwTOXSelectTabPage::FillTOXDescription() if (m_xBracketLB->get_active() != -1) rDesc.SetAuthBrackets(m_xBracketLB->get_active_text()); else - rDesc.SetAuthBrackets(aEmptyOUStr); + rDesc.SetAuthBrackets(OUString()); rDesc.SetAuthSequence(m_xSequenceCB->get_active()); } break; @@ -2022,7 +2022,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) { SwWrtShell& rSh = pTOXDlg->GetWrtShell(); const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>( - rSh.GetFieldType(SwFieldIds::TableOfAuthorities, aEmptyOUStr)); + rSh.GetFieldType(SwFieldIds::TableOfAuthorities, OUString())); if(pFType) { if(pFType->IsSortByDocument()) @@ -2104,7 +2104,7 @@ void SwTOXEntryTabPage::UpdateDescriptor() if(TOX_INDEX == aLastTOXType.eType) { const OUString sTemp(m_pMainEntryStyleLB->GetSelectedEntry()); - rDesc.SetMainEntryCharStyle(sNoCharStyle == sTemp ? aEmptyOUStr : sTemp); + rDesc.SetMainEntryCharStyle(sNoCharStyle == sTemp ? OUString() : sTemp); SwTOIOptions nIdxOptions = rDesc.GetIndexOptions() & ~SwTOIOptions::AlphaDelimiter; if(m_pAlphaDelimCB->IsChecked()) nIdxOptions |= SwTOIOptions::AlphaDelimiter; @@ -2582,7 +2582,7 @@ void SwTOXEntryTabPage::SetWrtShell(SwWrtShell& rSh) } } m_pMainEntryStyleLB->SelectEntry( SwStyleNameMapper::GetUIName( - RES_POOLCHR_IDX_MAIN_ENTRY, aEmptyOUStr )); + RES_POOLCHR_IDX_MAIN_ENTRY, OUString())); } OUString SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const @@ -2746,7 +2746,7 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) if( !bLastWasText ) { SwFormToken aTemp(TOKEN_TEXT); - Control* pCtrl = InsertItem(aEmptyOUStr, aTemp); + Control* pCtrl = InsertItem(OUString(), aTemp); if(!pSetActiveControl) pSetActiveControl = pCtrl; } @@ -2773,7 +2773,7 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) if(!bLastWasText) { SwFormToken aTemp(TOKEN_TEXT); - Control* pCtrl = InsertItem(aEmptyOUStr, aTemp); + Control* pCtrl = InsertItem(OUString(), aTemp); if(!pSetActiveControl) pSetActiveControl = pCtrl; } @@ -3662,7 +3662,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl, weld::Button&, void) m_xLevelLB->remove(nPos); m_xLevelLB->insert_text(nPos, aStr); m_xLevelLB->select_text(aStr); - m_pCurrentForm->SetTemplate(nPos, aEmptyOUStr); + m_pCurrentForm->SetTemplate(nPos, OUString()); Modify(); } } @@ -3842,22 +3842,22 @@ bool SwEntryBrowseBox::SeekRow( long nRow ) OUString SwEntryBrowseBox::GetCellText(long nRow, sal_uInt16 nColumn) const { - const OUString* pRet = &aEmptyOUStr; + OUString pRet; if (static_cast<size_t>(nRow) < m_Entries.size()) { const AutoMarkEntry* pEntry = m_Entries[ nRow ].get(); switch(nColumn) { - case ITEM_SEARCH :pRet = &pEntry->sSearch; break; - case ITEM_ALTERNATIVE :pRet = &pEntry->sAlternative; break; - case ITEM_PRIM_KEY :pRet = &pEntry->sPrimKey ; break; - case ITEM_SEC_KEY :pRet = &pEntry->sSecKey ; break; - case ITEM_COMMENT :pRet = &pEntry->sComment ; break; - case ITEM_CASE :pRet = pEntry->bCase ? &m_sYes : &m_sNo; break; - case ITEM_WORDONLY :pRet = pEntry->bWord ? &m_sYes : &m_sNo; break; + case ITEM_SEARCH : pRet = pEntry->sSearch; break; + case ITEM_ALTERNATIVE : pRet = pEntry->sAlternative; break; + case ITEM_PRIM_KEY : pRet = pEntry->sPrimKey; break; + case ITEM_SEC_KEY : pRet = pEntry->sSecKey; break; + case ITEM_COMMENT : pRet = pEntry->sComment; break; + case ITEM_CASE : pRet = pEntry->bCase ? m_sYes : m_sNo; break; + case ITEM_WORDONLY : pRet = pEntry->bWord ? m_sYes : m_sNo; break; } } - return *pRet; + return pRet; } void SwEntryBrowseBox::PaintCell(OutputDevice& rDev, diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 82febac648ed..d32df5c3e2d8 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -288,7 +288,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, weld::Button&, rButton, void ) if (!m_xGroupTLB->n_children()) rButton.set_sensitive(false); //the content must be deleted - otherwise the new handler would be called in Apply() - m_xNameED->set_text(aEmptyOUStr); + m_xNameED->set_text(OUString()); ModifyHdl(*m_xNameED); } diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 32cb5103562a..91c54d997261 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -516,8 +516,8 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool ) { SfxItemSet aSet( pSh->GetAttrPool(), svl::Items<RES_FRMMACRO, RES_FRMMACRO, SID_EVENTCONFIG, SID_EVENTCONFIG>{} ); - SvxMacro aStart(aEmptyOUStr, aEmptyOUStr, STARBASIC); - SvxMacro aEnd(aEmptyOUStr, aEmptyOUStr, STARBASIC); + SvxMacro aStart(OUString(), OUString(), STARBASIC); + SvxMacro aEnd(OUString(), OUString(), STARBASIC); pGlossaryHdl->GetMacros(m_pShortNameEdit->GetText(), aStart, aEnd ); SvxMacroItem aItem(RES_FRMMACRO); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index eb4c03c4d523..4a83c575a1cd 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -251,11 +251,11 @@ void SwNumPositionTabPage::InitControls() if(bSameDist) m_xDistNumMF->set_value(m_xDistNumMF->normalize(aNumFormatArr[nLvl]->GetCharTextDistance()), FieldUnit::TWIP); else - m_xDistNumMF->set_text(aEmptyOUStr); + m_xDistNumMF->set_text(OUString()); if(bSameIndent) m_xIndentMF->set_value(m_xIndentMF->normalize(-aNumFormatArr[nLvl]->GetFirstLineOffset()), FieldUnit::TWIP); else - m_xIndentMF->set_text(aEmptyOUStr); + m_xIndentMF->set_text(OUString()); if(bSameAdjust) { @@ -305,14 +305,14 @@ void SwNumPositionTabPage::InitControls() } else { - m_xListtabMF->set_text(aEmptyOUStr); + m_xListtabMF->set_text(OUString()); } } else { m_xListtabFT->set_sensitive( false ); m_xListtabMF->set_sensitive( false ); - m_xListtabMF->set_text(aEmptyOUStr); + m_xListtabMF->set_text(OUString()); } if ( bSameAlignAt ) @@ -324,7 +324,7 @@ void SwNumPositionTabPage::InitControls() } else { - m_xAlignedAtMF->set_text(aEmptyOUStr); + m_xAlignedAtMF->set_text(OUString()); } if ( bSameIndentAt ) @@ -334,11 +334,11 @@ void SwNumPositionTabPage::InitControls() } else { - m_xIndentAtMF->set_text(aEmptyOUStr); + m_xIndentAtMF->set_text(OUString()); } if (bSetDistEmpty) - m_xDistBorderMF->set_text(aEmptyOUStr); + m_xDistBorderMF->set_text(OUString()); bInInintControl = false; } @@ -659,7 +659,7 @@ IMPL_LINK(SwNumPositionTabPage, DistanceHdl, weld::MetricSpinButton&, rField, vo SetModified(); if(!m_xDistBorderMF->get_sensitive()) - m_xDistBorderMF->set_text(aEmptyOUStr); + m_xDistBorderMF->set_text(OUString()); } IMPL_LINK( SwNumPositionTabPage, RelativeHdl, weld::ToggleButton&, rBox, void ) @@ -695,7 +695,7 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, weld::ToggleButton&, rBox, void ) if(bSetValue) m_xDistBorderMF->set_value(m_xDistBorderMF->normalize(nValue), FieldUnit::TWIP); else - m_xDistBorderMF->set_text(aEmptyOUStr); + m_xDistBorderMF->set_text(OUString()); m_xDistBorderMF->set_sensitive(bOn || bSingleSelection || pOutlineDlg); bLastRelative = bOn; } diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index 8815f6a97ee2..92f15c173e3f 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -112,7 +112,7 @@ OUString InsertLabEnvText( SwWrtShell& rSh, SwFieldMgr& rFieldMgr, const OUStrin if (comphelper::string::getTokenCount(sDBName, '.') >= 3) { sDBName = ::ReplacePoint(sDBName, true); - SwInsertField_Data aData(TYP_DBFLD, 0, sDBName, aEmptyOUStr, 0, &rSh ); + SwInsertField_Data aData(TYP_DBFLD, 0, sDBName, OUString(), 0, &rSh); rFieldMgr.InsertField( aData ); sRet = sDBName; bField = true; diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index 9cc87905358b..cb564aca3d7c 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -141,7 +141,7 @@ static const SwFrameFormat *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& if( (!rItem.m_bSynchron || !(nCol|nRow)) && !(sDBName = InsertLabEnvText( rSh, rFieldMgr, rItem.m_aWriting )).isEmpty() && !bLast ) { sDBName = comphelper::string::setToken(sDBName, 3, DB_DELIM, "True"); - SwInsertField_Data aData(TYP_DBNEXTSETFLD, 0, sDBName, aEmptyOUStr, 0, &rSh ); + SwInsertField_Data aData(TYP_DBNEXTSETFLD, 0, sDBName, OUString(), 0, &rSh); rFieldMgr.InsertField( aData ); } diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 651f04e899fc..efafcfeef501 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -320,7 +320,7 @@ bool SwDocShell::Save() case SfxObjectCreateMode::ORGANIZER: { WriterRef xWrt; - ::GetXMLWriter( aEmptyOUStr, GetMedium()->GetBaseURL( true ), xWrt ); + ::GetXMLWriter(OUString(), GetMedium()->GetBaseURL(true), xWrt); xWrt->SetOrganizerMode( true ); SwWriter aWrt( *GetMedium(), *m_xDoc ); nErr = aWrt.Write( xWrt ); @@ -348,7 +348,7 @@ bool SwDocShell::Save() m_pWrtShell->EndAllTableBoxEdit(); WriterRef xWrt; - ::GetXMLWriter( aEmptyOUStr, GetMedium()->GetBaseURL( true ), xWrt ); + ::GetXMLWriter(OUString(), GetMedium()->GetBaseURL(true), xWrt); bool bLockedView(false); if (m_pWrtShell) @@ -544,7 +544,7 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium ) SfxObjectCreateMode::EMBEDDED == GetCreateMode() ); WriterRef xWrt; - ::GetXMLWriter( aEmptyOUStr, rMedium.GetBaseURL( true ), xWrt ); + ::GetXMLWriter(OUString(), rMedium.GetBaseURL(true), xWrt); bool bLockedView(false); if (m_pWrtShell) @@ -984,7 +984,7 @@ HiddenInformation SwDocShell::GetHiddenInformationState( HiddenInformation nStat OSL_ENSURE( GetWrtShell(), "No SwWrtShell, no information" ); if ( GetWrtShell() ) { - SwFieldType* pType = GetWrtShell()->GetFieldType( SwFieldIds::Postit, aEmptyOUStr ); + SwFieldType* pType = GetWrtShell()->GetFieldType(SwFieldIds::Postit, OUString()); SwIterator<SwFormatField,SwFieldType> aIter( *pType ); SwFormatField* pFirst = aIter.First(); while( pFirst ) diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index ef501c1d0e56..ddcb76e54617 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -729,7 +729,7 @@ void SwDocShell::Execute(SfxRequest& rReq) aTempFile.EnableKillingFile(); pSrcView->SaveContent(aTempFile.GetURL()); bDone = true; - SvxMacro aMac(aEmptyOUStr, aEmptyOUStr, STARBASIC); + SvxMacro aMac(OUString(), OUString(), STARBASIC); SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( GlobalEventId::OPENDOC ), aMac, this); SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( GlobalEventId::PREPARECLOSEDOC ), aMac, this); SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( GlobalEventId::ACTIVATEDOC ), aMac, this); @@ -783,7 +783,7 @@ void SwDocShell::Execute(SfxRequest& rReq) { WriterRef xWrt; // mba: looks as if relative URLs don't make sense here - ::GetRTFWriter( aEmptyOUStr, OUString(), xWrt ); + ::GetRTFWriter(OUString(), OUString(), xWrt); SvMemoryStream *pStrm = new SvMemoryStream(); pStrm->SetBufferSize( 16348 ); SwWriter aWrt( *pStrm, *pSmryDoc ); @@ -1142,7 +1142,7 @@ void SwDocShell::Execute(SfxRequest& rReq) if( bDone ) { SfxStringItem aName( SID_FILE_NAME, aFileName ); - SfxStringItem aReferer( SID_REFERER, aEmptyOUStr ); + SfxStringItem aReferer(SID_REFERER, OUString()); SfxViewShell* pViewShell = SfxViewShell::GetFirst(); while(pViewShell) { diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index e0b5204db7d9..5f680efb389e 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -199,7 +199,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) } pFontItem.reset(new SvxFontItem(aFont.GetFamilyType(), aFont.GetFamilyName(), - aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); + OUString(), aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); } else { @@ -216,7 +216,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) eLanguage, GetDefaultFontFlags::OnlyOne ); pFontItem.reset(new SvxFontItem(aLangDefFont.GetFamilyType(), aLangDefFont.GetFamilyName(), - aEmptyOUStr, aLangDefFont.GetPitch(), aLangDefFont.GetCharSet(), nFontWhich)); + OUString(), aLangDefFont.GetPitch(), aLangDefFont.GetCharSet(), nFontWhich)); } m_xDoc->SetDefault(*pFontItem); if( !bHTMLTemplSet ) @@ -284,7 +284,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) nFontWhich, false ) ) { pColl->SetFormatAttr(SvxFontItem(aFont.GetFamilyType(), aFont.GetFamilyName(), - aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); + OUString(), aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); } } sal_Int32 nFontHeight = pStdFont->GetFontHeight( static_cast< sal_Int8 >(aFontIdPoolId[nIdx]), 0, eLanguage ); @@ -521,7 +521,7 @@ bool SwDocShell::Load( SfxMedium& rMedium ) if( ReadXML ) { ReadXML->SetOrganizerMode( true ); - SwReader aRdr( rMedium, aEmptyOUStr, m_xDoc.get() ); + SwReader aRdr(rMedium, OUString(), m_xDoc.get()); nErr = aRdr.Read( *ReadXML ); ReadXML->SetOrganizerMode( false ); } @@ -544,7 +544,7 @@ bool SwDocShell::Load( SfxMedium& rMedium ) { // set Doc's DocInfo at DocShell-Medium SAL_INFO( "sw.ui", "before ReadDocInfo" ); - SwReader aRdr( rMedium, aEmptyOUStr, m_xDoc.get() ); + SwReader aRdr(rMedium, OUString(), m_xDoc.get()); SAL_INFO( "sw.ui", "before Read" ); nErr = aRdr.Read( *pReader ); SAL_INFO( "sw.ui", "after Read" ); @@ -611,7 +611,7 @@ bool SwDocShell::LoadFrom( SfxMedium& rMedium ) if( ReadXML ) { ReadXML->SetOrganizerMode( true ); - SwReader aRdr( rMedium, aEmptyOUStr, m_xDoc.get() ); + SwReader aRdr(rMedium, OUString(), m_xDoc.get()); nErr = aRdr.Read( *ReadXML ); ReadXML->SetOrganizerMode( false ); } diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 27fdffd1f5f3..9d77fed807e8 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -495,7 +495,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) switch(nSlot) { case SID_STYLE_EDIT: - Edit(aParam, aEmptyOUStr, nFamily, nMask, false, OString(), pActShell); + Edit(aParam, OUString(), nFamily, nMask, false, OString(), pActShell); break; case SID_STYLE_DELETE: Delete(aParam, nFamily); @@ -700,7 +700,7 @@ void SwDocShell::Edit( respectively "".*/ if (pColl && pColl->IsAssignedToListLevelOfOutlineStyle()) { - SwNumRuleItem aItem(aEmptyOUStr); + SwNumRuleItem aItem; pDStyle->GetCollection()->SetFormatAttr( aItem ); pDStyle->GetCollection()->SetAttrOutlineLevel( 0 ); } @@ -1374,7 +1374,7 @@ void SwDocShell::FormatPage( SwWrtShell& rActShell, SfxRequest* pRequest) { - Edit(rPage, aEmptyOUStr, SfxStyleFamily::Page, SfxStyleSearchBits::Auto, false, rPageId, &rActShell, pRequest); + Edit(rPage, OUString(), SfxStyleFamily::Page, SfxStyleSearchBits::Auto, false, rPageId, &rActShell, pRequest); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 184ca24c2d85..f7b254c42635 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -737,7 +737,10 @@ const OUString& SwDocStyleSheet::GetParent() const case SfxStyleFamily::Page: case SfxStyleFamily::Pseudo: default: - return aEmptyOUStr; // there's no parent + { + static const OUString sEmpty; + return sEmpty; // there's no parent + } } OUString sTmp; diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 09f88dd03632..47691cf0d181 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1319,7 +1319,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, } // Progress, to prohibit KeyInputs - SfxProgress aProgress(pSourceDocSh, ::aEmptyOUStr, 1); + SfxProgress aProgress(pSourceDocSh, OUString(), 1); // lock all dispatchers SfxViewFrame* pViewFrame = SfxViewFrame::GetFirst(pSourceDocSh); diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 6331e5a1d08d..b486c3b3041a 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -479,8 +479,8 @@ bool SwGlossaryHdl::Expand(weld::Window* pParent, const OUString& rShortName, } else { - SvxMacro aStartMacro(aEmptyOUStr, aEmptyOUStr, STARBASIC); - SvxMacro aEndMacro(aEmptyOUStr, aEmptyOUStr, STARBASIC); + SvxMacro aStartMacro(OUString(), OUString(), STARBASIC); + SvxMacro aEndMacro(OUString(), OUString(), STARBASIC); GetMacros( aShortName, aStartMacro, aEndMacro, pGlossary.get() ); // StartAction must not be before HasSelection and DelRight, @@ -527,8 +527,8 @@ bool SwGlossaryHdl::InsertGlossary(const OUString &rName) return false; } - SvxMacro aStartMacro(aEmptyOUStr, aEmptyOUStr, STARBASIC); - SvxMacro aEndMacro(aEmptyOUStr, aEmptyOUStr, STARBASIC); + SvxMacro aStartMacro(OUString(), OUString(), STARBASIC); + SvxMacro aEndMacro(OUString(), OUString(), STARBASIC); GetMacros( rName, aStartMacro, aEndMacro, pGlos ); // StartAction must not be before HasSelection and DelRight, diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index a3e7872eb030..1e0130f292d6 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -461,7 +461,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo if( rURL.GetMap() ) m_pImageMap.reset(new ImageMap( *rURL.GetMap() )); else if( !rURL.GetURL().isEmpty() ) - m_pTargetURL.reset(new INetImage( aEmptyOUStr, rURL.GetURL(), + m_pTargetURL.reset(new INetImage(OUString(), rURL.GetURL(), rURL.GetTargetFrameName() )); } } @@ -699,16 +699,16 @@ bool SwTransferable::WriteObject( tools::SvRef<SotStorageStream>& xStream, break; case SWTRANSFER_OBJECTTYPE_HTML: - GetHTMLWriter( aEmptyOUStr, OUString(), xWrt ); + GetHTMLWriter(OUString(), OUString(), xWrt); break; case SWTRANSFER_OBJECTTYPE_RTF: case SWTRANSFER_OBJECTTYPE_RICHTEXT: - GetRTFWriter( aEmptyOUStr, OUString(), xWrt ); + GetRTFWriter(OUString(), OUString(), xWrt); break; case SWTRANSFER_OBJECTTYPE_STRING: - GetASCWriter( aEmptyOUStr, OUString(), xWrt ); + GetASCWriter(OUString(), OUString(), xWrt); if( xWrt.is() ) { SwAsciiOptions aAOpt; @@ -1717,7 +1717,7 @@ bool SwTransferable::PasteFileContent( TransferableDataHelper& rData, rSh.SetChgLnk( Link<SwCursorShell*,void>() ); const SwPosition& rInsPos = *rSh.GetCursor()->Start(); - SwReader aReader( *pStream, aEmptyOUStr, OUString(), *rSh.GetCursor() ); + SwReader aReader(*pStream, OUString(), OUString(), *rSh.GetCursor()); rSh.SaveTableBoxContent( &rInsPos ); if( aReader.Read( *pRead ).IsError() ) pResId = STR_ERROR_CLPBRD_READ; @@ -1813,7 +1813,7 @@ bool SwTransferable::PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, if( pRead ) { SwPaM &rPAM = *rSh.GetCursor(); - SwReader aReader( xStore, aEmptyOUStr, rPAM ); + SwReader aReader(xStore, OUString(), rPAM); if( ! aReader.Read( *pRead ).IsError() ) bRet = true; else if( bMsg ) @@ -1991,7 +1991,7 @@ bool SwTransferable::PasteTargetURL( TransferableDataHelper& rData, //!!! check at FileSystem - only then it make sense to test graphics !!! Graphic aGraphic; GraphicFilter &rFlt = GraphicFilter::GetGraphicFilter(); - bRet = ERRCODE_NONE == GraphicFilter::LoadGraphic( sURL, aEmptyOUStr, aGraphic, &rFlt ); + bRet = ERRCODE_NONE == GraphicFilter::LoadGraphic(sURL, OUString(), aGraphic, &rFlt); if( bRet ) { @@ -2002,7 +2002,7 @@ bool SwTransferable::PasteTargetURL( TransferableDataHelper& rData, { case SwPasteSdr::Insert: SwTransferable::SetSelInShell( rSh, false, pPt ); - rSh.Insert( sURL, aEmptyOUStr, aGraphic ); + rSh.Insert(sURL, OUString(), aGraphic); break; case SwPasteSdr::Replace: @@ -2013,18 +2013,18 @@ bool SwTransferable::PasteTargetURL( TransferableDataHelper& rData, SwTransferable::SetSelInShell( rSh, true, &aPt ); } else - rSh.ReRead( sURL, aEmptyOUStr, &aGraphic ); + rSh.ReRead(sURL, OUString(), &aGraphic); break; case SwPasteSdr::SetAttr: if( rSh.IsObjSelected() ) rSh.Paste( aGraphic, OUString() ); else if( OBJCNT_GRF == rSh.GetObjCntTypeOfSelection() ) - rSh.ReRead( sURL, aEmptyOUStr, &aGraphic ); + rSh.ReRead(sURL, OUString(), &aGraphic); else { SwTransferable::SetSelInShell( rSh, false, pPt ); - rSh.Insert( sURL, aEmptyOUStr, aGraphic ); + rSh.Insert(sURL, OUString(), aGraphic); } break; default: @@ -2357,7 +2357,7 @@ bool SwTransferable::PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, { //!!! check at FileSystem - only then it makes sense to test the graphics !!! GraphicFilter &rFlt = GraphicFilter::GetGraphicFilter(); - bRet = ERRCODE_NONE == GraphicFilter::LoadGraphic( aBkmk.GetURL(), aEmptyOUStr, + bRet = ERRCODE_NONE == GraphicFilter::LoadGraphic(aBkmk.GetURL(), OUString(), aGraphic, &rFlt ); if( !bRet && SwPasteSdr::SetAttr == nAction && @@ -2398,7 +2398,7 @@ bool SwTransferable::PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, case SwPasteSdr::Insert: { SwTransferable::SetSelInShell( rSh, false, pPt ); - rSh.Insert( sURL, aEmptyOUStr, aGraphic, nullptr, nAnchorType ); + rSh.Insert(sURL, OUString(), aGraphic, nullptr, nAnchorType); break; } @@ -2412,14 +2412,14 @@ bool SwTransferable::PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, // a writer graphic; maybe this is an option later again if wanted rSh.Paste( aGraphic, sURL ); - // rSh.ReplaceSdrObj( sURL, aEmptyOUStr, &aGraphic ); + // rSh.ReplaceSdrObj(sURL, OUString(), &aGraphic); // Point aPt( pPt ? *pPt : rSh.GetCursorDocPos() ); // SwTransferable::SetSelInShell( rSh, true, &aPt ); } else { // set graphic at writer graphic without link - rSh.ReRead( sURL, aEmptyOUStr, &aGraphic ); + rSh.ReRead(sURL, OUString(), &aGraphic); } break; @@ -2447,12 +2447,12 @@ bool SwTransferable::PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, else if( OBJCNT_GRF == rSh.GetObjCntTypeOfSelection() ) { // set as linked graphic at writer graphic frame - rSh.ReRead( sURL, aEmptyOUStr, &aGraphic ); + rSh.ReRead(sURL, OUString(), &aGraphic); } else { SwTransferable::SetSelInShell( rSh, false, pPt ); - rSh.Insert( aBkmk.GetURL(), aEmptyOUStr, aGraphic ); + rSh.Insert(aBkmk.GetURL(), OUString(), aGraphic); } break; } @@ -2965,7 +2965,7 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat } pDlg->SetObjName( pClipboard->m_aObjDesc.maClassName, SwResId(pResId) ); - pDlg->Insert( SotClipboardFormatId::EMBED_SOURCE, aEmptyOUStr ); + pDlg->Insert(SotClipboardFormatId::EMBED_SOURCE, OUString()); } } else @@ -2977,9 +2977,9 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat } if( SwTransferable::TestAllowedFormat( rData, SotClipboardFormatId::EMBED_SOURCE, nDest )) - pDlg->Insert( SotClipboardFormatId::EMBED_SOURCE, aEmptyOUStr ); + pDlg->Insert(SotClipboardFormatId::EMBED_SOURCE, OUString()); if( SwTransferable::TestAllowedFormat( rData, SotClipboardFormatId::LINK_SOURCE, nDest )) - pDlg->Insert( SotClipboardFormatId::LINK_SOURCE, aEmptyOUStr ); + pDlg->Insert(SotClipboardFormatId::LINK_SOURCE, OUString()); } if( SwTransferable::TestAllowedFormat( rData, SotClipboardFormatId::LINK, nDest )) @@ -2987,7 +2987,7 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat for( SotClipboardFormatId* pIds = aPasteSpecialIds; *pIds != SotClipboardFormatId::NONE; ++pIds ) if( SwTransferable::TestAllowedFormat( rData, *pIds, nDest )) - pDlg->Insert( *pIds, aEmptyOUStr ); + pDlg->Insert(*pIds, OUString()); SotClipboardFormatId nFormat = pDlg->GetFormat( rData.GetTransferable() ); @@ -3052,7 +3052,7 @@ void SwTransferable::FillClipFormatItem( const SwWrtShell& rSh, for( SotClipboardFormatId* pIds = aPasteSpecialIds; *pIds != SotClipboardFormatId::NONE; ++pIds ) if( SwTransferable::TestAllowedFormat( rData, *pIds, nDest )) - rToFill.AddClipbrdFormat( *pIds, aEmptyOUStr ); + rToFill.AddClipbrdFormat(*pIds, OUString()); } void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos ) @@ -3719,7 +3719,7 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh ) { refObj->AddConnectAdvise( this ); refObj->AddDataAdvise( this, - aEmptyOUStr, + OUString(), ADVISEMODE_NODATA | ADVISEMODE_ONLYONCE ); nOldTimeOut = refObj->GetUpdateTimeout(); refObj->SetUpdateTimeout( 0 ); diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx index 5f5305cad250..e9bfb829dd36 100644 --- a/sw/source/uibase/envelp/envimg.cxx +++ b/sw/source/uibase/envelp/envimg.cxx @@ -94,7 +94,6 @@ OUString MakeSender() SwEnvItem::SwEnvItem() : SfxPoolItem(FN_ENVELOP) { - m_aAddrText = aEmptyOUStr; m_bSend = true; m_aSendText = MakeSender(); m_nSendFromLeft = 566; // 1 cm diff --git a/sw/source/uibase/index/toxmgr.cxx b/sw/source/uibase/index/toxmgr.cxx index d1b78368a7c3..d77a9f8d5bd3 100644 --- a/sw/source/uibase/index/toxmgr.cxx +++ b/sw/source/uibase/index/toxmgr.cxx @@ -159,7 +159,7 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc) if(rDesc.GetPhoneticReadingOfPrimKey()) pCurTOXMark->SetPrimaryKeyReading( *rDesc.GetPhoneticReadingOfPrimKey() ); else - pCurTOXMark->SetPrimaryKeyReading( aEmptyOUStr ); + pCurTOXMark->SetPrimaryKeyReading(OUString()); if( rDesc.GetSecKey() && !rDesc.GetSecKey()->isEmpty() ) { @@ -167,25 +167,25 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc) if(rDesc.GetPhoneticReadingOfSecKey()) pCurTOXMark->SetSecondaryKeyReading( *rDesc.GetPhoneticReadingOfSecKey() ); else - pCurTOXMark->SetSecondaryKeyReading( aEmptyOUStr ); + pCurTOXMark->SetSecondaryKeyReading(OUString()); } else { - pCurTOXMark->SetSecondaryKey( aEmptyOUStr ); - pCurTOXMark->SetSecondaryKeyReading( aEmptyOUStr ); + pCurTOXMark->SetSecondaryKey(OUString()); + pCurTOXMark->SetSecondaryKeyReading(OUString()); } } else { - pCurTOXMark->SetPrimaryKey( aEmptyOUStr ); - pCurTOXMark->SetPrimaryKeyReading( aEmptyOUStr ); - pCurTOXMark->SetSecondaryKey( aEmptyOUStr ); - pCurTOXMark->SetSecondaryKeyReading( aEmptyOUStr ); + pCurTOXMark->SetPrimaryKey(OUString()); + pCurTOXMark->SetPrimaryKeyReading(OUString()); + pCurTOXMark->SetSecondaryKey(OUString()); + pCurTOXMark->SetSecondaryKeyReading(OUString()); } if(rDesc.GetPhoneticReadingOfAltStr()) pCurTOXMark->SetTextReading( *rDesc.GetPhoneticReadingOfAltStr() ); else - pCurTOXMark->SetTextReading( aEmptyOUStr ); + pCurTOXMark->SetTextReading(OUString()); pCurTOXMark->SetMainEntry(rDesc.IsMainEntry()); } else @@ -348,7 +348,7 @@ bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc, if(TOX_AUTHORITIES == eCurTOXType) { SwAuthorityFieldType* pFType = static_cast<SwAuthorityFieldType*>( - pSh->GetFieldType(SwFieldIds::TableOfAuthorities, aEmptyOUStr)); + pSh->GetFieldType(SwFieldIds::TableOfAuthorities, OUString())); if (!pFType) { SwAuthorityFieldType const type(pSh->GetDoc()); diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx index fa953c925093..ff64e997c7b4 100644 --- a/sw/source/uibase/misc/glshell.cxx +++ b/sw/source/uibase/misc/glshell.cxx @@ -106,8 +106,8 @@ static bool lcl_Save( SwWrtShell& rSh, const OUString& rGroupName, const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get(); std::unique_ptr<SwTextBlocks> pBlock(::GetGlossaries()->GetGroupDoc( rGroupName )); - SvxMacro aStart(aEmptyOUStr, aEmptyOUStr); - SvxMacro aEnd(aEmptyOUStr, aEmptyOUStr); + SvxMacro aStart = SvxMacro(OUString(), OUString()); + SvxMacro aEnd = SvxMacro(OUString(), OUString()); SwGlossaryHdl* pGlosHdl; pGlosHdl = rSh.GetView().GetGlosHdl(); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 530e21e090a8..135cd7b49658 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -905,7 +905,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, FilterChangedHdl, SvxTPFilter*, void) if (pFilterTP->IsAction()) m_sFilterAction = pFilterTP->GetLbAction()->GetSelectedEntry(); else - m_sFilterAction = aEmptyOUStr; + m_sFilterAction.clear(); Init(); } diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 324c0fbd8877..1b4a146010a0 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -66,7 +66,6 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher const * pDispat , aEdit(VclPtr<InputEdit>::Create(this, WB_3DLOOK|WB_TABSTOP|WB_BORDER|WB_NOHIDESELECTION)) , pWrtShell(nullptr) , pView(nullptr) - , aCurrentTableName(aEmptyOUStr) , m_bDoesUndo(true) , m_bResetUndo(false) , m_bCallUndo(false) diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index cc36b1431f39..6ee69e9944a8 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -1053,7 +1053,7 @@ OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData ) rData.HasFormat( nFormat = SotClipboardFormatId::FILEGRPDESCRIPTOR ) || rData.HasFormat( nFormat = SotClipboardFormatId::UNIFORMRESOURCELOCATOR )) { - INetBookmark aBkmk( aEmptyOUStr, aEmptyOUStr ); + INetBookmark aBkmk = INetBookmark(OUString(), OUString()); if (rData.GetINetBookmark(nFormat, aBkmk)) sFileName = aBkmk.GetURL(); } |