diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-18 04:55:34 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-18 07:27:47 +0100 |
commit | d8037ae18a297229d1b79f8f76331abfd548350d (patch) | |
tree | 7eaa9f4cb012be19d2eca340236eebbc8e784f92 /sw/source/uibase | |
parent | c2a91dc53431b5658f54ca4fd32ca79165e865af (diff) |
Get rid of aEmptyOUStr
Commit 8051bb7e18ccae0f639e65dfa86bcc18a5fb9108 had removed its "String"
counterpart.
Change-Id: Id873a259e7f4b2794e94dec83d08ed6b57298beb
Reviewed-on: https://gerrit.libreoffice.org/65299
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/app/appenv.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/app/applab.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/app/docsh.cxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/app/docsh2.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/app/docshini.cxx | 12 | ||||
-rw-r--r-- | sw/source/uibase/app/docst.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/app/docstyle.cxx | 5 | ||||
-rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/dochdl/gloshdl.cxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 46 | ||||
-rw-r--r-- | sw/source/uibase/envelp/envimg.cxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/index/toxmgr.cxx | 20 | ||||
-rw-r--r-- | sw/source/uibase/misc/glshell.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/misc/redlndlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/ribbar/inputwin.cxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/utlui/navipi.cxx | 2 |
16 files changed, 64 insertions, 63 deletions
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(); } |