diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx index daad28b77feb..7b101b5258c0 100644 --- a/uui/source/authfallbackdlg.cxx +++ b/uui/source/authfallbackdlg.cxx @@ -11,16 +11,16 @@ AuthFallbackDlg::AuthFallbackDlg(weld::Window* pParent, const OUString& instructions, const OUString& url) - : GenericDialogController(pParent, "uui/ui/authfallback.ui", "AuthFallbackDlg") + : GenericDialogController(pParent, u"uui/ui/authfallback.ui"_ustr, u"AuthFallbackDlg"_ustr) , m_bGoogleMode(false) - , m_xTVInstructions(m_xBuilder->weld_label("instructions")) - , m_xEDUrl(m_xBuilder->weld_entry("url")) - , m_xEDCode(m_xBuilder->weld_entry("code")) - , m_xEDGoogleCode(m_xBuilder->weld_entry("google_code")) - , m_xBTOk(m_xBuilder->weld_button("ok")) - , m_xBTCancel(m_xBuilder->weld_button("cancel")) - , m_xGoogleBox(m_xBuilder->weld_widget("GDrive")) - , m_xOneDriveBox(m_xBuilder->weld_widget("OneDrive")) + , m_xTVInstructions(m_xBuilder->weld_label(u"instructions"_ustr)) + , m_xEDUrl(m_xBuilder->weld_entry(u"url"_ustr)) + , m_xEDCode(m_xBuilder->weld_entry(u"code"_ustr)) + , m_xEDGoogleCode(m_xBuilder->weld_entry(u"google_code"_ustr)) + , m_xBTOk(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xBTCancel(m_xBuilder->weld_button(u"cancel"_ustr)) + , m_xGoogleBox(m_xBuilder->weld_widget(u"GDrive"_ustr)) + , m_xOneDriveBox(m_xBuilder->weld_widget(u"OneDrive"_ustr)) { m_xBTOk->connect_clicked(LINK(this, AuthFallbackDlg, OKHdl)); m_xBTCancel->connect_clicked(LINK(this, AuthFallbackDlg, CancelHdl)); diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx index 748a2dc421a2..0aeee3a221f6 100644 --- a/uui/source/fltdlg.cxx +++ b/uui/source/fltdlg.cxx @@ -40,10 +40,11 @@ namespace uui @threadsafe no */ /*-*************************************************************************************************************/ FilterDialog::FilterDialog(weld::Window* pParentWindow) - : GenericDialogController(pParentWindow, "uui/ui/filterselect.ui", "FilterSelectDialog") + : GenericDialogController(pParentWindow, u"uui/ui/filterselect.ui"_ustr, + u"FilterSelectDialog"_ustr) , m_pFilterNames(nullptr) - , m_xFtURL(m_xBuilder->weld_label("url")) - , m_xLbFilters(m_xBuilder->weld_tree_view("filters")) + , m_xFtURL(m_xBuilder->weld_label(u"url"_ustr)) + , m_xLbFilters(m_xBuilder->weld_tree_view(u"filters"_ustr)) { m_xLbFilters->set_size_request(m_xLbFilters->get_approximate_digit_width() * 42, m_xLbFilters->get_height_rows(15)); diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index b2f0bf71be9c..95b3450b9881 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -90,7 +90,7 @@ handleNoSuchFilterRequest_( try { xFilterContainer.set( xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.document.FilterFactory", xContext ), + u"com.sun.star.document.FilterFactory"_ustr, xContext ), uno::UNO_QUERY ); } catch ( uno::Exception const & ) @@ -120,7 +120,7 @@ handleNoSuchFilterRequest_( // out by using DocumentService property later! uno::Reference< container::XEnumeration > xFilters = xFilterContainer->createSubSetEnumerationByQuery( - "_query_all:sort_prop=uiname:iflags=1:eflags=143360"); + u"_query_all:sort_prop=uiname:iflags=1:eflags=143360"_ustr); while (xFilters->hasMoreElements()) { try @@ -129,9 +129,9 @@ handleNoSuchFilterRequest_( uui::FilterNamePair aPair; aPair.sInternal = lProps.getUnpackedValueOrDefault( - "Name", OUString()); + u"Name"_ustr, OUString()); aPair.sUI = lProps.getUnpackedValueOrDefault( - "UIName", OUString()); + u"UIName"_ustr, OUString()); if ( aPair.sInternal.isEmpty() || aPair.sUI.isEmpty() ) { continue; @@ -192,7 +192,7 @@ handleFilterOptionsRequest_( try { xFilterCFG.set( xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.document.FilterFactory", xContext ), + u"com.sun.star.document.FilterFactory"_ustr, xContext ), uno::UNO_QUERY ); } catch ( uno::Exception const & ) diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 57613be71308..298754138990 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -294,7 +294,7 @@ bool UUIInteractionHelper::handleCustomRequest( const Reference< XInteractionReq if ( xHandlerInit.is() ) { ::comphelper::NamedValueCollection aInitArgs; - aInitArgs.put( "Parent", getParentXWindow() ); + aInitArgs.put( u"Parent"_ustr, getParentXWindow() ); xHandlerInit->initialize( aInitArgs.getWrappedPropertyValues() ); } @@ -321,7 +321,7 @@ bool UUIInteractionHelper::handleTypedHandlerImplementations( Reference< XIntera // the base registration node for "typed" interaction handlers const ::utl::OConfigurationTreeRoot aConfigRoot( ::utl::OConfigurationTreeRoot::createWithComponentContext( m_xContext, - "/org.openoffice.Interaction/InteractionHandlers", + u"/org.openoffice.Interaction/InteractionHandlers"_ustr, -1, ::utl::OConfigurationTreeRoot::CM_READONLY ) ); diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index ea6ebf6d36a4..f35c32b126ba 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -77,28 +77,28 @@ public: addPropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*xListener*/ ) override { throw css::uno::RuntimeException( - "UUIInteractionHandler addPropertyChangeListener is not supported"); + u"UUIInteractionHandler addPropertyChangeListener is not supported"_ustr); } virtual void SAL_CALL removePropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*xListener*/ ) override { throw css::uno::RuntimeException( - "UUIInteractionHandler removePropertyChangeListener is not supported"); + u"UUIInteractionHandler removePropertyChangeListener is not supported"_ustr); } virtual void SAL_CALL addVetoableChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*xListener*/ ) override { throw css::uno::RuntimeException( - "UUIInteractionHandler addVetoableChangeListener is not supported"); + u"UUIInteractionHandler addVetoableChangeListener is not supported"_ustr); } virtual void SAL_CALL removeVetoableChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*xListener*/ ) override { throw css::uno::RuntimeException( - "UUIInteractionHandler removeVetoableChangeListener is not supported"); + u"UUIInteractionHandler removeVetoableChangeListener is not supported"_ustr); } virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL @@ -137,7 +137,7 @@ UUIInteractionHandler::UUIInteractionHandler( OUString SAL_CALL UUIInteractionHandler::getImplementationName() { - return "com.sun.star.comp.uui.UUIInteractionHandler"; + return u"com.sun.star.comp.uui.UUIInteractionHandler"_ustr; } sal_Bool SAL_CALL @@ -149,11 +149,11 @@ UUIInteractionHandler::supportsService(OUString const & rServiceName) uno::Sequence< OUString > SAL_CALL UUIInteractionHandler::getSupportedServiceNames() { - return { "com.sun.star.task.InteractionHandler", + return { u"com.sun.star.task.InteractionHandler"_ustr, // added to indicate support for configuration.backend.MergeRecoveryRequest - "com.sun.star.configuration.backend.InteractionHandler", + u"com.sun.star.configuration.backend.InteractionHandler"_ustr, // for backwards compatibility - "com.sun.star.uui.InteractionHandler" }; + u"com.sun.star.uui.InteractionHandler"_ustr }; } void SAL_CALL @@ -171,13 +171,13 @@ UUIInteractionHandler::initialize( (rArguments[1] >>= aContext)))) { ::comphelper::NamedValueCollection aProperties( rArguments ); - if ( aProperties.has( "Parent" ) ) + if ( aProperties.has( u"Parent"_ustr ) ) { - OSL_VERIFY( aProperties.get( "Parent" ) >>= xWindow ); + OSL_VERIFY( aProperties.get( u"Parent"_ustr ) >>= xWindow ); } - if ( aProperties.has( "Context" ) ) + if ( aProperties.has( u"Context"_ustr ) ) { - OSL_VERIFY( aProperties.get( "Context" ) >>= aContext ); + OSL_VERIFY( aProperties.get( u"Context"_ustr ) >>= aContext ); } } diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index cb661c3534c5..4449506b5175 100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -83,13 +83,13 @@ void LoginDialog::SetRequest() OUString aRequest; if (m_xAccountFT->get_visible() && !m_realm.isEmpty()) { - std::unique_ptr xText(m_xBuilder->weld_label(oldPwd ? OUString("wrongloginrealm") : OUString("loginrealm"))); + std::unique_ptr xText(m_xBuilder->weld_label(oldPwd ? u"wrongloginrealm"_ustr : u"loginrealm"_ustr)); aRequest = xText->get_label(); aRequest = aRequest.replaceAll("%2", m_realm); } else { - std::unique_ptr xText(m_xBuilder->weld_label(oldPwd ? OUString("wrongrequestinfo") : OUString("requestinfo"))); + std::unique_ptr xText(m_xBuilder->weld_label(oldPwd ? u"wrongrequestinfo"_ustr : u"requestinfo"_ustr)); aRequest = xText->get_label(); } aRequest = aRequest.replaceAll("%1", m_server); @@ -111,19 +111,19 @@ IMPL_LINK_NOARG(LoginDialog, UseSysCredsHdl_Impl, weld::Toggleable&, void) LoginDialog::LoginDialog(weld::Window* pParent, LoginFlags nFlags, OUString aServer, OUString aRealm) - : GenericDialogController(pParent, "uui/ui/logindialog.ui", "LoginDialog") - , m_xErrorFT(m_xBuilder->weld_label("errorft")) - , m_xErrorInfo(m_xBuilder->weld_label("errorinfo")) - , m_xRequestInfo(m_xBuilder->weld_label("requestinfo")) - , m_xNameFT(m_xBuilder->weld_label("nameft")) - , m_xNameED(m_xBuilder->weld_entry("nameed")) - , m_xPasswordFT(m_xBuilder->weld_label("passwordft")) - , m_xPasswordED(m_xBuilder->weld_entry("passworded")) - , m_xAccountFT(m_xBuilder->weld_label("accountft")) - , m_xAccountED(m_xBuilder->weld_entry("accounted")) - , m_xSavePasswdBtn(m_xBuilder->weld_check_button("remember")) - , m_xUseSysCredsCB(m_xBuilder->weld_check_button("syscreds")) - , m_xOKBtn(m_xBuilder->weld_button("ok")) + : GenericDialogController(pParent, u"uui/ui/logindialog.ui"_ustr, u"LoginDialog"_ustr) + , m_xErrorFT(m_xBuilder->weld_label(u"errorft"_ustr)) + , m_xErrorInfo(m_xBuilder->weld_label(u"errorinfo"_ustr)) + , m_xRequestInfo(m_xBuilder->weld_label(u"requestinfo"_ustr)) + , m_xNameFT(m_xBuilder->weld_label(u"nameft"_ustr)) + , m_xNameED(m_xBuilder->weld_entry(u"nameed"_ustr)) + , m_xPasswordFT(m_xBuilder->weld_label(u"passwordft"_ustr)) + , m_xPasswordED(m_xBuilder->weld_entry(u"passworded"_ustr)) + , m_xAccountFT(m_xBuilder->weld_label(u"accountft"_ustr)) + , m_xAccountED(m_xBuilder->weld_entry(u"accounted"_ustr)) + , m_xSavePasswdBtn(m_xBuilder->weld_check_button(u"remember"_ustr)) + , m_xUseSysCredsCB(m_xBuilder->weld_check_button(u"syscreds"_ustr)) + , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr)) , m_server(std::move(aServer)), m_realm(std::move(aRealm)) { if ( !( nFlags & LoginFlags::NoUseSysCreds ) ) diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index f0c456365646..f38861a04cca 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -72,13 +72,13 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl, weld::Button&, void) } MasterPasswordCreateDialog::MasterPasswordCreateDialog(weld::Window* pParent, const std::locale& rLocale) - : GenericDialogController(pParent, "uui/ui/setmasterpassworddlg.ui", "SetMasterPasswordDialog") + : GenericDialogController(pParent, u"uui/ui/setmasterpassworddlg.ui"_ustr, u"SetMasterPasswordDialog"_ustr) , rResLocale(rLocale) - , m_xEDMasterPasswordCrt(m_xBuilder->weld_entry("password1")) - , m_xPasswordPolicyLabel(m_xBuilder->weld_label("passpolicylabel")) - , m_xEDMasterPasswordRepeat(m_xBuilder->weld_entry("password2")) - , m_xOKBtn(m_xBuilder->weld_button("ok")) - , m_xPasswdStrengthBar(m_xBuilder->weld_level_bar("password1levelbar")) + , m_xEDMasterPasswordCrt(m_xBuilder->weld_entry(u"password1"_ustr)) + , m_xPasswordPolicyLabel(m_xBuilder->weld_label(u"passpolicylabel"_ustr)) + , m_xEDMasterPasswordRepeat(m_xBuilder->weld_entry(u"password2"_ustr)) + , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xPasswdStrengthBar(m_xBuilder->weld_level_bar(u"password1levelbar"_ustr)) , m_oPasswordPolicy(officecfg::Office::Common::Security::Scripting::PasswordPolicy::get()) { m_xOKBtn->set_sensitive(false); diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index 7fcc7f2d7972..14235d77c80a 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -36,9 +36,9 @@ MasterPasswordDialog::MasterPasswordDialog css::task::PasswordRequestMode nDialogMode, const std::locale& rLocale ) - : GenericDialogController(pParent, "uui/ui/masterpassworddlg.ui", "MasterPasswordDialog") - , m_xEDMasterPassword(m_xBuilder->weld_entry("password")) - , m_xOKBtn(m_xBuilder->weld_button("ok")) + : GenericDialogController(pParent, u"uui/ui/masterpassworddlg.ui"_ustr, u"MasterPasswordDialog"_ustr) + , m_xEDMasterPassword(m_xBuilder->weld_entry(u"password"_ustr)) + , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr)) { if( nDialogMode == css::task::PasswordRequestMode_PASSWORD_REENTER ) { diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx index e49174bd688e..aec4e918422c 100644 --- a/uui/source/nameclashdlg.cxx +++ b/uui/source/nameclashdlg.cxx @@ -56,13 +56,13 @@ NameClashDialog::NameClashDialog( weld::Window* pParent, const std::locale& rRes OUString const & rClashingName, OUString const & rProposedNewName, bool bAllowOverwrite ) - : GenericDialogController(pParent, "uui/ui/simplenameclash.ui", "SimpleNameClashDialog") + : GenericDialogController(pParent, u"uui/ui/simplenameclash.ui"_ustr, u"SimpleNameClashDialog"_ustr) , m_aNewName(rClashingName) - , m_xFTMessage(m_xBuilder->weld_label("warning")) - , m_xEDNewName(m_xBuilder->weld_entry("newname")) - , m_xBtnOverwrite(m_xBuilder->weld_button("replace")) - , m_xBtnRename(m_xBuilder->weld_button("rename")) - , m_xBtnCancel(m_xBuilder->weld_button("cancel")) + , m_xFTMessage(m_xBuilder->weld_label(u"warning"_ustr)) + , m_xEDNewName(m_xBuilder->weld_entry(u"newname"_ustr)) + , m_xBtnOverwrite(m_xBuilder->weld_button(u"replace"_ustr)) + , m_xBtnRename(m_xBuilder->weld_button(u"rename"_ustr)) + , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr)) { Link aLink( LINK( this, NameClashDialog, ButtonHdl_Impl ) ); m_xBtnOverwrite->connect_clicked( aLink ); diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx index adcf060a2274..51e86e1b2bbe 100644 --- a/uui/source/openlocked.cxx +++ b/uui/source/openlocked.cxx @@ -48,14 +48,14 @@ IMPL_LINK(OpenLockedQueryBox, ClickHdl, weld::Button&, rButton, void) } OpenLockedQueryBox::OpenLockedQueryBox(weld::Window* pParent, const OUString& rHiddenData, bool bEnableOverride) - : GenericDialogController(pParent, "vcl/ui/openlockedquerybox.ui", "OpenLockedQueryBox") - , mxQuestionMarkImage(m_xBuilder->weld_image("questionmark")) - , mxOpenReadOnlyBtn(m_xBuilder->weld_button("readonly")) - , mxOpenCopyBtn(m_xBuilder->weld_button("opencopy")) - , mxOpenBtn(m_xBuilder->weld_button("open")) - , mxCancelBtn(m_xBuilder->weld_button("cancel")) - , mxNotifyBtn(m_xBuilder->weld_check_button("notify")) - , mxHiddenText(m_xBuilder->weld_label("hiddentext")) + : GenericDialogController(pParent, u"vcl/ui/openlockedquerybox.ui"_ustr, u"OpenLockedQueryBox"_ustr) + , mxQuestionMarkImage(m_xBuilder->weld_image(u"questionmark"_ustr)) + , mxOpenReadOnlyBtn(m_xBuilder->weld_button(u"readonly"_ustr)) + , mxOpenCopyBtn(m_xBuilder->weld_button(u"opencopy"_ustr)) + , mxOpenBtn(m_xBuilder->weld_button(u"open"_ustr)) + , mxCancelBtn(m_xBuilder->weld_button(u"cancel"_ustr)) + , mxNotifyBtn(m_xBuilder->weld_check_button(u"notify"_ustr)) + , mxHiddenText(m_xBuilder->weld_label(u"hiddentext"_ustr)) { //setup click hdl mxOpenReadOnlyBtn->connect_clicked(LINK(this, OpenLockedQueryBox, ClickHdl)); diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx index 80ad1495a72d..6ee43e14b327 100644 --- a/uui/source/passwordcontainer.cxx +++ b/uui/source/passwordcontainer.cxx @@ -290,7 +290,7 @@ PasswordContainerInteractionHandler::~PasswordContainerInteractionHandler() OUString SAL_CALL PasswordContainerInteractionHandler::getImplementationName() { - return "com.sun.star.comp.uui.PasswordContainerInteractionHandler"; + return u"com.sun.star.comp.uui.PasswordContainerInteractionHandler"_ustr; } @@ -307,7 +307,7 @@ PasswordContainerInteractionHandler::supportsService( uno::Sequence< OUString > SAL_CALL PasswordContainerInteractionHandler::getSupportedServiceNames() { - return { "com.sun.star.task.PasswordContainerInteractionHandler" }; + return { u"com.sun.star.task.PasswordContainerInteractionHandler"_ustr }; } diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index fb4c95e623f6..7579a8d6d567 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -32,12 +32,12 @@ using namespace ::com::sun::star; PasswordDialog::PasswordDialog(weld::Window* pParent, task::PasswordRequestMode nDialogMode, const std::locale& rResLocale, const OUString& aDocURL, bool bOpenToModify, bool bIsSimplePasswordRequest) - : GenericDialogController(pParent, "uui/ui/password.ui", "PasswordDialog") - , m_xFTPassword(m_xBuilder->weld_label("newpassFT")) - , m_xEDPassword(m_xBuilder->weld_entry("newpassEntry")) - , m_xFTConfirmPassword(m_xBuilder->weld_label("confirmpassFT")) - , m_xEDConfirmPassword(m_xBuilder->weld_entry("confirmpassEntry")) - , m_xOKBtn(m_xBuilder->weld_button("ok")) + : GenericDialogController(pParent, u"uui/ui/password.ui"_ustr, u"PasswordDialog"_ustr) + , m_xFTPassword(m_xBuilder->weld_label(u"newpassFT"_ustr)) + , m_xEDPassword(m_xBuilder->weld_entry(u"newpassEntry"_ustr)) + , m_xFTConfirmPassword(m_xBuilder->weld_label(u"confirmpassFT"_ustr)) + , m_xEDConfirmPassword(m_xBuilder->weld_entry(u"confirmpassEntry"_ustr)) + , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr)) , nMinLen(1) , aPasswdMismatch(Translate::get(STR_PASSWORD_MISMATCH, rResLocale)) { diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx index baaaf088713c..52a036980f01 100644 --- a/uui/source/requeststringresolver.cxx +++ b/uui/source/requeststringresolver.cxx @@ -39,7 +39,7 @@ UUIInteractionRequestStringResolver::~UUIInteractionRequestStringResolver() OUString SAL_CALL UUIInteractionRequestStringResolver::getImplementationName() { - return "com.sun.star.comp.uui.UUIInteractionRequestStringResolver"; + return u"com.sun.star.comp.uui.UUIInteractionRequestStringResolver"_ustr; } sal_Bool SAL_CALL @@ -53,7 +53,7 @@ UUIInteractionRequestStringResolver::supportsService( uno::Sequence< OUString > SAL_CALL UUIInteractionRequestStringResolver::getSupportedServiceNames() { - return { "com.sun.star.task.InteractionRequestStringResolver" }; + return { u"com.sun.star.task.InteractionRequestStringResolver"_ustr }; } beans::Optional< OUString > SAL_CALL diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 8868e93d5cd2..701bf73721f4 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -40,16 +40,16 @@ using namespace ::com::sun::star; using namespace comphelper; MacroWarning::MacroWarning(weld::Window* pParent, bool _bWithSignatures) - : MessageDialogController(pParent, "uui/ui/macrowarnmedium.ui", "MacroWarnMedium", "grid") - , mxGrid(m_xBuilder->weld_widget("grid")) - , mxSignsFI(m_xBuilder->weld_label("signsLabel")) - , mxNotYetValid(m_xBuilder->weld_label("certNotYetValidLabel")) - , mxNoLongerValid(m_xBuilder->weld_label("certNoLongerValidLabel")) - , mxViewSignsBtn(m_xBuilder->weld_button("viewSignsButton")) - , mxViewCertBtn(m_xBuilder->weld_button("viewCertButton")) - , mxAlwaysTrustCB(m_xBuilder->weld_check_button("alwaysTrustCheckbutton")) - , mxEnableBtn(m_xBuilder->weld_button("ok")) - , mxDisableBtn(m_xBuilder->weld_button("cancel")) + : MessageDialogController(pParent, u"uui/ui/macrowarnmedium.ui"_ustr, u"MacroWarnMedium"_ustr, u"grid"_ustr) + , mxGrid(m_xBuilder->weld_widget(u"grid"_ustr)) + , mxSignsFI(m_xBuilder->weld_label(u"signsLabel"_ustr)) + , mxNotYetValid(m_xBuilder->weld_label(u"certNotYetValidLabel"_ustr)) + , mxNoLongerValid(m_xBuilder->weld_label(u"certNoLongerValidLabel"_ustr)) + , mxViewSignsBtn(m_xBuilder->weld_button(u"viewSignsButton"_ustr)) + , mxViewCertBtn(m_xBuilder->weld_button(u"viewCertButton"_ustr)) + , mxAlwaysTrustCB(m_xBuilder->weld_check_button(u"alwaysTrustCheckbutton"_ustr)) + , mxEnableBtn(m_xBuilder->weld_button(u"ok"_ustr)) + , mxDisableBtn(m_xBuilder->weld_button(u"cancel"_ustr)) , mpInfos ( nullptr ) , mbShowSignatures ( _bWithSignatures ) , mnActSecLevel ( 0 ) @@ -156,7 +156,7 @@ void MacroWarning::EnableOkBtn(bool bEnable) { mxEnableBtn->set_sensitive(bEnable); std::locale aResLocale(Translate::Create("uui")); - mxEnableBtn->set_tooltip_text(bEnable ? "" : Translate::get(STR_VERIFY_CERT, aResLocale)); + mxEnableBtn->set_tooltip_text(bEnable ? u""_ustr : Translate::get(STR_VERIFY_CERT, aResLocale)); } void MacroWarning::SetStorage( const css::uno::Reference < css::embed::XStorage >& rxStore, diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx index be57ea1b2c57..9bd665d1ee0b 100644 --- a/uui/source/sslwarndlg.cxx +++ b/uui/source/sslwarndlg.cxx @@ -34,8 +34,8 @@ IMPL_LINK_NOARG(SSLWarnDialog, ViewCertHdl, weld::Button&, void) SSLWarnDialog::SSLWarnDialog(weld::Window* pParent, const css::uno::Reference< css::security::XCertificate >& rXCert, const css::uno::Reference< css::uno::XComponentContext >& xContext) - : MessageDialogController(pParent, "uui/ui/sslwarndialog.ui", "SSLWarnDialog") - , m_xView(m_xBuilder->weld_button("view")) + : MessageDialogController(pParent, u"uui/ui/sslwarndialog.ui"_ustr, u"SSLWarnDialog"_ustr) + , m_xView(m_xBuilder->weld_button(u"view"_ustr)) , m_xContext(xContext) , m_rXCert(rXCert) { diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index 783e6c3f48a4..c8fa6cc2e14c 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -46,10 +46,11 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl, weld::Button&, void) UnknownAuthDialog::UnknownAuthDialog( weld::Window* pParent, const css::uno::Reference& rXCert, const css::uno::Reference& xContext) - : MessageDialogController(pParent, "uui/ui/unknownauthdialog.ui", "UnknownAuthDialog") - , m_xCommandButtonOK(m_xBuilder->weld_button("ok")) - , m_xView_Certificate(m_xBuilder->weld_button("examine")) - , m_xOptionButtonAccept(m_xBuilder->weld_radio_button("accept")) + : MessageDialogController(pParent, u"uui/ui/unknownauthdialog.ui"_ustr, + u"UnknownAuthDialog"_ustr) + , m_xCommandButtonOK(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xView_Certificate(m_xBuilder->weld_button(u"examine"_ustr)) + , m_xOptionButtonAccept(m_xBuilder->weld_radio_button(u"accept"_ustr)) , m_xContext(xContext) , m_rXCert(rXCert) {