diff options
Diffstat (limited to 'extensions/source/propctrlr')
37 files changed, 205 insertions, 202 deletions
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index 4f4e6d9a97f1..117d7c7da1ce 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -43,13 +43,13 @@ namespace pcr OUString SAL_CALL MasterDetailLinkDialog::getImplementationName() { - return "org.openoffice.comp.form.ui.MasterDetailLinkDialog"; + return u"org.openoffice.comp.form.ui.MasterDetailLinkDialog"_ustr; } css::uno::Sequence<OUString> SAL_CALL MasterDetailLinkDialog::getSupportedServiceNames() { - return { "com.sun.star.form.MasterDetailLinkDialog" }; + return { u"com.sun.star.form.MasterDetailLinkDialog"_ustr }; } diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index f4619000dcf8..8e7d3e0699e6 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -54,11 +54,11 @@ namespace pcr OBrowserLine::OBrowserLine(OUString aEntryName, weld::Container* pParent, weld::SizeGroup* pLabelGroup, weld::Container* pInitialControlParent) : m_sEntryName(std::move(aEntryName)) - , m_xBuilder(Application::CreateBuilder(pParent, "modules/spropctrlr/ui/browserline.ui")) - , m_xContainer(m_xBuilder->weld_container("BrowserLine")) - , m_xFtTitle(m_xBuilder->weld_label("label")) - , m_xBrowseButton(m_xBuilder->weld_button("browse")) - , m_xAdditionalBrowseButton(m_xBuilder->weld_button("morebrowse")) + , m_xBuilder(Application::CreateBuilder(pParent, u"modules/spropctrlr/ui/browserline.ui"_ustr)) + , m_xContainer(m_xBuilder->weld_container(u"BrowserLine"_ustr)) + , m_xFtTitle(m_xBuilder->weld_label(u"label"_ustr)) + , m_xBrowseButton(m_xBuilder->weld_button(u"browse"_ustr)) + , m_xAdditionalBrowseButton(m_xBuilder->weld_button(u"morebrowse"_ustr)) , m_pInitialControlParent(pInitialControlParent) // controls start with this as their parent and need to be moved into m_xContainer , m_pParent(pParent) , m_pControlWindow( nullptr ) @@ -177,7 +177,7 @@ namespace pcr { OUStringBuffer aText(m_xFtTitle->get_label()); - int n10DotsWidth = m_xFtTitle->get_pixel_size("..........").Width(); + int n10DotsWidth = m_xFtTitle->get_pixel_size(u".........."_ustr).Width(); int nTextWidth = m_xFtTitle->get_pixel_size(OUString::unacquired(aText)).Width(); int nDiff = m_nNameWidth - nTextWidth; int nExtraChars = (nDiff * 10) / n10DotsWidth; @@ -314,7 +314,7 @@ namespace pcr Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create(xContext) ); - Sequence aMediaProperties{ comphelper::makePropertyValue("URL", rImageURL) }; + Sequence aMediaProperties{ comphelper::makePropertyValue(u"URL"_ustr, rImageURL) }; xGraphic = Reference<XGraphic>(xGraphicProvider->queryGraphic(aMediaProperties), css::uno::UNO_SET_THROW); } @@ -366,7 +366,7 @@ namespace pcr void OBrowserLine::SetTitleWidth(sal_uInt16 nWidth) { - int nMinDotsWidth = m_xFtTitle->get_pixel_size("...").Width(); + int nMinDotsWidth = m_xFtTitle->get_pixel_size(u"..."_ustr).Width(); if (m_nNameWidth != nWidth + nMinDotsWidth) m_nNameWidth = nWidth + nMinDotsWidth; FullFillTitleString(); diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index b48fc7fa227e..1ae4650a26bb 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -297,8 +297,8 @@ namespace pcr } OBrowserListBox::OBrowserListBox(weld::Builder& rBuilder, weld::Container* pContainer) - : m_xScrolledWindow(rBuilder.weld_scrolled_window("scrolledwindow")) - , m_xLinesPlayground(rBuilder.weld_container("playground")) + : m_xScrolledWindow(rBuilder.weld_scrolled_window(u"scrolledwindow"_ustr)) + , m_xLinesPlayground(rBuilder.weld_container(u"playground"_ustr)) , m_xSizeGroup(rBuilder.create_size_group()) , m_xHelpWindow(new InspectorHelpWindow(rBuilder)) , m_pInitialControlParent(pContainer) diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx index 5502418bd0e2..610315c18fb5 100644 --- a/extensions/source/propctrlr/browserpage.cxx +++ b/extensions/source/propctrlr/browserpage.cxx @@ -24,8 +24,8 @@ namespace pcr { OBrowserPage::OBrowserPage(weld::Container* pParent, weld::Container* pInitialControlContainer) : m_pParent(pParent) - , m_xBuilder(Application::CreateBuilder(pParent, "modules/spropctrlr/ui/browserpage.ui")) - , m_xContainer(m_xBuilder->weld_container("BrowserPage")) + , m_xBuilder(Application::CreateBuilder(pParent, u"modules/spropctrlr/ui/browserpage.ui"_ustr)) + , m_xContainer(m_xBuilder->weld_container(u"BrowserPage"_ustr)) , m_xListBox(new OBrowserListBox(*m_xBuilder, pInitialControlContainer)) { } diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index 43ed02a952d6..2aa0c7b93422 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -47,13 +47,13 @@ namespace pcr OUString ButtonNavigationHandler::getImplementationName( ) { - return "com.sun.star.comp.extensions.ButtonNavigationHandler"; + return u"com.sun.star.comp.extensions.ButtonNavigationHandler"_ustr; } Sequence< OUString > ButtonNavigationHandler::getSupportedServiceNames( ) { - return { "com.sun.star.form.inspection.ButtonNavigationHandler" }; + return { u"com.sun.star.form.inspection.ButtonNavigationHandler"_ustr }; } diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index bd1628192eb8..b1acab9ccbce 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -52,13 +52,13 @@ namespace pcr OUString CellBindingPropertyHandler::getImplementationName( ) { - return "com.sun.star.comp.extensions.CellBindingPropertyHandler"; + return u"com.sun.star.comp.extensions.CellBindingPropertyHandler"_ustr; } Sequence< OUString > CellBindingPropertyHandler::getSupportedServiceNames( ) { - return { "com.sun.star.form.inspection.CellBindingPropertyHandler" }; + return { u"com.sun.star.form.inspection.CellBindingPropertyHandler"_ustr }; } diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index 33da88b14ff4..4b587813534b 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -66,13 +66,13 @@ namespace pcr OUString SAL_CALL OControlFontDialog::getImplementationName() { - return "org.openoffice.comp.form.ui.OControlFontDialog"; + return u"org.openoffice.comp.form.ui.OControlFontDialog"_ustr; } css::uno::Sequence<OUString> SAL_CALL OControlFontDialog::getSupportedServiceNames() { - return { "com.sun.star.form.ControlFontDialog" }; + return { u"com.sun.star.form.ControlFontDialog"_ustr }; } void OControlFontDialog::initialize( const Sequence< Any >& aArguments ) @@ -80,7 +80,7 @@ namespace pcr Reference<XPropertySet> xGridModel; if (aArguments.getLength() == 1 && (aArguments[0] >>= xGridModel)) { - Sequence aNewArguments{ Any(comphelper::makePropertyValue("IntrospectedObject", + Sequence aNewArguments{ Any(comphelper::makePropertyValue(u"IntrospectedObject"_ustr, xGridModel)) }; OControlFontDialog_DBase::initialize(aNewArguments); } diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 3fa7fa5658a5..d6336eccf957 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -57,13 +57,13 @@ namespace pcr OUString SAL_CALL DefaultFormComponentInspectorModel::getImplementationName( ) { - return "org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"; + return u"org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"_ustr; } Sequence< OUString > SAL_CALL DefaultFormComponentInspectorModel::getSupportedServiceNames( ) { - return { "com.sun.star.form.inspection.DefaultFormComponentInspectorModel" }; + return { u"com.sun.star.form.inspection.DefaultFormComponentInspectorModel"_ustr }; } diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index 96c99af67e27..d087c474cae2 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -62,12 +62,12 @@ namespace pcr Sequence< OUString > SAL_CALL DefaultHelpProvider::getSupportedServiceNames() { - return { "com.sun.star.inspection.DefaultHelpProvider" }; + return { u"com.sun.star.inspection.DefaultHelpProvider"_ustr }; } OUString SAL_CALL DefaultHelpProvider::getImplementationName() { - return "org.openoffice.comp.extensions.DefaultHelpProvider"; + return u"org.openoffice.comp.extensions.DefaultHelpProvider"_ustr; } sal_Bool SAL_CALL DefaultHelpProvider::supportsService(const OUString& aServiceName) diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index 272e24428e20..1cc655736508 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -60,13 +60,13 @@ namespace pcr OUString EditPropertyHandler::getImplementationName( ) { - return "com.sun.star.comp.extensions.EditPropertyHandler"; + return u"com.sun.star.comp.extensions.EditPropertyHandler"_ustr; } Sequence< OUString > EditPropertyHandler::getSupportedServiceNames( ) { - return { "com.sun.star.form.inspection.EditPropertyHandler" }; + return { u"com.sun.star.form.inspection.EditPropertyHandler"_ustr }; } @@ -279,7 +279,7 @@ namespace pcr _rxInspectorUI->enablePropertyUI( PROPERTY_LINEEND_FORMAT, nTextType != TextType::SINGLELINE ); _rxInspectorUI->enablePropertyUI( PROPERTY_VERTICAL_ALIGN, nTextType == TextType::SINGLELINE ); - _rxInspectorUI->showCategory( "Data", nTextType != TextType::RICHTEXT ); + _rxInspectorUI->showCategory( u"Data"_ustr, nTextType != TextType::RICHTEXT ); } break; diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 68e8ebb4f423..59c97ac12c92 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -64,13 +64,13 @@ namespace pcr OUString EFormsPropertyHandler::getImplementationName( ) { - return "com.sun.star.comp.extensions.EFormsPropertyHandler"; + return u"com.sun.star.comp.extensions.EFormsPropertyHandler"_ustr; } Sequence< OUString > EFormsPropertyHandler::getSupportedServiceNames( ) { - return { "com.sun.star.form.inspection.XMLFormsPropertyHandler" }; + return { u"com.sun.star.form.inspection.XMLFormsPropertyHandler"_ustr }; } @@ -483,7 +483,7 @@ namespace pcr try { Reference< XExecutableDialog > xDialog; - xDialog.set( m_xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.xforms.ui.dialogs.AddCondition", m_xContext ), UNO_QUERY ); + xDialog.set( m_xContext->getServiceManager()->createInstanceWithContext( u"com.sun.star.xforms.ui.dialogs.AddCondition"_ustr, m_xContext ), UNO_QUERY ); Reference< XPropertySet > xDialogProps( xDialog, UNO_QUERY_THROW ); // the model for the dialog to work with @@ -498,15 +498,15 @@ namespace pcr if ( !xModel.is() || !xBinding.is() || sFacetName.isEmpty() ) return InteractiveSelectionResult_Cancelled; - xDialogProps->setPropertyValue("FormModel", Any( xModel ) ); - xDialogProps->setPropertyValue("Binding", Any( xBinding ) ); - xDialogProps->setPropertyValue("FacetName", Any( sFacetName ) ); + xDialogProps->setPropertyValue(u"FormModel"_ustr, Any( xModel ) ); + xDialogProps->setPropertyValue(u"Binding"_ustr, Any( xBinding ) ); + xDialogProps->setPropertyValue(u"FacetName"_ustr, Any( sFacetName ) ); if ( !xDialog->execute() ) // cancelled return InteractiveSelectionResult_Cancelled; - _rData = xDialogProps->getPropertyValue("ConditionValue"); + _rData = xDialogProps->getPropertyValue(u"ConditionValue"_ustr); return InteractiveSelectionResult_ObtainedValue; } catch( const Exception& ) diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 7e4ca0747cb4..fe497681203f 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -362,8 +362,8 @@ namespace pcr ::comphelper::NamedValueCollection aExtractor( aScriptDescriptor ); - pos->second.ScriptType = aExtractor.getOrDefault( "EventType", OUString() ); - pos->second.ScriptCode = aExtractor.getOrDefault( "Script", OUString() ); + pos->second.ScriptType = aExtractor.getOrDefault( u"EventType"_ustr, OUString() ); + pos->second.ScriptCode = aExtractor.getOrDefault( u"Script"_ustr, OUString() ); } Any SAL_CALL EventHolder::getByName( const OUString& _rName ) @@ -371,8 +371,8 @@ namespace pcr ScriptEventDescriptor aDescriptor( impl_getDescriptor_throw( _rName ) ); Sequence< PropertyValue > aScriptDescriptor{ - comphelper::makePropertyValue("EventType", aDescriptor.ScriptType), - comphelper::makePropertyValue("Script", aDescriptor.ScriptCode) + comphelper::makePropertyValue(u"EventType"_ustr, aDescriptor.ScriptType), + comphelper::makePropertyValue(u"Script"_ustr, aDescriptor.ScriptCode) }; return Any( aScriptDescriptor ); @@ -433,7 +433,7 @@ namespace pcr OUString SAL_CALL EventHandler::getImplementationName( ) { - return "com.sun.star.comp.extensions.EventHandler"; + return u"com.sun.star.comp.extensions.EventHandler"_ustr; } sal_Bool SAL_CALL EventHandler::supportsService( const OUString& ServiceName ) @@ -443,7 +443,7 @@ namespace pcr Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames( ) { - return { "com.sun.star.form.inspection.EventHandler" }; + return { u"com.sun.star.form.inspection.EventHandler"_ustr }; } void SAL_CALL EventHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) @@ -591,8 +591,8 @@ namespace pcr aComposeBuffer.append( xScriptUri->getName() ); // location - const OUString sLocation = xScriptUri->getParameter( "location" ); - const OUString sLanguage = xScriptUri->getParameter( "language" ); + const OUString sLocation = xScriptUri->getParameter( u"location"_ustr ); + const OUString sLanguage = xScriptUri->getParameter( u"language"_ustr ); if ( !(sLocation.isEmpty() && sLanguage.isEmpty()) ) { diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 78dd50c8475d..f9bc9bd93b61 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -199,11 +199,11 @@ namespace pcr //= ControlCharacterDialog ControlCharacterDialog::ControlCharacterDialog(weld::Window* pParent, const SfxItemSet& _rCoreSet) - : SfxTabDialogController(pParent, "modules/spropctrlr/ui/controlfontdialog.ui", "ControlFontDialog", &_rCoreSet) + : SfxTabDialogController(pParent, u"modules/spropctrlr/ui/controlfontdialog.ui"_ustr, u"ControlFontDialog"_ustr, &_rCoreSet) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - AddTabPage("font", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), nullptr ); - AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr ); + AddTabPage(u"font"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), nullptr ); + AddTabPage(u"fonteffects"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr ); } ControlCharacterDialog::~ControlCharacterDialog() @@ -545,7 +545,7 @@ namespace pcr // just to be sure... _rpSet = nullptr; _rpPool = nullptr; - _rpPool = new SfxItemPool("PCRControlFontItemPool"); + _rpPool = new SfxItemPool(u"PCRControlFontItemPool"_ustr); _rpPool->registerItemInfoPackage( getItemInfoPackageCntChrDlg(), [&rFontList](sal_uInt16 nWhich) diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 1b36dd64e387..9933ce2f9dce 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -159,13 +159,13 @@ namespace pcr OUString FormComponentPropertyHandler::getImplementationName( ) { - return "com.sun.star.comp.extensions.FormComponentPropertyHandler"; + return u"com.sun.star.comp.extensions.FormComponentPropertyHandler"_ustr; } Sequence< OUString > FormComponentPropertyHandler::getSupportedServiceNames( ) { - return { "com.sun.star.form.inspection.FormComponentPropertyHandler" }; + return { u"com.sun.star.form.inspection.FormComponentPropertyHandler"_ustr }; } namespace { @@ -221,7 +221,7 @@ namespace pcr Reference< resource::XStringResourceResolver > xStringResourceResolver; try { - xStringResourceResolver.set( _xComponent->getPropertyValue( "ResourceResolver" ),UNO_QUERY); + xStringResourceResolver.set( _xComponent->getPropertyValue( u"ResourceResolver"_ustr ),UNO_QUERY); if( xStringResourceResolver.is() && xStringResourceResolver->getLocales().hasElements() ) { @@ -993,8 +993,8 @@ namespace pcr case PROPERTY_ID_TARGET_URL: case PROPERTY_ID_IMAGE_URL: { - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/urlcontrol.ui", m_xContext)); - auto pURLBox = std::make_unique<SvtURLBox>(xBuilder->weld_combo_box("urlcontrol")); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/urlcontrol.ui"_ustr, m_xContext)); + auto pURLBox = std::make_unique<SvtURLBox>(xBuilder->weld_combo_box(u"urlcontrol"_ustr)); rtl::Reference<OFileUrlControl> pControl = new OFileUrlControl(std::move(pURLBox), std::move(xBuilder), false); pControl->SetModifyHandler(); aDescriptor.Control = pControl; @@ -1094,8 +1094,8 @@ namespace pcr if ( bIsFormatKey ) { - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/formattedsample.ui", m_xContext)); - auto pContainer = xBuilder->weld_container("formattedsample"); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/formattedsample.ui"_ustr, m_xContext)); + auto pContainer = xBuilder->weld_container(u"formattedsample"_ustr); rtl::Reference<OFormatSampleControl> pControl = new OFormatSampleControl(std::move(pContainer), std::move(xBuilder), false); pControl->SetModifyHandler(); @@ -1107,8 +1107,8 @@ namespace pcr } else { - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/formattedcontrol.ui", m_xContext)); - auto pSpinButton = xBuilder->weld_formatted_spin_button("formattedcontrol"); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/formattedcontrol.ui"_ustr, m_xContext)); + auto pSpinButton = xBuilder->weld_formatted_spin_button(u"formattedcontrol"_ustr); rtl::Reference<OFormattedNumericControl> pControl = new OFormattedNumericControl(std::move(pSpinButton), std::move(xBuilder), false); pControl->SetModifyHandler(); @@ -1146,8 +1146,8 @@ namespace pcr case PROPERTY_ID_DEFAULT_VALUE: case PROPERTY_ID_VALUE: { - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/formattedcontrol.ui", m_xContext)); - auto pSpinButton = xBuilder->weld_formatted_spin_button("formattedcontrol"); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/formattedcontrol.ui"_ustr, m_xContext)); + auto pSpinButton = xBuilder->weld_formatted_spin_button(u"formattedcontrol"_ustr); rtl::Reference<OFormattedNumericControl> pControl = new OFormattedNumericControl(std::move(pSpinButton), std::move(xBuilder), false); pControl->SetModifyHandler(); aDescriptor.Control = pControl; @@ -1279,8 +1279,8 @@ namespace pcr { case PROPERTY_ID_REPEAT_DELAY: { - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/numericfield.ui", m_xContext)); - auto pSpinButton = xBuilder->weld_metric_spin_button("numericfield", FieldUnit::MILLISECOND); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/numericfield.ui"_ustr, m_xContext)); + auto pSpinButton = xBuilder->weld_metric_spin_button(u"numericfield"_ustr, FieldUnit::MILLISECOND); rtl::Reference<ONumericControl> pControl = new ONumericControl(std::move(pSpinButton), std::move(xBuilder), bReadOnly); pControl->SetModifyHandler(); pControl->setMinValue( Optional< double >( true, 0 ) ); @@ -2381,7 +2381,7 @@ namespace pcr if ( !m_xRowSetConnection.is() ) { uno::Reference<sdbc::XConnection> xConnection; - Any any = m_xContext->getValueByName( "ActiveConnection" ); + Any any = m_xContext->getValueByName( u"ActiveConnection"_ustr ); any >>= xConnection; m_xRowSetConnection.reset(xConnection,::dbtools::SharedConnection::NoTakeOwnership); } @@ -2627,11 +2627,11 @@ namespace pcr // initialize the dialog Reference< XPropertySet > xDialogProps( xDialog, UNO_QUERY_THROW ); - xDialogProps->setPropertyValue("QueryComposer", Any( xComposer ) ); - xDialogProps->setPropertyValue("RowSet", Any( m_xComponent ) ); + xDialogProps->setPropertyValue(u"QueryComposer"_ustr, Any( xComposer ) ); + xDialogProps->setPropertyValue(u"RowSet"_ustr, Any( m_xComponent ) ); if (auto pTopLevel = impl_getDefaultDialogFrame_nothrow()) - xDialogProps->setPropertyValue("ParentWindow", Any(pTopLevel->GetXWindow())); - xDialogProps->setPropertyValue("Title", Any( sPropertyUIName ) ); + xDialogProps->setPropertyValue(u"ParentWindow"_ustr, Any(pTopLevel->GetXWindow())); + xDialogProps->setPropertyValue(u"Title"_ustr, Any( sPropertyUIName ) ); _rClearBeforeDialog.clear(); bSuccess = ( xDialog->execute() != 0 ); @@ -2687,7 +2687,7 @@ namespace pcr Reference< XUnoTunnel > xTunnel( xSupplier, UNO_QUERY_THROW ); SvNumberFormatsSupplierObj* pSupplier = reinterpret_cast< SvNumberFormatsSupplierObj* >( xTunnel->getSomething( SvNumberFormatsSupplierObj::getUnoTunnelId() ) ); - DBG_ASSERT( pSupplier != nullptr, "FormComponentPropertyHandler::impl_dialogFormatting_nothrow: invalid call !" ); + assert(pSupplier && "FormComponentPropertyHandler::impl_dialogFormatting_nothrow: invalid call !"); sal_Int32 nFormatKey = 0; impl_getPropertyValue_throw( PROPERTY_FORMATKEY ) >>= nFormatKey; @@ -2700,7 +2700,7 @@ namespace pcr // a tab dialog with a single page SfxSingleTabDialogController aDialog(impl_getDefaultDialogFrame_nothrow(), &aCoreSet, - "cui/ui/formatnumberdialog.ui", "FormatNumberDialog"); + u"cui/ui/formatnumberdialog.ui"_ustr, u"FormatNumberDialog"_ustr); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ); if ( !fnCreatePage ) @@ -2865,7 +2865,7 @@ namespace pcr weld::Window* pWin = impl_getDefaultDialogFrame_nothrow(); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, FileDialogFlags::NONE, - "sdatabase", SfxFilterFlags::NONE, SfxFilterFlags::NONE, pWin); + u"sdatabase"_ustr, SfxFilterFlags::NONE, SfxFilterFlags::NONE, pWin); OUString sDataSource; if( ! (impl_getPropertyValue_throw( PROPERTY_DATASOURCE ) >>= sDataSource) ) @@ -2876,7 +2876,7 @@ namespace pcr // is considered to be potentially expensive aFileDlg.SetDisplayDirectory( sDataSource ); - std::shared_ptr<const SfxFilter> pFilter = SfxFilter::GetFilterByName("StarOffice XML (Base)"); + std::shared_ptr<const SfxFilter> pFilter = SfxFilter::GetFilterByName(u"StarOffice XML (Base)"_ustr); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); if ( pFilter ) { @@ -2923,7 +2923,7 @@ namespace pcr Reference< XControlContainer > FormComponentPropertyHandler::impl_getContextControlContainer_nothrow() const { Reference< XControlContainer > xControlContext; - Any any = m_xContext->getValueByName( "ControlContext" ); + Any any = m_xContext->getValueByName( u"ControlContext"_ustr ); any >>= xControlContext; return xControlContext; } diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index f2daf2dbd329..8ebfe136dac7 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -230,8 +230,8 @@ extensions_propctrlr_FormController_get_implementation( css::uno::XComponentContext* context , css::uno::Sequence<css::uno::Any> const&) { return cppu::acquire(new pcr::FormController( context, - "org.openoffice.comp.extensions.FormController", - { "com.sun.star.form.PropertyBrowserController" }, + u"org.openoffice.comp.extensions.FormController"_ustr, + { u"com.sun.star.form.PropertyBrowserController"_ustr }, true ) ); } @@ -240,8 +240,8 @@ extensions_propctrlr_DialogController_get_implementation( css::uno::XComponentContext* context , css::uno::Sequence<css::uno::Any> const&) { return cppu::acquire(new pcr::FormController( context, - "org.openoffice.comp.extensions.DialogController", - { "com.sun.star.awt.PropertyBrowserController" }, + u"org.openoffice.comp.extensions.DialogController"_ustr, + { u"com.sun.star.awt.PropertyBrowserController"_ustr }, false ) ); } diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index b07cd7eb145e..65e47f0a09b2 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -304,7 +304,7 @@ namespace pcr if ( !xCheckGrid.is() ) { Reference< XMap > xControlMap; - Any any = m_xContext->getValueByName( "ControlShapeAccess" ); + Any any = m_xContext->getValueByName( u"ControlShapeAccess"_ustr ); any >>= xControlMap; m_xAssociatedShape.set( xControlMap->get( Any( xControlModel ) ), UNO_QUERY_THROW ); m_xShapeProperties.set( m_xAssociatedShape, UNO_QUERY_THROW ); @@ -323,13 +323,13 @@ namespace pcr OUString FormGeometryHandler::getImplementationName( ) { - return "com.sun.star.comp.extensions.FormGeometryHandler"; + return u"com.sun.star.comp.extensions.FormGeometryHandler"_ustr; } Sequence< OUString > FormGeometryHandler::getSupportedServiceNames( ) { - return { "com.sun.star.form.inspection.FormGeometryHandler" }; + return { u"com.sun.star.form.inspection.FormGeometryHandler"_ustr }; } @@ -608,7 +608,7 @@ namespace pcr if ( !xPSI->hasPropertyByName( PROPERTY_ANCHOR ) ) return false; Reference< XServiceInfo > xSI( m_xAssociatedShape, UNO_QUERY_THROW ); - if ( xSI->supportsService("com.sun.star.sheet.Shape") ) + if ( xSI->supportsService(u"com.sun.star.sheet.Shape"_ustr) ) return true; } catch( const Exception& ) diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 605837c5d1b3..440b47b93310 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -138,25 +138,25 @@ namespace pcr const OUString& _sExplanation, OUString _sDetailLabel, OUString _sMasterLabel) - : GenericDialogController(_pParent, "modules/spropctrlr/ui/formlinksdialog.ui", "FormLinks") + : GenericDialogController(_pParent, u"modules/spropctrlr/ui/formlinksdialog.ui"_ustr, u"FormLinks"_ustr) , m_xContext ( _rxContext ) , m_xDetailForm( _rxDetailForm ) , m_xMasterForm( _rxMasterForm ) , m_sDetailLabel(std::move(_sDetailLabel)) , m_sMasterLabel(std::move(_sMasterLabel)) - , m_xExplanation(m_xBuilder->weld_label("explanationLabel")) - , m_xDetailLabel(m_xBuilder->weld_label("detailLabel")) - , m_xMasterLabel(m_xBuilder->weld_label("masterLabel")) - , m_xRow1(std::make_unique<FieldLinkRow>(m_xBuilder->weld_combo_box("detailCombobox1"), - m_xBuilder->weld_combo_box("masterCombobox1"))) - , m_xRow2(std::make_unique<FieldLinkRow>(m_xBuilder->weld_combo_box("detailCombobox2"), - m_xBuilder->weld_combo_box("masterCombobox2"))) - , m_xRow3(std::make_unique<FieldLinkRow>(m_xBuilder->weld_combo_box("detailCombobox3"), - m_xBuilder->weld_combo_box("masterCombobox3"))) - , m_xRow4(std::make_unique<FieldLinkRow>(m_xBuilder->weld_combo_box("detailCombobox4"), - m_xBuilder->weld_combo_box("masterCombobox4"))) - , m_xOK(m_xBuilder->weld_button("ok")) - , m_xSuggest(m_xBuilder->weld_button("suggestButton")) + , m_xExplanation(m_xBuilder->weld_label(u"explanationLabel"_ustr)) + , m_xDetailLabel(m_xBuilder->weld_label(u"detailLabel"_ustr)) + , m_xMasterLabel(m_xBuilder->weld_label(u"masterLabel"_ustr)) + , m_xRow1(std::make_unique<FieldLinkRow>(m_xBuilder->weld_combo_box(u"detailCombobox1"_ustr), + m_xBuilder->weld_combo_box(u"masterCombobox1"_ustr))) + , m_xRow2(std::make_unique<FieldLinkRow>(m_xBuilder->weld_combo_box(u"detailCombobox2"_ustr), + m_xBuilder->weld_combo_box(u"masterCombobox2"_ustr))) + , m_xRow3(std::make_unique<FieldLinkRow>(m_xBuilder->weld_combo_box(u"detailCombobox3"_ustr), + m_xBuilder->weld_combo_box(u"masterCombobox3"_ustr))) + , m_xRow4(std::make_unique<FieldLinkRow>(m_xBuilder->weld_combo_box(u"detailCombobox4"_ustr), + m_xBuilder->weld_combo_box(u"masterCombobox4"_ustr))) + , m_xOK(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xSuggest(m_xBuilder->weld_button(u"suggestButton"_ustr)) { m_xRow1->Show(); m_xRow2->Show(); @@ -494,7 +494,7 @@ namespace pcr { xKeys->getByIndex( key ) >>= xKey; sal_Int32 nKeyType = 0; - xKey->getPropertyValue("Type") >>= nKeyType; + xKey->getPropertyValue(u"Type"_ustr) >>= nKeyType; if ( nKeyType != KeyType::FOREIGN ) continue; @@ -518,7 +518,7 @@ namespace pcr if ( xKeyColumn.is() ) { xKeyColumn->getPropertyValue( PROPERTY_NAME ) >>= sColumnName; - xKeyColumn->getPropertyValue("RelatedColumn") >>= sRelatedColumnName; + xKeyColumn->getPropertyValue(u"RelatedColumn"_ustr) >>= sRelatedColumnName; _rLeftFields[ column ] = sColumnName; _rRightFields[ column ] = sRelatedColumnName; diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index c6e1e0d6020e..025b03886220 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -413,7 +413,7 @@ namespace pcr if (_nId == PROPERTY_ID_SUBMIT_METHOD) { - return { "Get", "Post" }; + return { u"Get"_ustr, u"Post"_ustr }; } const TranslateId* pStringItemsResId = nullptr; std::size_t nElements = 0; @@ -569,7 +569,7 @@ namespace pcr // Initialization if(!s_pPropertyInfos) getPropertyInfo(); - OPropertyInfoImpl aSearch(_rName, 0, OUString(), 0, "", 0); + OPropertyInfoImpl aSearch(_rName, 0, OUString(), 0, u""_ustr, 0); const OPropertyInfoImpl* pInfo = std::lower_bound( s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch, PropertyInfoLessByName() ); @@ -588,7 +588,10 @@ namespace pcr { // Initialization if(!s_pPropertyInfos) + { getPropertyInfo(); + assert(s_pPropertyInfos); + } // TODO: a real structure which allows quick access by name as well as by id for (std::size_t i = 0; i < s_nCount; ++i) diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 322bc3405143..fc91e007ae36 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -93,7 +93,7 @@ namespace pcr if ( _rxContext.is() ) { Reference< XHierarchicalNameAccess > xTypeDescProv( - _rxContext->getValueByName("/singletons/com.sun.star.reflection.theTypeDescriptionManager"), + _rxContext->getValueByName(u"/singletons/com.sun.star.reflection.theTypeDescriptionManager"_ustr), UNO_QUERY_THROW ); m_xTypeDescription.set( xTypeDescProv->getByHierarchicalName( m_aEnumType.getTypeName() ), UNO_QUERY_THROW ); @@ -250,7 +250,7 @@ namespace pcr Reference< XDesktop2 > xDispProv = Desktop::create( m_xContext ); Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aURL, OUString(), 0 ), UNO_SET_THROW ); - Sequence aDispatchArgs{ comphelper::makePropertyValue("URL", _rURL) }; + Sequence aDispatchArgs{ comphelper::makePropertyValue(u"URL"_ustr, _rURL) }; xDispatch->dispatch( aURL, aDispatchArgs ); } @@ -271,7 +271,7 @@ namespace pcr OUString SAL_CALL GenericPropertyHandler::getImplementationName( ) { - return "com.sun.star.comp.extensions.GenericPropertyHandler"; + return u"com.sun.star.comp.extensions.GenericPropertyHandler"_ustr; } sal_Bool SAL_CALL GenericPropertyHandler::supportsService( const OUString& ServiceName ) @@ -281,7 +281,7 @@ namespace pcr Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames( ) { - return { "com.sun.star.inspection.GenericPropertyHandler" }; + return { u"com.sun.star.inspection.GenericPropertyHandler"_ustr }; } void SAL_CALL GenericPropertyHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) @@ -306,7 +306,7 @@ namespace pcr Reference< XIntrospectionAccess > xIntrospectionAccess( xIntrospection->inspect( Any( _rxIntrospectee ) ) ); if ( !xIntrospectionAccess.is() ) - throw RuntimeException("The introspection service could not handle the given component.", *this ); + throw RuntimeException(u"The introspection service could not handle the given component."_ustr, *this ); m_xComponent.set( xIntrospectionAccess->queryAdapter( cppu::UnoType<XPropertySet>::get() ), UNO_QUERY_THROW ); // now that we survived so far, remember m_xComponentIntrospectionAccess diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 77743c622ad7..d810ab4aa711 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -268,7 +268,7 @@ namespace pcr Reference< XInterface > PropertyHandlerHelper::getContextDocument_throw( const Reference<XComponentContext> & rContext ) { Reference< XInterface > xI; - Any aReturn = rContext->getValueByName( "ContextDocument" ); + Any aReturn = rContext->getValueByName( u"ContextDocument"_ustr ); aReturn >>= xI; return xI; } @@ -278,7 +278,7 @@ namespace pcr weld::Window* pInspectorWindow = nullptr; try { - Reference< XWindow > xInspectorWindow(rContext->getValueByName( "DialogParentWindow" ), UNO_QUERY_THROW); + Reference< XWindow > xInspectorWindow(rContext->getValueByName( u"DialogParentWindow"_ustr ), UNO_QUERY_THROW); pInspectorWindow = Application::GetFrameWeld(xInspectorWindow); } catch( const Exception& ) @@ -290,7 +290,7 @@ namespace pcr std::unique_ptr<weld::Builder> PropertyHandlerHelper::makeBuilder(const OUString& rUIFile, const Reference<XComponentContext>& rContext) { - Reference<XWindow> xWindow(rContext->getValueByName("BuilderParent"), UNO_QUERY_THROW); + Reference<XWindow> xWindow(rContext->getValueByName(u"BuilderParent"_ustr), UNO_QUERY_THROW); weld::TransportAsXWindow& rTunnel = dynamic_cast<weld::TransportAsXWindow&>(*xWindow); return Application::CreateBuilder(rTunnel.getWidget(), rUIFile); } @@ -299,13 +299,13 @@ namespace pcr { Reference<css::container::XNameContainer> xName(rContext, UNO_QUERY_THROW); Reference<XWindow> xWindow(new weld::TransportAsXWindow(pParent)); - xName->insertByName("BuilderParent", Any(xWindow)); + xName->insertByName(u"BuilderParent"_ustr, Any(xWindow)); } void PropertyHandlerHelper::clearBuilderParent(const css::uno::Reference<css::uno::XComponentContext>& rContext) { Reference<css::container::XNameContainer> xName(rContext, UNO_QUERY_THROW); - xName->removeByName("BuilderParent"); + xName->removeByName(u"BuilderParent"_ustr); } } // namespace pcr diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx index a57c4ffedbaf..c1f7e6dc5734 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.cxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx @@ -23,8 +23,8 @@ namespace pcr { //= InspectorHelpWindow InspectorHelpWindow::InspectorHelpWindow(weld::Builder& rBuilder) - : m_xHelpFrame(rBuilder.weld_widget("helpframe")) - , m_xHelpText(rBuilder.weld_text_view("helptext")) + : m_xHelpFrame(rBuilder.weld_widget(u"helpframe"_ustr)) + , m_xHelpText(rBuilder.weld_text_view(u"helptext"_ustr)) { } diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index aaa994e94abd..92504c243061 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.cxx @@ -96,25 +96,25 @@ namespace pcr ,m_bIsReadOnly( false ) { registerProperty( - "HasHelpSection", + u"HasHelpSection"_ustr, static_cast<sal_Int32>(ModelPropertyId::HAS_HELP_SECTION), PropertyAttribute::READONLY, &m_bHasHelpSection, cppu::UnoType<decltype(m_bHasHelpSection)>::get() ); registerProperty( - "MinHelpTextLines", + u"MinHelpTextLines"_ustr, static_cast<sal_Int32>(ModelPropertyId::MIN_HELP_TEXT_LINES), PropertyAttribute::READONLY, &m_nMinHelpTextLines, cppu::UnoType<decltype(m_nMinHelpTextLines)>::get() ); registerProperty( - "MaxHelpTextLines", + u"MaxHelpTextLines"_ustr, static_cast<sal_Int32>(ModelPropertyId::MAX_HELP_TEXT_LINES), PropertyAttribute::READONLY, &m_nMaxHelpTextLines, cppu::UnoType<decltype(m_nMaxHelpTextLines)>::get() ); registerProperty( - "IsReadOnly", + u"IsReadOnly"_ustr, static_cast<sal_Int32>(ModelPropertyId::IS_READ_ONLY), PropertyAttribute::BOUND, &m_bIsReadOnly, cppu::UnoType<decltype(m_bIsReadOnly)>::get() diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index 521afdf449fa..3de89eac76c4 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -31,11 +31,11 @@ namespace pcr ListSelectionDialog::ListSelectionDialog(weld::Window* pParent, const Reference< XPropertySet >& _rxListBox, OUString _sPropertyName, const OUString& _rPropertyUIName) - : GenericDialogController(pParent, "modules/spropctrlr/ui/listselectdialog.ui", "ListSelectDialog") + : GenericDialogController(pParent, u"modules/spropctrlr/ui/listselectdialog.ui"_ustr, u"ListSelectDialog"_ustr) , m_xListBox ( _rxListBox ) , m_sPropertyName(std::move( _sPropertyName )) - , m_xFrame(m_xBuilder->weld_frame("frame")) - , m_xEntries(m_xBuilder->weld_tree_view("treeview")) + , m_xFrame(m_xBuilder->weld_frame(u"frame"_ustr)) + , m_xEntries(m_xBuilder->weld_tree_view(u"treeview"_ustr)) { OSL_PRECOND( m_xListBox.is(), "ListSelectionDialog::ListSelectionDialog: invalid list box!" ); diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index b2399d680668..648f05199b4d 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -27,10 +27,10 @@ namespace pcr NewDataTypeDialog::NewDataTypeDialog(weld::Window* pParent, std::u16string_view _rNameBase, const std::vector< OUString >& _rProhibitedNames) - : GenericDialogController(pParent, "modules/spropctrlr/ui/datatypedialog.ui", "DataTypeDialog") + : GenericDialogController(pParent, u"modules/spropctrlr/ui/datatypedialog.ui"_ustr, u"DataTypeDialog"_ustr) , m_aProhibitedNames( _rProhibitedNames.begin(), _rProhibitedNames.end() ) - , m_xName(m_xBuilder->weld_entry("entry")) - , m_xOK(m_xBuilder->weld_button("ok")) + , m_xName(m_xBuilder->weld_entry(u"entry"_ustr)) + , m_xOK(m_xBuilder->weld_button(u"ok"_ustr)) { m_xName->connect_changed(LINK(this, NewDataTypeDialog, OnNameModified)); diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index a05d9347f979..d62b5ba3321b 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -139,19 +139,19 @@ namespace pcr OUString SAL_CALL ObjectInspectorModel::getImplementationName( ) { - return "org.openoffice.comp.extensions.ObjectInspectorModel"; + return u"org.openoffice.comp.extensions.ObjectInspectorModel"_ustr; } Sequence< OUString > SAL_CALL ObjectInspectorModel::getSupportedServiceNames( ) { - return { "com.sun.star.inspection.ObjectInspectorModel" }; + return { u"com.sun.star.inspection.ObjectInspectorModel"_ustr }; } void ObjectInspectorModel::createDefault() { - m_aFactories = { Any(OUString( "com.sun.star.inspection.GenericPropertyHandler" )) }; + m_aFactories = { Any(u"com.sun.star.inspection.GenericPropertyHandler"_ustr) }; } diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index f36aedf39d76..ef5ff1903f1e 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -70,13 +70,13 @@ namespace pcr OUString SAL_CALL OTabOrderDialog::getImplementationName() { - return "org.openoffice.comp.form.ui.OTabOrderDialog"; + return u"org.openoffice.comp.form.ui.OTabOrderDialog"_ustr; } css::uno::Sequence<OUString> SAL_CALL OTabOrderDialog::getSupportedServiceNames() { - return { "com.sun.star.form.ui.TabOrderDialog", "com.sun.star.form.TabOrderDialog" }; + return { u"com.sun.star.form.ui.TabOrderDialog"_ustr, u"com.sun.star.form.TabOrderDialog"_ustr }; } @@ -112,15 +112,15 @@ namespace pcr { Sequence< Any > aNewArguments{ Any(NamedValue( - "TabbingModel", + u"TabbingModel"_ustr, Any( xTabbingModel ) )), Any(NamedValue( - "ControlContext", + u"ControlContext"_ustr, Any( xControlContext ) )), Any(NamedValue( - "ParentWindow", + u"ParentWindow"_ustr, Any( xParentWindow ) )) }; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index f6a37893a11b..c8704c702e24 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -183,7 +183,7 @@ namespace pcr = _bDoListen ? &XPropertySet::addPropertyChangeListener : &XPropertySet::removePropertyChangeListener; (xModelProperties.get()->*pListenerOperation)( - OUString( "IsReadOnly" ), + u"IsReadOnly"_ustr, const_cast< OPropertyBrowserController* >( this ) ); } @@ -316,7 +316,7 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); if (_rxFrame.is() && haveView()) - throw RuntimeException("Unable to attach to a second frame.",*this); + throw RuntimeException(u"Unable to attach to a second frame."_ustr,*this); // revoke as focus listener from the old container window stopContainerWindowListening(); @@ -333,7 +333,7 @@ namespace pcr // announcement is responsible for calling setComponent, too. Reference<XWindow> xContainerWindow = m_xFrame->getContainerWindow(); - OUString sUIFile("modules/spropctrlr/ui/formproperties.ui"); + OUString sUIFile(u"modules/spropctrlr/ui/formproperties.ui"_ustr); std::unique_ptr<weld::Builder> xBuilder; if (weld::TransportAsXWindow* pTunnel = dynamic_cast<weld::TransportAsXWindow*>(xContainerWindow.get())) @@ -344,7 +344,7 @@ namespace pcr { VclPtr<vcl::Window> pParentWin = VCLUnoHelper::GetWindow(xContainerWindow); if (!pParentWin) - throw RuntimeException("The frame is invalid. Unable to extract the container window.",*this); + throw RuntimeException(u"The frame is invalid. Unable to extract the container window."_ustr,*this); xBuilder = Application::CreateInterimBuilder(pParentWin, sUIFile, true); } @@ -505,7 +505,7 @@ namespace pcr OUString SAL_CALL OPropertyBrowserController::getImplementationName( ) { - return "org.openoffice.comp.extensions.ObjectInspector"; + return u"org.openoffice.comp.extensions.ObjectInspector"_ustr; } sal_Bool SAL_CALL OPropertyBrowserController::supportsService( const OUString& ServiceName ) @@ -516,7 +516,7 @@ namespace pcr Sequence< OUString > SAL_CALL OPropertyBrowserController::getSupportedServiceNames( ) { - return { "com.sun.star.inspection.ObjectInspector" }; + return { u"com.sun.star.inspection.ObjectInspector"_ustr }; } @@ -691,8 +691,8 @@ namespace pcr case PropertyControlType::StringListField: { bool bMultiLineTextField = ControlType == PropertyControlType::MultiLineTextField; - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/multiline.ui", m_xContext)); - auto pContainer = xBuilder->weld_container("multiline"); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/multiline.ui"_ustr, m_xContext)); + auto pContainer = xBuilder->weld_container(u"multiline"_ustr); rtl::Reference<OMultilineEditControl> pControl = new OMultilineEditControl(std::move(pContainer), std::move(xBuilder), bMultiLineTextField ? eMultiLineText : eStringList, bCreateReadOnly); pControl->SetModifyHandler(); @@ -702,8 +702,8 @@ namespace pcr case PropertyControlType::ListBox: { - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/listbox.ui", m_xContext)); - auto pComboBox = xBuilder->weld_combo_box("listbox"); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/listbox.ui"_ustr, m_xContext)); + auto pComboBox = xBuilder->weld_combo_box(u"listbox"_ustr); rtl::Reference<OListboxControl> pControl = new OListboxControl(std::move(pComboBox), std::move(xBuilder), bCreateReadOnly); pControl->SetModifyHandler(); xControl = pControl; @@ -712,8 +712,8 @@ namespace pcr case PropertyControlType::ComboBox: { - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/combobox.ui", m_xContext)); - auto pComboBox = xBuilder->weld_combo_box("combobox"); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/combobox.ui"_ustr, m_xContext)); + auto pComboBox = xBuilder->weld_combo_box(u"combobox"_ustr); rtl::Reference<OComboboxControl> pControl = new OComboboxControl(std::move(pComboBox), std::move(xBuilder), bCreateReadOnly); pControl->SetModifyHandler(); xControl = pControl; @@ -724,8 +724,8 @@ namespace pcr case PropertyControlType::CharacterField: { bool bCharacterField = ControlType == PropertyControlType::CharacterField; - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/textfield.ui", m_xContext)); - auto pEntry = xBuilder->weld_entry("textfield"); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/textfield.ui"_ustr, m_xContext)); + auto pEntry = xBuilder->weld_entry(u"textfield"_ustr); rtl::Reference<OEditControl> pControl = new OEditControl(std::move(pEntry), std::move(xBuilder), bCharacterField, bCreateReadOnly); pControl->SetModifyHandler(); xControl = pControl; @@ -734,8 +734,8 @@ namespace pcr case PropertyControlType::NumericField: { - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/numericfield.ui", m_xContext)); - auto pSpinButton = xBuilder->weld_metric_spin_button("numericfield", FieldUnit::NONE); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/numericfield.ui"_ustr, m_xContext)); + auto pSpinButton = xBuilder->weld_metric_spin_button(u"numericfield"_ustr, FieldUnit::NONE); rtl::Reference<ONumericControl> pControl = new ONumericControl(std::move(pSpinButton), std::move(xBuilder), bCreateReadOnly); pControl->SetModifyHandler(); xControl = pControl; @@ -744,8 +744,8 @@ namespace pcr case PropertyControlType::DateTimeField: { - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/datetimefield.ui", m_xContext)); - auto pContainer = xBuilder->weld_container("datetimefield"); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/datetimefield.ui"_ustr, m_xContext)); + auto pContainer = xBuilder->weld_container(u"datetimefield"_ustr); rtl::Reference<ODateTimeControl> pControl = new ODateTimeControl(std::move(pContainer), std::move(xBuilder), bCreateReadOnly); pControl->SetModifyHandler(); xControl = pControl; @@ -754,8 +754,8 @@ namespace pcr case PropertyControlType::DateField: { - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/datefield.ui", m_xContext)); - auto pContainer = xBuilder->weld_container("datefield"); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/datefield.ui"_ustr, m_xContext)); + auto pContainer = xBuilder->weld_container(u"datefield"_ustr); rtl::Reference<ODateControl> pControl = new ODateControl(std::move(pContainer), std::move(xBuilder), bCreateReadOnly); pControl->SetModifyHandler(); xControl = pControl; @@ -764,8 +764,8 @@ namespace pcr case PropertyControlType::TimeField: { - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/timefield.ui", m_xContext)); - auto pTimeSpinButton = xBuilder->weld_formatted_spin_button("timefield"); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/timefield.ui"_ustr, m_xContext)); + auto pTimeSpinButton = xBuilder->weld_formatted_spin_button(u"timefield"_ustr); rtl::Reference<OTimeControl> pControl = new OTimeControl(std::move(pTimeSpinButton), std::move(xBuilder), bCreateReadOnly); pControl->SetModifyHandler(); xControl = pControl; @@ -775,8 +775,8 @@ namespace pcr case PropertyControlType::ColorListBox: { auto lambda = [this]{ return PropertyHandlerHelper::getDialogParentFrame(m_xContext); }; - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/colorlistbox.ui", m_xContext)); - auto pMenuButton = xBuilder->weld_menu_button("colorlistbox"); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/colorlistbox.ui"_ustr, m_xContext)); + auto pMenuButton = xBuilder->weld_menu_button(u"colorlistbox"_ustr); rtl::Reference<OColorControl> pControl = new OColorControl(std::make_unique<ColorListBox>(std::move(pMenuButton), lambda), std::move(xBuilder), bCreateReadOnly); pControl->SetModifyHandler(); xControl = pControl; @@ -785,8 +785,8 @@ namespace pcr case PropertyControlType::HyperlinkField: { - std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/hyperlinkfield.ui", m_xContext)); - auto pContainer = xBuilder->weld_container("hyperlinkfield"); + std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder(u"modules/spropctrlr/ui/hyperlinkfield.ui"_ustr, m_xContext)); + auto pContainer = xBuilder->weld_container(u"hyperlinkfield"_ustr); rtl::Reference<OHyperlinkControl> pControl = new OHyperlinkControl(std::move(pContainer), std::move(xBuilder), bCreateReadOnly); pControl->SetModifyHandler(); xControl = pControl; diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 1e026c5b5bb4..f6f1c1fe5f29 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -33,9 +33,9 @@ namespace pcr using ::com::sun::star::uno::Reference; OPropertyEditor::OPropertyEditor(const css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Builder& rBuilder) - : m_xContainer(rBuilder.weld_container("box")) - , m_xTabControl(rBuilder.weld_notebook("tabcontrol")) - , m_xControlHoldingParent(rBuilder.weld_container("controlparent")) // controls initially have this parent before they are moved + : m_xContainer(rBuilder.weld_container(u"box"_ustr)) + , m_xTabControl(rBuilder.weld_notebook(u"tabcontrol"_ustr)) + , m_xControlHoldingParent(rBuilder.weld_container(u"controlparent"_ustr)) // controls initially have this parent before they are moved , m_xContext(rContext) , m_pListener(nullptr) , m_pObserver(nullptr) diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index 3491a89be338..1d80142bc456 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -275,7 +275,7 @@ namespace pcr impl_getContextDocument_nothrow() const { return css::uno::Reference< css::frame::XModel >( - m_xContext->getValueByName( "ContextDocument" ), css::uno::UNO_QUERY ); + m_xContext->getValueByName( u"ContextDocument"_ustr ), css::uno::UNO_QUERY ); } /** marks the context document as modified diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 706e6eb3c807..f0ba29207794 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -51,14 +51,14 @@ namespace pcr // OSelectLabelDialog OSelectLabelDialog::OSelectLabelDialog(weld::Window* pParent, Reference< XPropertySet > const & _xControlModel) - : GenericDialogController(pParent, "modules/spropctrlr/ui/labelselectiondialog.ui", "LabelSelectionDialog") + : GenericDialogController(pParent, u"modules/spropctrlr/ui/labelselectiondialog.ui"_ustr, u"LabelSelectionDialog"_ustr) , m_xControlModel(_xControlModel) , m_bLastSelected(false) , m_bHaveAssignableControl(false) - , m_xMainDesc(m_xBuilder->weld_label("label")) - , m_xControlTree(m_xBuilder->weld_tree_view("control")) + , m_xMainDesc(m_xBuilder->weld_label(u"label"_ustr)) + , m_xControlTree(m_xBuilder->weld_tree_view(u"control"_ustr)) , m_xScratchIter(m_xControlTree->make_iterator()) - , m_xNoAssignment(m_xBuilder->weld_check_button("noassignment")) + , m_xNoAssignment(m_xBuilder->weld_check_button(u"noassignment"_ustr)) { m_xControlTree->connect_changed(LINK(this, OSelectLabelDialog, OnEntrySelected)); m_xControlTree->set_size_request(-1, m_xControlTree->get_height_rows(8)); diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index d98b2a569234..c4e0d2f365b8 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -231,12 +231,12 @@ namespace pcr comphelper::makePropertyValue(PROPERTY_COMMAND, m_xObjectAdapter->getSQLCommand()), comphelper::makePropertyValue(PROPERTY_COMMANDTYPE, CommandType::COMMAND), comphelper::makePropertyValue(PROPERTY_ESCAPE_PROCESSING, bEscapeProcessing), - comphelper::makePropertyValue("GraphicalDesign", bEscapeProcessing) + comphelper::makePropertyValue(u"GraphicalDesign"_ustr, bEscapeProcessing) }; Reference< XComponent > xQueryDesign = xLoader->loadComponentFromURL( - ".component:DB/QueryDesign", - "_self", + u".component:DB/QueryDesign"_ustr, + u"_self"_ustr, FrameSearchFlag::TASKS | FrameSearchFlag::CREATE, aArgs ); @@ -282,7 +282,7 @@ namespace pcr Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext); Reference< XFrames > xDesktopFramesCollection( xDesktop->getFrames(), css::uno::UNO_SET_THROW ); - xFrame = xDesktop->findFrame( "_blank", FrameSearchFlag::CREATE ); + xFrame = xDesktop->findFrame( u"_blank"_ustr, FrameSearchFlag::CREATE ); OSL_ENSURE( xFrame.is(), "SQLCommandDesigner::impl_createEmptyParentlessTask_nothrow: could not create an empty frame!" ); xDesktopFramesCollection->remove( xFrame ); } @@ -309,11 +309,11 @@ namespace pcr // instead of calling XCloseable::close directly. The latter method would also close // the frame, but not care for things like shutting down the office when the last // frame is gone ... - const UnoURL aCloseURL( ".uno:CloseDoc", + const UnoURL aCloseURL( u".uno:CloseDoc"_ustr, Reference< XMultiServiceFactory >( m_xORB, UNO_QUERY ) ); Reference< XDispatchProvider > xProvider( m_xDesigner->getFrame(), UNO_QUERY_THROW ); - Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, "_top", FrameSearchFlag::SELF ) ); + Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, u"_top"_ustr, FrameSearchFlag::SELF ) ); OSL_ENSURE( xDispatch.is(), "SQLCommandDesigner::impl_closeDesigner_nothrow: no dispatcher for the CloseDoc command!" ); if ( xDispatch.is() ) { diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index ad978253b076..f5bb95f7380a 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -66,7 +66,7 @@ namespace pcr util::Time aUNOTime; if ( !( _rValue >>= aUNOTime ) ) { - getTypedControlWindow()->set_text(""); + getTypedControlWindow()->set_text(u""_ustr); m_xFormatter->SetTime(tools::Time(tools::Time::EMPTY)); } else @@ -93,8 +93,8 @@ namespace pcr //= ODateControl ODateControl::ODateControl(std::unique_ptr<weld::Container> xWidget, std::unique_ptr<weld::Builder> xBuilder, bool bReadOnly) : ODateControl_Base(PropertyControlType::DateField, std::move(xBuilder), std::move(xWidget), bReadOnly) - , m_xEntry(m_xBuilder->weld_entry("entry")) - , m_xCalendarBox(std::make_unique<SvtCalendarBox>(m_xBuilder->weld_menu_button("button"), false)) + , m_xEntry(m_xBuilder->weld_entry(u"entry"_ustr)) + , m_xCalendarBox(std::make_unique<SvtCalendarBox>(m_xBuilder->weld_menu_button(u"button"_ustr), false)) { m_xEntryFormatter.reset(new weld::DateFormatter(*m_xEntry)); @@ -249,8 +249,8 @@ namespace pcr ODateTimeControl::ODateTimeControl(std::unique_ptr<weld::Container> xWidget, std::unique_ptr<weld::Builder> xBuilder, bool bReadOnly) : ODateTimeControl_Base(PropertyControlType::DateTimeField, std::move(xBuilder), std::move(xWidget), bReadOnly) - , m_xDate(std::make_unique<SvtCalendarBox>(m_xBuilder->weld_menu_button("datefield"))) - , m_xTime(m_xBuilder->weld_formatted_spin_button("timefield")) + , m_xDate(std::make_unique<SvtCalendarBox>(m_xBuilder->weld_menu_button(u"datefield"_ustr))) + , m_xTime(m_xBuilder->weld_formatted_spin_button(u"timefield"_ustr)) , m_xFormatter(new weld::TimeFormatter(*m_xTime)) { m_xFormatter->SetExtFormat(ExtTimeFieldFormat::LongDuration); @@ -261,7 +261,7 @@ namespace pcr if ( !_rValue.hasValue() ) { m_xDate->set_date(::Date(::Date::SYSTEM)); - m_xTime->set_text(""); + m_xTime->set_text(u""_ustr); m_xFormatter->SetTime(tools::Time(tools::Time::EMPTY)); } else @@ -300,8 +300,8 @@ namespace pcr //= OHyperlinkControl OHyperlinkControl::OHyperlinkControl(std::unique_ptr<weld::Container> xWidget, std::unique_ptr<weld::Builder> xBuilder, bool bReadOnly) : OHyperlinkControl_Base(PropertyControlType::HyperlinkField, std::move(xBuilder), std::move(xWidget), bReadOnly) - , m_xEntry(m_xBuilder->weld_entry("entry")) - , m_xButton(m_xBuilder->weld_button("button")) + , m_xEntry(m_xBuilder->weld_entry(u"entry"_ustr)) + , m_xButton(m_xBuilder->weld_button(u"button"_ustr)) , m_aActionListeners(m_aMutex) { auto pWidget = getTypedControlWindow(); @@ -352,7 +352,7 @@ namespace pcr IMPL_LINK_NOARG( OHyperlinkControl, OnHyperlinkClicked, weld::Button&, void ) { - ActionEvent aEvent( *this, "clicked" ); + ActionEvent aEvent( *this, u"clicked"_ustr ); m_aActionListeners.forEach< XActionListener >( [&aEvent] (uno::Reference<awt::XActionListener> const& xListener) { return xListener->actionPerformed(aEvent); }); @@ -468,7 +468,7 @@ namespace pcr { if ( !_rValue.hasValue() ) { - getTypedControlWindow()->set_text( "" ); + getTypedControlWindow()->set_text( u""_ustr ); } else { @@ -770,11 +770,11 @@ namespace pcr : OMultilineEditControl_Base(eMode == eMultiLineText ? PropertyControlType::MultiLineTextField : PropertyControlType::StringListField, std::move(xBuilder), std::move(xWidget), bReadOnly) , m_nOperationMode(eMode) - , m_xEntry(m_xBuilder->weld_entry("entry")) - , m_xButton(m_xBuilder->weld_menu_button("button")) - , m_xPopover(m_xBuilder->weld_widget("popover")) - , m_xTextView(m_xBuilder->weld_text_view("textview")) - , m_xOk(m_xBuilder->weld_button("ok")) + , m_xEntry(m_xBuilder->weld_entry(u"entry"_ustr)) + , m_xButton(m_xBuilder->weld_menu_button(u"button"_ustr)) + , m_xPopover(m_xBuilder->weld_widget(u"popover"_ustr)) + , m_xTextView(m_xBuilder->weld_text_view(u"textview"_ustr)) + , m_xOk(m_xBuilder->weld_button(u"ok"_ustr)) { m_xButton->set_popover(m_xPopover.get()); m_xTextView->set_size_request(m_xTextView->get_approximate_digit_width() * 30, m_xTextView->get_height_rows(8)); diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 6f40c09c9d84..9a4d21eb95dc 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -136,7 +136,7 @@ StringRepresentation::StringRepresentation(uno::Reference< uno::XComponentContex // com.sun.star.uno.XServiceInfo: OUString SAL_CALL StringRepresentation::getImplementationName() { - return "StringRepresentation"; + return u"StringRepresentation"_ustr; } sal_Bool SAL_CALL StringRepresentation::supportsService(OUString const & serviceName) @@ -146,7 +146,7 @@ sal_Bool SAL_CALL StringRepresentation::supportsService(OUString const & service uno::Sequence< OUString > SAL_CALL StringRepresentation::getSupportedServiceNames() { - return { "com.sun.star.inspection.StringRepresentation" }; + return { u"com.sun.star.inspection.StringRepresentation"_ustr }; } // inspection::XStringRepresentation: @@ -250,7 +250,7 @@ void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > & return; uno::Reference< container::XHierarchicalNameAccess > xTypeDescProv( - m_xContext->getValueByName("/singletons/com.sun.star.reflection.theTypeDescriptionManager"), + m_xContext->getValueByName(u"/singletons/com.sun.star.reflection.theTypeDescriptionManager"_ustr), uno::UNO_QUERY_THROW ); m_xTypeDescription.set( xTypeDescProv->getByHierarchicalName( sConstantName ), uno::UNO_QUERY_THROW ); diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index 05e25e4d71a8..3abbbd3f6375 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -95,13 +95,13 @@ namespace pcr OUString SubmissionPropertyHandler::getImplementationName( ) { - return "com.sun.star.comp.extensions.SubmissionPropertyHandler"; + return u"com.sun.star.comp.extensions.SubmissionPropertyHandler"_ustr; } Sequence< OUString > SubmissionPropertyHandler::getSupportedServiceNames( ) { - return { "com.sun.star.form.inspection.SubmissionPropertyHandler" }; + return { u"com.sun.star.form.inspection.SubmissionPropertyHandler"_ustr }; } diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index af7b9ced7480..358b2818fc12 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -107,15 +107,15 @@ namespace pcr //= TabOrderDialog TabOrderDialog::TabOrderDialog(weld::Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel, const Reference< XControlContainer >& _rxControlCont, const Reference< XComponentContext >& _rxORB) - : GenericDialogController( _pParent, "modules/spropctrlr/ui/taborder.ui", "TabOrderDialog") + : GenericDialogController( _pParent, u"modules/spropctrlr/ui/taborder.ui"_ustr, u"TabOrderDialog"_ustr) , m_xModel( _rxTabModel ) , m_xControlContainer( _rxControlCont ) , m_xORB( _rxORB ) - , m_xLB_Controls(m_xBuilder->weld_tree_view("CTRLtree")) - , m_xPB_OK(m_xBuilder->weld_button("ok")) - , m_xPB_MoveUp(m_xBuilder->weld_button("upB")) - , m_xPB_MoveDown(m_xBuilder->weld_button("downB")) - , m_xPB_AutoOrder(m_xBuilder->weld_button("autoB")) + , m_xLB_Controls(m_xBuilder->weld_tree_view(u"CTRLtree"_ustr)) + , m_xPB_OK(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xPB_MoveUp(m_xBuilder->weld_button(u"upB"_ustr)) + , m_xPB_MoveDown(m_xBuilder->weld_button(u"downB"_ustr)) + , m_xPB_AutoOrder(m_xBuilder->weld_button(u"autoB"_ustr)) { m_xLB_Controls->set_size_request(m_xLB_Controls->get_approximate_digit_width() * 60, m_xLB_Controls->get_height_rows(10)); diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 8cccb48e84b5..1b9a4c4095ad 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -46,8 +46,8 @@ namespace pcr sal_uInt16 nKey = rKeyEvent.GetKeyCode().GetCode(); if ((KEY_DELETE == nKey) || (KEY_BACKSPACE == nKey)) { - m_xSpinButton->set_text(""); - m_xEntry->set_text(""); + m_xSpinButton->set_text(u""_ustr); + m_xEntry->set_text(u""_ustr); setModified(); } @@ -69,7 +69,7 @@ namespace pcr { rFieldFormatter.TreatAsNumber(false); rFieldFormatter.SetFormatter(nullptr); - m_xSpinButton->set_text( "" ); + m_xSpinButton->set_text( u""_ustr ); } m_xEntry->set_text(m_xSpinButton->get_text()); @@ -77,8 +77,8 @@ namespace pcr OFormatSampleControl::OFormatSampleControl(std::unique_ptr<weld::Container> xWidget, std::unique_ptr<weld::Builder> xBuilder, bool bReadOnly) : OFormatSampleControl_Base(PropertyControlType::Unknown, std::move(xBuilder), std::move(xWidget), bReadOnly) - , m_xSpinButton(m_xBuilder->weld_formatted_spin_button("sample")) - , m_xEntry(m_xBuilder->weld_entry("entry")) + , m_xSpinButton(m_xBuilder->weld_formatted_spin_button(u"sample"_ustr)) + , m_xEntry(m_xBuilder->weld_entry(u"entry"_ustr)) { Formatter& rFieldFormatter = m_xSpinButton->GetFormatter(); rFieldFormatter.TreatAsNumber(true); @@ -107,7 +107,7 @@ namespace pcr rFieldFormatter.SetValue( pEntry ? getPreviewValue( *pEntry ) : 1234.56789 ); } else - m_xSpinButton->set_text( "" ); + m_xSpinButton->set_text( u""_ustr ); m_xEntry->set_text(m_xSpinButton->get_text()); } @@ -183,7 +183,7 @@ namespace pcr if ( _rValue >>= nValue ) getTypedControlWindow()->GetFormatter().SetValue(nValue); else - getTypedControlWindow()->set_text(""); + getTypedControlWindow()->set_text(u""_ustr); } Any SAL_CALL OFormattedNumericControl::getValue() @@ -226,7 +226,7 @@ namespace pcr { rFieldFormatter.TreatAsNumber(false); rFieldFormatter.SetFormatter(nullptr); - getTypedControlWindow()->set_text(""); + getTypedControlWindow()->set_text(u""_ustr); } } diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index 29bc09a65a7f..5e65bc727b64 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -77,13 +77,13 @@ namespace pcr OUString XSDValidationPropertyHandler::getImplementationName( ) { - return "com.sun.star.comp.extensions.XSDValidationPropertyHandler"; + return u"com.sun.star.comp.extensions.XSDValidationPropertyHandler"_ustr; } Sequence< OUString > XSDValidationPropertyHandler::getSupportedServiceNames( ) { - return{ "com.sun.star.form.inspection.XSDValidationPropertyHandler" }; + return{ u"com.sun.star.form.inspection.XSDValidationPropertyHandler"_ustr }; } |