diff options
Diffstat (limited to 'sw/source')
22 files changed, 110 insertions, 110 deletions
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index d6f018e98ac6..a7e3afe845a0 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -117,7 +117,7 @@ void SwAnnotationShell::InitInterface_Impl() { GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, ToolbarId::Text_Toolbox_Sw); - GetStaticInterface()->RegisterPopupMenu("annotation"); + GetStaticInterface()->RegisterPopupMenu(u"annotation"_ustr); } @@ -476,11 +476,11 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) VclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(m_rView.GetFrameWeld(), m_rView, aDlgAttr, SwCharDlgMode::Ann)); if (nSlot == SID_CHAR_DLG_EFFECT) { - pDlg->SetCurPageId("fonteffects"); + pDlg->SetCurPageId(u"fonteffects"_ustr); } if (nSlot == SID_CHAR_DLG_POSITION) { - pDlg->SetCurPageId("position"); + pDlg->SetCurPageId(u"position"_ustr); } else if (pItem) { @@ -1327,7 +1327,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) { Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - "com.sun.star.linguistic2.ChineseTranslationDialog", xContext), + u"com.sun.star.linguistic2.ChineseTranslationDialog"_ustr, xContext), UNO_QUERY); Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY ); if( xInit.is() ) @@ -1352,9 +1352,9 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) { try { - xProp->getPropertyValue( "IsDirectionToSimplified" ) >>= bToSimplified; - xProp->getPropertyValue( "IsUseCharacterVariants" ) >>= bUseVariants; - xProp->getPropertyValue( "IsTranslateCommonTerms" ) >>= bCommonTerms; + xProp->getPropertyValue( u"IsDirectionToSimplified"_ustr ) >>= bToSimplified; + xProp->getPropertyValue( u"IsUseCharacterVariants"_ustr ) >>= bUseVariants; + xProp->getPropertyValue( u"IsTranslateCommonTerms"_ustr ) >>= bCommonTerms; } catch (const Exception&) { diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index cf36bcd7e076..3b7e66f6c465 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -834,10 +834,10 @@ bool UpdateFieldContents(SfxRequest& rReq, SwWrtShell& rWrtSh) break; } comphelper::SequenceAsHashMap aMap(aFields[nFieldIndex++]); - pRefMark->GetRefName() = aMap["Name"].get<OUString>(); + pRefMark->GetRefName() = aMap[u"Name"_ustr].get<OUString>(); auto pTextRefMark = const_cast<SwTextRefMark*>(pRefMark->GetTextRefMark()); - pTextRefMark->UpdateFieldContent(pDoc, rWrtSh, aMap["Content"].get<OUString>()); + pTextRefMark->UpdateFieldContent(pDoc, rWrtSh, aMap[u"Content"_ustr].get<OUString>()); } rWrtSh.EndAction(); @@ -899,9 +899,9 @@ void UpdateFieldContent(SfxRequest& rReq, SwWrtShell& rWrtSh) }); comphelper::SequenceAsHashMap aMap(aField); - rRefmark.GetRefName() = aMap["Name"].get<OUString>(); + rRefmark.GetRefName() = aMap[u"Name"_ustr].get<OUString>(); - OUString aContent = aMap["Content"].get<OUString>(); + OUString aContent = aMap[u"Content"_ustr].get<OUString>(); auto pTextRefMark = const_cast<SwTextRefMark*>(rRefmark.GetTextRefMark()); pTextRefMark->UpdateFieldContent(pDoc, rWrtSh, aContent); } @@ -2330,7 +2330,7 @@ SwBaseShell::SwBaseShell(SwView& rVw) : SwWrtShell& rWrtSh = m_rView.GetWrtShell(); SetPool(&rWrtSh.GetAttrPool()); - SetName("Base"); + SetName(u"Base"_ustr); rWrtSh.SetGrfArrivedLnk( LINK( this, SwBaseShell, GraphicArrivedHdl)); } diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx index 2c4510fd7aa0..3f55ffe15601 100644 --- a/sw/source/uibase/shells/beziersh.cxx +++ b/sw/source/uibase/shells/beziersh.cxx @@ -41,7 +41,7 @@ SFX_IMPL_INTERFACE(SwBezierShell, SwBaseShell) void SwBezierShell::InitInterface_Impl() { - GetStaticInterface()->RegisterPopupMenu("draw"); + GetStaticInterface()->RegisterPopupMenu(u"draw"_ustr); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, ToolbarId::Bezier_Toolbox_Sw); } @@ -50,7 +50,7 @@ void SwBezierShell::InitInterface_Impl() SwBezierShell::SwBezierShell(SwView &_rView): SwBaseShell( _rView ) { - SetName("Bezier"); + SetName(u"Bezier"_ustr); SwWrtShell *pSh = &GetShell(); SdrView* pSdrView = pSh->GetDrawView(); diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index 2abfb9952395..dd93cb847387 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -62,7 +62,7 @@ SFX_IMPL_INTERFACE(SwDrawShell, SwDrawBaseShell) void SwDrawShell::InitInterface_Impl() { - GetStaticInterface()->RegisterPopupMenu("draw"); + GetStaticInterface()->RegisterPopupMenu(u"draw"_ustr); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, ToolbarId::Draw_Toolbox_Sw); @@ -508,7 +508,7 @@ void SwDrawShell::GetState(SfxItemSet& rSet) if (SdrObjCustomShape* pCustomShape = dynamic_cast<SdrObjCustomShape*>( pObj) ) { const SdrCustomShapeGeometryItem& rGeometryItem = pCustomShape->GetMergedItem(SDRATTR_CUSTOMSHAPE_GEOMETRY); - if (const uno::Any* pAny = rGeometryItem.GetPropertyValueByName("Type")) + if (const uno::Any* pAny = rGeometryItem.GetPropertyValueByName(u"Type"_ustr)) // But still disallow fontwork shapes. bDisable = pAny->get<OUString>().startsWith("fontwork-"); } @@ -544,7 +544,7 @@ void SwDrawShell::GetState(SfxItemSet& rSet) SwDrawShell::SwDrawShell(SwView &_rView) : SwDrawBaseShell(_rView) { - SetName("Draw"); + SetName(u"Draw"_ustr); vcl::EnumContext::Context eContext = vcl::EnumContext::Context::Draw; diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx index fcf2eab803d1..fdfe6774fa3f 100644 --- a/sw/source/uibase/shells/drformsh.cxx +++ b/sw/source/uibase/shells/drformsh.cxx @@ -53,7 +53,7 @@ SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell) void SwDrawFormShell::InitInterface_Impl() { - GetStaticInterface()->RegisterPopupMenu("form"); + GetStaticInterface()->RegisterPopupMenu(u"form"_ustr); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, ToolbarId::Text_Toolbox_Sw); } @@ -105,7 +105,7 @@ void SwDrawFormShell::Execute(SfxRequest const &rReq) uno::Reference< beans::XPropertySet > xPropSet(xControlModel, uno::UNO_QUERY); // Can we set a URL to the object? - OUString sTargetURL( "TargetURL" ); + OUString sTargetURL( u"TargetURL"_ustr ); uno::Reference< beans::XPropertySetInfo > xPropInfoSet = xPropSet->getPropertySetInfo(); if( xPropInfoSet->hasPropertyByName( sTargetURL )) { @@ -114,7 +114,7 @@ void SwDrawFormShell::Execute(SfxRequest const &rReq) { uno::Any aTmp; // Yes! - OUString sLabel("Label"); + OUString sLabel(u"Label"_ustr); if( xPropInfoSet->hasPropertyByName(sLabel) ) { aTmp <<= rHLinkItem.GetName(); @@ -131,11 +131,11 @@ void SwDrawFormShell::Execute(SfxRequest const &rReq) if( !rHLinkItem.GetTargetFrame().isEmpty() ) { aTmp <<= rHLinkItem.GetTargetFrame(); - xPropSet->setPropertyValue( "TargetFrame", aTmp ); + xPropSet->setPropertyValue( u"TargetFrame"_ustr, aTmp ); } aTmp <<= form::FormButtonType_URL; - xPropSet->setPropertyValue( "ButtonType", aTmp ); + xPropSet->setPropertyValue( u"ButtonType"_ustr, aTmp ); } } } @@ -181,16 +181,16 @@ void SwDrawFormShell::GetState(SfxItemSet& rSet) uno::Any aTmp; uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - if(xInfo->hasPropertyByName( "ButtonType" )) + if(xInfo->hasPropertyByName( u"ButtonType"_ustr )) { form::FormButtonType eButtonType = form::FormButtonType_URL; - aTmp = xPropSet->getPropertyValue( "ButtonType" ); + aTmp = xPropSet->getPropertyValue( u"ButtonType"_ustr ); if( aTmp >>= eButtonType ) { // Label - if(xInfo->hasPropertyByName( "Label" )) + if(xInfo->hasPropertyByName( u"Label"_ustr )) { - aTmp = xPropSet->getPropertyValue( "Label" ); + aTmp = xPropSet->getPropertyValue( u"Label"_ustr ); OUString sTmp; if( (aTmp >>= sTmp) && !sTmp.isEmpty()) { @@ -199,9 +199,9 @@ void SwDrawFormShell::GetState(SfxItemSet& rSet) } // URL - if(xInfo->hasPropertyByName( "TargetURL" )) + if(xInfo->hasPropertyByName( u"TargetURL"_ustr )) { - aTmp = xPropSet->getPropertyValue( "TargetURL" ); + aTmp = xPropSet->getPropertyValue( u"TargetURL"_ustr ); OUString sTmp; if( (aTmp >>= sTmp) && !sTmp.isEmpty()) { @@ -210,9 +210,9 @@ void SwDrawFormShell::GetState(SfxItemSet& rSet) } // Target - if(xInfo->hasPropertyByName( "TargetFrame" )) + if(xInfo->hasPropertyByName( u"TargetFrame"_ustr )) { - aTmp = xPropSet->getPropertyValue( "TargetFrame" ); + aTmp = xPropSet->getPropertyValue( u"TargetFrame"_ustr ); OUString sTmp; if( (aTmp >>= sTmp) && !sTmp.isEmpty()) { @@ -240,7 +240,7 @@ SwDrawFormShell::SwDrawFormShell(SwView &_rView) : SwDrawBaseShell(_rView) { GetShell().NoEdit(); - SetName("DrawForm"); + SetName(u"DrawForm"_ustr); SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Form)); } diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index 0e5409700ceb..1a8f8640b44a 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -249,7 +249,7 @@ void SwDrawBaseShell::Execute(SfxRequest& rReq) if (rIDSA.get(DocumentSettingId::DO_NOT_MIRROR_RTL_DRAW_OBJS)) { SfxGrabBagItem aItem(RES_CHRATR_GRABBAG); - aItem.GetGrabBag()["DoNotMirrorRtlDrawObjs"] <<= true; + aItem.GetGrabBag()[u"DoNotMirrorRtlDrawObjs"_ustr] <<= true; aSet.Put(aItem); } diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 56b29f14c16e..e3dff9857c0a 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -349,15 +349,15 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) VclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(rView.GetFrameWeld(), rView, aDlgAttr, SwCharDlgMode::Draw)); if (nSlot == SID_CHAR_DLG_EFFECT) { - pDlg->SetCurPageId("fonteffects"); + pDlg->SetCurPageId(u"fonteffects"_ustr); } else if (nSlot == SID_CHAR_DLG_POSITION) { - pDlg->SetCurPageId("position"); + pDlg->SetCurPageId(u"position"_ustr); } else if (nSlot == SID_CHAR_DLG_FOR_PARAGRAPH) { - pDlg->SetCurPageId("font"); + pDlg->SetCurPageId(u"font"_ustr); } else if (pItem) { diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 784ff5b82804..fb5191131e5a 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -80,7 +80,7 @@ SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell) void SwDrawTextShell::InitInterface_Impl() { - GetStaticInterface()->RegisterPopupMenu("drawtext"); + GetStaticInterface()->RegisterPopupMenu(u"drawtext"_ustr); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, ToolbarId::Draw_Text_Toolbox_Sw); @@ -126,7 +126,7 @@ SwDrawTextShell::SwDrawTextShell(SwView &rV) : // Initialize and show cursor to start editing. Init(); - SetName("ObjectText"); + SetName(u"ObjectText"_ustr); SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::DrawText)); } @@ -293,7 +293,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest const &rReq) return; Reference<ui::dialogs::XExecutableDialog> xDialog( - xMCF->createInstanceWithContext("com.sun.star.linguistic2.ChineseTranslationDialog", xContext), UNO_QUERY); + xMCF->createInstanceWithContext(u"com.sun.star.linguistic2.ChineseTranslationDialog"_ustr, xContext), UNO_QUERY); Reference<lang::XInitialization> xInit(xDialog, UNO_QUERY); @@ -320,9 +320,9 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest const &rReq) { try { - xPropertySet->getPropertyValue("IsDirectionToSimplified") >>= bToSimplified; - xPropertySet->getPropertyValue("IsUseCharacterVariants") >>= bUseVariants; - xPropertySet->getPropertyValue("IsTranslateCommonTerms") >>= bCommonTerms; + xPropertySet->getPropertyValue(u"IsDirectionToSimplified"_ustr) >>= bToSimplified; + xPropertySet->getPropertyValue(u"IsUseCharacterVariants"_ustr) >>= bUseVariants; + xPropertySet->getPropertyValue(u"IsTranslateCommonTerms"_ustr) >>= bCommonTerms; } catch (const Exception&) { diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index 765b4855ef8d..612f68383fc9 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -86,7 +86,7 @@ SFX_IMPL_INTERFACE(SwFrameShell, SwBaseShell) void SwFrameShell::InitInterface_Impl() { - GetStaticInterface()->RegisterPopupMenu("frame"); + GetStaticInterface()->RegisterPopupMenu(u"frame"_ustr); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, ToolbarId::Frame_Toolbox); } @@ -155,7 +155,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) if (!pArgs) { // Frame already exists, open frame dialog for editing. - SfxStringItem aDefPage(FN_FORMAT_FRAME_DLG, "columns"); + SfxStringItem aDefPage(FN_FORMAT_FRAME_DLG, u"columns"_ustr); rSh.GetView().GetViewFrame().GetDispatcher()->ExecuteList( FN_FORMAT_FRAME_DLG, SfxCallMode::SYNCHRON|SfxCallMode::RECORD, @@ -514,9 +514,9 @@ void SwFrameShell::Execute(SfxRequest &rReq) SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric) )); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateFrameTabDialog( - nSel & SelectionType::Graphic ? OUString("PictureDialog") : - nSel & SelectionType::Ole ? OUString("ObjectDialog"): - OUString("FrameDialog"), + nSel & SelectionType::Graphic ? u"PictureDialog"_ustr : + nSel & SelectionType::Ole ? u"ObjectDialog"_ustr: + u"FrameDialog"_ustr, GetView().GetViewFrame(), GetView().GetFrameWeld(), aSet, @@ -525,7 +525,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) if ( nSlot == FN_DRAW_WRAP_DLG ) { - pDlg->SetCurPageId("wrap"); + pDlg->SetCurPageId(u"wrap"_ustr); } if ( pDlg->Execute() ) @@ -887,21 +887,21 @@ void SwFrameShell::GetState(SfxItemSet& rSet) case SID_OBJECT_ALIGN_UP : case FN_FRAME_ALIGN_VERT_TOP: { - auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(".uno:AlignTop", aModuleName); + auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(u".uno:AlignTop"_ustr, aModuleName); sNewLabel = vcl::CommandInfoProvider::GetLabelForCommand(aProperties); break; } case SID_OBJECT_ALIGN_MIDDLE: case FN_FRAME_ALIGN_VERT_CENTER: { - auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(".uno:AlignVerticalCenter", aModuleName); + auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(u".uno:AlignVerticalCenter"_ustr, aModuleName); sNewLabel = vcl::CommandInfoProvider::GetLabelForCommand(aProperties); break; } case SID_OBJECT_ALIGN_DOWN: case FN_FRAME_ALIGN_VERT_BOTTOM: { - auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(".uno:AlignBottom", aModuleName); + auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(u".uno:AlignBottom"_ustr, aModuleName); sNewLabel = vcl::CommandInfoProvider::GetLabelForCommand(aProperties); break; } @@ -1062,7 +1062,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) SwFrameShell::SwFrameShell(SwView &_rView) : SwBaseShell( _rView ) { - SetName("Frame"); + SetName(u"Frame"_ustr); // #96392# Use this to announce it is the frame shell who creates the selection. SwTransferable::CreateSelection( _rView.GetWrtShell(), this ); diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index c1421a861df1..ca4e48b179d1 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -99,7 +99,7 @@ SFX_IMPL_INTERFACE(SwGrfShell, SwBaseShell) void SwGrfShell::InitInterface_Impl() { - GetStaticInterface()->RegisterPopupMenu("graphic"); + GetStaticInterface()->RegisterPopupMenu(u"graphic"_ustr); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, ToolbarId::Grafik_Toolbox); } @@ -405,12 +405,12 @@ void SwGrfShell::Execute(SfxRequest &rReq) } SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateFrameTabDialog("PictureDialog", + ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateFrameTabDialog(u"PictureDialog"_ustr, GetView().GetViewFrame(), GetView().GetFrameWeld(), aSet, false)); if (nSlot == FN_DRAW_WRAP_DLG) - pDlg->SetCurPageId("wrap"); + pDlg->SetCurPageId(u"wrap"_ustr); if (pDlg->Execute() == RET_OK) { @@ -1012,7 +1012,7 @@ SwGrfShell::~SwGrfShell() SwGrfShell::SwGrfShell(SwView &_rView) : SwBaseShell(_rView) { - SetName("Graphic"); + SetName(u"Graphic"_ustr); SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Graphic)); } diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx index 654fb8364daf..de3f438f18db 100644 --- a/sw/source/uibase/shells/grfshex.cxx +++ b/sw/source/uibase/shells/grfshex.cxx @@ -83,7 +83,7 @@ bool SwTextShell::InsertMediaDlg( SfxRequest const & rReq ) avmedia::MediaWindow::dispatchInsertAVMedia(xDispatchProvider, aSize, aURL, bLink); })); - const bool bIsMediaURL = ::avmedia::MediaWindow::isMediaURL(aURL, "", true, xPlayerListener); + const bool bIsMediaURL = ::avmedia::MediaWindow::isMediaURL(aURL, u""_ustr, true, xPlayerListener); rWindow.LeaveWait(); @@ -138,7 +138,7 @@ bool SwTextShell::InsertMediaDlg( SfxRequest const & rReq ) *rSh.GetDoc()->getIDocumentDrawModelAccess().GetDrawModel(), tools::Rectangle(aPos, aSize)); - pObj->setURL( realURL, "" ); + pObj->setURL( realURL, u""_ustr ); rSh.EnterStdMode(); rSh.SwFEShell::InsertDrawObj( *pObj, aPos ); bRet = true; diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx index b7c2f44828f8..3bcdd618d0e5 100644 --- a/sw/source/uibase/shells/langhelper.cxx +++ b/sw/source/uibase/shells/langhelper.cxx @@ -71,7 +71,7 @@ namespace SwLangHelper aKeyboardLang = SvtLanguageTable::GetLanguageString( nLang ); // get the language that is in use - OUString aCurrentLang("*"); + OUString aCurrentLang(u"*"_ustr); SfxItemSet aSet(pOLV->GetAttribs()); nLang = SwLangHelper::GetCurrentLanguage( aSet,nScriptType ); if (nLang != LANGUAGE_DONTKNOW) diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx index 0fe21755cc02..2590f8dd4d60 100644 --- a/sw/source/uibase/shells/listsh.cxx +++ b/sw/source/uibase/shells/listsh.cxx @@ -242,7 +242,7 @@ void SwListShell::GetState(SfxItemSet &rSet) SwListShell::SwListShell(SwView &_rView) : SwBaseShell(_rView) { - SetName("List"); + SetName(u"List"_ustr); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx index ab3628bfe10e..b714cbbcfba0 100644 --- a/sw/source/uibase/shells/mediash.cxx +++ b/sw/source/uibase/shells/mediash.cxx @@ -37,7 +37,7 @@ SFX_IMPL_INTERFACE(SwMediaShell, SwBaseShell) void SwMediaShell::InitInterface_Impl() { - GetStaticInterface()->RegisterPopupMenu("media"); + GetStaticInterface()->RegisterPopupMenu(u"media"_ustr); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, ToolbarId::Media_Toolbox); @@ -92,7 +92,7 @@ void SwMediaShell::GetMediaState(SfxItemSet& rSet) SwMediaShell::SwMediaShell(SwView& _rView) : SwBaseShell(_rView) { - SetName("Media Playback"); + SetName(u"Media Playback"_ustr); SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Media)); } diff --git a/sw/source/uibase/shells/navsh.cxx b/sw/source/uibase/shells/navsh.cxx index c34bebdbc71e..feebd98586ca 100644 --- a/sw/source/uibase/shells/navsh.cxx +++ b/sw/source/uibase/shells/navsh.cxx @@ -26,7 +26,7 @@ void SwNavigationShell::InitInterface_Impl() {} SwNavigationShell::SwNavigationShell(SwView& _rView) : SwBaseShell(_rView) { - SetName("Navigation"); + SetName(u"Navigation"_ustr); } void SwNavigationShell::Execute(SfxRequest const& rReq) diff --git a/sw/source/uibase/shells/olesh.cxx b/sw/source/uibase/shells/olesh.cxx index 28e8e153eeb1..60bf35538470 100644 --- a/sw/source/uibase/shells/olesh.cxx +++ b/sw/source/uibase/shells/olesh.cxx @@ -49,7 +49,7 @@ SFX_IMPL_INTERFACE(SwOleShell, SwFrameShell) void SwOleShell::InitInterface_Impl() { - GetStaticInterface()->RegisterPopupMenu("oleobject"); + GetStaticInterface()->RegisterPopupMenu(u"oleobject"_ustr); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, ToolbarId::Ole_Toolbox); } @@ -88,7 +88,7 @@ SwOleShell::SwOleShell(SwView &_rView) : SwFrameShell(_rView) { - SetName("Object"); + SetName(u"Object"_ustr); SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::OLE)); } diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 63857cfea12f..2fa9db78f6cb 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -93,7 +93,7 @@ SFX_IMPL_INTERFACE(SwTableShell, SwBaseShell) void SwTableShell::InitInterface_Impl() { - GetStaticInterface()->RegisterPopupMenu("table"); + GetStaticInterface()->RegisterPopupMenu(u"table"_ustr); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, ToolbarId::Table_Toolbox); } @@ -1726,7 +1726,7 @@ void SwTableShell::GetState(SfxItemSet &rSet) SwTableShell::SwTableShell(SwView &_rView) : SwBaseShell(_rView) { - SetName("Table"); + SetName(u"Table"_ustr); SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Table)); } diff --git a/sw/source/uibase/shells/textdrw.cxx b/sw/source/uibase/shells/textdrw.cxx index 881468c5d717..a4d075daef3b 100644 --- a/sw/source/uibase/shells/textdrw.cxx +++ b/sw/source/uibase/shells/textdrw.cxx @@ -85,7 +85,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, uno::Any aTmp; aTmp <<= rText; - xPropSet->setPropertyValue( "Label", aTmp ); + xPropSet->setPropertyValue( u"Label"_ustr, aTmp ); SfxMedium* pMedium = rSh.GetView().GetDocShell()->GetMedium(); INetURLObject aAbs; @@ -93,23 +93,23 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, aAbs = pMedium->GetURLObject(); aTmp <<= URIHelper::SmartRel2Abs(aAbs, rURL); - xPropSet->setPropertyValue( "TargetURL", aTmp ); + xPropSet->setPropertyValue( u"TargetURL"_ustr, aTmp ); if( !rTarget.isEmpty() ) { aTmp <<= rTarget; - xPropSet->setPropertyValue( "TargetFrame", aTmp ); + xPropSet->setPropertyValue( u"TargetFrame"_ustr, aTmp ); } aTmp <<= form::FormButtonType_URL; - xPropSet->setPropertyValue( "ButtonType", aTmp ); + xPropSet->setPropertyValue( u"ButtonType"_ustr, aTmp ); #if HAVE_FEATURE_AVMEDIA - if ( ::avmedia::MediaWindow::isMediaURL( rURL, ""/*TODO?*/ ) ) + if ( ::avmedia::MediaWindow::isMediaURL( rURL, u""_ustr/*TODO?*/ ) ) { // #105638# OJ aTmp <<= true; - xPropSet->setPropertyValue("DispatchURLInternal", aTmp ); + xPropSet->setPropertyValue(u"DispatchURLInternal"_ustr, aTmp ); } #endif } diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index cec8afc3f76c..bd0861ace3f0 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -1005,7 +1005,7 @@ FIELD_INSERT: } comphelper::SequenceAsHashMap aMap(aFields[nFieldIndex++]); - itParam->second = aMap["FieldCommand"]; + itParam->second = aMap[u"FieldCommand"_ustr]; SwPaM aPaM(pFieldmark->GetMarkPos(), pFieldmark->GetOtherMarkPos()); aPaM.Normalize(); // Skip field start & separator. @@ -1014,7 +1014,7 @@ FIELD_INSERT: aPaM.GetMark()->AdjustContent(-1); rSh.GetDoc()->getIDocumentContentOperations().DeleteAndJoin(aPaM); OUString aFieldResult; - aMap["FieldResult"] >>= aFieldResult; + aMap[u"FieldResult"_ustr] >>= aFieldResult; SwTranslateHelper::PasteHTMLToPaM(rSh, &aPaM, aFieldResult.toUtf8()); } @@ -1292,7 +1292,7 @@ FIELD_INSERT: aMgr.InsertField(aData); if (pDlg->GetIncludePageTotal()) { - rDoc->getIDocumentContentOperations().InsertString(*rSh.GetCursor(), " / "); + rDoc->getIDocumentContentOperations().InsertString(*rSh.GetCursor(), u" / "_ustr); SwInsertField_Data aPageTotalData(SwFieldTypesEnum::DocumentStatistics, DS_PAGE, OUString(), OUString(), SVX_NUM_PAGEDESC); aMgr.InsertField(aPageTotalData); @@ -1346,7 +1346,7 @@ FIELD_INSERT: aEvenMgr.InsertField(aData); if (pDlg->GetIncludePageTotal()) { - rDoc->getIDocumentContentOperations().InsertString(*rSh.GetCursor(), " / "); + rDoc->getIDocumentContentOperations().InsertString(*rSh.GetCursor(), u" / "_ustr); SwInsertField_Data aPageTotalData(SwFieldTypesEnum::DocumentStatistics, DS_PAGE, OUString(), OUString(), SVX_NUM_PAGEDESC); @@ -1424,7 +1424,7 @@ FIELD_INSERT: rSh.GetDoc()->GetIDocumentUndoRedo().StartUndo(SwUndoId::UPDATE_FORM_FIELD, nullptr); rSh.StartAction(); comphelper::SequenceAsHashMap aMap(aField); - itParam->second = aMap["FieldCommand"]; + itParam->second = aMap[u"FieldCommand"_ustr]; SwPaM aPaM(pFieldmark->GetMarkPos(), pFieldmark->GetOtherMarkPos()); aPaM.Normalize(); // Skip field start & separator. @@ -1433,7 +1433,7 @@ FIELD_INSERT: aPaM.GetMark()->AdjustContent(-1); rSh.GetDoc()->getIDocumentContentOperations().DeleteAndJoin(aPaM); OUString aFieldResult; - aMap["FieldResult"] >>= aFieldResult; + aMap[u"FieldResult"_ustr] >>= aFieldResult; SwTranslateHelper::PasteHTMLToPaM(rSh, &aPaM, aFieldResult.toUtf8()); rSh.EndAction(); diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 77f300367f50..d6d9f5acfd28 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -119,7 +119,7 @@ IMPL_STATIC_LINK( SwTextShell, DialogClosedHdl, css::ui::dialogs::DialogClosedEv void SwTextShell::InitInterface_Impl() { - GetStaticInterface()->RegisterPopupMenu("text"); + GetStaticInterface()->RegisterPopupMenu(u"text"_ustr); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, ToolbarId::Text_Toolbox_Sw); @@ -333,27 +333,27 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) if ( pMarginItem ) aMargin = pMarginItem->GetSize(); - xSet->setPropertyValue("FrameURL", uno::Any( pURLItem->GetValue() ) ); + xSet->setPropertyValue(u"FrameURL"_ustr, uno::Any( pURLItem->GetValue() ) ); if ( pNameItem ) - xSet->setPropertyValue("FrameName", uno::Any( pNameItem->GetValue() ) ); + xSet->setPropertyValue(u"FrameName"_ustr, uno::Any( pNameItem->GetValue() ) ); 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 ) ); if ( pBorderItem ) - xSet->setPropertyValue("FrameIsBorder", + xSet->setPropertyValue(u"FrameIsBorder"_ustr, uno::Any( pBorderItem->GetValue() ) ); if ( pMarginItem ) { - 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() ) ) ); } } @@ -529,7 +529,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) FieldUnit eMetric = ::GetDfltMetric(dynamic_cast<SwWebDocShell*>( GetView().GetDocShell()) != nullptr ); SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - VclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateFrameTabDialog("FrameDialog", + VclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateFrameTabDialog(u"FrameDialog"_ustr, GetView().GetViewFrame(), GetView().GetFrameWeld(), aSet)); @@ -906,7 +906,7 @@ void SwTextShell::ExecRotateTransliteration( SfxRequest const & rReq ) SwTextShell::SwTextShell(SwView &_rView) : SwBaseShell(_rView) { - SetName("Text"); + SetName(u"Text"_ustr); SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Text)); } diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 4606b6228bbc..a51c7f6432be 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -185,13 +185,13 @@ static void sw_CharDialog(SwWrtShell& rWrtSh, bool bUseDialog, bool bApplyToPara pDlg.reset(pFact->CreateSwCharDlg(rWrtSh.GetView().GetFrameWeld(), rWrtSh.GetView(), *pCoreSet, SwCharDlgMode::Std)); if (nSlot == FN_INSERT_HYPERLINK) - pDlg->SetCurPageId("hyperlink"); + pDlg->SetCurPageId(u"hyperlink"_ustr); else if (nSlot == SID_CHAR_DLG_EFFECT) - pDlg->SetCurPageId("fonteffects"); + pDlg->SetCurPageId(u"fonteffects"_ustr); else if (nSlot == SID_CHAR_DLG_POSITION) - pDlg->SetCurPageId("position"); + pDlg->SetCurPageId(u"position"_ustr); else if (nSlot == SID_CHAR_DLG_FOR_PARAGRAPH) - pDlg->SetCurPageId("font"); + pDlg->SetCurPageId(u"font"_ustr); else if (pReq) { const SfxStringItem* pItem = (*pReq).GetArg<SfxStringItem>(FN_PARAM_1); @@ -448,7 +448,7 @@ void UpdateSections(SfxRequest& rReq, SwWrtShell& rWrtSh) } comphelper::SequenceAsHashMap aMap(aSections[nSectionIndex++]); - OUString aSectionName = aMap["RegionName"].get<OUString>(); + OUString aSectionName = aMap[u"RegionName"_ustr].get<OUString>(); if (aSectionName != pFormat->GetName()) { const_cast<SwSectionFormat*>(pFormat)->SetFormatName(aSectionName, /*bBroadcast=*/true); @@ -469,7 +469,7 @@ void UpdateSections(SfxRequest& rReq, SwWrtShell& rWrtSh) rIDCO.DeleteAndJoin(*pCursorPos); rWrtSh.EndSelect(); - OUString aSectionText = aMap["Content"].get<OUString>(); + OUString aSectionText = aMap[u"Content"_ustr].get<OUString>(); SwTranslateHelper::PasteHTMLToPaM(rWrtSh, pCursorPos, aSectionText.toUtf8()); } } @@ -563,17 +563,17 @@ void UpdateBookmarks(SfxRequest& rReq, SwWrtShell& rWrtSh) } comphelper::SequenceAsHashMap aMap(aBookmarks[nBookmarkIndex++]); - if (aMap["Bookmark"].get<OUString>() != pMark->GetName()) + if (aMap[u"Bookmark"_ustr].get<OUString>() != pMark->GetName()) { - rIDMA.renameMark(pMark, aMap["Bookmark"].get<OUString>()); + rIDMA.renameMark(pMark, aMap[u"Bookmark"_ustr].get<OUString>()); } - OUString aBookmarkText = aMap["BookmarkText"].get<OUString>(); + OUString aBookmarkText = aMap[u"BookmarkText"_ustr].get<OUString>(); // Insert markers to remember where the paste positions are. SwPaM aMarkers(pMark->GetMarkEnd()); IDocumentContentOperations& rIDCO = rWrtSh.GetDoc()->getIDocumentContentOperations(); - bool bSuccess = rIDCO.InsertString(aMarkers, "XY"); + bool bSuccess = rIDCO.InsertString(aMarkers, u"XY"_ustr); if (bSuccess) { SwPaM aPasteEnd(pMark->GetMarkEnd()); @@ -650,15 +650,15 @@ void UpdateBookmark(SfxRequest& rReq, SwWrtShell& rWrtSh) comphelper::SequenceAsHashMap aMap(aBookmark); - if (aMap["Bookmark"].get<OUString>() != pBookmark->GetName()) + if (aMap[u"Bookmark"_ustr].get<OUString>() != pBookmark->GetName()) { - rIDMA.renameMark(pBookmark, aMap["Bookmark"].get<OUString>()); + rIDMA.renameMark(pBookmark, aMap[u"Bookmark"_ustr].get<OUString>()); } // Insert markers to remember where the paste positions are. SwPaM aMarkers(pBookmark->GetMarkEnd()); IDocumentContentOperations& rIDCO = rWrtSh.GetDoc()->getIDocumentContentOperations(); - if (!rIDCO.InsertString(aMarkers, "XY")) + if (!rIDCO.InsertString(aMarkers, u"XY"_ustr)) { return; } @@ -666,7 +666,7 @@ void UpdateBookmark(SfxRequest& rReq, SwWrtShell& rWrtSh) SwPaM aPasteEnd(pBookmark->GetMarkEnd()); aPasteEnd.Move(fnMoveForward, GoInContent); - OUString aBookmarkText = aMap["BookmarkText"].get<OUString>(); + OUString aBookmarkText = aMap[u"BookmarkText"_ustr].get<OUString>(); // Paste HTML content. SwPaM* pCursorPos = rWrtSh.GetCursor(); @@ -1660,7 +1660,7 @@ void SwTextShell::Execute(SfxRequest &rReq) { // MigrateItemSet guarantees unique gradient names SfxItemSetFixed<XATTR_FILLGRADIENT, XATTR_FILLGRADIENT> aMigrateSet(rWrtSh.GetView().GetPool()); - aMigrateSet.Put(XFillGradientItem("gradient", pTempGradItem->GetGradientValue())); + aMigrateSet.Put(XFillGradientItem(u"gradient"_ustr, pTempGradItem->GetGradientValue())); SdrModel::MigrateItemSet(&aMigrateSet, pSet, pDrawModel); } @@ -1670,7 +1670,7 @@ void SwTextShell::Execute(SfxRequest &rReq) if (pTempHatchItem && pTempHatchItem->GetName().isEmpty()) { SfxItemSetFixed<XATTR_FILLHATCH, XATTR_FILLHATCH> aMigrateSet(rWrtSh.GetView().GetPool()); - aMigrateSet.Put(XFillHatchItem("hatch", pTempHatchItem->GetHatchValue())); + aMigrateSet.Put(XFillHatchItem(u"hatch"_ustr, pTempHatchItem->GetHatchValue())); SdrModel::MigrateItemSet(&aMigrateSet, pSet, pDrawModel); } @@ -1916,7 +1916,7 @@ void SwTextShell::Execute(SfxRequest &rReq) if (pField && pField->GetTyp()->Which() == SwFieldIds::TableOfAuthorities) { const auto& rAuthorityField = *static_cast<const SwAuthorityField*>(pField); - OUString targetURL = ""; + OUString targetURL = u""_ustr; if (auto targetType = rAuthorityField.GetTargetType(); targetType == SwAuthorityField::TargetType::UseDisplayURL @@ -2253,7 +2253,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) aKeyboardLang = SvtLanguageTable::GetLanguageString( nLang ); // get the language that is in use - OUString aCurrentLang = "*"; + OUString aCurrentLang = u"*"_ustr; nLang = SwLangHelper::GetCurrentLanguage( rSh ); if (nLang != LANGUAGE_DONTKNOW) { @@ -2526,14 +2526,14 @@ void SwTextShell::GetState( SfxItemSet &rSet ) std::vector<OUString> aList; static constexpr OUStringLiteral sPhysical(u"IsPhysical"); static constexpr OUStringLiteral sDisplay(u"DisplayName"); - const OUString sHeaderOn(nWhich == FN_INSERT_PAGEHEADER ? OUString("HeaderIsOn") : OUString("FooterIsOn")); + const OUString sHeaderOn(nWhich == FN_INSERT_PAGEHEADER ? u"HeaderIsOn"_ustr : u"FooterIsOn"_ustr); uno::Reference< XStyleFamiliesSupplier > xSupplier(GetView().GetDocShell()->GetBaseModel(), uno::UNO_QUERY); if (xSupplier.is()) { uno::Reference< XNameContainer > xContainer; uno::Reference< XNameAccess > xFamilies = xSupplier->getStyleFamilies(); - if (xFamilies->getByName("PageStyles") >>= xContainer) + if (xFamilies->getByName(u"PageStyles"_ustr) >>= xContainer) { const uno::Sequence< OUString > aSeqNames = xContainer->getElementNames(); for (const auto& rName : aSeqNames) @@ -2558,7 +2558,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) } if (bAllState && aList.size() > 1) - aList.push_back("_ALL_"); + aList.push_back(u"_ALL_"_ustr); rSet.Put(SfxStringListItem(nWhich, &aList)); } diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx index 1ef46f09ab45..86aa9a6b224e 100644 --- a/sw/source/uibase/shells/txtnum.cxx +++ b/sw/source/uibase/shells/txtnum.cxx @@ -323,7 +323,7 @@ void SwTextShell::ExecSetNumber(SfxRequest const &rReq) { // no outline provided: launch dialog to request a specific outline SfxBindings& rBindings = GetView().GetViewFrame().GetBindings(); - const SfxStringItem aPage(FN_PARAM_1, "outlinenum"); + const SfxStringItem aPage(FN_PARAM_1, u"outlinenum"_ustr); const SfxPoolItem* aItems[] = { &aPage, nullptr }; rBindings.Execute(SID_OUTLINE_BULLET, aItems); } |