sc/source/ui/docshell/datastream.cxx | 2 sc/source/ui/docshell/dbdocimp.cxx | 2 sc/source/ui/docshell/docfunc.cxx | 8 - sc/source/ui/docshell/docsh.cxx | 62 ++++---- sc/source/ui/docshell/docsh2.cxx | 2 sc/source/ui/docshell/docsh3.cxx | 4 sc/source/ui/docshell/docsh4.cxx | 14 - sc/source/ui/docshell/docsh5.cxx | 2 sc/source/ui/docshell/docsh8.cxx | 4 sc/source/ui/docshell/externalrefmgr.cxx | 2 sc/source/ui/docshell/impex.cxx | 6 sc/source/ui/docshell/macromgr.cxx | 2 sc/source/ui/docshell/tablink.cxx | 4 sc/source/ui/docshell/tpstat.cxx | 12 - sw/source/filter/basflt/fltini.cxx | 6 sw/source/filter/basflt/iodetect.cxx | 12 - sw/source/filter/docx/swdocxreader.cxx | 4 sw/source/filter/html/SwAppletImpl.cxx | 14 - sw/source/filter/html/htmlatr.cxx | 2 sw/source/filter/html/htmlcss1.cxx | 10 - sw/source/filter/html/htmlflywriter.cxx | 8 - sw/source/filter/html/htmlform.cxx | 126 ++++++++--------- sw/source/filter/html/htmlforw.cxx | 102 ++++++------- sw/source/filter/html/htmlplug.cxx | 60 ++++---- sw/source/filter/html/htmlreqifreader.cxx | 12 - sw/source/filter/html/swhtml.cxx | 8 - sw/source/filter/html/wrthtml.cxx | 40 ++--- sw/source/filter/inc/IndexingExportFilter.hxx | 4 sw/source/filter/rtf/swparrtf.cxx | 4 sw/source/filter/xml/swxml.cxx | 70 ++++----- sw/source/filter/xml/wrtxml.cxx | 68 ++++----- sw/source/filter/xml/xmlexp.cxx | 26 +-- sw/source/filter/xml/xmlfmt.cxx | 6 sw/source/filter/xml/xmlimp.cxx | 190 +++++++++++++------------- sw/source/filter/xml/xmltble.cxx | 8 - sw/source/filter/xml/xmltbli.cxx | 10 - sw/source/filter/xml/xmltexte.cxx | 34 ++-- sw/source/filter/xml/xmltexti.cxx | 32 ++-- sw/source/filter/xml/zorder.hxx | 6 39 files changed, 494 insertions(+), 494 deletions(-)
New commits: commit 832211d7c5803d38997dddff55632ae0e582f5fc Author: Noel Grandin <[email protected]> AuthorDate: Sat Jun 1 10:27:38 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Jun 1 17:38:39 2024 +0200 loplugin:ostr in sc/../docshell Change-Id: I181b23558eedd690492d804619a0f9345d1d532f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168308 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 998985bb78ff..6d28fff40fdc 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -249,7 +249,7 @@ void DataStream::MakeToolbarVisible() return; css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager; + xPropSet->getPropertyValue(u"LayoutManager"_ustr) >>= xLayoutManager; if (!xLayoutManager.is()) return; diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 92f5d55376a8..70616d9382b5 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -79,7 +79,7 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, const SfxViewFrame* uno::Reference<frame::XFrame> xFrame = pFrame->GetFrame().GetFrameInterface(); uno::Reference<frame::XFrame> xBeamerFrame = xFrame->findFrame( - "_beamer", + u"_beamer"_ustr, frame::FrameSearchFlag::CHILDREN); if (!xBeamerFrame.is()) return; diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 6e3e050b8366..61dc9d5603ae 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -3201,7 +3201,7 @@ static uno::Reference< uno::XInterface > GetDocModuleObject( const SfxObjectShel uno::Reference< uno::XInterface > xDocModuleApiObject; if ( xSF.is() ) { - xVBACodeNamedObjectAccess.set( xSF->createInstance("ooo.vba.VBAObjectModuleObjectProvider"), uno::UNO_QUERY ); + xVBACodeNamedObjectAccess.set( xSF->createInstance(u"ooo.vba.VBAObjectModuleObjectProvider"_ustr), uno::UNO_QUERY ); xDocModuleApiObject.set( xVBACodeNamedObjectAccess->getByName( sCodeName ), uno::UNO_QUERY ); } return xDocModuleApiObject; @@ -3225,7 +3225,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sSource ) uno::Reference< container::XNameContainer > xLib; if( xLibContainer.is() ) { - OUString aLibName( "Standard" ); + OUString aLibName( u"Standard"_ustr ); #if HAVE_FEATURE_SCRIPTING if ( rDocSh.GetBasicManager() && !rDocSh.GetBasicManager()->GetName().isEmpty() ) { @@ -3240,7 +3240,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sSource ) // if the Module with codename exists then find a new name sal_Int32 nNum = 1; - OUString genModuleName = "Sheet1"; + OUString genModuleName = u"Sheet1"_ustr; while( xLib->hasByName( genModuleName ) ) genModuleName = "Sheet" + OUString::number( ++nNum ); @@ -3267,7 +3267,7 @@ void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ) uno::Reference< container::XNameContainer > xLib; if( xLibContainer.is() ) { - OUString aLibName( "Standard" ); + OUString aLibName( u"Standard"_ustr ); #if HAVE_FEATURE_SCRIPTING if ( rDocSh.GetBasicManager() && !rDocSh.GetBasicManager()->GetName().isEmpty() ) { diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index e5d444d07e07..7a95002a45a4 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -189,7 +189,7 @@ void ScDocShell::InitInterface_Impl() } // GlobalName of the current version: -SFX_IMPL_OBJECTFACTORY( ScDocShell, SvGlobalName(SO3_SC_CLASSID), "scalc" ) +SFX_IMPL_OBJECTFACTORY( ScDocShell, SvGlobalName(SO3_SC_CLASSID), u"scalc"_ustr ) void ScDocShell::FillClass( SvGlobalName* pClassName, @@ -468,8 +468,8 @@ private: std::unique_ptr<weld::CheckButton> m_xWarningOnBox; public: MessageWithCheck(weld::Window *pParent, const OUString& rUIFile, const OUString& rDialogId) - : MessageDialogController(pParent, rUIFile, rDialogId, "ask") - , m_xWarningOnBox(m_xBuilder->weld_check_button("ask")) + : MessageDialogController(pParent, rUIFile, rDialogId, u"ask"_ustr) + , m_xWarningOnBox(m_xBuilder->weld_check_button(u"ask"_ustr)) { } bool get_active() const { return m_xWarningOnBox->get_active(); } @@ -519,8 +519,8 @@ bool ScDocShell::GetRecalcRowHeightsMode() { // Ask if the user wants to perform full re-calculation. MessageWithCheck aQueryBox(ScDocShell::GetActiveDialogParent(), - "modules/scalc/ui/recalcquerydialog.ui", - "RecalcQueryDialog"); + u"modules/scalc/ui/recalcquerydialog.ui"_ustr, + u"RecalcQueryDialog"_ustr); aQueryBox.set_primary_text(ScResId(STR_QUERY_OPT_ROW_HEIGHT_RECALC_ONLOAD)); aQueryBox.set_default_response(RET_YES); @@ -603,7 +603,7 @@ bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const css::uno::Reference< css // Generator is not LibreOffice. Ask if the user wants to perform // full re-calculation. MessageWithCheck aQueryBox(GetActiveDialogParent(), - "modules/scalc/ui/recalcquerydialog.ui", "RecalcQueryDialog"); + u"modules/scalc/ui/recalcquerydialog.ui"_ustr, u"RecalcQueryDialog"_ustr); aQueryBox.set_primary_text(ScResId(STR_QUERY_FORMULA_RECALC_ONLOAD_ODS)); aQueryBox.set_default_response(RET_YES); @@ -698,7 +698,7 @@ bool ScDocShell::Load( SfxMedium& rMedium ) /* Create styles that are imported through Orcus */ - OUString aURL("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/calc/styles.xml"); + OUString aURL(u"$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/calc/styles.xml"_ustr); rtl::Bootstrap::expandMacros(aURL); OUString aPath; @@ -820,7 +820,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( aAppOptions.GetShowSharedDocumentWarning() ) { MessageWithCheck aWarningBox(ScDocShell::GetActiveDialogParent(), - "modules/scalc/ui/sharedwarningdialog.ui", "SharedWarningDialog"); + u"modules/scalc/ui/sharedwarningdialog.ui"_ustr, u"SharedWarningDialog"_ustr); aWarningBox.run(); bool bChecked = aWarningBox.get_active(); @@ -846,7 +846,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::UNO_QUERY_THROW ); uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xServiceManager, uno::UNO_QUERY_THROW ); uno::Reference< container::XEnumeration> xEnum = xEnumAccess->createContentEnumeration( - "com.sun.star.sheet.SpreadsheetDocumentJob" ); + u"com.sun.star.sheet.SpreadsheetDocumentJob"_ustr ); if ( xEnum.is() ) { while ( xEnum->hasMoreElements() ) @@ -860,7 +860,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) SfxFrame* pFrame = ( pViewFrame ? &pViewFrame->GetFrame() : nullptr ); uno::Reference< frame::XController > xController = ( pFrame ? pFrame->GetController() : nullptr ); uno::Reference< sheet::XSpreadsheetView > xSpreadsheetView( xController, uno::UNO_QUERY_THROW ); - uno::Sequence< beans::NamedValue > aArgsForJob { { "SpreadsheetView", uno::Any( xSpreadsheetView ) } }; + uno::Sequence< beans::NamedValue > aArgsForJob { { u"SpreadsheetView"_ustr, uno::Any( xSpreadsheetView ) } }; xJob->execute( aArgsForJob ); } } @@ -1000,7 +1000,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) // TODO/LATER: More entries from the MediaDescriptor might be interesting for the merge uno::Sequence< beans::PropertyValue > aValues{ comphelper::makePropertyValue( - "FilterName", + u"FilterName"_ustr, GetMedium()->GetFilter()->GetFilterName()) }; @@ -1165,7 +1165,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Any aWorkbook; aWorkbook <<= mxAutomationWorkbookObject; uno::Sequence< uno::Any > aArgs{ aWorkbook }; - SC_MOD()->CallAutomationApplicationEventSinks( "NewWorkbook", aArgs ); + SC_MOD()->CallAutomationApplicationEventSinks( u"NewWorkbook"_ustr, aArgs ); } break; case SfxEventHintId::OpenDoc: @@ -1173,7 +1173,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Any aWorkbook; aWorkbook <<= mxAutomationWorkbookObject; uno::Sequence< uno::Any > aArgs{ aWorkbook }; - SC_MOD()->CallAutomationApplicationEventSinks( "WorkbookOpen", aArgs ); + SC_MOD()->CallAutomationApplicationEventSinks( u"WorkbookOpen"_ustr, aArgs ); } break; default: @@ -1331,7 +1331,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError == SCWARN_IMPORT_UNKNOWN_ENCRYPTION) { - m_pImpl->mpDelayedInfobarEntry.push_back({ "UnknownEncryption", ScResId(STR_CONTENT_WITH_UNKNOWN_ENCRYPTION), "", InfobarType::INFO, true }); + m_pImpl->mpDelayedInfobarEntry.push_back({ u"UnknownEncryption"_ustr, ScResId(STR_CONTENT_WITH_UNKNOWN_ENCRYPTION), u""_ustr, InfobarType::INFO, true }); eError = ERRCODE_NONE; } @@ -2945,7 +2945,7 @@ std::unique_ptr<ScDocFunc> ScDocShell::CreateDocFunc() ScDocShell::ScDocShell( const SfxModelFlags i_nSfxCreationFlags, const std::shared_ptr<ScDocument>& pDoc ) : SfxObjectShell( i_nSfxCreationFlags ), m_pDocument ( pDoc ? pDoc : std::make_shared<ScDocument>( SCDOCMODE_DOCUMENT, this )), - m_aDdeTextFmt(OUString("TEXT")), + m_aDdeTextFmt(u"TEXT"_ustr), m_nPrtToScreenFactor( 1.0 ), m_pImpl ( new DocShell_Impl ), m_bHeaderOn ( true ), @@ -3151,7 +3151,7 @@ std::shared_ptr<SfxDocumentInfoDialog> ScDocShell::CreateDocumentInfoDialog(weld ::CreateTabPage ScDocStatPageCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_STAT); OSL_ENSURE(ScDocStatPageCreate, "Tabpage create fail!"); xDlg->AddFontTabPage(); - xDlg->AddTabPage("calcstats", ScResId(STR_DOC_STAT), ScDocStatPageCreate); + xDlg->AddTabPage(u"calcstats"_ustr, ScResId(STR_DOC_STAT), ScDocStatPageCreate); } return xDlg; } @@ -3213,7 +3213,7 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ) // Grab the Calc configuration. Reference<XUIConfigurationManager> xConfigMgr = xModuleCfgSupplier->getUIConfigurationManager( - "com.sun.star.sheet.SpreadsheetDocument"); + u"com.sun.star.sheet.SpreadsheetDocument"_ustr); if (!xConfigMgr.is()) return; @@ -3289,22 +3289,22 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ) switch (eType) { case ScOptionsUtil::KEY_DEFAULT: - xScAccel->setKeyEvent(aDelete, ".uno:ClearContents"); - xScAccel->setKeyEvent(aBackspace, ".uno:Delete"); - xScAccel->setKeyEvent(aCtrlD, ".uno:FillDown"); - xScAccel->setKeyEvent(aAltDown, ".uno:DataSelect"); - xScAccel->setKeyEvent(aCtrlSpace, ".uno:SelectColumn"); - xScAccel->setKeyEvent(aCtrlShiftSpace, ".uno:SelectAll"); - xScAccel->setKeyEvent(aF4, ".uno:ToggleRelative"); - xScAccel->setKeyEvent(aCtrlShiftF4, ".uno:ViewDataSourceBrowser"); + xScAccel->setKeyEvent(aDelete, u".uno:ClearContents"_ustr); + xScAccel->setKeyEvent(aBackspace, u".uno:Delete"_ustr); + xScAccel->setKeyEvent(aCtrlD, u".uno:FillDown"_ustr); + xScAccel->setKeyEvent(aAltDown, u".uno:DataSelect"_ustr); + xScAccel->setKeyEvent(aCtrlSpace, u".uno:SelectColumn"_ustr); + xScAccel->setKeyEvent(aCtrlShiftSpace, u".uno:SelectAll"_ustr); + xScAccel->setKeyEvent(aF4, u".uno:ToggleRelative"_ustr); + xScAccel->setKeyEvent(aCtrlShiftF4, u".uno:ViewDataSourceBrowser"_ustr); break; case ScOptionsUtil::KEY_OOO_LEGACY: - xScAccel->setKeyEvent(aDelete, ".uno:Delete"); - xScAccel->setKeyEvent(aBackspace, ".uno:ClearContents"); - xScAccel->setKeyEvent(aCtrlD, ".uno:DataSelect"); - xScAccel->setKeyEvent(aCtrlShiftSpace, ".uno:SelectColumn"); - xScAccel->setKeyEvent(aF4, ".uno:ViewDataSourceBrowser"); - xScAccel->setKeyEvent(aShiftF4, ".uno:ToggleRelative"); + xScAccel->setKeyEvent(aDelete, u".uno:Delete"_ustr); + xScAccel->setKeyEvent(aBackspace, u".uno:ClearContents"_ustr); + xScAccel->setKeyEvent(aCtrlD, u".uno:DataSelect"_ustr); + xScAccel->setKeyEvent(aCtrlShiftSpace, u".uno:SelectColumn"_ustr); + xScAccel->setKeyEvent(aF4, u".uno:ViewDataSourceBrowser"_ustr); + xScAccel->setKeyEvent(aShiftF4, u".uno:ToggleRelative"_ustr); break; default: ; diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index cf5a1dfc770c..6823327284db 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -65,7 +65,7 @@ bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) /* Create styles that are imported through Orcus */ - OUString aURL("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/calc/styles.xml"); + OUString aURL(u"$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/calc/styles.xml"_ustr); rtl::Bootstrap::expandMacros(aURL); OUString aPath; diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 90663bc0520f..e8f40c8b2bdc 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -393,7 +393,7 @@ void ScDocShell::CalcOutputFactor() } OUString aTestString( - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890123456789"); + u"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890123456789"_ustr); tools::Long nPrinterWidth = 0; const ScPatternAttr& rPattern(m_pDocument->getCellAttributeHelper().getDefaultCellAttribute()); @@ -849,7 +849,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck return; //! nothing to do - error notification? // from here on no return - ScProgress aProgress( this, "...", nNewActionCount, true ); + ScProgress aProgress( this, u"..."_ustr, nNewActionCount, true ); sal_uLong nLastMergeAction = pSourceTrack->GetLast()->GetActionNumber(); // UpdateReference-Undo, valid references for the last common state diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 91d5ddc5836f..c1ee001cf393 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -478,7 +478,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) if (pViewFrame) { pViewFrame->RemoveInfoBar(u"enablecontent"); - auto pInfoBar = pViewFrame->AppendInfoBar("enablecontent", SfxResId(RID_SECURITY_WARNING_TITLE), + auto pInfoBar = pViewFrame->AppendInfoBar(u"enablecontent"_ustr, SfxResId(RID_SECURITY_WARNING_TITLE), ScResId(STR_RELOAD_TABLES), InfobarType::WARNING); if (pInfoBar) { @@ -1124,8 +1124,8 @@ void ScDocShell::Execute( SfxRequest& rReq ) ScViewData* pViewData = GetViewData(); if (pViewData) { - SfxStringItem aApp(SID_DOC_SERVICE, "com.sun.star.sheet.SpreadsheetDocument"); - SfxStringItem aTarget(SID_TARGETNAME, "_blank"); + SfxStringItem aApp(SID_DOC_SERVICE, u"com.sun.star.sheet.SpreadsheetDocument"_ustr); + SfxStringItem aTarget(SID_TARGETNAME, u"_blank"_ustr); pViewData->GetDispatcher().ExecuteList( SID_OPENDOC, SfxCallMode::API|SfxCallMode::SYNCHRON, { &aApp, &aTarget }); @@ -1137,7 +1137,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) const SfxStringItem* pFile = rReq.GetArg<SfxStringItem>( SID_NOTEBOOKBAR ); if ( pBindings && sfx2::SfxNotebookBar::IsActive() ) - sfx2::SfxNotebookBar::ExecMethod(*pBindings, pFile ? pFile->GetValue() : ""); + sfx2::SfxNotebookBar::ExecMethod(*pBindings, pFile ? pFile->GetValue() : u""_ustr); else if ( pBindings ) sfx2::SfxNotebookBar::CloseMethod(*pBindings); } @@ -1167,7 +1167,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) { if (ScTabViewShell* pSh = GetBestViewShell()) { - pSh->ExecuteCellFormatDlg(rReq, "font"); + pSh->ExecuteCellFormatDlg(rReq, u"font"_ustr); pBindings->Invalidate(SID_LANGUAGE_STATUS); } } @@ -2891,7 +2891,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() { SC_MOD()->SetInSharedDocLoading( true ); uno::Reference< frame::XDesktop2 > xLoader = frame::Desktop::create( ::comphelper::getProcessComponentContext() ); - uno::Sequence aArgs{ comphelper::makePropertyValue("Hidden", true) }; + uno::Sequence aArgs{ comphelper::makePropertyValue(u"Hidden"_ustr, true) }; if ( GetMedium() ) { @@ -2914,7 +2914,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() } xModel.set( - xLoader->loadComponentFromURL( GetSharedFileURL(), "_blank", 0, aArgs ), + xLoader->loadComponentFromURL( GetSharedFileURL(), u"_blank"_ustr, 0, aArgs ), uno::UNO_QUERY_THROW ); SC_MOD()->SetInSharedDocLoading( false ); } diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 1b2ddf216b9f..52fdbfada36a 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -955,7 +955,7 @@ bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRec bool bVbaEnabled = m_pDocument->IsInVBAMode(); if ( bVbaEnabled ) { - OUString aLibName( "Standard" ); + OUString aLibName( u"Standard"_ustr ); Reference< XLibraryContainer > xLibContainer = GetBasicContainer(); Reference< XVBACompatibility > xVBACompat( xLibContainer, UNO_QUERY ); diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 6d0da17eb574..7fa58b0aba43 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -159,7 +159,7 @@ bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); uno::Reference< css::ucb::XCommandInfo > xInfo = aDestPath.getCommands(); - OUString aTransferName = "transfer"; + OUString aTransferName = u"transfer"_ustr; if ( xInfo->hasCommandByName( aTransferName ) ) { aDestPath.executeCommand( aTransferName, uno::Any( @@ -191,7 +191,7 @@ bool ScDocShell::KillFile( const INetURLObject& rURL ) ::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::DecodeMechanism::NONE), uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( "delete", css::uno::Any( true ) ); + aCnt.executeCommand( u"delete"_ustr, css::uno::Any( true ) ); } catch( uno::Exception& ) { diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 3e66cfe68016..c9cde1cbf8f5 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2765,7 +2765,7 @@ void ScExternalRefManager::maybeCreateRealFileName(sal_uInt16 nFileId) OUString ScExternalRefManager::getOwnDocumentName() const { if (comphelper::IsFuzzing()) - return "file:///tmp/document"; + return u"file:///tmp/document"_ustr; ScDocShell* pShell = mrDoc.GetDocumentShell(); if (!pShell) diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 80b4a2b96701..9957e97bfbd0 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -1260,7 +1260,7 @@ static bool lcl_PutString( if ( rTransliteration.isEqual( aMStr, xMonths[i].FullName ) || rTransliteration.isEqual( aMStr, xMonths[i].AbbrevName ) ) nMonth = sal::static_int_cast<sal_Int16>( i+1 ); - else if ( i == 8 && rTransliteration.isEqual( "SEPT", + else if ( i == 8 && rTransliteration.isEqual( u"SEPT"_ustr, xMonths[i].AbbrevName ) && rTransliteration.isEqual( aMStr, aSepShortened ) ) { // correct English abbreviation is SEPT, @@ -1343,13 +1343,13 @@ static bool lcl_PutString( // strings. if (nHour == 12 && (rTransliteration.isEqual( aAmPm, pFormatter->GetLocaleData()->getTimeAM()) || - (pSecondTransliteration && pSecondTransliteration->isEqual( aAmPm, "AM")))) + (pSecondTransliteration && pSecondTransliteration->isEqual( aAmPm, u"AM"_ustr)))) { nHour = 0; } else if (nHour < 12 && (rTransliteration.isEqual( aAmPm, pFormatter->GetLocaleData()->getTimePM()) || - (pSecondTransliteration && pSecondTransliteration->isEqual( aAmPm, "PM")))) + (pSecondTransliteration && pSecondTransliteration->isEqual( aAmPm, u"PM"_ustr)))) { nHour += 12; } diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 455571e7917c..126f482674b2 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -131,7 +131,7 @@ void ScMacroManager::InitUserFuncData() { // Clear unordered_map mhFuncToVolatile.clear(); - OUString sProjectName("Standard"); + OUString sProjectName(u"Standard"_ustr); Reference< container::XContainer > xModuleContainer; ScDocShell* pShell = mrDoc.GetDocumentShell(); diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 04f21b9c05b6..65fe4981c932 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -86,7 +86,7 @@ ScTableLink::~ScTableLink() SCTAB nCount = rDoc.GetTableCount(); for (SCTAB nTab=0; nTab<nCount; nTab++) if (rDoc.IsLinked(nTab) && aFileName == rDoc.GetLinkDoc(nTab)) - rDoc.SetLink( nTab, ScLinkMode::NONE, "", "", "", "", 0 ); + rDoc.SetLink( nTab, ScLinkMode::NONE, u""_ustr, u""_ustr, u""_ustr, u""_ustr, 0 ); } void ScTableLink::Edit(weld::Window* pParent, const Link<SvBaseLink&,void>& rEndEditHdl) @@ -437,7 +437,7 @@ bool ScDocumentLoader::GetFilterName( const OUString& rFileName, if ( bWithInteraction ) pMedium->UseInteractionHandler(true); // #i73992# no longer called from GuessFilter - SfxFilterMatcher aMatcher("scalc"); + SfxFilterMatcher aMatcher(u"scalc"_ustr); if( bWithContent ) aMatcher.GuessFilter( *pMedium, pSfxFilter ); else diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index 226c862f379a..96765554719b 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -32,12 +32,12 @@ std::unique_ptr<SfxTabPage> ScDocStatPage::Create( weld::Container* pPage, weld: } ScDocStatPage::ScDocStatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) - : SfxTabPage(pPage, pController, "modules/scalc/ui/statisticsinfopage.ui", "StatisticsInfoPage", &rSet) - , m_xFtTables(m_xBuilder->weld_label("nosheets")) - , m_xFtCells(m_xBuilder->weld_label("nocells")) - , m_xFtPages(m_xBuilder->weld_label("nopages")) - , m_xFtFormula(m_xBuilder->weld_label("noformula")) - , m_xFrame(m_xBuilder->weld_frame("StatisticsInfoPage")) + : SfxTabPage(pPage, pController, u"modules/scalc/ui/statisticsinfopage.ui"_ustr, u"StatisticsInfoPage"_ustr, &rSet) + , m_xFtTables(m_xBuilder->weld_label(u"nosheets"_ustr)) + , m_xFtCells(m_xBuilder->weld_label(u"nocells"_ustr)) + , m_xFtPages(m_xBuilder->weld_label(u"nopages"_ustr)) + , m_xFtFormula(m_xBuilder->weld_label(u"noformula"_ustr)) + , m_xFrame(m_xBuilder->weld_frame(u"StatisticsInfoPage"_ustr)) { ScDocShell* pDocSh = dynamic_cast<ScDocShell*>( SfxObjectShell::Current() ); ScDocStat aDocStat; commit 6302535030fc0e4853eb3793bb57a32e34a82ad3 Author: Noel Grandin <[email protected]> AuthorDate: Sat Jun 1 10:28:45 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Jun 1 17:38:28 2024 +0200 loplugin:ostr in sw/../filter Change-Id: Ia1a96f966324e37cea55bd093f8fdbd9d9f99c07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168330 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 86c05f2b6843..6e37bfb1ebb3 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -130,7 +130,7 @@ oslGenericFunction Filters::GetMswordLibSymbol( const char *pSymbol ) { if (!msword_.is()) { - OUString url("$LO_LIB_DIR/" SVLIBRARY("msword")); + OUString url(u"$LO_LIB_DIR/" SVLIBRARY("msword") ""_ustr); rtl::Bootstrap::expandMacros(url); bool ok = msword_.load( url, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ); SAL_WARN_IF(!ok, "sw", "failed to load msword library"); @@ -214,7 +214,7 @@ bool StgWriter::IsStgWriter() const { return true; } SwFilterOptions::SwFilterOptions( sal_uInt16 nCnt, const OUString* ppNames, sal_uInt64* pValues ) - : ConfigItem( "Office.Writer/FilterFlags" ) + : ConfigItem( u"Office.Writer/FilterFlags"_ustr ) { GetValues( nCnt, ppNames, pValues ); } @@ -309,7 +309,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNode& rAnchor, // if the first node don't contained any content, then // insert one char in it calc again and delete once again SwContentIndex aNdIdx( pFirstTextNd ); - pFirstTextNd->InsertText("MM", aNdIdx); + pFirstTextNd->InsertText(u"MM"_ustr, aNdIdx); sal_uLong nAbsMinCnts; pFirstTextNd->GetMinMaxSize( pFirstTextNd->GetIndex(), nMinFrame, nMaxFrame, nAbsMinCnts ); diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index 9afff4d8b23b..59bdd4294d1e 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -59,9 +59,9 @@ OUString SwIoSystem::GetSubStorageName( const SfxFilter& rFltr ) if (rUserData == FILTER_XML || rUserData == FILTER_XMLV || rUserData == FILTER_XMLVW) - return "content.xml"; + return u"content.xml"_ustr; if (rUserData == sWW6 || rUserData == FILTER_WW8) - return "WordDocument"; + return u"WordDocument"_ustr; return OUString(); } @@ -98,7 +98,7 @@ bool SwIoSystem::IsValidStgFilter( const css::uno::Reference < css::embed::XStor try { SotClipboardFormatId nStgFormatId = SotStorage::GetFormatID( rStg ); - bRet = rStg->isStreamElement( "content.xml" ); + bRet = rStg->isStreamElement( u"content.xml"_ustr ); if ( bRet ) bRet = ( nStgFormatId != SotClipboardFormatId::NONE && ( rFilter.GetFormat() == nStgFormatId ) ); } @@ -125,13 +125,13 @@ bool SwIoSystem::IsValidStgFilter(SotStorage& rStg, const SfxFilter& rFilter) /* Bug 62703 - and also WinWord Docs w/o ClipBoardId! */ if (rFilter.GetUserData() == FILTER_WW8 || rFilter.GetUserData() == sWW6) { - bRet = (rStg.IsContained("0Table") - || rStg.IsContained("1Table")) + bRet = (rStg.IsContained(u"0Table"_ustr) + || rStg.IsContained(u"1Table"_ustr)) == (rFilter.GetUserData() == FILTER_WW8); if (bRet && !rFilter.IsAllowedAsTemplate()) { rtl::Reference<SotStorageStream> xRef = - rStg.OpenSotStream("WordDocument", + rStg.OpenSotStream(u"WordDocument"_ustr, StreamMode::STD_READ ); xRef->Seek(10); sal_uInt8 nByte; diff --git a/sw/source/filter/docx/swdocxreader.cxx b/sw/source/filter/docx/swdocxreader.cxx index c77c4417f73f..ca88027cba48 100644 --- a/sw/source/filter/docx/swdocxreader.cxx +++ b/sw/source/filter/docx/swdocxreader.cxx @@ -56,7 +56,7 @@ ErrCodeMsg SwDOCXReader::Read(SwDoc& rDoc, const OUString& /* rBaseURL */, SwPaM rDoc.SetTextFormatColl(rPam, rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD, false)); uno::Reference<lang::XMultiServiceFactory> xMultiServiceFactory(comphelper::getProcessServiceFactory()); - uno::Reference<uno::XInterface> xInterface(xMultiServiceFactory->createInstance("com.sun.star.comp.Writer.WriterFilter"), uno::UNO_SET_THROW); + uno::Reference<uno::XInterface> xInterface(xMultiServiceFactory->createInstance(u"com.sun.star.comp.Writer.WriterFilter"_ustr), uno::UNO_SET_THROW); SwDocShell* pDocShell(rDoc.GetDocShell()); uno::Reference<lang::XComponent> xDstDoc(pDocShell->GetModel(), uno::UNO_QUERY_THROW); @@ -112,7 +112,7 @@ bool SwDOCXReader::ReadGlossaries( SwTextBlocks& rBlocks, bool /* bSaveRelFiles comphelper::getProcessServiceFactory() ); uno::Reference<uno::XInterface> xInterface( - xMultiServiceFactory->createInstance( "com.sun.star.comp.Writer.WriterFilter" ), + xMultiServiceFactory->createInstance( u"com.sun.star.comp.Writer.WriterFilter"_ustr ), uno::UNO_SET_THROW ); uno::Reference<document::XFilter> xFilter( xInterface, uno::UNO_QUERY_THROW ); diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx index 9dbca2748305..f3f3909f8443 100644 --- a/sw/source/filter/html/SwAppletImpl.cxx +++ b/sw/source/filter/html/SwAppletImpl.cxx @@ -132,14 +132,14 @@ void SwApplet_Impl::CreateApplet( const OUString& rCode, const OUString& rName, uno::Reference < beans::XPropertySet > xSet( m_xApplet->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue("AppletCode", uno::Any( rCode ) ); - xSet->setPropertyValue("AppletName", uno::Any( rName ) ); - xSet->setPropertyValue("AppletIsScript", uno::Any( bMayScript ) ); - xSet->setPropertyValue("AppletDocBase", uno::Any( sDocBase ) ); + xSet->setPropertyValue(u"AppletCode"_ustr, uno::Any( rCode ) ); + xSet->setPropertyValue(u"AppletName"_ustr, uno::Any( rName ) ); + xSet->setPropertyValue(u"AppletIsScript"_ustr, uno::Any( bMayScript ) ); + xSet->setPropertyValue(u"AppletDocBase"_ustr, uno::Any( sDocBase ) ); if ( !rCodeBase.isEmpty() ) - xSet->setPropertyValue("AppletCodeBase", uno::Any( rCodeBase ) ); + xSet->setPropertyValue(u"AppletCodeBase"_ustr, uno::Any( rCodeBase ) ); else - xSet->setPropertyValue("AppletCodeBase", uno::Any( sDocBase ) ); + xSet->setPropertyValue(u"AppletCodeBase"_ustr, uno::Any( sDocBase ) ); } } #if HAVE_FEATURE_JAVA @@ -180,7 +180,7 @@ void SwApplet_Impl::FinishApplet() { uno::Sequence < beans::PropertyValue > aProps; m_aCommandList.FillSequence( aProps ); - xSet->setPropertyValue("AppletCommands", uno::Any( aProps ) ); + xSet->setPropertyValue(u"AppletCommands"_ustr, uno::Any( aProps ) ); } } diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 3ce02bc54a0d..a8b394887d7c 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -104,7 +104,7 @@ sal_uInt16 SwHTMLWriter::GetDefListLvl( std::u16string_view rNm, sal_uInt16 nPoo return 1 | HTML_DLCOLL_DT; } - OUString sDTDD = OOO_STRING_SVTOOLS_HTML_dt " "; + OUString sDTDD = u"" OOO_STRING_SVTOOLS_HTML_dt " "_ustr; if( o3tl::starts_with(rNm, sDTDD) ) // DefinitionList - term return o3tl::narrowing<sal_uInt16>(o3tl::toInt32(rNm.substr( sDTDD.getLength() ))) | HTML_DLCOLL_DT; diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 2e947b90f0f7..c484233fbe5d 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -216,7 +216,7 @@ void SwCSS1Parser::SetLinkCharFormats() OSL_ENSURE( !m_bLinkCharFormatsSet, "Call SetLinkCharFormats unnecessary" ); SvxCSS1MapEntry *pStyleEntry = - GetTag( OOO_STRING_SVTOOLS_HTML_anchor ); + GetTag( u"" OOO_STRING_SVTOOLS_HTML_anchor ""_ustr ); SwCharFormat *pUnvisited = nullptr, *pVisited = nullptr; if( pStyleEntry ) { @@ -232,7 +232,7 @@ void SwCSS1Parser::SetLinkCharFormats() m_bBodyVLinkSet |= bColorSet; } - OUString sTmp = OOO_STRING_SVTOOLS_HTML_anchor ":link"; + OUString sTmp = u"" OOO_STRING_SVTOOLS_HTML_anchor ":link"_ustr; pStyleEntry = GetTag( sTmp ); if( pStyleEntry ) @@ -1826,7 +1826,7 @@ bool SwCSS1Parser::ParseStyleSheet( const OUString& rIn ) } - pPageEntry = GetPage( "first", true ); + pPageEntry = GetPage( u"first"_ustr, true ); if( pPageEntry ) { SetPageDescAttrs( GetFirstPageDesc(true), pPageEntry->GetItemSet(), @@ -1834,7 +1834,7 @@ bool SwCSS1Parser::ParseStyleSheet( const OUString& rIn ) m_bSetFirstPageDesc = true; } - pPageEntry = GetPage( "right", true ); + pPageEntry = GetPage( u"right"_ustr, true ); if( pPageEntry ) { SetPageDescAttrs( GetRightPageDesc(true), pPageEntry->GetItemSet(), @@ -1842,7 +1842,7 @@ bool SwCSS1Parser::ParseStyleSheet( const OUString& rIn ) m_bSetRightPageDesc = true; } - pPageEntry = GetPage( "left", true ); + pPageEntry = GetPage( u"left"_ustr, true ); if( pPageEntry ) SetPageDescAttrs( GetLeftPageDesc(true), pPageEntry->GetItemSet(), pPageEntry->GetPropertyInfo() ); diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index e4dad5df1ae8..fbe44a87017e 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -1837,13 +1837,13 @@ static SwHTMLWriter & OutHTML_FrameFormatAsImage( SwHTMLWriter& rWrt, const SwFr Size aSz( 0, 0 ); OUString GraphicURL; - OUString aMimeType("image/jpeg"); + OUString aMimeType(u"image/jpeg"_ustr); if(!rWrt.mbEmbedImages) { if( rWrt.GetOrigFileName() ) GraphicURL = *rWrt.GetOrigFileName(); - OUString aFilterName("JPG"); + OUString aFilterName(u"JPG"_ustr); XOutFlags nFlags = XOutFlags::UseGifIfPossible | XOutFlags::UseNativeIfPossible; if (rWrt.mbReqIF && !bWritePNGFallback) @@ -1877,7 +1877,7 @@ static SwHTMLWriter & OutHTML_FrameFormatAsImage( SwHTMLWriter& rWrt, const SwFr } uno::Reference<beans::XPropertySet> xGraphic(aGraphic.GetXGraphic(), uno::UNO_QUERY); if (xGraphic.is() && aMimeType.isEmpty()) - xGraphic->getPropertyValue("MimeType") >>= aMimeType; + xGraphic->getPropertyValue(u"MimeType"_ustr) >>= aMimeType; OutHTML_ImageOLEStart(rWrt, aGraphic, rFrameFormat); @@ -2023,7 +2023,7 @@ static SwHTMLWriter& OutHTML_FrameFormatGrfNode( SwHTMLWriter& rWrt, const SwFra } uno::Reference<beans::XPropertySet> xGraphic(aGraphic.GetXGraphic(), uno::UNO_QUERY); if (xGraphic.is() && aMimeType.isEmpty()) - xGraphic->getPropertyValue("MimeType") >>= aMimeType; + xGraphic->getPropertyValue(u"MimeType"_ustr) >>= aMimeType; OutHTML_ImageOLEStart(rWrt, aGraphic, rFrameFormat); diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 8270d104e582..7e055dccea28 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -591,24 +591,24 @@ static void lcl_html_setFixedFontProperty( GetDefaultFontFlags::OnlyOne ) ); Any aTmp; aTmp <<= aFixedFont.GetFamilyName(); - rPropSet->setPropertyValue("FontName", aTmp ); + rPropSet->setPropertyValue(u"FontName"_ustr, aTmp ); aTmp <<= aFixedFont.GetStyleName(); - rPropSet->setPropertyValue("FontStyleName", + rPropSet->setPropertyValue(u"FontStyleName"_ustr, aTmp ); aTmp <<= static_cast<sal_Int16>(aFixedFont.GetFamilyType()); - rPropSet->setPropertyValue("FontFamily", aTmp ); + rPropSet->setPropertyValue(u"FontFamily"_ustr, aTmp ); aTmp <<= static_cast<sal_Int16>(aFixedFont.GetCharSet()); - rPropSet->setPropertyValue("FontCharset", + rPropSet->setPropertyValue(u"FontCharset"_ustr, aTmp ); aTmp <<= static_cast<sal_Int16>(aFixedFont.GetPitch()); - rPropSet->setPropertyValue("FontPitch", aTmp ); + rPropSet->setPropertyValue(u"FontPitch"_ustr, aTmp ); aTmp <<= float(10.0); - rPropSet->setPropertyValue("FontHeight", aTmp ); + rPropSet->setPropertyValue(u"FontHeight"_ustr, aTmp ); } void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rShape, @@ -856,7 +856,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( if( !rServiceFactory.is() ) return xShape; - uno::Reference< XInterface > xCreate = rServiceFactory->createInstance( "com.sun.star.drawing.ControlShape" ); + uno::Reference< XInterface > xCreate = rServiceFactory->createInstance( u"com.sun.star.drawing.ControlShape"_ustr ); if( !xCreate.is() ) return xShape; @@ -895,10 +895,10 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( { Any aAny2; aAny2 <<= nLeftSpace; - xShapePropSet->setPropertyValue("LeftMargin", aAny2 ); + xShapePropSet->setPropertyValue(u"LeftMargin"_ustr, aAny2 ); aAny2 <<= nRightSpace; - xShapePropSet->setPropertyValue("RightMargin", aAny2 ); + xShapePropSet->setPropertyValue(u"RightMargin"_ustr, aAny2 ); } // set upper/lower border @@ -922,15 +922,15 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( { uno::Any aAny2; aAny2 <<= nUpperSpace; - xShapePropSet->setPropertyValue("TopMargin", aAny2 ); + xShapePropSet->setPropertyValue(u"TopMargin"_ustr, aAny2 ); aAny2 <<= nLowerSpace; - xShapePropSet->setPropertyValue("BottomMargin", aAny2 ); + xShapePropSet->setPropertyValue(u"BottomMargin"_ustr, aAny2 ); } uno::Reference< beans::XPropertySetInfo > xPropSetInfo = rFCompPropSet->getPropertySetInfo(); - OUString sPropName = "BackgroundColor"; + OUString sPropName = u"BackgroundColor"_ustr; const SvxBrushItem* pBrushItem = rCSS1ItemSet.GetItemIfSet( RES_BACKGROUND ); if( pBrushItem && xPropSetInfo->hasPropertyByName( sPropName ) ) { @@ -1109,16 +1109,16 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( break; } aTmp <<= nVertOri ; - xShapePropSet->setPropertyValue("VertOrient", aTmp ); + xShapePropSet->setPropertyValue(u"VertOrient"_ustr, aTmp ); } aTmp <<= nAnchorType ; - xShapePropSet->setPropertyValue("AnchorType", aTmp ); + xShapePropSet->setPropertyValue(u"AnchorType"_ustr, aTmp ); if( text::TextContentAnchorType_AT_PAGE == nAnchorType ) { aTmp <<= sal_Int16(1) ; - xShapePropSet->setPropertyValue("AnchorPageNo", aTmp ); + xShapePropSet->setPropertyValue(u"AnchorPageNo"_ustr, aTmp ); } else { @@ -1129,25 +1129,25 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( } aTmp <<= xTextRg; - xShapePropSet->setPropertyValue("TextRange", aTmp ); + xShapePropSet->setPropertyValue(u"TextRange"_ustr, aTmp ); } if( bSetPos ) { aTmp <<= sal_Int16(text::HoriOrientation::NONE); - xShapePropSet->setPropertyValue("HoriOrient", aTmp ); + xShapePropSet->setPropertyValue(u"HoriOrient"_ustr, aTmp ); aTmp <<= nXPos ; - xShapePropSet->setPropertyValue("HoriOrientPosition", aTmp ); + xShapePropSet->setPropertyValue(u"HoriOrientPosition"_ustr, aTmp ); aTmp <<= sal_Int16(text::VertOrientation::NONE); - xShapePropSet->setPropertyValue("VertOrient", aTmp ); + xShapePropSet->setPropertyValue(u"VertOrient"_ustr, aTmp ); aTmp <<= nYPos ; - xShapePropSet->setPropertyValue("VertOrientPosition", aTmp ); + xShapePropSet->setPropertyValue(u"VertOrientPosition"_ustr, aTmp ); } if( bSetSurround ) { aTmp <<= nSurround ; - xShapePropSet->setPropertyValue("Surround", aTmp ); + xShapePropSet->setPropertyValue(u"Surround"_ustr, aTmp ); } m_pFormImpl->GetShapes()->add(xShape); @@ -1278,7 +1278,7 @@ void SwHTMLParser::NewForm( bool bAppend ) uno::Reference<XForm> xForm; try { - xInt = rSrvcMgr->createInstance("com.sun.star.form.component.Form"); + xInt = rSrvcMgr->createInstance(u"com.sun.star.form.component.Form"_ustr); if (!xInt.is()) return; xForm.set(xInt, UNO_QUERY); @@ -1299,7 +1299,7 @@ void SwHTMLParser::NewForm( bool bAppend ) Any aTmp; aTmp <<= sName; - xFormPropSet->setPropertyValue("Name", aTmp ); + xFormPropSet->setPropertyValue(u"Name"_ustr, aTmp ); if( !aAction.isEmpty() ) { @@ -1312,20 +1312,20 @@ void SwHTMLParser::NewForm( bool bAppend ) aAction = aURLObj.GetPartBeforeLastName(); } aTmp <<= aAction; - xFormPropSet->setPropertyValue("TargetURL", + xFormPropSet->setPropertyValue(u"TargetURL"_ustr, aTmp ); aTmp <<= nMethod; - xFormPropSet->setPropertyValue("SubmitMethod", + xFormPropSet->setPropertyValue(u"SubmitMethod"_ustr, aTmp ); aTmp <<= nEncType; - xFormPropSet->setPropertyValue("SubmitEncoding", aTmp ); + xFormPropSet->setPropertyValue(u"SubmitEncoding"_ustr, aTmp ); if( !sTarget.isEmpty() ) { aTmp <<= sTarget; - xFormPropSet->setPropertyValue( "TargetFrame", aTmp ); + xFormPropSet->setPropertyValue( u"TargetFrame"_ustr, aTmp ); } const uno::Reference< container::XIndexContainer > & rForms = @@ -1594,19 +1594,19 @@ void SwHTMLParser::InsertInput() Any aTmp; aTmp <<= sName; - xPropSet->setPropertyValue("Name", aTmp ); + xPropSet->setPropertyValue(u"Name"_ustr, aTmp ); if( HTMLInputType::Hidden != eType ) { if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX ) { aTmp <<= static_cast<sal_Int16>(nTabIndex) ; - xPropSet->setPropertyValue("TabIndex", aTmp ); + xPropSet->setPropertyValue(u"TabIndex"_ustr, aTmp ); } if( bDisabled ) { - xPropSet->setPropertyValue("Enabled", Any(false) ); + xPropSet->setPropertyValue(u"Enabled"_ustr, Any(false) ); } } @@ -1622,11 +1622,11 @@ void SwHTMLParser::InsertInput() case HTMLInputType::Radio: { if( !bValue ) - aTmp <<= OUString( OOO_STRING_SVTOOLS_HTML_on ); - xPropSet->setPropertyValue("RefValue", + aTmp <<= u"" OOO_STRING_SVTOOLS_HTML_on ""_ustr; + xPropSet->setPropertyValue(u"RefValue"_ustr, aTmp ); aTmp <<= OUString(); - xPropSet->setPropertyValue("Label", + xPropSet->setPropertyValue(u"Label"_ustr, aTmp ); // RadioButton: The DefaultChecked property should only be set // if the control has been created and activateTabOrder has been called @@ -1634,7 +1634,7 @@ void SwHTMLParser::InsertInput() if( HTMLInputType::Checkbox == eType ) { aTmp <<= nChecked ; - xPropSet->setPropertyValue("DefaultState", aTmp ); + xPropSet->setPropertyValue(u"DefaultState"_ustr, aTmp ); } const SvxMacro* pMacro = aMacroTable.Get( SvMacroItemId::HtmlOnClick ); @@ -1654,10 +1654,10 @@ void SwHTMLParser::InsertInput() aSz.setWidth(o3tl::convert(nWidth, o3tl::Length::px, o3tl::Length::mm100)); aSz.setHeight(o3tl::convert(nHeight, o3tl::Length::px, o3tl::Length::mm100)); aTmp <<= FormButtonType_SUBMIT; - xPropSet->setPropertyValue("ButtonType", aTmp ); + xPropSet->setPropertyValue(u"ButtonType"_ustr, aTmp ); aTmp <<= sal_Int16(0) ; - xPropSet->setPropertyValue("Border", + xPropSet->setPropertyValue(u"Border"_ustr, aTmp ); } break; @@ -1686,11 +1686,11 @@ void SwHTMLParser::InsertInput() ; } aTmp <<= sText; - xPropSet->setPropertyValue("Label", + xPropSet->setPropertyValue(u"Label"_ustr, aTmp ); aTmp <<= eButtonType; - xPropSet->setPropertyValue("ButtonType", aTmp ); + xPropSet->setPropertyValue(u"ButtonType"_ustr, aTmp ); bMinWidth = bMinHeight = true; bUseSize = true; @@ -1703,18 +1703,18 @@ void SwHTMLParser::InsertInput() if( HTMLInputType::File != eType ) { // The VALUE of file control will be ignored for security reasons - xPropSet->setPropertyValue("DefaultText", aTmp ); + xPropSet->setPropertyValue(u"DefaultText"_ustr, aTmp ); if( nMaxLen != 0 ) { aTmp <<= nMaxLen ; - xPropSet->setPropertyValue("MaxTextLen", aTmp ); + xPropSet->setPropertyValue(u"MaxTextLen"_ustr, aTmp ); } } if( HTMLInputType::Password == eType ) { aTmp <<= sal_Int16('*') ; - xPropSet->setPropertyValue("EchoChar", aTmp ); + xPropSet->setPropertyValue(u"EchoChar"_ustr, aTmp ); } lcl_html_setFixedFontProperty( xPropSet ); @@ -1726,7 +1726,7 @@ void SwHTMLParser::InsertInput() break; case HTMLInputType::Hidden: - xPropSet->setPropertyValue("HiddenValue", aTmp ); + xPropSet->setPropertyValue(u"HiddenValue"_ustr, aTmp ); bHidden = true; break; default: @@ -1799,7 +1799,7 @@ void SwHTMLParser::InsertInput() if( HTMLInputType::Radio == eType ) { aTmp <<= nChecked ; - xPropSet->setPropertyValue("DefaultState", aTmp ); + xPropSet->setPropertyValue(u"DefaultState"_ustr, aTmp ); } if( HTMLInputType::Image == eType ) @@ -1807,7 +1807,7 @@ void SwHTMLParser::InsertInput() // Set the URL after inserting the graphic because the Download can // only register with XModel after the control has been inserted. aTmp <<= URIHelper::SmartRel2Abs(INetURLObject(m_sBaseURL), sImgSrc, Link<OUString *, bool>(), false); - xPropSet->setPropertyValue("ImageURL", + xPropSet->setPropertyValue(u"ImageURL"_ustr, aTmp ); } @@ -1954,7 +1954,7 @@ void SwHTMLParser::NewTextArea() return; } uno::Reference< uno::XInterface > xInt = rSrvcMgr->createInstance( - "com.sun.star.form.component.TextField" ); + u"com.sun.star.form.component.TextField"_ustr ); if( !xInt.is() ) { FinishTextArea(); @@ -1968,27 +1968,27 @@ void SwHTMLParser::NewTextArea() Any aTmp; aTmp <<= sName; - xPropSet->setPropertyValue("Name", aTmp ); + xPropSet->setPropertyValue(u"Name"_ustr, aTmp ); aTmp <<= true; - xPropSet->setPropertyValue("MultiLine", aTmp ); - xPropSet->setPropertyValue("VScroll", aTmp ); + xPropSet->setPropertyValue(u"MultiLine"_ustr, aTmp ); + xPropSet->setPropertyValue(u"VScroll"_ustr, aTmp ); if( HTML_WM_OFF == nWrap ) - xPropSet->setPropertyValue("HScroll", aTmp ); + xPropSet->setPropertyValue(u"HScroll"_ustr, aTmp ); if( HTML_WM_HARD == nWrap ) - xPropSet->setPropertyValue("HardLineBreaks", aTmp ); + xPropSet->setPropertyValue(u"HardLineBreaks"_ustr, aTmp ); if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX ) { aTmp <<= static_cast<sal_Int16>(nTabIndex) ; - xPropSet->setPropertyValue("TabIndex", aTmp ); + xPropSet->setPropertyValue(u"TabIndex"_ustr, aTmp ); } lcl_html_setFixedFontProperty( xPropSet ); if( bDisabled ) { - xPropSet->setPropertyValue("Enabled", Any(false) ); + xPropSet->setPropertyValue(u"Enabled"_ustr, Any(false) ); } OSL_ENSURE( m_pFormImpl->GetText().isEmpty(), "Text is not empty!" ); @@ -2055,7 +2055,7 @@ void SwHTMLParser::EndTextArea() Any aTmp; aTmp <<= m_pFormImpl->GetText(); - rPropSet->setPropertyValue("DefaultText", aTmp ); + rPropSet->setPropertyValue(u"DefaultText"_ustr, aTmp ); m_pFormImpl->EraseText(); m_pFormImpl->ReleaseFCompPropSet(); @@ -2221,7 +2221,7 @@ void SwHTMLParser::NewSelect() return; } uno::Reference< uno::XInterface > xInt = rSrvcMgr->createInstance( - "com.sun.star.form.component.ListBox" ); + u"com.sun.star.form.component.ListBox"_ustr ); if( !xInt.is() ) { FinishTextArea(); @@ -2235,24 +2235,24 @@ void SwHTMLParser::NewSelect() Any aTmp; aTmp <<= sName; - xPropSet->setPropertyValue("Name", aTmp ); + xPropSet->setPropertyValue(u"Name"_ustr, aTmp ); if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX ) { aTmp <<= static_cast<sal_Int16>(nTabIndex) ; - xPropSet->setPropertyValue("TabIndex", aTmp ); + xPropSet->setPropertyValue(u"TabIndex"_ustr, aTmp ); } if( bDisabled ) { - xPropSet->setPropertyValue("Enabled", Any(false) ); + xPropSet->setPropertyValue(u"Enabled"_ustr, Any(false) ); } Size aTextSz( 0, 0 ); bool bMinWidth = true, bMinHeight = true; if( !bMultiple && 1==m_nSelectEntryCnt ) { - xPropSet->setPropertyValue("Dropdown", Any(true) ); + xPropSet->setPropertyValue(u"Dropdown"_ustr, Any(true) ); } else { @@ -2261,7 +2261,7 @@ void SwHTMLParser::NewSelect() if( bMultiple ) { - xPropSet->setPropertyValue("MultiSelection", Any(true) ); + xPropSet->setPropertyValue(u"MultiSelection"_ustr, Any(true) ); } aTextSz.setHeight( m_nSelectEntryCnt ); bMinHeight = false; @@ -2344,11 +2344,11 @@ void SwHTMLParser::EndSelect() pValues[i] = sText; } - rPropSet->setPropertyValue("StringItemList", Any(aList) ); + rPropSet->setPropertyValue(u"StringItemList"_ustr, Any(aList) ); - rPropSet->setPropertyValue("ListSourceType", Any(ListSourceType_VALUELIST) ); + rPropSet->setPropertyValue(u"ListSourceType"_ustr, Any(ListSourceType_VALUELIST) ); - rPropSet->setPropertyValue("ListSource", Any(aValueList) ); + rPropSet->setPropertyValue(u"ListSource"_ustr, Any(aValueList) ); size_t nSelCnt = m_pFormImpl->GetSelectedList().size(); if( !nSelCnt && 1 == m_nSelectEntryCnt && nEntryCnt ) @@ -2363,7 +2363,7 @@ void SwHTMLParser::EndSelect() { pSels[i] = static_cast<sal_Int16>(m_pFormImpl->GetSelectedList()[i]); } - rPropSet->setPropertyValue("DefaultSelection", Any(aSelList) ); + rPropSet->setPropertyValue(u"DefaultSelection"_ustr, Any(aSelList) ); m_pFormImpl->EraseStringList(); m_pFormImpl->EraseValueList(); diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 0317b7b7f2a3..f7141a1d3130 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -401,7 +401,7 @@ void SwHTMLWriter::OutHiddenForm( const uno::Reference< form::XForm > & rForm ) if( bHiddenOnly ) { uno::Reference< beans::XPropertySet > xPropSet( *xFormComp, uno::UNO_QUERY ); - OUString sPropName("ClassId"); + OUString sPropName(u"ClassId"_ustr); if( xPropSet->getPropertySetInfo()->hasPropertyByName( sPropName ) ) { uno::Any aAny2 = xPropSet->getPropertyValue( sPropName ); @@ -448,7 +448,7 @@ void SwHTMLWriter::OutForm( bool bOn, uno::Reference< beans::XPropertySet > xFormPropSet( rFormComps, uno::UNO_QUERY ); - uno::Any aTmp = xFormPropSet->getPropertyValue( "Name" ); + uno::Any aTmp = xFormPropSet->getPropertyValue( u"Name"_ustr ); if( auto s = o3tl::tryAccess<OUString>(aTmp) ) { if( !s->isEmpty() ) @@ -460,7 +460,7 @@ void SwHTMLWriter::OutForm( bool bOn, } } - aTmp = xFormPropSet->getPropertyValue( "TargetURL" ); + aTmp = xFormPropSet->getPropertyValue( u"TargetURL"_ustr ); if( auto s = o3tl::tryAccess<OUString>(aTmp) ) { if ( !s->isEmpty() ) @@ -474,7 +474,7 @@ void SwHTMLWriter::OutForm( bool bOn, } } - aTmp = xFormPropSet->getPropertyValue( "SubmitMethod" ); + aTmp = xFormPropSet->getPropertyValue( u"SubmitMethod"_ustr ); if( auto eMethod = o3tl::tryAccess<form::FormSubmitMethod>(aTmp) ) { if( form::FormSubmitMethod_POST==*eMethod ) @@ -483,7 +483,7 @@ void SwHTMLWriter::OutForm( bool bOn, OOO_STRING_SVTOOLS_HTML_METHOD_post "\""; } } - aTmp = xFormPropSet->getPropertyValue( "SubmitEncoding" ); + aTmp = xFormPropSet->getPropertyValue( u"SubmitEncoding"_ustr ); if( auto eEncType = o3tl::tryAccess<form::FormSubmitEncoding>(aTmp) ) { const char *pStr = nullptr; @@ -506,7 +506,7 @@ void SwHTMLWriter::OutForm( bool bOn, } } - aTmp = xFormPropSet->getPropertyValue( "TargetFrame" ); + aTmp = xFormPropSet->getPropertyValue( u"TargetFrame"_ustr ); if( auto s = o3tl::tryAccess<OUString>(aTmp) ) { if (!s->isEmpty() ) @@ -558,7 +558,7 @@ void SwHTMLWriter::OutHiddenControls( continue; uno::Reference< beans::XPropertySet > xPropSet( *xFC, uno::UNO_QUERY ); - OUString sPropName = "ClassId"; + OUString sPropName = u"ClassId"_ustr; if( !xPropSet->getPropertySetInfo()->hasPropertyByName( sPropName ) ) continue; @@ -575,7 +575,7 @@ void SwHTMLWriter::OutHiddenControls( OOO_STRING_SVTOOLS_HTML_O_type "=\"" OOO_STRING_SVTOOLS_HTML_IT_hidden "\""; - aTmp = xPropSet->getPropertyValue( "Name" ); + aTmp = xPropSet->getPropertyValue( u"Name"_ustr ); if( auto s = o3tl::tryAccess<OUString>(aTmp) ) { if( !s->isEmpty() ) @@ -586,7 +586,7 @@ void SwHTMLWriter::OutHiddenControls( sOut = "\""_ostr; } } - aTmp = xPropSet->getPropertyValue( "HiddenValue" ); + aTmp = xPropSet->getPropertyValue( u"HiddenValue"_ustr ); if( auto s = o3tl::tryAccess<OUString>(aTmp) ) { if( !s->isEmpty() ) @@ -632,7 +632,7 @@ const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrameFormat& rFormat uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); - OUString sPropName("ClassId"); + OUString sPropName(u"ClassId"_ustr); if( !xPropSet->getPropertySetInfo()->hasPropertyByName( sPropName ) ) return nullptr; @@ -706,7 +706,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, OUString sValue; OString sOptions; bool bEmptyValue = false; - uno::Any aTmp = xPropSet->getPropertyValue( "ClassId" ); + uno::Any aTmp = xPropSet->getPropertyValue( u"ClassId"_ustr ); sal_Int16 nClassId = *o3tl::doAccess<sal_Int16>(aTmp); HtmlFrmOpts nFrameOpts = HTML_FRMOPTS_CONTROL; switch( nClassId ) @@ -715,7 +715,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, case form::FormComponentType::RADIOBUTTON: eType = (form::FormComponentType::CHECKBOX == nClassId ? TYPE_CHECKBOX : TYPE_RADIO); - aTmp = xPropSet->getPropertyValue( "DefaultState" ); + aTmp = xPropSet->getPropertyValue( u"DefaultState"_ustr ); if( auto n = o3tl::tryAccess<sal_Int16>(aTmp) ) { if ( TRISTATE_FALSE != *n ) @@ -726,7 +726,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, } } - aTmp = xPropSet->getPropertyValue( "RefValue" ); + aTmp = xPropSet->getPropertyValue( u"RefValue"_ustr ); if( auto rVal = o3tl::tryAccess<OUString>(aTmp) ) { @@ -740,7 +740,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, case form::FormComponentType::COMMANDBUTTON: { form::FormButtonType eButtonType = form::FormButtonType_PUSH; - aTmp = xPropSet->getPropertyValue( "ButtonType" ); + aTmp = xPropSet->getPropertyValue( u"ButtonType"_ustr ); if( auto t = o3tl::tryAccess<form::FormButtonType>(aTmp) ) eButtonType = *t; @@ -757,7 +757,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, eType = TYPE_BUTTON; } - aTmp = xPropSet->getPropertyValue( "Label" ); + aTmp = xPropSet->getPropertyValue( u"Label"_ustr ); if( auto s = o3tl::tryAccess<OUString>(aTmp) ) { if( !s->isEmpty() ) @@ -772,7 +772,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, if (rWrt.IsLFPossible()) rWrt.OutNewLine( true ); eTag = TAG_SELECT; - aTmp = xPropSet->getPropertyValue( "Dropdown" ); + aTmp = xPropSet->getPropertyValue( u"Dropdown"_ustr ); if( auto b1 = o3tl::tryAccess<bool>(aTmp) ) { if( !*b1 ) @@ -787,7 +787,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, OString::number(static_cast<sal_Int32>(aSz.Height())) + "\""; } - auto aTmp2 = xPropSet->getPropertyValue( "MultiSelection" ); + auto aTmp2 = xPropSet->getPropertyValue( u"MultiSelection"_ustr ); if( auto b2 = o3tl::tryAccess<bool>(aTmp2) ) { if ( *b2 ) @@ -805,7 +805,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, GetControlSize( rFormObj, aSz, rWrt.m_pDoc ); bool bMultiLine = false; - OUString sMultiLine("MultiLine"); + OUString sMultiLine(u"MultiLine"_ustr); if( xPropSetInfo->hasPropertyByName( sMultiLine ) ) { aTmp = xPropSet->getPropertyValue( sMultiLine ); @@ -830,13 +830,13 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, OString::number(static_cast<sal_Int32>(aSz.Width())) + "\""; } - aTmp = xPropSet->getPropertyValue( "HScroll" ); + aTmp = xPropSet->getPropertyValue( u"HScroll"_ustr ); if( aTmp.getValueType() == cppu::UnoType<void>::get() || (aTmp.getValueType() == cppu::UnoType<bool>::get() && !*o3tl::forceAccess<bool>(aTmp)) ) { const char *pWrapStr = nullptr; - auto aTmp2 = xPropSet->getPropertyValue( "HardLineBreaks" ); + auto aTmp2 = xPropSet->getPropertyValue( u"HardLineBreaks"_ustr ); std::optional<const bool> b = o3tl::tryAccess<bool>(aTmp2); pWrapStr = (b.has_value() && *b) ? OOO_STRING_SVTOOLS_HTML_WW_hard : OOO_STRING_SVTOOLS_HTML_WW_soft; @@ -847,7 +847,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, else { eType = TYPE_TEXT; - OUString sEchoChar("EchoChar"); + OUString sEchoChar(u"EchoChar"_ustr); if( xPropSetInfo->hasPropertyByName( sEchoChar ) ) { aTmp = xPropSet->getPropertyValue( sEchoChar ); @@ -864,7 +864,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, OString::number(static_cast<sal_Int32>(aSz.Width())) + "\""; } - aTmp = xPropSet->getPropertyValue( "MaxTextLen" ); + aTmp = xPropSet->getPropertyValue( u"MaxTextLen"_ustr ); if( auto n = o3tl::tryAccess<sal_Int16>(aTmp) ) { if( *n != 0 ) @@ -874,9 +874,9 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, } } - if( xPropSetInfo->hasPropertyByName( "DefaultText" ) ) + if( xPropSetInfo->hasPropertyByName( u"DefaultText"_ustr ) ) { - aTmp = xPropSet->getPropertyValue( "DefaultText" ); + aTmp = xPropSet->getPropertyValue( u"DefaultText"_ustr ); if( auto s = o3tl::tryAccess<OUString>(aTmp) ) { if( !s->isEmpty() ) @@ -925,7 +925,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, TypeNames[eType] + "\""; } - aTmp = xPropSet->getPropertyValue("Name"); + aTmp = xPropSet->getPropertyValue(u"Name"_ustr); if( auto s = o3tl::tryAccess<OUString>(aTmp) ) { if( !s->isEmpty() ) @@ -937,7 +937,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, } } - aTmp = xPropSet->getPropertyValue("Enabled"); + aTmp = xPropSet->getPropertyValue(u"Enabled"_ustr); if( auto b = o3tl::tryAccess<bool>(aTmp) ) { if( !*b ) @@ -958,7 +958,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, if( TYPE_IMAGE == eType ) { - aTmp = xPropSet->getPropertyValue( "ImageURL" ); + aTmp = xPropSet->getPropertyValue( u"ImageURL"_ustr ); if( auto s = o3tl::tryAccess<OUString>(aTmp) ) { if( !s->isEmpty() ) @@ -987,7 +987,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, } } - aTmp = xPropSet->getPropertyValue( "TabIndex" ); + aTmp = xPropSet->getPropertyValue( u"TabIndex"_ustr ); if( auto n = o3tl::tryAccess<sal_Int16>(aTmp) ) { sal_Int16 nTabIndex = *n; @@ -1023,27 +1023,27 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, TYPE_TEXT == eType; SfxItemSetFixed<RES_CHRATR_BEGIN, RES_CHRATR_END> aItemSet( rWrt.m_pDoc->GetAttrPool() ); - if( xPropSetInfo->hasPropertyByName( "BackgroundColor" ) ) + if( xPropSetInfo->hasPropertyByName( u"BackgroundColor"_ustr ) ) { - aTmp = xPropSet->getPropertyValue( "BackgroundColor" ); + aTmp = xPropSet->getPropertyValue( u"BackgroundColor"_ustr ); if( auto n = o3tl::tryAccess<sal_Int32>(aTmp) ) { Color aCol(ColorTransparency, *n); aItemSet.Put( SvxBrushItem( aCol, RES_CHRATR_BACKGROUND ) ); } } - if( xPropSetInfo->hasPropertyByName( "TextColor" ) ) + if( xPropSetInfo->hasPropertyByName( u"TextColor"_ustr ) ) { - aTmp = xPropSet->getPropertyValue( "TextColor" ); + aTmp = xPropSet->getPropertyValue( u"TextColor"_ustr ); if( auto n = o3tl::tryAccess<sal_Int32>(aTmp) ) { Color aColor( ColorTransparency, *n ); aItemSet.Put( SvxColorItem( aColor, RES_CHRATR_COLOR ) ); } } - if( xPropSetInfo->hasPropertyByName( "FontHeight" ) ) + if( xPropSetInfo->hasPropertyByName( u"FontHeight"_ustr ) ) { - aTmp = xPropSet->getPropertyValue( "FontHeight" ); + aTmp = xPropSet->getPropertyValue( u"FontHeight"_ustr ); if( auto nHeight = o3tl::tryAccess<float>(aTmp) ) { @@ -1051,9 +1051,9 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, aItemSet.Put( SvxFontHeightItem( sal_Int16(*nHeight * 20.), 100, RES_CHRATR_FONTSIZE ) ); } } - if( xPropSetInfo->hasPropertyByName( "FontName" ) ) + if( xPropSetInfo->hasPropertyByName( u"FontName"_ustr ) ) { - aTmp = xPropSet->getPropertyValue( "FontName" ); + aTmp = xPropSet->getPropertyValue( u"FontName"_ustr ); if( auto aFName = o3tl::tryAccess<OUString>(aTmp) ) { if( !aFName->isEmpty() ) @@ -1064,9 +1064,9 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, if( !bEdit || *aFName != aFixedFont.GetFamilyName() ) { FontFamily eFamily = FAMILY_DONTKNOW; - if( xPropSetInfo->hasPropertyByName( "FontFamily" ) ) + if( xPropSetInfo->hasPropertyByName( u"FontFamily"_ustr ) ) { - auto aTmp2 = xPropSet->getPropertyValue( "FontFamily" ); + auto aTmp2 = xPropSet->getPropertyValue( u"FontFamily"_ustr ); if( auto n = o3tl::tryAccess<sal_Int16>(aTmp2) ) eFamily = static_cast<FontFamily>(*n); } @@ -1076,9 +1076,9 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, } } } - if( xPropSetInfo->hasPropertyByName( "FontWeight" ) ) + if( xPropSetInfo->hasPropertyByName( u"FontWeight"_ustr ) ) { - aTmp = xPropSet->getPropertyValue( "FontWeight" ); + aTmp = xPropSet->getPropertyValue( u"FontWeight"_ustr ); if( auto x = o3tl::tryAccess<float>(aTmp) ) { FontWeight eWeight = @@ -1087,9 +1087,9 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, aItemSet.Put( SvxWeightItem( eWeight, RES_CHRATR_WEIGHT ) ); } } - if( xPropSetInfo->hasPropertyByName( "FontSlant" ) ) + if( xPropSetInfo->hasPropertyByName( u"FontSlant"_ustr ) ) { - aTmp = xPropSet->getPropertyValue( "FontSlant" ); + aTmp = xPropSet->getPropertyValue( u"FontSlant"_ustr ); if( auto n = o3tl::tryAccess<sal_Int16>(aTmp) ) { FontItalic eItalic = static_cast<FontItalic>(*n); @@ -1097,9 +1097,9 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, aItemSet.Put( SvxPostureItem( eItalic, RES_CHRATR_POSTURE ) ); } } - if( xPropSetInfo->hasPropertyByName( "FontLineStyle" ) ) + if( xPropSetInfo->hasPropertyByName( u"FontLineStyle"_ustr ) ) { - aTmp = xPropSet->getPropertyValue( "FontLineStyle" ); + aTmp = xPropSet->getPropertyValue( u"FontLineStyle"_ustr ); if( auto n = o3tl::tryAccess<sal_Int16>(aTmp) ) { FontLineStyle eUnderline = static_cast<FontLineStyle>(*n); @@ -1108,9 +1108,9 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, aItemSet.Put( SvxUnderlineItem( eUnderline, RES_CHRATR_UNDERLINE ) ); } } - if( xPropSetInfo->hasPropertyByName( "FontStrikeout" ) ) + if( xPropSetInfo->hasPropertyByName( u"FontStrikeout"_ustr ) ) { - aTmp = xPropSet->getPropertyValue( "FontStrikeout" ); + aTmp = xPropSet->getPropertyValue( u"FontStrikeout"_ustr ); if( auto n = o3tl::tryAccess<sal_Int16>(aTmp) ) { FontStrikeout eStrikeout = static_cast<FontStrikeout>(*n); @@ -1131,7 +1131,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, if( TAG_SELECT == eTag ) { - aTmp = xPropSet->getPropertyValue( "StringItemList" ); + aTmp = xPropSet->getPropertyValue( u"StringItemList"_ustr ); if( auto aList = o3tl::tryAccess<uno::Sequence<OUString>>(aTmp) ) { rWrt.IncIndentLevel(); // the content of Select can be indented @@ -1140,7 +1140,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, const OUString *pValues = nullptr; sal_Int32 nValCnt = 0; - auto aTmp2 = xPropSet->getPropertyValue( "ListSource" ); + auto aTmp2 = xPropSet->getPropertyValue( u"ListSource"_ustr ); uno::Sequence<OUString> aValList; if( auto s = o3tl::tryAccess<uno::Sequence<OUString>>(aTmp2) ) { @@ -1149,7 +1149,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, pValues = aValList.getConstArray(); } - uno::Any aSelTmp = xPropSet->getPropertyValue( "DefaultSelection" ); + uno::Any aSelTmp = xPropSet->getPropertyValue( u"DefaultSelection"_ustr ); const sal_Int16 *pSels = nullptr; sal_Int32 nSel = 0; sal_Int32 nSelCnt = 0; @@ -1206,7 +1206,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, { // In TextAreas no additional spaces or LF may be exported! OUString sVal; - aTmp = xPropSet->getPropertyValue( "DefaultText" ); + aTmp = xPropSet->getPropertyValue( u"DefaultText"_ustr ); if( auto s = o3tl::tryAccess<OUString>(aTmp) ) { if( !s->isEmpty() ) @@ -1230,7 +1230,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt, } else if( TYPE_CHECKBOX == eType || TYPE_RADIO == eType ) { - aTmp = xPropSet->getPropertyValue("Label"); + aTmp = xPropSet->getPropertyValue(u"Label"_ustr); if( auto s = o3tl::tryAccess<OUString>(aTmp) ) { if( !s->isEmpty() ) diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index d70634e2dddf..80453237045d 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -552,13 +552,13 @@ bool SwHTMLParser::InsertEmbed() if ( xSet.is() ) { if( bHasURL ) - xSet->setPropertyValue("PluginURL", uno::Any( aURL ) ); + xSet->setPropertyValue(u"PluginURL"_ustr, uno::Any( aURL ) ); if( bHasType ) - xSet->setPropertyValue("PluginMimeType", uno::Any( aType ) ); + xSet->setPropertyValue(u"PluginMimeType"_ustr, uno::Any( aType ) ); uno::Sequence < beans::PropertyValue > aProps; aCmdLst.FillSequence( aProps ); - xSet->setPropertyValue("PluginCommands", uno::Any( aProps ) ); + xSet->setPropertyValue(u"PluginCommands"_ustr, uno::Any( aProps ) ); } } @@ -596,7 +596,7 @@ bool SwHTMLParser::InsertEmbed() { uno::Sequence<beans::PropertyValue> aMedium = comphelper::InitPropertySequence( { { "InputStream", uno::Any(xInStream) }, - { "URL", uno::Any(OUString("private:stream")) }, + { "URL", uno::Any(u"private:stream"_ustr) }, { "DocumentBaseURL", uno::Any(m_sBaseURL) } }); xObj = aCnt.InsertEmbeddedObject(aMedium, aName, &m_sBaseURL); } @@ -630,7 +630,7 @@ bool SwHTMLParser::InsertEmbed() // Set media type of the native data. uno::Reference<beans::XPropertySet> xOutStreamProps(xOutStream, uno::UNO_QUERY); if (xOutStreamProps.is()) - xOutStreamProps->setPropertyValue("MediaType", uno::Any(aType)); + xOutStreamProps->setPropertyValue(u"MediaType"_ustr, uno::Any(aType)); } } xObj = aCnt.GetEmbeddedObject(aObjName); @@ -667,7 +667,7 @@ bool SwHTMLParser::InsertEmbed() { // Request that the native data of the embedded object is not modified // during parsing. - uno::Sequence<beans::PropertyValue> aValues{ comphelper::makePropertyValue("StreamReadOnly", + uno::Sequence<beans::PropertyValue> aValues{ comphelper::makePropertyValue(u"StreamReadOnly"_ustr, true) }; uno::Sequence<uno::Any> aArguments{ uno::Any(aValues) }; xObjInitialization->initialize(aArguments); @@ -678,7 +678,7 @@ bool SwHTMLParser::InsertEmbed() &aFrameSet); if (xObjInitialization.is()) { - uno::Sequence<beans::PropertyValue> aValues{ comphelper::makePropertyValue("StreamReadOnly", + uno::Sequence<beans::PropertyValue> aValues{ comphelper::makePropertyValue(u"StreamReadOnly"_ustr, false) }; uno::Sequence<uno::Any> aArguments{ uno::Any(aValues) }; xObjInitialization->initialize(aArguments); @@ -1120,23 +1120,23 @@ void SwHTMLParser::InsertFloatingFrame() if (INetURLObject(sHRef).IsExoticProtocol()) NotifyMacroEventRead(); - xSet->setPropertyValue("FrameURL", uno::Any( sHRef ) ); - xSet->setPropertyValue("FrameName", uno::Any( aName ) ); + xSet->setPropertyValue(u"FrameURL"_ustr, uno::Any( sHRef ) ); + xSet->setPropertyValue(u"FrameName"_ustr, uno::Any( aName ) ); if ( eScroll == ScrollingMode::Auto ) - xSet->setPropertyValue("FrameIsAutoScroll", + xSet->setPropertyValue(u"FrameIsAutoScroll"_ustr, uno::Any( true ) ); else - xSet->setPropertyValue("FrameIsScrollingMode", + xSet->setPropertyValue(u"FrameIsScrollingMode"_ustr, uno::Any( eScroll == ScrollingMode::Yes ) ); - xSet->setPropertyValue("FrameIsBorder", + xSet->setPropertyValue(u"FrameIsBorder"_ustr, uno::Any( bHasBorder ) ); - xSet->setPropertyValue("FrameMarginWidth", + xSet->setPropertyValue(u"FrameMarginWidth"_ustr, uno::Any( sal_Int32( aMargin.Width() ) ) ); - xSet->setPropertyValue("FrameMarginHeight", + xSet->setPropertyValue(u"FrameMarginHeight"_ustr, uno::Any( sal_Int32( aMargin.Height() ) ) ); } } @@ -1256,7 +1256,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENode( SwHTMLWriter& rWrt, const SwFrameForma OUString aStr; OUString aURL; - aAny = xSet->getPropertyValue("PluginURL"); + aAny = xSet->getPropertyValue(u"PluginURL"_ustr); if( (aAny >>= aStr) && !aStr.isEmpty() ) { aURL = URIHelper::simpleNormalizedMakeRelative( rWrt.GetBaseURL(), @@ -1273,7 +1273,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENode( SwHTMLWriter& rWrt, const SwFrameForma } OUString aType; - aAny = xSet->getPropertyValue("PluginMimeType"); + aAny = xSet->getPropertyValue(u"PluginMimeType"_ustr); if( (aAny >>= aType) && !aType.isEmpty() ) { sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_type "=\""); @@ -1305,7 +1305,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENode( SwHTMLWriter& rWrt, const SwFrameForma // CODEBASE OUString aCd; - aAny = xSet->getPropertyValue("AppletCodeBase"); + aAny = xSet->getPropertyValue(u"AppletCodeBase"_ustr); if( (aAny >>= aCd) && !aCd.isEmpty() ) { OUString sCodeBase( URIHelper::simpleNormalizedMakeRelative(rWrt.GetBaseURL(), aCd) ); @@ -1321,7 +1321,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENode( SwHTMLWriter& rWrt, const SwFrameForma // CODE OUString aClass; - aAny = xSet->getPropertyValue("AppletCode"); + aAny = xSet->getPropertyValue(u"AppletCode"_ustr); aAny >>= aClass; sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_code "=\""); rWrt.Strm().WriteOString( sOut ); @@ -1331,7 +1331,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENode( SwHTMLWriter& rWrt, const SwFrameForma // NAME OUString aAppletName; - aAny = xSet->getPropertyValue("AppletName"); + aAny = xSet->getPropertyValue(u"AppletName"_ustr); aAny >>= aAppletName; if( !aAppletName.isEmpty() ) { @@ -1343,7 +1343,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENode( SwHTMLWriter& rWrt, const SwFrameForma } bool bScript = false; - aAny = xSet->getPropertyValue("AppletIsScript"); + aAny = xSet->getPropertyValue(u"AppletIsScript"_ustr); aAny >>= bScript; if( bScript ) sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_mayscript); @@ -1382,7 +1382,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENode( SwHTMLWriter& rWrt, const SwFrameForma // and write a </APPLET> uno::Sequence < beans::PropertyValue > aProps; - aAny = xSet->getPropertyValue("AppletCommands"); + aAny = xSet->getPropertyValue(u"AppletCommands"_ustr); aAny >>= aProps; SvCommandList aCommands; @@ -1442,7 +1442,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENode( SwHTMLWriter& rWrt, const SwFrameForma // write plug-ins parameters as options uno::Sequence < beans::PropertyValue > aProps; - aAny = xSet->getPropertyValue("PluginCommands"); + aAny = xSet->getPropertyValue(u"PluginCommands"_ustr); aAny >>= aProps; SvCommandList aCommands; @@ -1613,9 +1613,9 @@ SwHTMLWriter& OutHTML_FrameFormatOLENodeGrf( SwHTMLWriter& rWrt, const SwFrameFo OUString aFilter; if (uno::Reference<lang::XServiceInfo> xServiceInfo{ xStorable, uno::UNO_QUERY }) { - if (xServiceInfo->supportsService("com.sun.star.sheet.SpreadsheetDocument")) + if (xServiceInfo->supportsService(u"com.sun.star.sheet.SpreadsheetDocument"_ustr)) aFilter = "HTML (StarCalc)"; - else if (xServiceInfo->supportsService("com.sun.star.text.TextDocument")) + else if (xServiceInfo->supportsService(u"com.sun.star.text.TextDocument"_ustr)) aFilter = "HTML (StarWriter)"; } @@ -1627,10 +1627,10 @@ SwHTMLWriter& OutHTML_FrameFormatOLENodeGrf( SwHTMLWriter& rWrt, const SwFrameFo SvMemoryStream aStream; uno::Reference<io::XOutputStream> xOutputStream(new utl::OStreamWrapper(aStream)); utl::MediaDescriptor aMediaDescriptor; - aMediaDescriptor["FilterName"] <<= aFilter; - aMediaDescriptor["FilterOptions"] <<= OUString("SkipHeaderFooter"); - aMediaDescriptor["OutputStream"] <<= xOutputStream; - xStorable->storeToURL("private:stream", aMediaDescriptor.getAsConstPropertyValueList()); + aMediaDescriptor[u"FilterName"_ustr] <<= aFilter; + aMediaDescriptor[u"FilterOptions"_ustr] <<= u"SkipHeaderFooter"_ustr; + aMediaDescriptor[u"OutputStream"_ustr] <<= xOutputStream; + xStorable->storeToURL(u"private:stream"_ustr, aMediaDescriptor.getAsConstPropertyValueList()); SAL_WARN_IF(aStream.GetSize()>=o3tl::make_unsigned(SAL_MAX_INT32), "sw.html", "Stream can't fit in OString"); OString aData(static_cast<const char*>(aStream.GetData()), static_cast<sal_Int32>(aStream.GetSize())); // Wrap output in a <span> tag to avoid 'HTML parser error: Unexpected end tag: p' @@ -1659,7 +1659,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENodeGrf( SwHTMLWriter& rWrt, const SwFrameFo SwDocShell* pDocSh = rWrt.m_pDoc->GetDocShell(); bool bObjectOpened = false; - OUString aRTFType = "text/rtf"; + OUString aRTFType = u"text/rtf"_ustr; if (!rWrt.m_aRTFOLEMimeType.isEmpty()) { aRTFType = rWrt.m_aRTFOLEMimeType; @@ -1740,7 +1740,7 @@ SwHTMLWriter& OutHTML_FrameFormatOLENodeGrf( SwHTMLWriter& rWrt, const SwFrameFo uno::Reference<beans::XPropertySet> xOutStreamProps(xInStream, uno::UNO_QUERY); if (xOutStreamProps.is()) - xOutStreamProps->getPropertyValue("MediaType") >>= aFileType; + xOutStreamProps->getPropertyValue(u"MediaType"_ustr) >>= aFileType; if (!aRTFType.isEmpty()) { aFileType = aRTFType; diff --git a/sw/source/filter/html/htmlreqifreader.cxx b/sw/source/filter/html/htmlreqifreader.cxx index d784312b6fd2..d0c059037231 100644 --- a/sw/source/filter/html/htmlreqifreader.cxx +++ b/sw/source/filter/html/htmlreqifreader.cxx @@ -76,7 +76,7 @@ OString ExtractOLEClassName(const rtl::Reference<SotStorage>& xStorage) { OString aRet; - rtl::Reference<SotStorageStream> pCompObj = xStorage->OpenSotStream("CompObj"); + rtl::Reference<SotStorageStream> pCompObj = xStorage->OpenSotStream(u"CompObj"_ustr); if (!pCompObj) return aRet; @@ -108,7 +108,7 @@ bool ParseOLE2Presentation(SvStream& rOle2, sal_uInt32& nWidth, sal_uInt32& nHei rOle2.Seek(0); rtl::Reference<SotStorage> pStorage = new SotStorage(rOle2); rtl::Reference<SotStorageStream> xOle2Presentation - = pStorage->OpenSotStream("OlePres000", StreamMode::STD_READ); + = pStorage->OpenSotStream(u"OlePres000"_ustr, StreamMode::STD_READ); // Read AnsiClipboardFormat. sal_uInt32 nMarkerOrLength = 0; @@ -168,7 +168,7 @@ OString InsertOLE1HeaderFromOle10NativeStream(const rtl::Reference<SotStorage>& SwOLENode& rOLENode, SvStream& rOle1) { rtl::Reference<SotStorageStream> xOle1Stream - = xStorage->OpenSotStream("Ole10Native", StreamMode::STD_READ); + = xStorage->OpenSotStream(u"Ole10Native"_ustr, StreamMode::STD_READ); sal_uInt32 nOle1Size = 0; xOle1Stream->ReadUInt32(nOle1Size); @@ -275,7 +275,7 @@ OString InsertOLE1Header(SvStream& rOle2, SvStream& rOle1, sal_uInt32& nWidth, s if (xStorage->GetError() != ERRCODE_NONE) return {}; - if (xStorage->IsStream("Ole10Native")) + if (xStorage->IsStream(u"Ole10Native"_ustr)) { return InsertOLE1HeaderFromOle10NativeStream(xStorage, rOLENode, rOle1); } @@ -449,7 +449,7 @@ bool WrapOleInRtf(SvStream& rOle2, SvStream& rRtf, SwOLENode& rOLENode, if (pGraphic) { uno::Sequence<beans::PropertyValue> aFilterData - = { comphelper::makePropertyValue("EmbedEMF", false) }; + = { comphelper::makePropertyValue(u"EmbedEMF"_ustr, false) }; FilterConfigItem aConfigItem(&aFilterData); if (ConvertGraphicToWMF(*pGraphic, aGraphicStream, &aConfigItem)) { @@ -572,7 +572,7 @@ bool WrapGraphicInRtf(const Graphic& rGraphic, const SwFrameFormat& rFormat, SvS sal_uInt64 nPresentationData = 0; SvMemoryStream aGraphicStream; uno::Sequence<beans::PropertyValue> aFilterData - = { comphelper::makePropertyValue("EmbedEMF", false) }; + = { comphelper::makePropertyValue(u"EmbedEMF"_ustr, false) }; FilterConfigItem aConfigItem(&aFilterData); if (ConvertGraphicToWMF(rGraphic, aGraphicStream, &aConfigItem)) { diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 7332fa881c48..fe6091534a29 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -453,7 +453,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn, } comphelper::SequenceAsHashMap aLoadMap(pMed->GetArgs()); - auto it = aLoadMap.find("AllowedRTFOLEMimeTypes"); + auto it = aLoadMap.find(u"AllowedRTFOLEMimeTypes"_ustr); if (it == aLoadMap.end()) { return; @@ -1607,7 +1607,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken ) case HtmlTokenId::NOEMBED_ON: m_bInNoEmbed = true; m_bCallNextToken = bool(m_xTable); - ReadRawData( OOO_STRING_SVTOOLS_HTML_noembed ); + ReadRawData( u"" OOO_STRING_SVTOOLS_HTML_noembed ""_ustr ); break; case HtmlTokenId::DEFLIST_ON: @@ -5071,7 +5071,7 @@ void SwHTMLParser::InsertSpacer() else { NewAttr(m_xAttrTab, &m_xAttrTab->pKerning, SvxKerningItem( static_cast<short>(nSize), RES_CHRATR_KERNING )); - m_xDoc->getIDocumentContentOperations().InsertString( *m_pPam, " " ); + m_xDoc->getIDocumentContentOperations().InsertString( *m_pPam, u" "_ustr ); EndAttr( m_xAttrTab->pKerning ); } } @@ -5200,7 +5200,7 @@ void SwHTMLParser::InsertLineBreak() if (eClear == SwLineBreakClear::NONE) { // If no CLEAR could or should be executed, a line break will be inserted - m_xDoc->getIDocumentContentOperations().InsertString(*m_pPam, "\x0A"); + m_xDoc->getIDocumentContentOperations().InsertString(*m_pPam, u"\x0A"_ustr); } else { diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index b13015a11f7a..58360ff40527 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -206,27 +206,27 @@ void SwHTMLWriter::SetupFilterOptions(std::u16string_view rFilterOptions) comphelper::SequenceAsHashMap aStoreMap; if (rFilterOptions.find(u"SkipImages") != std::u16string_view::npos) { - aStoreMap["SkipImages"] <<= true; + aStoreMap[u"SkipImages"_ustr] <<= true; } else if (rFilterOptions.find(u"SkipHeaderFooter") != std::u16string_view::npos) { - aStoreMap["SkipHeaderFooter"] <<= true; + aStoreMap[u"SkipHeaderFooter"_ustr] <<= true; } else if (rFilterOptions.find(u"EmbedImages") != std::u16string_view::npos) { - aStoreMap["EmbedImages"] <<= true; + aStoreMap[u"EmbedImages"_ustr] <<= true; } // this option can be "on" together with any of above if (rFilterOptions.find(u"NoLineLimit") != std::u16string_view::npos) { - aStoreMap["NoLineLimit"] <<= true; + aStoreMap[u"NoLineLimit"_ustr] <<= true; } // this option can be "on" together with any of above if (rFilterOptions.find(u"NoPrettyPrint") != std::u16string_view::npos) { - aStoreMap["NoPrettyPrint"] <<= true; + aStoreMap[u"NoPrettyPrint"_ustr] <<= true; } const uno::Sequence<OUString> aOptionSeq @@ -236,11 +236,11 @@ void SwHTMLWriter::SetupFilterOptions(std::u16string_view rFilterOptions) { if (rOption == "XHTML") { - aStoreMap["XHTML"] <<= true; + aStoreMap[u"XHTML"_ustr] <<= true; } else if (rOption.startsWith(aXhtmlNsKey)) { - aStoreMap["XhtmlNs"] <<= rOption.copy(aXhtmlNsKey.getLength()); + aStoreMap[u"XhtmlNs"_ustr] <<= rOption.copy(aXhtmlNsKey.getLength()); } } @@ -251,25 +251,25 @@ void SwHTMLWriter::SetupFilterFromPropertyValues( const css::uno::Sequence<css::beans::PropertyValue>& rPropertyValues) { comphelper::SequenceAsHashMap aStoreMap(rPropertyValues); - auto it = aStoreMap.find("RTFOLEMimeType"); + auto it = aStoreMap.find(u"RTFOLEMimeType"_ustr); if (it != aStoreMap.end()) { it->second >>= m_aRTFOLEMimeType; } - it = aStoreMap.find("ExportImagesAsOLE"); + it = aStoreMap.find(u"ExportImagesAsOLE"_ustr); if (it != aStoreMap.end()) { it->second >>= m_bExportImagesAsOLE; } - it = aStoreMap.find("ExportFormulasAsPDF"); + it = aStoreMap.find(u"ExportFormulasAsPDF"_ustr); if (it != aStoreMap.end()) { it->second >>= m_bExportFormulasAsPDF; } - it = aStoreMap.find("ShapeDPI"); + it = aStoreMap.find(u"ShapeDPI"_ustr); if (it != aStoreMap.end()) { sal_Int32 nVal{}; @@ -277,7 +277,7 @@ void SwHTMLWriter::SetupFilterFromPropertyValues( m_nShapeDPI.emplace(nVal); } - it = aStoreMap.find("SkipImages"); + it = aStoreMap.find(u"SkipImages"_ustr); if (it != aStoreMap.end()) { bool bVal{}; @@ -285,7 +285,7 @@ void SwHTMLWriter::SetupFilterFromPropertyValues( mbSkipImages = bVal; } - it = aStoreMap.find("SkipHeaderFooter"); + it = aStoreMap.find(u"SkipHeaderFooter"_ustr); if (it != aStoreMap.end()) { bool bVal{}; @@ -294,14 +294,14 @@ void SwHTMLWriter::SetupFilterFromPropertyValues( } // this option can be "on" together with any of above - it = aStoreMap.find("NoPrettyPrint"); + it = aStoreMap.find(u"NoPrettyPrint"_ustr); if (it != aStoreMap.end()) { m_nWishLineLen = -1; m_bPrettyPrint = false; } - it = aStoreMap.find("EmbedImages"); + it = aStoreMap.find(u"EmbedImages"_ustr); if (it != aStoreMap.end()) { bool bVal{}; @@ -309,7 +309,7 @@ void SwHTMLWriter::SetupFilterFromPropertyValues( mbEmbedImages = bVal; } - it = aStoreMap.find("NoLineLimit"); + it = aStoreMap.find(u"NoLineLimit"_ustr); if (it != aStoreMap.end()) { bool bVal{}; @@ -320,7 +320,7 @@ void SwHTMLWriter::SetupFilterFromPropertyValues( } } - it = aStoreMap.find("XHTML"); + it = aStoreMap.find(u"XHTML"_ustr); if (it != aStoreMap.end()) { bool bVal{}; @@ -328,7 +328,7 @@ void SwHTMLWriter::SetupFilterFromPropertyValues( mbXHTML = bVal; } - it = aStoreMap.find("XhtmlNs"); + it = aStoreMap.find(u"XhtmlNs"_ustr); if (it != aStoreMap.end()) { OUString aVal; @@ -345,7 +345,7 @@ void SwHTMLWriter::SetupFilterFromPropertyValues( mbXHTML = true; } - it = aStoreMap.find("LeadingTabWidth"); + it = aStoreMap.find(u"LeadingTabWidth"_ustr); if (it != aStoreMap.end()) { sal_Int32 nVal{}; @@ -353,7 +353,7 @@ void SwHTMLWriter::SetupFilterFromPropertyValues( m_nLeadingTabWidth.emplace(nVal); } - it = aStoreMap.find("PreserveSpaces"); + it = aStoreMap.find(u"PreserveSpaces"_ustr); if (it != aStoreMap.end()) { // Paragraphs with leading/trailing/repeated whitespace will have "white-space: pre-wrap" diff --git a/sw/source/filter/inc/IndexingExportFilter.hxx b/sw/source/filter/inc/IndexingExportFilter.hxx index 82c56dfa9a61..2174af61a060 100644 --- a/sw/source/filter/inc/IndexingExportFilter.hxx +++ b/sw/source/filter/inc/IndexingExportFilter.hxx @@ -50,7 +50,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() override { - return "com.sun.star.comp.Writer.IndexingExportFilter"; + return u"com.sun.star.comp.Writer.IndexingExportFilter"_ustr; } virtual sal_Bool SAL_CALL supportsService(OUString const& rServiceName) override @@ -60,7 +60,7 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { - return { "com.sun.star.document.ExportFilter" }; + return { u"com.sun.star.document.ExportFilter"_ustr }; } }; } diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 56dd36530224..f81c40eaee31 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -82,7 +82,7 @@ ErrCodeMsg SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& r uno::Reference<lang::XMultiServiceFactory> xMultiServiceFactory( comphelper::getProcessServiceFactory()); uno::Reference<uno::XInterface> xInterface( - xMultiServiceFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"), + xMultiServiceFactory->createInstance(u"com.sun.star.comp.Writer.RtfFilter"_ustr), uno::UNO_SET_THROW); uno::Reference<document::XImporter> xImporter(xInterface, uno::UNO_QUERY_THROW); @@ -186,7 +186,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportRTF(SvStream& rStream) uno::Reference<lang::XMultiServiceFactory> xMultiServiceFactory( comphelper::getProcessServiceFactory()); uno::Reference<uno::XInterface> xInterface( - xMultiServiceFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"), + xMultiServiceFactory->createInstance(u"com.sun.star.comp.Writer.RtfFilter"_ustr), uno::UNO_SET_THROW); uno::Reference<document::XImporter> xImporter(xInterface, uno::UNO_QUERY_THROW); diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 16ae089113b8..36b8c91eac94 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -303,7 +303,7 @@ ErrCodeMsg ReadThroughComponent( OSL_ENSURE( xInfoSet.is(), "missing property set" ); if( xInfoSet.is() ) { - xInfoSet->setPropertyValue( "StreamName", Any( sStreamName ) ); + xInfoSet->setPropertyValue( u"StreamName"_ustr, Any( sStreamName ) ); } try @@ -312,7 +312,7 @@ ErrCodeMsg ReadThroughComponent( uno::Reference <io::XStream> xStream = xStorage->openStreamElement( sStreamName, embed::ElementModes::READ ); uno::Reference <beans::XPropertySet > xProps( xStream, uno::UNO_QUERY ); - Any aAny = xProps->getPropertyValue("Encrypted"); + Any aAny = xProps->getPropertyValue(u"Encrypted"_ustr); std::optional<const bool> b = o3tl::tryAccess<bool>(aAny); bool bEncrypted = b.has_value() && *b; @@ -519,64 +519,64 @@ ErrCodeMsg XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, // create XPropertySet with three properties for status indicator static comphelper::PropertyMapEntry const aInfoMap[] = { - { OUString("ProgressRange"), 0, + { u"ProgressRange"_ustr, 0, ::cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressMax"), 0, + { u"ProgressMax"_ustr, 0, ::cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressCurrent"), 0, + { u"ProgressCurrent"_ustr, 0, ::cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("NumberStyles"), 0, + { u"NumberStyles"_ustr, 0, cppu::UnoType<container::XNameContainer>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("RecordChanges"), 0, + { u"RecordChanges"_ustr, 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("ShowChanges"), 0, + { u"ShowChanges"_ustr, 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("RedlineProtectionKey"), 0, + { u"RedlineProtectionKey"_ustr, 0, cppu::UnoType<Sequence<sal_Int8>>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("PrivateData"), 0, + { u"PrivateData"_ustr, 0, cppu::UnoType<XInterface>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("BaseURI"), 0, + { u"BaseURI"_ustr, 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamRelPath"), 0, + { u"StreamRelPath"_ustr, 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamName"), 0, + { u"StreamName"_ustr, 0, ::cppu::UnoType<OUString>::get(), -e ... etc. - the rest is truncated
