diff options
Diffstat (limited to 'sd/source')
166 files changed, 1391 insertions, 1385 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 1b0f87caa546..ee332d9c252b 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -120,7 +120,7 @@ void AccessibleDocumentViewBase::Init() uno::Reference<beans::XPropertySet> xSet (mxController, uno::UNO_QUERY); if (xSet.is()) xSet->addPropertyChangeListener ( - "", + u""_ustr, static_cast<beans::XPropertyChangeListener*>(this)); // Register this object as dispose event listener at the controller. @@ -402,7 +402,7 @@ void SAL_CALL OUString SAL_CALL AccessibleDocumentViewBase::getImplementationName() { - return "AccessibleDocumentViewBase"; + return u"AccessibleDocumentViewBase"_ustr; } css::uno::Sequence< OUString> SAL_CALL @@ -466,7 +466,7 @@ void AccessibleDocumentViewBase::impl_dispose() { uno::Reference<beans::XPropertySet> xSet (mxController, uno::UNO_QUERY); if (xSet.is()) - xSet->removePropertyChangeListener ("", static_cast<beans::XPropertyChangeListener*>(this)); + xSet->removePropertyChangeListener (u""_ustr, static_cast<beans::XPropertyChangeListener*>(this)); mxController->removeEventListener ( static_cast<awt::XWindowListener*>(this)); @@ -580,7 +580,7 @@ void SAL_CALL AccessibleDocumentViewBase::disposing() OUString AccessibleDocumentViewBase::CreateAccessibleName() { - return "AccessibleDocumentViewBase"; + return u"AccessibleDocumentViewBase"_ustr; } void AccessibleDocumentViewBase::Activated() @@ -657,7 +657,7 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes() if (auto pDrViewSh = dynamic_cast<::sd::DrawViewShell* > (mpViewShell)) { OUString sDisplay; - OUString sName = "page-name:"; + OUString sName = u"page-name:"_ustr; // MT IA2: Not used... // SdPage* pCurrPge = pDrViewSh->getCurrentPage(); SdDrawDocument* pDoc = pDrViewSh->GetDoc(); diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 24fa39eb21cc..2c1898d1242a 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -147,7 +147,7 @@ rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageSh uno::Reference<lang::XMultiServiceFactory> xFactory (mxModel, uno::UNO_QUERY); uno::Reference<drawing::XShape> xRectangle; if (xFactory.is()) - xRectangle.set(xFactory->createInstance ("com.sun.star.drawing.RectangleShape"), + xRectangle.set(xFactory->createInstance (u"com.sun.star.drawing.RectangleShape"_ustr), uno::UNO_QUERY); // Set the shape's size and position. @@ -159,15 +159,15 @@ rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageSh // Set size and position of the shape to those of the draw // page. - aValue = xSet->getPropertyValue ("BorderLeft"); + aValue = xSet->getPropertyValue (u"BorderLeft"_ustr); aValue >>= aPosition.X; - aValue = xSet->getPropertyValue ("BorderTop"); + aValue = xSet->getPropertyValue (u"BorderTop"_ustr); aValue >>= aPosition.Y; xRectangle->setPosition (aPosition); - aValue = xSet->getPropertyValue ("Width"); + aValue = xSet->getPropertyValue (u"Width"_ustr); aValue >>= aSize.Width; - aValue = xSet->getPropertyValue ("Height"); + aValue = xSet->getPropertyValue (u"Height"_ustr); aValue >>= aSize.Height; xRectangle->setSize (aSize); @@ -375,14 +375,14 @@ void SAL_CALL OUString SAL_CALL AccessibleDrawDocumentView::getImplementationName() { - return "AccessibleDrawDocumentView"; + return u"AccessibleDrawDocumentView"_ustr; } css::uno::Sequence< OUString> SAL_CALL AccessibleDrawDocumentView::getSupportedServiceNames() { ThrowIfDisposed(); - const css::uno::Sequence<OUString> vals { "com.sun.star.drawing.AccessibleDrawDocumentView" }; + const css::uno::Sequence<OUString> vals { u"com.sun.star.drawing.AccessibleDrawDocumentView"_ustr }; uno::Sequence<OUString> aServiceNames = AccessibleDocumentViewBase::getSupportedServiceNames(); @@ -750,7 +750,7 @@ void AccessibleDrawDocumentView::UpdateAccessibleName() try { sal_Int16 nPageNumber (0); - if (xProperties->getPropertyValue("Number") >>= nPageNumber) + if (xProperties->getPropertyValue(u"Number"_ustr) >>= nPageNumber) { sNewName += OUString::number(nPageNumber); } diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 9d2e82c1b12a..f2e8aa340da9 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -160,7 +160,7 @@ void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::R OUString SAL_CALL AccessibleOutlineView::getImplementationName() { - return "AccessibleOutlineView"; + return u"AccessibleOutlineView"_ustr; } //===== XEventListener ====================================================== diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 894f7b724b42..22721bc3b3d5 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -67,7 +67,7 @@ sal_Int64 SAL_CALL uno::Reference<XAccessible> SAL_CALL AccessiblePageShape::getAccessibleChild( sal_Int64 ) { - throw lang::IndexOutOfBoundsException ("page shape has no children", + throw lang::IndexOutOfBoundsException (u"page shape has no children"_ustr, static_cast<uno::XWeak*>(this)); } @@ -86,14 +86,14 @@ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds() { uno::Any aValue; - aValue = xSet->getPropertyValue ("BorderLeft"); + aValue = xSet->getPropertyValue (u"BorderLeft"_ustr); aValue >>= aBoundingBox.X; - aValue = xSet->getPropertyValue ("BorderTop"); + aValue = xSet->getPropertyValue (u"BorderTop"_ustr); aValue >>= aBoundingBox.Y; - aValue = xSet->getPropertyValue ("Width"); + aValue = xSet->getPropertyValue (u"Width"_ustr); aValue >>= aBoundingBox.Width; - aValue = xSet->getPropertyValue ("Height"); + aValue = xSet->getPropertyValue (u"Height"_ustr); aValue >>= aBoundingBox.Height; } @@ -144,7 +144,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getForeground() uno::Reference<beans::XPropertySet> aSet (mxPage, uno::UNO_QUERY); if (aSet.is()) { - uno::Any aColor = aSet->getPropertyValue ("LineColor"); + uno::Any aColor = aSet->getPropertyValue (u"LineColor"_ustr); aColor >>= nColor; } } @@ -168,7 +168,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground() uno::Reference<beans::XPropertySet> xSet (mxPage, uno::UNO_QUERY); if (xSet.is()) { - uno::Any aBGSet = xSet->getPropertyValue ("Background"); + uno::Any aBGSet = xSet->getPropertyValue (u"Background"_ustr); Reference<beans::XPropertySet> xBGSet (aBGSet, uno::UNO_QUERY); if ( ! xBGSet.is()) { @@ -178,7 +178,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground() if (xTarget.is()) { xSet.set(xTarget->getMasterPage(), uno::UNO_QUERY); - aBGSet = xSet->getPropertyValue ("Background"); + aBGSet = xSet->getPropertyValue (u"Background"_ustr); xBGSet.set(aBGSet, uno::UNO_QUERY); } } @@ -186,7 +186,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground() // gradients, hashes, and bitmaps. if (xBGSet.is()) { - uno::Any aColor = xBGSet->getPropertyValue ("FillColor"); + uno::Any aColor = xBGSet->getPropertyValue (u"FillColor"_ustr); aColor >>= nColor; } else @@ -207,7 +207,7 @@ OUString SAL_CALL AccessiblePageShape::getImplementationName() { ThrowIfDisposed (); - return "AccessiblePageShape"; + return u"AccessiblePageShape"_ustr; } css::uno::Sequence< OUString> SAL_CALL @@ -233,7 +233,7 @@ void AccessiblePageShape::dispose() OUString AccessiblePageShape::CreateAccessibleBaseName() { - return "PageShape"; + return u"PageShape"_ustr; } OUString @@ -247,7 +247,7 @@ OUString { if (xPageProperties.is()) { - xPageProperties->getPropertyValue( "LinkDisplayName" ) >>= sCurrentSlideName; + xPageProperties->getPropertyValue( u"LinkDisplayName"_ustr ) >>= sCurrentSlideName; } } catch (const beans::UnknownPropertyException&) diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index a8c37fa892a1..d9e52438dd76 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -44,7 +44,7 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape() {} OUString SAL_CALL AccessiblePresentationGraphicShape::getImplementationName() { - return "AccessiblePresentationGraphicShape"; + return u"AccessiblePresentationGraphicShape"_ustr; } /// Set this object's name if is different to the current name. diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index 411d04af15f0..f654e3eb07b5 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -44,7 +44,7 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape() {} OUString SAL_CALL AccessiblePresentationOLEShape::getImplementationName() { - return "AccessiblePresentationOLEShape"; + return u"AccessiblePresentationOLEShape"_ustr; } /// Set this object's name if it is different to the current name. diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index 4a963155e6e3..784cb2eda1d5 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -45,7 +45,7 @@ AccessiblePresentationShape::~AccessiblePresentationShape() {} OUString SAL_CALL AccessiblePresentationShape::getImplementationName() { - return "AccessiblePresentationShape"; + return u"AccessiblePresentationShape"_ustr; } /// Set this object's name if is different to the current name. diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index c22077fe42c7..61749bda2b0b 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -379,7 +379,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground() OUString SAL_CALL AccessibleSlideSorterObject::getImplementationName() { - return "AccessibleSlideSorterObject"; + return u"AccessibleSlideSorterObject"_ustr; } sal_Bool SAL_CALL AccessibleSlideSorterObject::supportsService (const OUString& sServiceName) @@ -393,8 +393,8 @@ uno::Sequence< OUString> SAL_CALL ThrowIfDisposed (); return uno::Sequence<OUString> { - OUString("com.sun.star.accessibility.Accessible"), - OUString("com.sun.star.accessibility.AccessibleContext") + u"com.sun.star.accessibility.Accessible"_ustr, + u"com.sun.star.accessibility.AccessibleContext"_ustr }; } @@ -403,7 +403,7 @@ void AccessibleSlideSorterObject::ThrowIfDisposed() if (m_bDisposed) { SAL_WARN("sd", "Calling disposed object. Throwing exception:"); - throw lang::DisposedException ("object has been already disposed", + throw lang::DisposedException (u"object has been already disposed"_ustr, static_cast<uno::XWeak*>(this)); } } diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 7ab8b0d03360..2fc11d1a537a 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -602,7 +602,7 @@ void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int64 nChi OUString SAL_CALL AccessibleSlideSorterView::getImplementationName() { - return "AccessibleSlideSorterView"; + return u"AccessibleSlideSorterView"_ustr; } sal_Bool SAL_CALL AccessibleSlideSorterView::supportsService (const OUString& sServiceName) @@ -616,9 +616,9 @@ uno::Sequence< OUString> SAL_CALL ThrowIfDisposed (); return uno::Sequence<OUString> { - OUString("com.sun.star.accessibility.Accessible"), - OUString("com.sun.star.accessibility.AccessibleContext"), - OUString("com.sun.star.drawing.AccessibleSlideSorterView") + u"com.sun.star.accessibility.Accessible"_ustr, + u"com.sun.star.accessibility.AccessibleContext"_ustr, + u"com.sun.star.drawing.AccessibleSlideSorterView"_ustr }; } @@ -627,7 +627,7 @@ void AccessibleSlideSorterView::ThrowIfDisposed() if (rBHelper.bDisposed || rBHelper.bInDispose) { SAL_WARN("sd", "Calling disposed object. Throwing exception:"); - throw lang::DisposedException ("object has been already disposed", + throw lang::DisposedException (u"object has been already disposed"_ustr, static_cast<uno::XWeak*>(this)); } } diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx index 7fab0961ee27..317725d41004 100644 --- a/sd/source/ui/accessibility/SdShapeTypes.cxx +++ b/sd/source/ui/accessibility/SdShapeTypes.cxx @@ -66,59 +66,59 @@ void RegisterImpressShapeTypes() ShapeTypeDescriptor aSdShapeTypeList[] = { ShapeTypeDescriptor ( PRESENTATION_OUTLINER, - "com.sun.star.presentation.OutlinerShape", + u"com.sun.star.presentation.OutlinerShape"_ustr, CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_SUBTITLE, - "com.sun.star.presentation.SubtitleShape", + u"com.sun.star.presentation.SubtitleShape"_ustr, CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_GRAPHIC_OBJECT, - "com.sun.star.presentation.GraphicObjectShape", + u"com.sun.star.presentation.GraphicObjectShape"_ustr, CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_PAGE, - "com.sun.star.presentation.PageShape", + u"com.sun.star.presentation.PageShape"_ustr, CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_OLE, - "com.sun.star.presentation.OLE2Shape", + u"com.sun.star.presentation.OLE2Shape"_ustr, CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_CHART, - "com.sun.star.presentation.ChartShape", + u"com.sun.star.presentation.ChartShape"_ustr, CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_TABLE, - "com.sun.star.presentation.TableShape", + u"com.sun.star.presentation.TableShape"_ustr, CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_NOTES, - "com.sun.star.presentation.NotesShape", + u"com.sun.star.presentation.NotesShape"_ustr, CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_TITLE, - "com.sun.star.presentation.TitleTextShape", + u"com.sun.star.presentation.TitleTextShape"_ustr, CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_HANDOUT, - "com.sun.star.presentation.HandoutShape", + u"com.sun.star.presentation.HandoutShape"_ustr, CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_HEADER, - "com.sun.star.presentation.HeaderShape", + u"com.sun.star.presentation.HeaderShape"_ustr, CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_FOOTER, - "com.sun.star.presentation.FooterShape", + u"com.sun.star.presentation.FooterShape"_ustr, CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_DATETIME, - "com.sun.star.presentation.DateTimeShape", + u"com.sun.star.presentation.DateTimeShape"_ustr, CreateSdAccessibleShape ), ShapeTypeDescriptor ( PRESENTATION_PAGENUMBER, - "com.sun.star.presentation.SlideNumberShape", + u"com.sun.star.presentation.SlideNumberShape"_ustr, CreateSdAccessibleShape ) }; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 7ed2f4590452..f769f5b87c06 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -84,9 +84,9 @@ using ::com::sun::star::beans::XPropertySet; namespace sd { SdPropertySubControl::SdPropertySubControl(weld::Container* pParent) - : mxBuilder(Application::CreateBuilder(pParent, "modules/simpress/ui/customanimationfragment.ui", + : mxBuilder(Application::CreateBuilder(pParent, u"modules/simpress/ui/customanimationfragment.ui"_ustr, false, reinterpret_cast<sal_uInt64>(SfxViewShell::Current()))) - , mxContainer(mxBuilder->weld_container("EffectFragment")) + , mxContainer(mxBuilder->weld_container(u"EffectFragment"_ustr)) , mpParent(pParent) { } @@ -119,7 +119,7 @@ private: SdPresetPropertyBox::SdPresetPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const OUString& aPresetId, const Link<LinkParamNone*,void>& rModifyHdl) : SdPropertySubControl(pParent) , maModifyLink(rModifyHdl) - , mxControl(mxBuilder->weld_combo_box("combo")) + , mxControl(mxBuilder->weld_combo_box(u"combo"_ustr)) { mxControl->connect_changed(LINK(this, SdPresetPropertyBox, OnSelect)); mxControl->set_help_id(HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX); @@ -202,7 +202,7 @@ private: SdColorPropertyBox::SdColorPropertyBox(weld::Label* pLabel, weld::Container* pParent, weld::Window* pTopLevel, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl) : SdPropertySubControl(pParent) , maModifyLink(rModifyHdl) - , mxControl(new ColorListBox(mxBuilder->weld_menu_button("color"), [pTopLevel]{ return pTopLevel; })) + , mxControl(new ColorListBox(mxBuilder->weld_menu_button(u"color"_ustr), [pTopLevel]{ return pTopLevel; })) { mxControl->SetSelectHdl(LINK(this, SdColorPropertyBox, OnSelect)); mxControl->set_help_id(HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX); @@ -258,7 +258,7 @@ private: SdFontPropertyBox::SdFontPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl) : SdPropertySubControl(pParent) , maModifyHdl(rModifyHdl) - , mxControl(mxBuilder->weld_combo_box("fontname")) + , mxControl(mxBuilder->weld_combo_box(u"fontname"_ustr)) { mxControl->connect_changed(LINK(this, SdFontPropertyBox, ControlSelectHdl)); mxControl->set_help_id(HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX); @@ -344,8 +344,8 @@ private: SdCharHeightPropertyBox::SdCharHeightPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl) : SdPropertySubControl(pParent) , maModifyHdl(rModifyHdl) - , mxMetric(mxBuilder->weld_metric_spin_button("fontsize", FieldUnit::PERCENT)) - , mxControl(mxBuilder->weld_menu_button("fontsizemenu")) + , mxMetric(mxBuilder->weld_metric_spin_button(u"fontsize"_ustr, FieldUnit::PERCENT)) + , mxControl(mxBuilder->weld_menu_button(u"fontsizemenu"_ustr)) { mxMetric->connect_value_changed(LINK(this, SdCharHeightPropertyBox, EditModifyHdl)); mxMetric->set_help_id(HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX); @@ -413,8 +413,8 @@ private: SdTransparencyPropertyBox::SdTransparencyPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl) : SdPropertySubControl(pParent) , maModifyHdl(rModifyHdl) - , mxMetric(mxBuilder->weld_metric_spin_button("transparent", FieldUnit::PERCENT)) - , mxControl(mxBuilder->weld_menu_button("transparentmenu")) + , mxMetric(mxBuilder->weld_metric_spin_button(u"transparent"_ustr, FieldUnit::PERCENT)) + , mxControl(mxBuilder->weld_menu_button(u"transparentmenu"_ustr)) { for (sal_Int32 i = 25; i < 101; i += 25) { @@ -502,8 +502,8 @@ private: SdRotationPropertyBox::SdRotationPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl) : SdPropertySubControl(pParent) , maModifyHdl(rModifyHdl) - , mxMetric(mxBuilder->weld_metric_spin_button("rotate", FieldUnit::DEGREE)) - , mxControl(mxBuilder->weld_menu_button("rotatemenu")) + , mxMetric(mxBuilder->weld_metric_spin_button(u"rotate"_ustr, FieldUnit::DEGREE)) + , mxControl(mxBuilder->weld_menu_button(u"rotatemenu"_ustr)) { mxMetric->connect_value_changed(LINK( this, SdRotationPropertyBox, implModifyHdl)); mxMetric->set_help_id(HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX); @@ -523,13 +523,13 @@ void SdRotationPropertyBox::updateMenu() bool bDirection = nValue >= 0; nValue = (nValue < 0 ? -nValue : nValue); - mxControl->set_item_active("90", nValue == 90); - mxControl->set_item_active("180", nValue == 180); - mxControl->set_item_active("360", nValue == 360); - mxControl->set_item_active("720", nValue == 720); + mxControl->set_item_active(u"90"_ustr, nValue == 90); + mxControl->set_item_active(u"180"_ustr, nValue == 180); + mxControl->set_item_active(u"360"_ustr, nValue == 360); + mxControl->set_item_active(u"720"_ustr, nValue == 720); - mxControl->set_item_active("clockwise", bDirection); - mxControl->set_item_active("counterclock", !bDirection); + mxControl->set_item_active(u"clockwise"_ustr, bDirection); + mxControl->set_item_active(u"counterclock"_ustr, !bDirection); } IMPL_LINK_NOARG(SdRotationPropertyBox, implModifyHdl, weld::MetricSpinButton&, void) @@ -606,8 +606,8 @@ private: SdScalePropertyBox::SdScalePropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl) : SdPropertySubControl(pParent) , maModifyHdl( rModifyHdl ) - , mxMetric(mxBuilder->weld_metric_spin_button("scale", FieldUnit::PERCENT)) - , mxControl(mxBuilder->weld_menu_button("scalemenu")) + , mxMetric(mxBuilder->weld_metric_spin_button(u"scale"_ustr, FieldUnit::PERCENT)) + , mxControl(mxBuilder->weld_menu_button(u"scalemenu"_ustr)) { mxControl->connect_selected(LINK(this, SdScalePropertyBox, implMenuSelectHdl)); mxControl->set_help_id(HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX); @@ -625,14 +625,14 @@ void SdScalePropertyBox::updateMenu() { auto nValue = mxMetric->get_value(FieldUnit::PERCENT); - mxControl->set_item_active("25scale", nValue == 25); - mxControl->set_item_active("50scale", nValue == 50); - mxControl->set_item_active("150scale", nValue == 150); - mxControl->set_item_active("400scale", nValue == 400); + mxControl->set_item_active(u"25scale"_ustr, nValue == 25); + mxControl->set_item_active(u"50scale"_ustr, nValue == 50); + mxControl->set_item_active(u"150scale"_ustr, nValue == 150); + mxControl->set_item_active(u"400scale"_ustr, nValue == 400); - mxControl->set_item_active("hori", mnDirection == 1); - mxControl->set_item_active("vert", mnDirection == 2); - mxControl->set_item_active("both", mnDirection == 3); + mxControl->set_item_active(u"hori"_ustr, mnDirection == 1); + mxControl->set_item_active(u"vert"_ustr, mnDirection == 2); + mxControl->set_item_active(u"both"_ustr, mnDirection == 3); } IMPL_LINK_NOARG(SdScalePropertyBox, implModifyHdl, weld::MetricSpinButton&, void) @@ -789,8 +789,8 @@ private: SdFontStylePropertyBox::SdFontStylePropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl ) : SdPropertySubControl(pParent) , maModifyHdl( rModifyHdl ) - , mxEdit(mxBuilder->weld_entry("entry")) - , mxControl(mxBuilder->weld_menu_button("entrymenu")) + , mxEdit(mxBuilder->weld_entry(u"entry"_ustr)) + , mxControl(mxBuilder->weld_menu_button(u"entrymenu"_ustr)) { mxEdit->set_text(SdResId(STR_CUSTOMANIMATION_SAMPLE)); mxEdit->set_help_id(HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX); @@ -807,9 +807,9 @@ SdFontStylePropertyBox::SdFontStylePropertyBox(weld::Label* pLabel, weld::Contai void SdFontStylePropertyBox::update() { // update menu - mxControl->set_item_active("bold", mfFontWeight == awt::FontWeight::BOLD); - mxControl->set_item_active("italic", meFontSlant == awt::FontSlant_ITALIC); - mxControl->set_item_active("underline", mnFontUnderline != awt::FontUnderline::NONE ); + mxControl->set_item_active(u"bold"_ustr, mfFontWeight == awt::FontWeight::BOLD); + mxControl->set_item_active(u"italic"_ustr, meFontSlant == awt::FontSlant_ITALIC); + mxControl->set_item_active(u"underline"_ustr, mnFontUnderline != awt::FontUnderline::NONE ); // update sample edit vcl::Font aFont(mxEdit->get_font()); @@ -915,23 +915,23 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage(weld::Container* pPar : mbHasText(false) , mpSet(pSet) , mpDialog(pDialog) - , mxBuilder(Application::CreateBuilder(pParent, "modules/simpress/ui/customanimationeffecttab.ui")) - , mxContainer(mxBuilder->weld_container("EffectTab")) - , mxSettings(mxBuilder->weld_widget("settings")) - , mxFTProperty1(mxBuilder->weld_label("prop_label1")) - , mxPlaceholderBox(mxBuilder->weld_container("placeholder")) - , mxCBSmoothStart(mxBuilder->weld_check_button("smooth_start")) - , mxCBSmoothEnd(mxBuilder->weld_check_button("smooth_end")) - , mxFTSound(mxBuilder->weld_label("sound_label")) - , mxLBSound(mxBuilder->weld_combo_box("sound_list")) - , mxPBSoundPreview(mxBuilder->weld_button("sound_preview")) - , mxLBAfterEffect(mxBuilder->weld_combo_box("aeffect_list")) - , mxFTDimColor(mxBuilder->weld_label("dim_color_label")) - , mxCLBDimColor(new ColorListBox(mxBuilder->weld_menu_button("dim_color_list"), [pDialog]{ return pDialog; })) - , mxFTTextAnim(mxBuilder->weld_label("text_animation_label")) - , mxLBTextAnim(mxBuilder->weld_combo_box("text_animation_list")) - , mxMFTextDelay(mxBuilder->weld_metric_spin_button("text_delay", FieldUnit::PERCENT)) - , mxFTTextDelay(mxBuilder->weld_label("text_delay_label")) + , mxBuilder(Application::CreateBuilder(pParent, u"modules/simpress/ui/customanimationeffecttab.ui"_ustr)) + , mxContainer(mxBuilder->weld_container(u"EffectTab"_ustr)) + , mxSettings(mxBuilder->weld_widget(u"settings"_ustr)) + , mxFTProperty1(mxBuilder->weld_label(u"prop_label1"_ustr)) + , mxPlaceholderBox(mxBuilder->weld_container(u"placeholder"_ustr)) + , mxCBSmoothStart(mxBuilder->weld_check_button(u"smooth_start"_ustr)) + , mxCBSmoothEnd(mxBuilder->weld_check_button(u"smooth_end"_ustr)) + , mxFTSound(mxBuilder->weld_label(u"sound_label"_ustr)) + , mxLBSound(mxBuilder->weld_combo_box(u"sound_list"_ustr)) + , mxPBSoundPreview(mxBuilder->weld_button(u"sound_preview"_ustr)) + , mxLBAfterEffect(mxBuilder->weld_combo_box(u"aeffect_list"_ustr)) + , mxFTDimColor(mxBuilder->weld_label(u"dim_color_label"_ustr)) + , mxCLBDimColor(new ColorListBox(mxBuilder->weld_menu_button(u"dim_color_list"_ustr), [pDialog]{ return pDialog; })) + , mxFTTextAnim(mxBuilder->weld_label(u"text_animation_label"_ustr)) + , mxLBTextAnim(mxBuilder->weld_combo_box(u"text_animation_list"_ustr)) + , mxMFTextDelay(mxBuilder->weld_metric_spin_button(u"text_delay"_ustr, FieldUnit::PERCENT)) + , mxFTTextDelay(mxBuilder->weld_label(u"text_delay_label"_ustr)) { mxCLBDimColor->SelectEntry(COL_BLACK); @@ -1405,7 +1405,7 @@ void CustomAnimationEffectTabPage::onSoundPreview() if( nPos >= 2 ) try { const OUString aSoundURL( maSoundList[ nPos-2 ] ); - mxPlayer.set( avmedia::MediaWindow::createPlayer( aSoundURL, "" ), uno::UNO_SET_THROW ); + mxPlayer.set( avmedia::MediaWindow::createPlayer( aSoundURL, u""_ustr ), uno::UNO_SET_THROW ); mxPlayer->start(); } catch( uno::Exception& ) @@ -1444,18 +1444,18 @@ private: CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(weld::Container* pParent, const STLPropertySet* pSet) : mpSet(pSet) - , mxBuilder(Application::CreateBuilder(pParent, "modules/simpress/ui/customanimationtimingtab.ui")) - , mxContainer(mxBuilder->weld_container("TimingTab")) - , mxLBStart(mxBuilder->weld_combo_box("start_list")) - , mxMFStartDelay(mxBuilder->weld_metric_spin_button("delay_value", FieldUnit::SECOND)) - , mxFTDuration(mxBuilder->weld_label("duration_label")) - , mxCBXDuration(mxBuilder->weld_metric_spin_button("anim_duration", FieldUnit::SECOND)) - , mxFTRepeat(mxBuilder->weld_label("repeat_label")) - , mxCBRepeat(mxBuilder->weld_combo_box("repeat_list")) - , mxCBXRewind(mxBuilder->weld_check_button("rewind")) - , mxRBClickSequence(mxBuilder->weld_radio_button("rb_click_sequence")) - , mxRBInteractive(mxBuilder->weld_radio_button("rb_interactive")) - , mxLBTrigger(mxBuilder->weld_combo_box("trigger_list")) + , mxBuilder(Application::CreateBuilder(pParent, u"modules/simpress/ui/customanimationtimingtab.ui"_ustr)) + , mxContainer(mxBuilder->weld_container(u"TimingTab"_ustr)) + , mxLBStart(mxBuilder->weld_combo_box(u"start_list"_ustr)) + , mxMFStartDelay(mxBuilder->weld_metric_spin_button(u"delay_value"_ustr, FieldUnit::SECOND)) + , mxFTDuration(mxBuilder->weld_label(u"duration_label"_ustr)) + , mxCBXDuration(mxBuilder->weld_metric_spin_button(u"anim_duration"_ustr, FieldUnit::SECOND)) + , mxFTRepeat(mxBuilder->weld_label(u"repeat_label"_ustr)) + , mxCBRepeat(mxBuilder->weld_combo_box(u"repeat_list"_ustr)) + , mxCBXRewind(mxBuilder->weld_check_button(u"rewind"_ustr)) + , mxRBClickSequence(mxBuilder->weld_radio_button(u"rb_click_sequence"_ustr)) + , mxRBInteractive(mxBuilder->weld_radio_button(u"rb_interactive"_ustr)) + , mxLBTrigger(mxBuilder->weld_combo_box(u"trigger_list"_ustr)) { mxLBTrigger->set_size_request(mxLBTrigger->get_approximate_digit_width() * 20, -1); @@ -1788,13 +1788,13 @@ private: CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(weld::Container* pParent, const STLPropertySet* pSet) : mpSet(pSet) , mbHasVisibleShapes(true) - , mxBuilder(Application::CreateBuilder(pParent, "modules/simpress/ui/customanimationtexttab.ui")) - , mxContainer(mxBuilder->weld_container("TextAnimationTab")) - , mxLBGroupText(mxBuilder->weld_combo_box("group_text_list")) - , mxCBXGroupAuto(mxBuilder->weld_check_button("auto_after")) - , mxMFGroupAuto(mxBuilder->weld_metric_spin_button("auto_after_value",FieldUnit::SECOND)) - , mxCBXAnimateForm(mxBuilder->weld_check_button("animate_shape")) - , mxCBXReverse(mxBuilder->weld_check_button("reverse_order")) + , mxBuilder(Application::CreateBuilder(pParent, u"modules/simpress/ui/customanimationtexttab.ui"_ustr)) + , mxContainer(mxBuilder->weld_container(u"TextAnimationTab"_ustr)) + , mxLBGroupText(mxBuilder->weld_combo_box(u"group_text_list"_ustr)) + , mxCBXGroupAuto(mxBuilder->weld_check_button(u"auto_after"_ustr)) + , mxMFGroupAuto(mxBuilder->weld_metric_spin_button(u"auto_after_value"_ustr,FieldUnit::SECOND)) + , mxCBXAnimateForm(mxBuilder->weld_check_button(u"animate_shape"_ustr)) + , mxCBXReverse(mxBuilder->weld_check_button(u"reverse_order"_ustr)) { mxLBGroupText->connect_changed(LINK(this, CustomAnimationTextAnimTabPage, implSelectHdl)); @@ -1943,11 +1943,11 @@ IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl, weld::ComboBox&, } CustomAnimationDialog::CustomAnimationDialog(weld::Window* pParent, std::unique_ptr<STLPropertySet> pSet, const OUString& rPage) - : GenericDialogController(pParent, "modules/simpress/ui/customanimationproperties.ui", "CustomAnimationProperties") + : GenericDialogController(pParent, u"modules/simpress/ui/customanimationproperties.ui"_ustr, u"CustomAnimationProperties"_ustr) , mxSet(std::move(pSet)) - , mxTabControl(m_xBuilder->weld_notebook("tabcontrol")) - , mxDurationTabPage(new CustomAnimationDurationTabPage(mxTabControl->get_page("timing"), mxSet.get())) - , mxEffectTabPage(new CustomAnimationEffectTabPage(mxTabControl->get_page("effect"), m_xDialog.get(), mxSet.get())) + , mxTabControl(m_xBuilder->weld_notebook(u"tabcontrol"_ustr)) + , mxDurationTabPage(new CustomAnimationDurationTabPage(mxTabControl->get_page(u"timing"_ustr), mxSet.get())) + , mxEffectTabPage(new CustomAnimationEffectTabPage(mxTabControl->get_page(u"effect"_ustr), m_xDialog.get(), mxSet.get())) { bool bHasText = false; if( mxSet->getPropertyState( nHandleHasText ) != STLPropertyState::Ambiguous ) @@ -1955,11 +1955,11 @@ CustomAnimationDialog::CustomAnimationDialog(weld::Window* pParent, std::unique_ if( bHasText ) { - mxTextAnimTabPage.reset(new CustomAnimationTextAnimTabPage(mxTabControl->get_page("textanim"), mxSet.get())); + mxTextAnimTabPage.reset(new CustomAnimationTextAnimTabPage(mxTabControl->get_page(u"textanim"_ustr), mxSet.get())); } else { - mxTabControl->remove_page("textanim"); + mxTabControl->remove_page(u"textanim"_ustr); } if (!rPage.isEmpty()) diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index bb08f33c4411..188f30b23960 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -578,10 +578,10 @@ IMPL_LINK(CustomAnimationList, KeyInputHdl, const KeyEvent&, rKEvt, bool) switch (nKeyCode) { case KEY_DELETE: - mpController->onContextMenu("remove"); + mpController->onContextMenu(u"remove"_ustr); return true; case KEY_INSERT: - mpController->onContextMenu("create"); + mpController->onContextMenu(u"create"_ustr); return true; case KEY_SPACE: { @@ -1173,8 +1173,8 @@ IMPL_LINK(CustomAnimationList, CommandHdl, const CommandEvent&, rCEvt, bool) if (!mxTreeView->get_selected(nullptr)) return false; - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(mxTreeView.get(), "modules/simpress/ui/effectmenu.ui")); - std::unique_ptr<weld::Menu> xMenu = xBuilder->weld_menu("menu"); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(mxTreeView.get(), u"modules/simpress/ui/effectmenu.ui"_ustr)); + std::unique_ptr<weld::Menu> xMenu = xBuilder->weld_menu(u"menu"_ustr); sal_Int16 nNodeType = -1; sal_Int16 nEntries = 0; @@ -1203,11 +1203,11 @@ IMPL_LINK(CustomAnimationList, CommandHdl, const CommandEvent&, rCEvt, bool) return false; }); - xMenu->set_active("onclick", nNodeType == EffectNodeType::ON_CLICK); - xMenu->set_active("withprev", nNodeType == EffectNodeType::WITH_PREVIOUS); - xMenu->set_active("afterprev", nNodeType == EffectNodeType::AFTER_PREVIOUS); - xMenu->set_sensitive("options", nEntries == 1); - xMenu->set_sensitive("timing", nEntries == 1); + xMenu->set_active(u"onclick"_ustr, nNodeType == EffectNodeType::ON_CLICK); + xMenu->set_active(u"withprev"_ustr, nNodeType == EffectNodeType::WITH_PREVIOUS); + xMenu->set_active(u"afterprev"_ustr, nNodeType == EffectNodeType::AFTER_PREVIOUS); + xMenu->set_sensitive(u"options"_ustr, nEntries == 1); + xMenu->set_sensitive(u"timing"_ustr, nEntries == 1); OUString sCommand = xMenu->popup_at_rect(mxTreeView.get(), ::tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); if (!sCommand.isEmpty()) diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index f6d8505966e7..954e7ac2e74e 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -118,32 +118,32 @@ void fillRepeatComboBox(weld::ComboBox& rBox) } CustomAnimationPane::CustomAnimationPane( weld::Widget* pParent, ViewShellBase& rBase ) - : PanelLayout(pParent, "CustomAnimationsPanel", "modules/simpress/ui/customanimationspanel.ui") + : PanelLayout(pParent, u"CustomAnimationsPanel"_ustr, u"modules/simpress/ui/customanimationspanel.ui"_ustr) , mrBase(rBase) // load resources - , mxFTAnimation(m_xBuilder->weld_label("effectlabel")) - , mxCustomAnimationList(new CustomAnimationList(m_xBuilder->weld_tree_view("custom_animation_list"), - m_xBuilder->weld_label("custom_animation_label"), - m_xBuilder->weld_widget("custom_animation_label_parent"))) - , mxPBAddEffect(m_xBuilder->weld_button("add_effect")) - , mxPBRemoveEffect(m_xBuilder->weld_button("remove_effect")) - , mxPBMoveUp(m_xBuilder->weld_button("move_up")) - , mxPBMoveDown(m_xBuilder->weld_button("move_down")) - , mxFTCategory(m_xBuilder->weld_label("categorylabel")) - , mxLBCategory(m_xBuilder->weld_combo_box("categorylb")) - , mxFTEffect(m_xBuilder->weld_label("effect_label")) - , mxLBAnimation(m_xBuilder->weld_tree_view("effect_list")) - , mxFTStart(m_xBuilder->weld_label("start_effect")) - , mxLBStart(m_xBuilder->weld_combo_box("start_effect_list")) - , mxFTProperty(m_xBuilder->weld_label("effect_property")) - , mxPlaceholderBox(m_xBuilder->weld_container("placeholder")) - , mxPBPropertyMore(m_xBuilder->weld_button("more_properties")) - , mxFTDuration(m_xBuilder->weld_label("effect_duration")) - , mxCBXDuration(m_xBuilder->weld_metric_spin_button("anim_duration", FieldUnit::SECOND)) - , mxFTStartDelay(m_xBuilder->weld_label("delay_label")) - , mxMFStartDelay(m_xBuilder->weld_metric_spin_button("delay_value", FieldUnit::SECOND)) - , mxCBAutoPreview(m_xBuilder->weld_check_button("auto_preview")) - , mxPBPlay(m_xBuilder->weld_button("play")) + , mxFTAnimation(m_xBuilder->weld_label(u"effectlabel"_ustr)) + , mxCustomAnimationList(new CustomAnimationList(m_xBuilder->weld_tree_view(u"custom_animation_list"_ustr), + m_xBuilder->weld_label(u"custom_animation_label"_ustr), + m_xBuilder->weld_widget(u"custom_animation_label_parent"_ustr))) + , mxPBAddEffect(m_xBuilder->weld_button(u"add_effect"_ustr)) + , mxPBRemoveEffect(m_xBuilder->weld_button(u"remove_effect"_ustr)) + , mxPBMoveUp(m_xBuilder->weld_button(u"move_up"_ustr)) + , mxPBMoveDown(m_xBuilder->weld_button(u"move_down"_ustr)) + , mxFTCategory(m_xBuilder->weld_label(u"categorylabel"_ustr)) + , mxLBCategory(m_xBuilder->weld_combo_box(u"categorylb"_ustr)) + , mxFTEffect(m_xBuilder->weld_label(u"effect_label"_ustr)) + , mxLBAnimation(m_xBuilder->weld_tree_view(u"effect_list"_ustr)) + , mxFTStart(m_xBuilder->weld_label(u"start_effect"_ustr)) + , mxLBStart(m_xBuilder->weld_combo_box(u"start_effect_list"_ustr)) + , mxFTProperty(m_xBuilder->weld_label(u"effect_property"_ustr)) + , mxPlaceholderBox(m_xBuilder->weld_container(u"placeholder"_ustr)) + , mxPBPropertyMore(m_xBuilder->weld_button(u"more_properties"_ustr)) + , mxFTDuration(m_xBuilder->weld_label(u"effect_duration"_ustr)) + , mxCBXDuration(m_xBuilder->weld_metric_spin_button(u"anim_duration"_ustr, FieldUnit::SECOND)) + , mxFTStartDelay(m_xBuilder->weld_label(u"delay_label"_ustr)) + , mxMFStartDelay(m_xBuilder->weld_metric_spin_button(u"delay_value"_ustr, FieldUnit::SECOND)) + , mxCBAutoPreview(m_xBuilder->weld_check_button(u"auto_preview"_ustr)) + , mxPBPlay(m_xBuilder->weld_button(u"play"_ustr)) , maIdle("sd idle treeview select") , mnLastSelectedAnimation(-1) , mnPropertyType(nPropertyTypeNone) @@ -862,7 +862,7 @@ void CustomAnimationPane::onContextMenu(const OUString &rIdent) else if (rIdent == "options") showOptions(); else if (rIdent == "timing") - showOptions("timing"); + showOptions(u"timing"_ustr); else if (rIdent == "remove") onRemove(); else if (rIdent == "create" && maViewSelection.hasValue()) @@ -907,7 +907,7 @@ static sal_Int32 calcMaxParaDepth( const Reference< XShape >& xTargetShape ) if( xParaSet.is() ) { sal_Int32 nParaDepth = 0; - xParaSet->getPropertyValue( "NumberingLevel" ) >>= nParaDepth; + xParaSet->getPropertyValue( u"NumberingLevel"_ustr ) >>= nParaDepth; if( nParaDepth > nMaxParaDepth ) nMaxParaDepth = nParaDepth; @@ -1062,10 +1062,10 @@ static bool hasVisibleShape( const Reference< XShape >& xShape ) Reference< XPropertySet > xSet( xShape, UNO_QUERY_THROW ); FillStyle eFillStyle; - xSet->getPropertyValue( "FillStyle" ) >>= eFillStyle; + xSet->getPropertyValue( u"FillStyle"_ustr ) >>= eFillStyle; css::drawing::LineStyle eLineStyle; - xSet->getPropertyValue( "LineStyle" ) >>= eLineStyle; + xSet->getPropertyValue( u"LineStyle"_ustr ) >>= eLineStyle; return eFillStyle != FillStyle_NONE || eLineStyle != css::drawing::LineStyle_NONE; } @@ -2473,7 +2473,7 @@ void CustomAnimationPane::preview( const Reference< XAnimationNode >& xAnimation { Reference< XParallelTimeContainer > xRoot = ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ); Sequence< css::beans::NamedValue > aUserData - { { "node-type", css::uno::Any(css::presentation::EffectNodeType::TIMING_ROOT) } }; + { { u"node-type"_ustr, css::uno::Any(css::presentation::EffectNodeType::TIMING_ROOT) } }; xRoot->setUserData( aUserData ); xRoot->appendChild( xAnimationNode ); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 4f9914f6ea22..d2ec3668a64c 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -392,7 +392,7 @@ public: SlideTransitionPane::SlideTransitionPane( weld::Widget* pParent, ViewShellBase & rBase) : - PanelLayout( pParent, "SlideTransitionsPanel", "modules/simpress/ui/slidetransitionspanel.ui" ), + PanelLayout( pParent, u"SlideTransitionsPanel"_ustr, u"modules/simpress/ui/slidetransitionspanel.ui"_ustr ), mrBase( rBase ), mpDrawDoc( rBase.GetDocShell() ? rBase.GetDocShell()->GetDoc() : nullptr ), mbHasSelection( false ), @@ -413,17 +413,17 @@ constexpr sal_uInt16 nNoneId = std::numeric_limits<sal_uInt16>::max(); void SlideTransitionPane::Initialize(SdDrawDocument* pDoc) { - mxLB_VARIANT = m_xBuilder->weld_combo_box("variant_list"); - mxCBX_duration = m_xBuilder->weld_metric_spin_button("transition_duration", FieldUnit::SECOND); - mxFT_SOUND = m_xBuilder->weld_label("sound_label"); - mxLB_SOUND = m_xBuilder->weld_combo_box("sound_list"); - mxCB_LOOP_SOUND = m_xBuilder->weld_check_button("loop_sound"); - mxRB_ADVANCE_ON_MOUSE = m_xBuilder->weld_radio_button("rb_mouse_click"); - mxRB_ADVANCE_AUTO = m_xBuilder->weld_radio_button("rb_auto_after"); - mxMF_ADVANCE_AUTO_AFTER = m_xBuilder->weld_metric_spin_button("auto_after_value", FieldUnit::SECOND); - mxPB_APPLY_TO_ALL = m_xBuilder->weld_button("apply_to_all"); - mxPB_PLAY = m_xBuilder->weld_button("play"); - mxCB_AUTO_PREVIEW = m_xBuilder->weld_check_button("auto_preview"); + mxLB_VARIANT = m_xBuilder->weld_combo_box(u"variant_list"_ustr); + mxCBX_duration = m_xBuilder->weld_metric_spin_button(u"transition_duration"_ustr, FieldUnit::SECOND); + mxFT_SOUND = m_xBuilder->weld_label(u"sound_label"_ustr); + mxLB_SOUND = m_xBuilder->weld_combo_box(u"sound_list"_ustr); + mxCB_LOOP_SOUND = m_xBuilder->weld_check_button(u"loop_sound"_ustr); + mxRB_ADVANCE_ON_MOUSE = m_xBuilder->weld_radio_button(u"rb_mouse_click"_ustr); + mxRB_ADVANCE_AUTO = m_xBuilder->weld_radio_button(u"rb_auto_after"_ustr); + mxMF_ADVANCE_AUTO_AFTER = m_xBuilder->weld_metric_spin_button(u"auto_after_value"_ustr, FieldUnit::SECOND); + mxPB_APPLY_TO_ALL = m_xBuilder->weld_button(u"apply_to_all"_ustr); + mxPB_PLAY = m_xBuilder->weld_button(u"play"_ustr); + mxCB_AUTO_PREVIEW = m_xBuilder->weld_check_button(u"auto_preview"_ustr); auto nMax = mxMF_ADVANCE_AUTO_AFTER->get_max(FieldUnit::SECOND); mxMF_ADVANCE_AUTO_AFTER->set_max(99, FieldUnit::SECOND); @@ -432,8 +432,8 @@ void SlideTransitionPane::Initialize(SdDrawDocument* pDoc) mxMF_ADVANCE_AUTO_AFTER->set_width_chars(nWidthChars); mxCBX_duration->set_width_chars(nWidthChars); - mxVS_TRANSITION_ICONS.reset(new TransitionPane(m_xBuilder->weld_scrolled_window("transitions_iconswin", true))); - mxVS_TRANSITION_ICONSWin.reset(new weld::CustomWeld(*m_xBuilder, "transitions_icons", *mxVS_TRANSITION_ICONS)); + mxVS_TRANSITION_ICONS.reset(new TransitionPane(m_xBuilder->weld_scrolled_window(u"transitions_iconswin"_ustr, true))); + mxVS_TRANSITION_ICONSWin.reset(new weld::CustomWeld(*m_xBuilder, u"transitions_icons"_ustr, *mxVS_TRANSITION_ICONS)); if( pDoc ) mxModel = pDoc->getUnoModel(); @@ -443,7 +443,7 @@ void SlideTransitionPane::Initialize(SdDrawDocument* pDoc) // dummy list box of slide transitions for startup. mxVS_TRANSITION_ICONS->InsertItem( - nNoneId, Image( StockImage::Yes, "sd/cmd/transition-none.png" ), + nNoneId, Image( StockImage::Yes, u"sd/cmd/transition-none.png"_ustr ), SdResId( STR_SLIDETRANSITION_NONE ), VALUESET_APPEND, /* show legend */ true ); mxVS_TRANSITION_ICONS->Recalculate(); @@ -576,7 +576,7 @@ void SlideTransitionPane::updateControls() if( aEffect.mbDurationAmbiguous ) { - mxCBX_duration->set_text(""); + mxCBX_duration->set_text(u""_ustr); //TODO mxCBX_duration->SetNoSelection(); } else diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index d3153f892b94..503ab57c0b5e 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -334,7 +334,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con maOriginPos = mxOrigin->getPosition(); XDash aDash( css::drawing::DashStyle_RECT, 1, 80, 1, 80, 80); - OUString aEmpty( "?" ); + OUString aEmpty( u"?"_ustr ); mpPathObj->SetMergedItem( XLineDashItem( aEmpty, aDash ) ); mpPathObj->SetMergedItem( XLineStyleItem( drawing::LineStyle_DASH ) ); mpPathObj->SetMergedItem( XLineColorItem(aEmpty, COL_GRAY) ); @@ -386,7 +386,7 @@ void MotionPathTag::updatePathAttributes() aEndArrow.append(::basegfx::B2DPoint(0.0, 30.0)); aEndArrow.append(::basegfx::B2DPoint(20.0, 30.0)); aEndArrow.setClosed(true); - mpPathObj->SetMergedItem(XLineEndItem("?",::basegfx::B2DPolyPolygon(aEndArrow))); + mpPathObj->SetMergedItem(XLineEndItem(u"?"_ustr,::basegfx::B2DPolyPolygon(aEndArrow))); mpPathObj->SetMergedItem(XLineEndWidthItem(400)); mpPathObj->SetMergedItem(XLineEndCenterItem(true)); } diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index bc4db37332d5..1446756d339a 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -96,7 +96,7 @@ SfxItemPool* GetAnnotationPool() s_pAnnotationPool->SetUserDefaultItem(SvxFontHeightItem(423,100,EE_CHAR_FONTHEIGHT)); vcl::Font aAppFont( Application::GetSettings().GetStyleSettings().GetAppFont() ); - s_pAnnotationPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyType(),aAppFont.GetFamilyName(),"",PITCH_DONTKNOW,RTL_TEXTENCODING_DONTKNOW,EE_CHAR_FONTINFO)); + s_pAnnotationPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyType(),aAppFont.GetFamilyName(),u""_ustr,PITCH_DONTKNOW,RTL_TEXTENCODING_DONTKNOW,EE_CHAR_FONTINFO)); } return s_pAnnotationPool.get(); @@ -1060,24 +1060,24 @@ void AnnotationManagerImpl::ExecuteAnnotationTagContextMenu(const rtl::Reference if (bReadOnly) return; - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pParent, "modules/simpress/ui/annotationtagmenu.ui")); - std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu("menu")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pParent, u"modules/simpress/ui/annotationtagmenu.ui"_ustr)); + std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu(u"menu"_ustr)); SvtUserOptions aUserOptions; OUString sCurrentAuthor( aUserOptions.GetFullName() ); OUString sAuthor( xAnnotation->getAuthor() ); - OUString aStr(xMenu->get_label(".uno:DeleteAllAnnotationByAuthor")); + OUString aStr(xMenu->get_label(u".uno:DeleteAllAnnotationByAuthor"_ustr)); OUString aReplace( sAuthor ); if( aReplace.isEmpty() ) aReplace = SdResId( STR_ANNOTATION_NOAUTHOR ); aStr = aStr.replaceFirst("%1", aReplace); - xMenu->set_label(".uno:DeleteAllAnnotationByAuthor", aStr); + xMenu->set_label(u".uno:DeleteAllAnnotationByAuthor"_ustr, aStr); bool bShowReply = sAuthor != sCurrentAuthor; - xMenu->set_visible(".uno:ReplyToAnnotation", bShowReply); - xMenu->set_visible("separator", bShowReply); - xMenu->set_visible(".uno:DeleteAnnotation", xAnnotation.is()); + xMenu->set_visible(u".uno:ReplyToAnnotation"_ustr, bShowReply); + xMenu->set_visible(u"separator"_ustr, bShowReply); + xMenu->set_visible(u".uno:DeleteAnnotation"_ustr, xAnnotation.is()); auto sId = xMenu->popup_at_rect(pParent, rContextRect); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 59ccc11af604..a2f17a1a53cb 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -210,9 +210,9 @@ void AnnotationTextWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea) AnnotationWindow::AnnotationWindow(weld::Window* pParent, const ::tools::Rectangle& rRect, DrawDocShell* pDocShell, const Reference<XAnnotation>& xAnnotation) - : mxBuilder(Application::CreateBuilder(pParent, "modules/simpress/ui/annotation.ui")) - , mxPopover(mxBuilder->weld_popover("Annotation")) - , mxContainer(mxBuilder->weld_widget("container")) + : mxBuilder(Application::CreateBuilder(pParent, u"modules/simpress/ui/annotation.ui"_ustr)) + , mxPopover(mxBuilder->weld_popover(u"Annotation"_ustr)) + , mxContainer(mxBuilder->weld_widget(u"container"_ustr)) , mpDocShell(pDocShell) , mpDoc(pDocShell->GetDoc()) , mbReadonly(pDocShell->IsReadOnly()) @@ -237,7 +237,7 @@ AnnotationWindow::~AnnotationWindow() void AnnotationWindow::InitControls() { // window control for author and date - mxMeta = mxBuilder->weld_label("meta"); + mxMeta = mxBuilder->weld_label(u"meta"_ustr); mxMeta->set_direction(AllSettings::GetLayoutRTL()); maLabelFont = Application::GetSettings().GetStyleSettings().GetLabelFont(); @@ -258,11 +258,11 @@ void AnnotationWindow::InitControls() mpOutliner->InsertView(mpOutlinerView.get() ); //create Scrollbars - mxVScrollbar = mxBuilder->weld_scrolled_window("scrolledwindow", true); + mxVScrollbar = mxBuilder->weld_scrolled_window(u"scrolledwindow"_ustr, true); // actual window which holds the user text mxTextControl.reset(new AnnotationTextWindow(*this)); - mxTextControlWin.reset(new weld::CustomWeld(*mxBuilder, "editview", *mxTextControl)); + mxTextControlWin.reset(new weld::CustomWeld(*mxBuilder, u"editview"_ustr, *mxTextControl)); mxTextControl->SetPointer(PointerStyle::Text); Rescale(); @@ -274,7 +274,7 @@ void AnnotationWindow::InitControls() mpOutlinerView->SetBackgroundColor(COL_TRANSPARENT); mpOutlinerView->SetOutputArea(rDevice.PixelToLogic(::tools::Rectangle(0, 0, 1, 1))); - mxMenuButton = mxBuilder->weld_menu_button("menubutton"); + mxMenuButton = mxBuilder->weld_menu_button(u"menubutton"_ustr); if (mbReadonly) mxMenuButton->hide(); else @@ -333,19 +333,19 @@ void AnnotationWindow::FillMenuButton() OUString sCurrentAuthor( aUserOptions.GetFullName() ); OUString sAuthor( mxAnnotation->getAuthor() ); - OUString aStr(mxMenuButton->get_item_label(".uno:DeleteAllAnnotationByAuthor")); + OUString aStr(mxMenuButton->get_item_label(u".uno:DeleteAllAnnotationByAuthor"_ustr)); OUString aReplace( sAuthor ); if( aReplace.isEmpty() ) aReplace = SdResId( STR_ANNOTATION_NOAUTHOR ); aStr = aStr.replaceFirst("%1", aReplace); - mxMenuButton->set_item_label(".uno:DeleteAllAnnotationByAuthor", aStr); + mxMenuButton->set_item_label(u".uno:DeleteAllAnnotationByAuthor"_ustr, aStr); bool bShowReply = sAuthor != sCurrentAuthor && !mbReadonly; - mxMenuButton->set_item_visible(".uno:ReplyToAnnotation", bShowReply); - mxMenuButton->set_item_visible("separator", bShowReply); - mxMenuButton->set_item_visible(".uno:DeleteAnnotation", mxAnnotation.is() && !mbReadonly); - mxMenuButton->set_item_visible(".uno:DeleteAllAnnotationByAuthor", !mbReadonly); - mxMenuButton->set_item_visible(".uno:DeleteAllAnnotation", !mbReadonly); + mxMenuButton->set_item_visible(u".uno:ReplyToAnnotation"_ustr, bShowReply); + mxMenuButton->set_item_visible(u"separator"_ustr, bShowReply); + mxMenuButton->set_item_visible(u".uno:DeleteAnnotation"_ustr, mxAnnotation.is() && !mbReadonly); + mxMenuButton->set_item_visible(u".uno:DeleteAllAnnotationByAuthor"_ustr, !mbReadonly); + mxMenuButton->set_item_visible(u".uno:DeleteAllAnnotation"_ustr, !mbReadonly); } void AnnotationWindow::StartEdit() @@ -622,8 +622,8 @@ bool AnnotationTextWindow::Command(const CommandEvent& rCEvt) ::tools::Rectangle aRect(rCEvt.GetMousePosPixel(), Size(1, 1)); weld::Widget* pPopupParent = GetDrawingArea(); - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, "modules/simpress/ui/annotationtagmenu.ui")); - std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu("menu")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, u"modules/simpress/ui/annotationtagmenu.ui"_ustr)); + std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu(u"menu"_ustr)); auto xAnnotation = mrContents.getAnnotation(); @@ -631,19 +631,19 @@ bool AnnotationTextWindow::Command(const CommandEvent& rCEvt) OUString sCurrentAuthor( aUserOptions.GetFullName() ); OUString sAuthor( xAnnotation->getAuthor() ); - OUString aStr(xMenu->get_label(".uno:DeleteAllAnnotationByAuthor")); + OUString aStr(xMenu->get_label(u".uno:DeleteAllAnnotationByAuthor"_ustr)); OUString aReplace( sAuthor ); if( aReplace.isEmpty() ) aReplace = SdResId( STR_ANNOTATION_NOAUTHOR ); aStr = aStr.replaceFirst("%1", aReplace); - xMenu->set_label(".uno:DeleteAllAnnotationByAuthor", aStr); + xMenu->set_label(u".uno:DeleteAllAnnotationByAuthor"_ustr, aStr); bool bShowReply = sAuthor != sCurrentAuthor && !bReadOnly; - xMenu->set_visible(".uno:ReplyToAnnotation", bShowReply); - xMenu->set_visible("separator", bShowReply); - xMenu->set_visible(".uno:DeleteAnnotation", xAnnotation.is() && !bReadOnly); - xMenu->set_visible(".uno:DeleteAllAnnotationByAuthor", !bReadOnly); - xMenu->set_visible(".uno:DeleteAllAnnotation", !bReadOnly); + xMenu->set_visible(u".uno:ReplyToAnnotation"_ustr, bShowReply); + xMenu->set_visible(u"separator"_ustr, bShowReply); + xMenu->set_visible(u".uno:DeleteAnnotation"_ustr, xAnnotation.is() && !bReadOnly); + xMenu->set_visible(u".uno:DeleteAllAnnotationByAuthor"_ustr, !bReadOnly); + xMenu->set_visible(u".uno:DeleteAllAnnotation"_ustr, !bReadOnly); int nInsertPos = 2; @@ -655,68 +655,68 @@ bool AnnotationTextWindow::Command(const CommandEvent& rCEvt) { SfxItemSet aSet(mrContents.GetOutlinerView()->GetAttribs()); - xMenu->insert(nInsertPos++, ".uno:Bold", + xMenu->insert(nInsertPos++, u".uno:Bold"_ustr, vcl::CommandInfoProvider::GetMenuLabelForCommand( - vcl::CommandInfoProvider::GetCommandProperties(".uno:Bold", aModuleName)), - nullptr, nullptr, vcl::CommandInfoProvider::GetXGraphicForCommand(".uno:Bold", xFrame), + vcl::CommandInfoProvider::GetCommandProperties(u".uno:Bold"_ustr, aModuleName)), + nullptr, nullptr, vcl::CommandInfoProvider::GetXGraphicForCommand(u".uno:Bold"_ustr, xFrame), TRISTATE_TRUE); if ( aSet.GetItemState( EE_CHAR_WEIGHT ) == SfxItemState::SET ) { if( aSet.Get( EE_CHAR_WEIGHT ).GetWeight() == WEIGHT_BOLD ) - xMenu->set_active(".uno:Bold", true); + xMenu->set_active(u".uno:Bold"_ustr, true); } - xMenu->insert(nInsertPos++, ".uno:Italic", + xMenu->insert(nInsertPos++, u".uno:Italic"_ustr, vcl::CommandInfoProvider::GetMenuLabelForCommand( - vcl::CommandInfoProvider::GetCommandProperties(".uno:Italic", aModuleName)), - nullptr, nullptr, vcl::CommandInfoProvider::GetXGraphicForCommand(".uno:Italic", xFrame), + vcl::CommandInfoProvider::GetCommandProperties(u".uno:Italic"_ustr, aModuleName)), + nullptr, nullptr, vcl::CommandInfoProvider::GetXGraphicForCommand(u".uno:Italic"_ustr, xFrame), TRISTATE_TRUE); if ( aSet.GetItemState( EE_CHAR_ITALIC ) == SfxItemState::SET ) { if( aSet.Get( EE_CHAR_ITALIC ).GetPosture() != ITALIC_NONE ) - xMenu->set_active(".uno:Italic", true); + xMenu->set_active(u".uno:Italic"_ustr, true); } - xMenu->insert(nInsertPos++, ".uno:Underline", + xMenu->insert(nInsertPos++, u".uno:Underline"_ustr, vcl::CommandInfoProvider::GetMenuLabelForCommand( - vcl::CommandInfoProvider::GetCommandProperties(".uno:Underline", aModuleName)), - nullptr, nullptr, vcl::CommandInfoProvider::GetXGraphicForCommand(".uno:Underline", xFrame), + vcl::CommandInfoProvider::GetCommandProperties(u".uno:Underline"_ustr, aModuleName)), + nullptr, nullptr, vcl::CommandInfoProvider::GetXGraphicForCommand(u".uno:Underline"_ustr, xFrame), TRISTATE_TRUE); if ( aSet.GetItemState( EE_CHAR_UNDERLINE ) == SfxItemState::SET ) { if( aSet.Get( EE_CHAR_UNDERLINE ).GetLineStyle() != LINESTYLE_NONE ) - xMenu->set_active(".uno:Underline", true); + xMenu->set_active(u".uno:Underline"_ustr, true); } - xMenu->insert(nInsertPos++, ".uno:Strikeout", + xMenu->insert(nInsertPos++, u".uno:Strikeout"_ustr, vcl::CommandInfoProvider::GetMenuLabelForCommand( - vcl::CommandInfoProvider::GetCommandProperties(".uno:Strikeout", aModuleName)), - nullptr, nullptr, vcl::CommandInfoProvider::GetXGraphicForCommand(".uno:Strikeout", xFrame), + vcl::CommandInfoProvider::GetCommandProperties(u".uno:Strikeout"_ustr, aModuleName)), + nullptr, nullptr, vcl::CommandInfoProvider::GetXGraphicForCommand(u".uno:Strikeout"_ustr, xFrame), TRISTATE_TRUE); if ( aSet.GetItemState( EE_CHAR_STRIKEOUT ) == SfxItemState::SET ) { if( aSet.Get( EE_CHAR_STRIKEOUT ).GetStrikeout() != STRIKEOUT_NONE ) - xMenu->set_active(".uno:Strikeout", true); + xMenu->set_active(u".uno:Strikeout"_ustr, true); } - xMenu->insert_separator(nInsertPos++, "separator2"); + xMenu->insert_separator(nInsertPos++, u"separator2"_ustr); } - xMenu->insert(nInsertPos++, ".uno:Copy", + xMenu->insert(nInsertPos++, u".uno:Copy"_ustr, vcl::CommandInfoProvider::GetMenuLabelForCommand( - vcl::CommandInfoProvider::GetCommandProperties(".uno:Copy", aModuleName)), - nullptr, nullptr, vcl::CommandInfoProvider::GetXGraphicForCommand(".uno:Copy", xFrame), + vcl::CommandInfoProvider::GetCommandProperties(u".uno:Copy"_ustr, aModuleName)), + nullptr, nullptr, vcl::CommandInfoProvider::GetXGraphicForCommand(u".uno:Copy"_ustr, xFrame), TRISTATE_INDET); - xMenu->insert(nInsertPos++, ".uno:Paste", + xMenu->insert(nInsertPos++, u".uno:Paste"_ustr, vcl::CommandInfoProvider::GetMenuLabelForCommand( - vcl::CommandInfoProvider::GetCommandProperties(".uno:Paste", aModuleName)), - nullptr, nullptr, vcl::CommandInfoProvider::GetXGraphicForCommand(".uno:Paste", xFrame), + vcl::CommandInfoProvider::GetCommandProperties(u".uno:Paste"_ustr, aModuleName)), + nullptr, nullptr, vcl::CommandInfoProvider::GetXGraphicForCommand(u".uno:Paste"_ustr, xFrame), TRISTATE_INDET); bool bCanPaste = false; @@ -726,10 +726,10 @@ bool AnnotationTextWindow::Command(const CommandEvent& rCEvt) bCanPaste = aDataHelper.GetFormatCount() != 0; } - xMenu->insert_separator(nInsertPos++, "separator3"); + xMenu->insert_separator(nInsertPos++, u"separator3"_ustr); - xMenu->set_sensitive(".uno:Copy", mrContents.GetOutlinerView()->HasSelection()); - xMenu->set_sensitive(".uno:Paste", bCanPaste); + xMenu->set_sensitive(u".uno:Copy"_ustr, mrContents.GetOutlinerView()->HasSelection()); + xMenu->set_sensitive(u".uno:Paste"_ustr, bCanPaste); auto sId = xMenu->popup_at_rect(pPopupParent, aRect); diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 9b1ec49f85a5..454e2171baf6 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -186,8 +186,8 @@ bool SdOptionsGeneric::isMetricSystem() SdOptionsMisc::SdOptionsMisc( bool bImpress, bool bUseConfig ) : SdOptionsGeneric( bImpress, bUseConfig ? ( bImpress ? - OUString( "Office.Impress/Misc" ) : - OUString( "Office.Draw/Misc" ) ) : + u"Office.Impress/Misc"_ustr : + u"Office.Draw/Misc"_ustr ) : OUString() ), nDefaultObjectSizeWidth(8000), nDefaultObjectSizeHeight(5000), @@ -524,8 +524,8 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const SdOptionsGrid::SdOptionsGrid(bool bImpress) : SdOptionsGeneric( bImpress, bImpress ? - OUString( "Office.Impress/Grid" ) : - OUString( "Office.Draw/Grid" ) + u"Office.Impress/Grid"_ustr : + u"Office.Draw/Grid"_ustr ) { EnableModify( false ); @@ -666,8 +666,8 @@ void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const SdOptionsPrint::SdOptionsPrint( bool bImpress, bool bUseConfig ) : SdOptionsGeneric( bImpress, bUseConfig ? ( bImpress ? - OUString( "Office.Impress/Print" ) : - OUString( "Office.Draw/Print" ) ) : + u"Office.Impress/Print"_ustr : + u"Office.Draw/Print"_ustr ) : OUString() ), bDraw( true ), bNotes( false ), diff --git a/sd/source/ui/app/scalectrl.cxx b/sd/source/ui/app/scalectrl.cxx index c2d3f034a031..a12cbdd3d660 100644 --- a/sd/source/ui/app/scalectrl.cxx +++ b/sd/source/ui/app/scalectrl.cxx @@ -76,8 +76,8 @@ void SdScaleControl::Command(const CommandEvent& rCEvt) return; std::unique_ptr<weld::Builder> xBuilder( - Application::CreateBuilder(nullptr, "modules/simpress/ui/masterpagemenu.ui")); - std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu("menu")); + Application::CreateBuilder(nullptr, u"modules/simpress/ui/masterpagemenu.ui"_ustr)); + std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu(u"menu"_ustr)); sal_uInt16 aTable[12] = { 1, 2, 4, 5, 8, 10, 16, 20, 30, 40, 50, 100 }; diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index c1e76ee7e0a7..d65bee2ad2c1 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -238,12 +238,12 @@ void SdDLL::Init() { // Register the Impress shape types in order to make the shapes accessible. ::accessibility::RegisterImpressShapeTypes (); - ::sd::DrawDocShell::Factory().SetDocumentServiceName( "com.sun.star.presentation.PresentationDocument" ); + ::sd::DrawDocShell::Factory().SetDocumentServiceName( u"com.sun.star.presentation.PresentationDocument"_ustr ); } if (!comphelper::IsFuzzing() && SvtModuleOptions().IsDraw()) { - ::sd::GraphicDocShell::Factory().SetDocumentServiceName( "com.sun.star.drawing.DrawingDocument" ); + ::sd::GraphicDocShell::Factory().SetDocumentServiceName( u"com.sun.star.drawing.DrawingDocument"_ustr ); } // register your view-factories here diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index d534fe51aa23..bb4d30f9e1df 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -65,7 +65,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) mbEventListenerAdded(false), mpColorConfig(new svtools::ColorConfig) { - SetName( "StarDraw" ); // Do not translate! + SetName( u"StarDraw"_ustr ); // Do not translate! pSearchItem.reset( new SvxSearchItem(SID_SEARCH_ITEM) ); pSearchItem->SetAppFlag(SvxSearchApp::DRAW); StartListening( *SfxGetpApp() ); diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 374a30c241eb..a9cafe31a765 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -213,7 +213,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) } else if( dynamic_cast< const SvxPageField* >(pField) ) { - OUString aRepresentation(" "); + OUString aRepresentation(u" "_ustr); ::sd::ViewShell* pViewSh = pDocShell ? pDocShell->GetViewShell() : nullptr; if(pViewSh == nullptr) @@ -249,7 +249,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) } else if( dynamic_cast< const SvxPageTitleField* >(pField) ) { - OUString aRepresentation(" "); + OUString aRepresentation(u" "_ustr); ::sd::ViewShell* pViewSh = pDocShell ? pDocShell->GetViewShell() : nullptr; if(pViewSh == nullptr) @@ -280,7 +280,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) } else if( dynamic_cast< const SvxPagesField* >(pField) ) { - OUString aRepresentation(" "); + OUString aRepresentation(u" "_ustr); ::sd::ViewShell* pViewSh = pDocShell ? pDocShell->GetViewShell() : nullptr; if(pViewSh == nullptr) diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index a303817eeb18..0e6f84347e7e 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -37,8 +37,8 @@ * Popup menu for editing of field command */ SdFieldPopup::SdFieldPopup(const SvxFieldData* pInField, LanguageType eLanguage) - : m_xBuilder(Application::CreateBuilder(nullptr, "modules/simpress/ui/fieldmenu.ui")) - , m_xPopup(m_xBuilder->weld_menu("menu")) + : m_xBuilder(Application::CreateBuilder(nullptr, u"modules/simpress/ui/fieldmenu.ui"_ustr)) + , m_xPopup(m_xBuilder->weld_menu(u"menu"_ustr)) , m_pField(pInField) { Fill(eLanguage); @@ -53,16 +53,16 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) sal_uInt16 nID = 1; m_xPopup->append_radio(OUString::number(nID++), SdResId(STR_FIX)); m_xPopup->append_radio(OUString::number(nID++), SdResId(STR_VAR)); - m_xPopup->append_separator("separator1"); + m_xPopup->append_separator(u"separator1"_ustr); if( auto pDateField = dynamic_cast< const SvxDateField *>( m_pField ) ) { SvxDateField aDateField( *pDateField ); if (pDateField->GetType() == SvxDateType::Fix) - m_xPopup->set_active("1", true); + m_xPopup->set_active(u"1"_ustr, true); else - m_xPopup->set_active("2", true); + m_xPopup->set_active(u"2"_ustr, true); //SvxDateFormat::AppDefault, // is not used //SvxDateFormat::System, // is not used @@ -91,9 +91,9 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) SvxExtTimeField aTimeField( *pTimeField ); if( pTimeField->GetType() == SvxTimeType::Fix ) - m_xPopup->set_active("1", true); + m_xPopup->set_active(u"1"_ustr, true); else - m_xPopup->set_active("2", true); + m_xPopup->set_active(u"2"_ustr, true); //SvxTimeFormat::AppDefault, // is not used //SvxTimeFormat::System, // is not used @@ -124,9 +124,9 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) //SvxExtFileField aFileField( *pFileField ); if( pFileField->GetType() == SvxFileType::Fix ) - m_xPopup->set_active("1", true); + m_xPopup->set_active(u"1"_ustr, true); else - m_xPopup->set_active("2", true); + m_xPopup->set_active(u"2"_ustr, true); m_xPopup->append_radio(OUString::number(nID++), SdResId(STR_FILEFORMAT_NAME_EXT)); m_xPopup->append_radio(OUString::number(nID++), SdResId(STR_FILEFORMAT_FULLPATH)); @@ -140,9 +140,9 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) SvxAuthorField aAuthorField( *pAuthorField ); if( pAuthorField->GetType() == SvxAuthorType::Fix ) - m_xPopup->set_active("1", true); + m_xPopup->set_active(u"1"_ustr, true); else - m_xPopup->set_active("2", true); + m_xPopup->set_active(u"2"_ustr, true); for( sal_uInt16 i = 0; i < 4; i++ ) { @@ -161,8 +161,8 @@ void SdFieldPopup::Execute(weld::Window* pParent, const tools::Rectangle& rRect) if (sIdent == "1" || sIdent == "2") { - m_xPopup->set_active("1", sIdent == "1"); - m_xPopup->set_active("2", sIdent == "2"); + m_xPopup->set_active(u"1"_ustr, sIdent == "1"); + m_xPopup->set_active(u"2"_ustr, sIdent == "2"); } else { @@ -189,7 +189,7 @@ SvxFieldData* SdFieldPopup::GetField() SvxDateFormat eFormat; sal_uInt16 i; - if (m_xPopup->get_active("1")) + if (m_xPopup->get_active(u"1"_ustr)) eType = SvxDateType::Fix; else eType = SvxDateType::Var; @@ -221,7 +221,7 @@ SvxFieldData* SdFieldPopup::GetField() SvxTimeFormat eFormat; sal_uInt16 i; - if (m_xPopup->get_active("1")) + if (m_xPopup->get_active(u"1"_ustr)) eType = SvxTimeType::Fix; else eType = SvxTimeType::Var; @@ -254,7 +254,7 @@ SvxFieldData* SdFieldPopup::GetField() SvxFileFormat eFormat; sal_uInt16 i; - if (m_xPopup->get_active("1")) + if (m_xPopup->get_active(u"1"_ustr)) eType = SvxFileType::Fix; else eType = SvxFileType::Var; @@ -290,7 +290,7 @@ SvxFieldData* SdFieldPopup::GetField() SvxAuthorFormat eFormat; sal_uInt16 i; - if (m_xPopup->get_active("1")) + if (m_xPopup->get_active(u"1"_ustr)) eType = SvxAuthorType::Fix; else eType = SvxAuthorType::Var; diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index d411d4260284..a7cd70860ce1 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -189,14 +189,14 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) return; css::form::FormButtonType eButtonType; - Any aTmp( xPropSet->getPropertyValue( "ButtonType" ) ); + Any aTmp( xPropSet->getPropertyValue( u"ButtonType"_ustr ) ); if( aTmp >>= eButtonType ) { OUString aLabel, aURL; - xPropSet->getPropertyValue( "Label" ) >>= aLabel; - xPropSet->getPropertyValue( "TargetURL" ) >>= aURL; + xPropSet->getPropertyValue( u"Label"_ustr ) >>= aLabel; + xPropSet->getPropertyValue( u"TargetURL"_ustr ) >>= aURL; moBookmark.emplace( aURL, aLabel ); } diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index ffc79e923c71..b15569180340 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -80,8 +80,8 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt ) if( !pDoc ) return; - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(nullptr, "modules/simpress/ui/masterpagemenu.ui")); - std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu("menu")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(nullptr, u"modules/simpress/ui/masterpagemenu.ui"_ustr)); + std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu(u"menu"_ustr)); const sal_uInt16 nMasterCount = pDoc->GetMasterSdPageCount(PageKind::Standard); diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index 81ad2d19e477..59f91e48ba13 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -98,7 +98,7 @@ const snew_slide_value_info editmodes[] = BMP_DISPLAYMODE_SLIDE_SORTER, STR_SLIDE_SORTER_MODE, ".uno:DiaMode" }, - {0, "", {}, "" } + {0, u""_ustr, {}, "" } }; const snew_slide_value_info mastermodes[] = @@ -115,7 +115,7 @@ const snew_slide_value_info mastermodes[] = BMP_DISPLAYMODE_HANDOUT_MASTER, STR_HANDOUT_MASTER_MODE, ".uno:HandoutMode" }, - {0, "", {}, "" } + {0, u""_ustr, {}, "" } }; @@ -145,14 +145,14 @@ static void fillLayoutValueSet(ValueSet* pValue, const snew_slide_value_info* pI } DisplayModeToolbarMenu::DisplayModeToolbarMenu(DisplayModeController* pControl, weld::Widget* pParent) - : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "modules/simpress/ui/displaywindow.ui", "DisplayWindow") + : WeldToolbarPopup(pControl->getFrameInterface(), pParent, u"modules/simpress/ui/displaywindow.ui"_ustr, u"DisplayWindow"_ustr) , mxControl(pControl) - , mxFrame1(m_xBuilder->weld_frame("editframe")) + , mxFrame1(m_xBuilder->weld_frame(u"editframe"_ustr)) , mxDisplayModeSet1(new ValueSet(nullptr)) - , mxDisplayModeSetWin1(new weld::CustomWeld(*m_xBuilder, "valueset1", *mxDisplayModeSet1)) - , mxFrame2(m_xBuilder->weld_frame("masterframe")) + , mxDisplayModeSetWin1(new weld::CustomWeld(*m_xBuilder, u"valueset1"_ustr, *mxDisplayModeSet1)) + , mxFrame2(m_xBuilder->weld_frame(u"masterframe"_ustr)) , mxDisplayModeSet2(new ValueSet(nullptr)) - , mxDisplayModeSetWin2(new weld::CustomWeld(*m_xBuilder, "valueset2", *mxDisplayModeSet2)) + , mxDisplayModeSetWin2(new weld::CustomWeld(*m_xBuilder, u"valueset2"_ustr, *mxDisplayModeSet2)) { mxDisplayModeSet1->SetStyle(WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT); mxDisplayModeSet1->SetStyle(WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT); @@ -243,12 +243,12 @@ void DisplayModeController::setToolboxItemImage(const OUString& rImage) OUString SAL_CALL DisplayModeController::getImplementationName() { - return "com.sun.star.comp.sd.DisplayModeController"; + return u"com.sun.star.comp.sd.DisplayModeController"_ustr; } Sequence< OUString > SAL_CALL DisplayModeController::getSupportedServiceNames( ) { - css::uno::Sequence<OUString> aRet { "com.sun.star.frame.ToolbarController" }; + css::uno::Sequence<OUString> aRet { u"com.sun.star.frame.ToolbarController"_ustr }; return aRet; } diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 27b238de3e70..7478fd290825 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -155,16 +155,16 @@ static void fillLayoutValueSet( ValueSet* pValue, const snew_slide_value_info_la } LayoutToolbarMenu::LayoutToolbarMenu(SlideLayoutController* pControl, weld::Widget* pParent, const bool bInsertPage, const OUString& rCommand) - : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "modules/simpress/ui/layoutwindow.ui", "LayoutWindow") + : WeldToolbarPopup(pControl->getFrameInterface(), pParent, u"modules/simpress/ui/layoutwindow.ui"_ustr, u"LayoutWindow"_ustr) , mxControl(pControl) , mbInsertPage(bInsertPage) - , mxFrame1(m_xBuilder->weld_frame("horiframe")) + , mxFrame1(m_xBuilder->weld_frame(u"horiframe"_ustr)) , mxLayoutSet1(new ValueSet(nullptr)) - , mxLayoutSetWin1(new weld::CustomWeld(*m_xBuilder, "valueset1", *mxLayoutSet1)) - , mxFrame2(m_xBuilder->weld_frame("vertframe")) + , mxLayoutSetWin1(new weld::CustomWeld(*m_xBuilder, u"valueset1"_ustr, *mxLayoutSet1)) + , mxFrame2(m_xBuilder->weld_frame(u"vertframe"_ustr)) , mxLayoutSet2(new ValueSet(nullptr)) - , mxLayoutSetWin2(new weld::CustomWeld(*m_xBuilder, "valueset2", *mxLayoutSet2)) - , mxMoreButton(m_xBuilder->weld_button("more")) + , mxLayoutSetWin2(new weld::CustomWeld(*m_xBuilder, u"valueset2"_ustr, *mxLayoutSet2)) + , mxMoreButton(m_xBuilder->weld_button(u"more"_ustr)) { mxLayoutSet1->SetStyle(WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT); mxLayoutSet2->SetStyle(WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT); @@ -175,7 +175,7 @@ LayoutToolbarMenu::LayoutToolbarMenu(SlideLayoutController* pControl, weld::Widg if( m_xFrame.is() ) try { Reference< XPropertySet > xControllerSet( m_xFrame->getController(), UNO_QUERY_THROW ); - xControllerSet->getPropertyValue( "DrawViewMode" ) >>= eMode; + xControllerSet->getPropertyValue( u"DrawViewMode"_ustr ) >>= eMode; } catch( Exception& ) { @@ -266,7 +266,7 @@ void LayoutToolbarMenu::SelectHdl(AutoLayout eLayout) if( eLayout != AUTOLAYOUT_END ) { - aArgs = { comphelper::makePropertyValue("WhatLayout", static_cast<sal_Int32>(eLayout)) }; + aArgs = { comphelper::makePropertyValue(u"WhatLayout"_ustr, static_cast<sal_Int32>(eLayout)) }; } else if( mbInsertPage ) { @@ -282,26 +282,26 @@ void LayoutToolbarMenu::SelectHdl(AutoLayout eLayout) /// @throws css::uno::RuntimeException static OUString SlideLayoutController_getImplementationName() { - return "com.sun.star.comp.sd.SlideLayoutController"; + return u"com.sun.star.comp.sd.SlideLayoutController"_ustr; } /// @throws RuntimeException static Sequence< OUString > SlideLayoutController_getSupportedServiceNames() { - Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; + Sequence<OUString> aSNS { u"com.sun.star.frame.ToolbarController"_ustr }; return aSNS; } /// @throws css::uno::RuntimeException static OUString InsertSlideController_getImplementationName() { - return "com.sun.star.comp.sd.InsertSlideController"; + return u"com.sun.star.comp.sd.InsertSlideController"_ustr; } /// @throws RuntimeException static Sequence< OUString > InsertSlideController_getSupportedServiceNames() { - Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; + Sequence<OUString> aSNS { u"com.sun.star.frame.ToolbarController"_ustr }; return aSNS; } diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index a79a8e7f47d2..5c3724561975 100644 --- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx +++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx @@ -62,7 +62,7 @@ static bool bLastRelative = false; static const vcl::Font& lcl_GetDefaultBulletFont() { static vcl::Font aDefBulletFont = []() { - vcl::Font tmp("OpenSymbol", "", Size(0, 14)); + vcl::Font tmp(u"OpenSymbol"_ustr, u""_ustr, Size(0, 14)); tmp.SetCharSet(RTL_TEXTENCODING_SYMBOL); tmp.SetFamily(FAMILY_DONTKNOW); tmp.SetPitch(PITCH_DONTKNOW); @@ -77,7 +77,8 @@ class SdDrawDocument; SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const SfxItemSet& rSet, const ::sd::View* pView) - : GenericDialogController(pWindow, "cui/ui/bulletandposition.ui", "BulletAndPosition") + : GenericDialogController(pWindow, u"cui/ui/bulletandposition.ui"_ustr, + u"BulletAndPosition"_ustr) , aInvalidateTimer("sd SvxBulletAndPositionDlg aInvalidateTimer") , rFirstStateSet(rSet) , bLastWidthModified(false) @@ -91,44 +92,44 @@ SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf , nNumItemId(SID_ATTR_NUMBERING_RULE) , m_aRatioTop(ConnectorType::Top) , m_aRatioBottom(ConnectorType::Bottom) - , m_xGrid(m_xBuilder->weld_widget("grid2")) - , m_xLevelLB(m_xBuilder->weld_tree_view("levellb")) - , m_xFmtLB(m_xBuilder->weld_combo_box("numfmtlb")) - , m_xPrefixFT(m_xBuilder->weld_label("prefixft")) - , m_xPrefixED(m_xBuilder->weld_entry("prefix")) - , m_xSuffixFT(m_xBuilder->weld_label("suffixft")) - , m_xSuffixED(m_xBuilder->weld_entry("suffix")) - , m_xBeforeAfter(m_xBuilder->weld_frame("beforeafter")) - , m_xBulColorFT(m_xBuilder->weld_label("colorft")) - , m_xBulColLB(new ColorListBox(m_xBuilder->weld_menu_button("color"), + , m_xGrid(m_xBuilder->weld_widget(u"grid2"_ustr)) + , m_xLevelLB(m_xBuilder->weld_tree_view(u"levellb"_ustr)) + , m_xFmtLB(m_xBuilder->weld_combo_box(u"numfmtlb"_ustr)) + , m_xPrefixFT(m_xBuilder->weld_label(u"prefixft"_ustr)) + , m_xPrefixED(m_xBuilder->weld_entry(u"prefix"_ustr)) + , m_xSuffixFT(m_xBuilder->weld_label(u"suffixft"_ustr)) + , m_xSuffixED(m_xBuilder->weld_entry(u"suffix"_ustr)) + , m_xBeforeAfter(m_xBuilder->weld_frame(u"beforeafter"_ustr)) + , m_xBulColorFT(m_xBuilder->weld_label(u"colorft"_ustr)) + , m_xBulColLB(new ColorListBox(m_xBuilder->weld_menu_button(u"color"_ustr), [this] { return m_xDialog.get(); })) - , m_xBulRelSizeFT(m_xBuilder->weld_label("relsizeft")) - , m_xBulRelSizeMF(m_xBuilder->weld_metric_spin_button("relsize", FieldUnit::PERCENT)) - , m_xStartFT(m_xBuilder->weld_label("startatft")) - , m_xStartED(m_xBuilder->weld_spin_button("startat")) - , m_xBulletFT(m_xBuilder->weld_label("bulletft")) - , m_xBulletPB(m_xBuilder->weld_button("bullet")) - , m_xBitmapMB(m_xBuilder->weld_menu_button("bitmap")) - , m_xWidthFT(m_xBuilder->weld_label("widthft")) - , m_xWidthMF(m_xBuilder->weld_metric_spin_button("widthmf", FieldUnit::CM)) - , m_xHeightFT(m_xBuilder->weld_label("heightft")) - , m_xHeightMF(m_xBuilder->weld_metric_spin_button("heightmf", FieldUnit::CM)) - , m_xRatioCB(m_xBuilder->weld_check_button("keepratio")) - , m_xCbxScaleImg(m_xBuilder->weld_image("imRatio")) - , m_xImgRatioTop(new weld::CustomWeld(*m_xBuilder, "daRatioTop", m_aRatioTop)) - , m_xImgRatioBottom(new weld::CustomWeld(*m_xBuilder, "daRatioBottom", m_aRatioBottom)) - , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWIN)) - , m_xDistBorderFT(m_xBuilder->weld_label("indent")) - , m_xDistBorderMF(m_xBuilder->weld_metric_spin_button("indentmf", FieldUnit::CM)) - , m_xRelativeCB(m_xBuilder->weld_check_button("relative")) - , m_xIndentMF(m_xBuilder->weld_metric_spin_button("numberingwidthmf", FieldUnit::CM)) - , m_xLeftTB(m_xBuilder->weld_toggle_button("left")) - , m_xCenterTB(m_xBuilder->weld_toggle_button("center")) - , m_xRightTB(m_xBuilder->weld_toggle_button("right")) - , m_xSlideRB(m_xBuilder->weld_radio_button("sliderb")) - , m_xSelectionRB(m_xBuilder->weld_radio_button("selectionrb")) - , m_xApplyToMaster(m_xBuilder->weld_toggle_button("applytomaster")) - , m_xReset(m_xBuilder->weld_button("reset")) + , m_xBulRelSizeFT(m_xBuilder->weld_label(u"relsizeft"_ustr)) + , m_xBulRelSizeMF(m_xBuilder->weld_metric_spin_button(u"relsize"_ustr, FieldUnit::PERCENT)) + , m_xStartFT(m_xBuilder->weld_label(u"startatft"_ustr)) + , m_xStartED(m_xBuilder->weld_spin_button(u"startat"_ustr)) + , m_xBulletFT(m_xBuilder->weld_label(u"bulletft"_ustr)) + , m_xBulletPB(m_xBuilder->weld_button(u"bullet"_ustr)) + , m_xBitmapMB(m_xBuilder->weld_menu_button(u"bitmap"_ustr)) + , m_xWidthFT(m_xBuilder->weld_label(u"widthft"_ustr)) + , m_xWidthMF(m_xBuilder->weld_metric_spin_button(u"widthmf"_ustr, FieldUnit::CM)) + , m_xHeightFT(m_xBuilder->weld_label(u"heightft"_ustr)) + , m_xHeightMF(m_xBuilder->weld_metric_spin_button(u"heightmf"_ustr, FieldUnit::CM)) + , m_xRatioCB(m_xBuilder->weld_check_button(u"keepratio"_ustr)) + , m_xCbxScaleImg(m_xBuilder->weld_image(u"imRatio"_ustr)) + , m_xImgRatioTop(new weld::CustomWeld(*m_xBuilder, u"daRatioTop"_ustr, m_aRatioTop)) + , m_xImgRatioBottom(new weld::CustomWeld(*m_xBuilder, u"daRatioBottom"_ustr, m_aRatioBottom)) + , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr, m_aPreviewWIN)) + , m_xDistBorderFT(m_xBuilder->weld_label(u"indent"_ustr)) + , m_xDistBorderMF(m_xBuilder->weld_metric_spin_button(u"indentmf"_ustr, FieldUnit::CM)) + , m_xRelativeCB(m_xBuilder->weld_check_button(u"relative"_ustr)) + , m_xIndentMF(m_xBuilder->weld_metric_spin_button(u"numberingwidthmf"_ustr, FieldUnit::CM)) + , m_xLeftTB(m_xBuilder->weld_toggle_button(u"left"_ustr)) + , m_xCenterTB(m_xBuilder->weld_toggle_button(u"center"_ustr)) + , m_xRightTB(m_xBuilder->weld_toggle_button(u"right"_ustr)) + , m_xSlideRB(m_xBuilder->weld_radio_button(u"sliderb"_ustr)) + , m_xSelectionRB(m_xBuilder->weld_radio_button(u"selectionrb"_ustr)) + , m_xApplyToMaster(m_xBuilder->weld_toggle_button(u"applytomaster"_ustr)) + , m_xReset(m_xBuilder->weld_button(u"reset"_ustr)) { m_xBulColLB->SetSlotId(SID_ATTR_CHAR_COLOR); m_xBulRelSizeMF->set_min(SVX_NUM_REL_SIZE_MIN, FieldUnit::PERCENT); @@ -519,8 +520,8 @@ void SvxBulletAndPositionDlg::InitControls() } else { - m_xHeightMF->set_text(""); - m_xWidthMF->set_text(""); + m_xHeightMF->set_text(u""_ustr); + m_xWidthMF->set_text(u""_ustr); } } @@ -537,7 +538,7 @@ void SvxBulletAndPositionDlg::InitControls() if (bSameBulRelSize) m_xBulRelSizeMF->set_value(aNumFmtArr[nLvl]->GetBulletRelSize(), FieldUnit::PERCENT); else - m_xBulRelSizeMF->set_text(""); + m_xBulRelSizeMF->set_text(u""_ustr); } if (bBullColor) { @@ -554,7 +555,7 @@ void SvxBulletAndPositionDlg::InitControls() m_xStartED->set_value(aNumFmtArr[nLvl]->GetStart()); } else - m_xStartED->set_text(""); + m_xStartED->set_text(u""_ustr); break; case SHOW_BULLET: break; @@ -586,11 +587,11 @@ void SvxBulletAndPositionDlg::InitControls() if (bSamePrefix) m_xPrefixED->set_text(aNumFmtArr[nLvl]->GetPrefix()); else - m_xPrefixED->set_text(""); + m_xPrefixED->set_text(u""_ustr); if (bSameSuffix) m_xSuffixED->set_text(aNumFmtArr[nLvl]->GetSuffix()); else - m_xSuffixED->set_text(""); + m_xSuffixED->set_text(u""_ustr); if (bSameDistBorderNum) { @@ -614,12 +615,12 @@ void SvxBulletAndPositionDlg::InitControls() bSetDistEmpty = true; if (bSetDistEmpty) - m_xDistBorderMF->set_text(""); + m_xDistBorderMF->set_text(u""_ustr); if (bSameIndent) SetMetricValue(*m_xIndentMF, -aNumFmtArr[nLvl]->GetFirstLineOffset(), eCoreUnit); else - m_xIndentMF->set_text(""); + m_xIndentMF->set_text(u""_ustr); m_xSelectionRB->set_active(true); @@ -737,16 +738,16 @@ IMPL_LINK(SvxBulletAndPositionDlg, NumberTypeSelectHdl_Impl, weld::ComboBox&, rB { bBmp |= nullptr != aNumFmt.GetBrush(); aNumFmt.SetIncludeUpperLevels(0); - aNumFmt.SetListFormat("", "", i); + aNumFmt.SetListFormat(u""_ustr, u""_ustr, i); if (!bBmp) - aNumFmt.SetGraphic(""); + aNumFmt.SetGraphic(u""_ustr); pActNum->SetLevel(i, aNumFmt); SwitchNumberType(SHOW_BITMAP); } else if (SVX_NUM_CHAR_SPECIAL == nNumberingType) { aNumFmt.SetIncludeUpperLevels(0); - aNumFmt.SetListFormat("", "", i); + aNumFmt.SetListFormat(u""_ustr, u""_ustr, i); if (!aNumFmt.GetBulletFont()) aNumFmt.SetBulletFont(&aActBulletFont); if (!aNumFmt.GetBulletChar()) @@ -889,7 +890,7 @@ IMPL_LINK_NOARG(SvxBulletAndPositionDlg, PopupActivateHdl_Impl, weld::Toggleable if (m_xGalleryMenu) return; - m_xGalleryMenu = m_xBuilder->weld_menu("gallerysubmenu"); + m_xGalleryMenu = m_xBuilder->weld_menu(u"gallerysubmenu"_ustr); weld::WaitObject aWait(p_Window); if (!GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames)) @@ -1206,7 +1207,7 @@ IMPL_LINK(SvxBulletAndPositionDlg, DistanceHdl_Impl, weld::MetricSpinButton&, rF SetModified(); if (!m_xDistBorderMF->get_sensitive()) { - m_xDistBorderMF->set_text(""); + m_xDistBorderMF->set_text(u""_ustr); } sal_Int32 aLastLevelLSpace @@ -1250,7 +1251,7 @@ IMPL_LINK(SvxBulletAndPositionDlg, RelativeHdl_Impl, weld::Toggleable&, rBox, vo if (bSetValue) SetMetricValue(*m_xDistBorderMF, nValue, eCoreUnit); else - m_xDistBorderMF->set_text(""); + m_xDistBorderMF->set_text(u""_ustr); m_xDistBorderMF->set_sensitive(bOn || bSingleSelection); m_xDistBorderFT->set_sensitive(bOn || bSingleSelection); bLastRelative = bOn; diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index 49a09a147936..324a9bd36ad9 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -401,7 +401,7 @@ void LayerTabBar::Command(const CommandEvent& rCEvt) { BringLayerObjectsToAttention(); SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); - pDispatcher->ExecutePopup("layertab"); + pDispatcher->ExecutePopup(u"layertab"_ustr); } } diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index ab523bf7c83c..8f1d1c0f3831 100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -30,7 +30,7 @@ namespace sd { static SfxSlot aLeftImpressPaneShellSlots_Impl[] = { - { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, "" } + { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, u""_ustr } }; SFX_IMPL_INTERFACE(LeftImpressPaneShell, SfxShell) @@ -43,7 +43,7 @@ void LeftImpressPaneShell::InitInterface_Impl() LeftImpressPaneShell::LeftImpressPaneShell() { - SetName("LeftImpressPane"); + SetName(u"LeftImpressPane"_ustr); } LeftImpressPaneShell::~LeftImpressPaneShell() @@ -54,7 +54,7 @@ LeftImpressPaneShell::~LeftImpressPaneShell() static SfxSlot aBottomImpressPaneShellSlots_Impl[] = { { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, - 0, SfxDisableFlags::NONE, "" } }; + 0, SfxDisableFlags::NONE, u""_ustr } }; SFX_IMPL_INTERFACE(BottomImpressPaneShell, SfxShell) @@ -63,7 +63,7 @@ void BottomImpressPaneShell::InitInterface_Impl() GetStaticInterface()->RegisterChildWindow(::sd::BottomPaneImpressChildWindow::GetChildWindowId()); } -BottomImpressPaneShell::BottomImpressPaneShell() { SetName("BottomImpressPane"); } +BottomImpressPaneShell::BottomImpressPaneShell() { SetName(u"BottomImpressPane"_ustr); } BottomImpressPaneShell::~BottomImpressPaneShell() {} @@ -71,7 +71,7 @@ BottomImpressPaneShell::~BottomImpressPaneShell() {} static SfxSlot aLeftDrawPaneShellSlots_Impl[] = { - { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, "" } + { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, u""_ustr } }; SFX_IMPL_INTERFACE(LeftDrawPaneShell, SfxShell) @@ -84,7 +84,7 @@ void LeftDrawPaneShell::InitInterface_Impl() LeftDrawPaneShell::LeftDrawPaneShell() { - SetName("LeftDrawPane"); + SetName(u"LeftDrawPane"_ustr); } LeftDrawPaneShell::~LeftDrawPaneShell() diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 8e1e1bb5b036..4a6cc71cb0e0 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -38,22 +38,22 @@ namespace sd { SdPhotoAlbumDialog::SdPhotoAlbumDialog(weld::Window* pWindow, SdDrawDocument* pActDoc) - : GenericDialogController(pWindow, "modules/simpress/ui/photoalbum.ui", "PhotoAlbumCreatorDialog") + : GenericDialogController(pWindow, u"modules/simpress/ui/photoalbum.ui"_ustr, u"PhotoAlbumCreatorDialog"_ustr) , m_pDoc(pActDoc) , m_aImg(m_xDialog.get()) - , m_xCancelBtn(m_xBuilder->weld_button("cancel")) - , m_xCreateBtn(m_xBuilder->weld_button("ok")) - , m_xAddBtn(m_xBuilder->weld_button("add_btn")) - , m_xUpBtn(m_xBuilder->weld_button("up_btn")) - , m_xDownBtn(m_xBuilder->weld_button("down_btn")) - , m_xRemoveBtn(m_xBuilder->weld_button("rem_btn")) - , m_xImagesLst(m_xBuilder->weld_tree_view("images_tree")) - , m_xImg(new weld::CustomWeld(*m_xBuilder, "preview_img", m_aImg)) - , m_xInsTypeCombo(m_xBuilder->weld_combo_box("opt_combo")) - , m_xASRCheck(m_xBuilder->weld_check_button("asr_check")) - , m_xASRCheckCrop(m_xBuilder->weld_check_button("asr_check_crop")) - , m_xCapCheck(m_xBuilder->weld_check_button("cap_check")) - , m_xInsertAsLinkCheck(m_xBuilder->weld_check_button("insert_as_link_check")) + , m_xCancelBtn(m_xBuilder->weld_button(u"cancel"_ustr)) + , m_xCreateBtn(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xAddBtn(m_xBuilder->weld_button(u"add_btn"_ustr)) + , m_xUpBtn(m_xBuilder->weld_button(u"up_btn"_ustr)) + , m_xDownBtn(m_xBuilder->weld_button(u"down_btn"_ustr)) + , m_xRemoveBtn(m_xBuilder->weld_button(u"rem_btn"_ustr)) + , m_xImagesLst(m_xBuilder->weld_tree_view(u"images_tree"_ustr)) + , m_xImg(new weld::CustomWeld(*m_xBuilder, u"preview_img"_ustr, m_aImg)) + , m_xInsTypeCombo(m_xBuilder->weld_combo_box(u"opt_combo"_ustr)) + , m_xASRCheck(m_xBuilder->weld_check_button(u"asr_check"_ustr)) + , m_xASRCheckCrop(m_xBuilder->weld_check_button(u"asr_check_crop"_ustr)) + , m_xCapCheck(m_xBuilder->weld_check_button(u"cap_check"_ustr)) + , m_xInsertAsLinkCheck(m_xBuilder->weld_check_button(u"insert_as_link_check"_ustr)) { m_xCancelBtn->connect_clicked(LINK(this, SdPhotoAlbumDialog, CancelHdl)); m_xCreateBtn->connect_clicked(LINK(this, SdPhotoAlbumDialog, CreateHdl)); @@ -125,18 +125,18 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void) ::awt::Size aPicSize(aGraphic.GetSizePixel().Width()*100, aGraphic.GetSizePixel().Height()*100); Reference< drawing::XShape > xShape( - xShapeFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"), + xShapeFactory->createInstance(u"com.sun.star.drawing.GraphicObjectShape"_ustr), uno::UNO_QUERY); Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); - xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic)); + xProps->setPropertyValue(u"Graphic"_ustr, ::uno::Any(xGraphic)); ::awt::Size aPageSize; xSlideProps->getPropertyValue( - "Width") >>= aPageSize.Width; + u"Width"_ustr) >>= aPageSize.Width; xSlideProps->getPropertyValue( - "Height") >>= aPageSize.Height; + u"Height"_ustr) >>= aPageSize.Height; ::awt::Point aPicPos; @@ -178,9 +178,9 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void) ::awt::Size aPageSize; xSlideProps->getPropertyValue( - "Width") >>= aPageSize.Width; + u"Width"_ustr) >>= aPageSize.Width; xSlideProps->getPropertyValue( - "Height") >>= aPageSize.Height; + u"Height"_ustr) >>= aPageSize.Height; // grab the left one OUString sUrl1 = m_xImagesLst->get_id(i); @@ -198,11 +198,11 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void) ::awt::Size aPicSize(aGraphic.GetSizePixel().Width()*100, aGraphic.GetSizePixel().Height()*100); Reference< drawing::XShape > xShape( - xShapeFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"), + xShapeFactory->createInstance(u"com.sun.star.drawing.GraphicObjectShape"_ustr), uno::UNO_QUERY); Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); - xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic)); + xProps->setPropertyValue(u"Graphic"_ustr, ::uno::Any(xGraphic)); ::awt::Point aPicPos; @@ -242,11 +242,11 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void) ::awt::Size aPicSize(aGraphic.GetSizePixel().Width()*100, aGraphic.GetSizePixel().Height()*100); Reference< drawing::XShape > xShape( - xShapeFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"), + xShapeFactory->createInstance(u"com.sun.star.drawing.GraphicObjectShape"_ustr), uno::UNO_QUERY); Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); - xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic)); + xProps->setPropertyValue(u"Graphic"_ustr, ::uno::Any(xGraphic)); ::awt::Point aPicPos; @@ -290,9 +290,9 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void) ::awt::Size aPageSize; xSlideProps->getPropertyValue( - "Width") >>= aPageSize.Width; + u"Width"_ustr) >>= aPageSize.Width; xSlideProps->getPropertyValue( - "Height") >>= aPageSize.Height; + u"Height"_ustr) >>= aPageSize.Height; // grab the upper left one OUString sUrl1 = m_xImagesLst->get_id(i); @@ -317,11 +317,11 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void) ::awt::Size aPicSize(aGraphic.GetSizePixel().Width()*100, aGraphic.GetSizePixel().Height()*100); Reference< drawing::XShape > xShape( - xShapeFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"), + xShapeFactory->createInstance(u"com.sun.star.drawing.GraphicObjectShape"_ustr), uno::UNO_QUERY); Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); - xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic)); + xProps->setPropertyValue(u"Graphic"_ustr, ::uno::Any(xGraphic)); ::awt::Point aPicPos; @@ -360,11 +360,11 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void) ::awt::Size aPicSize(aGraphic.GetSizePixel().Width()*100, aGraphic.GetSizePixel().Height()*100); Reference< drawing::XShape > xShape( - xShapeFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"), + xShapeFactory->createInstance(u"com.sun.star.drawing.GraphicObjectShape"_ustr), uno::UNO_QUERY); Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); - xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic)); + xProps->setPropertyValue(u"Graphic"_ustr, ::uno::Any(xGraphic)); ::awt::Point aPicPos; @@ -403,11 +403,11 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void) ::awt::Size aPicSize(aGraphic.GetSizePixel().Width()*100, aGraphic.GetSizePixel().Height()*100); Reference< drawing::XShape > xShape( - xShapeFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"), + xShapeFactory->createInstance(u"com.sun.star.drawing.GraphicObjectShape"_ustr), uno::UNO_QUERY); Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); - xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic)); + xProps->setPropertyValue(u"Graphic"_ustr, ::uno::Any(xGraphic)); ::awt::Point aPicPos; @@ -446,11 +446,11 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void) ::awt::Size aPicSize(aGraphic.GetSizePixel().Width()*100, aGraphic.GetSizePixel().Height()*100); Reference< drawing::XShape > xShape( - xShapeFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"), + xShapeFactory->createInstance(u"com.sun.star.drawing.GraphicObjectShape"_ustr), uno::UNO_QUERY); Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); - xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic)); + xProps->setPropertyValue(u"Graphic"_ustr, ::uno::Any(xGraphic)); ::awt::Point aPicPos; @@ -486,7 +486,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, weld::Button&, void) { std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(m_xDialog.get(), VclMessageType::Info, VclButtonsType::Ok, - "Function is not implemented!")); + u"Function is not implemented!"_ustr)); xInfoBox->run(); } m_xDialog->response(RET_OK); @@ -507,7 +507,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl, weld::Button&, void) { // Store full path, show filename only. Use INetURLObject to display spaces in filename correctly INetURLObject aUrl(rFile); - m_xImagesLst->append(aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE), aUrl.GetLastName(INetURLObject::DecodeMechanism::WithCharset), ""); + m_xImagesLst->append(aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE), aUrl.GetLastName(INetURLObject::DecodeMechanism::WithCharset), u""_ustr); } } EnableDisableButtons(); @@ -743,7 +743,7 @@ void SdPhotoAlbumDialog::createCaption(const awt::Size& aPageSize ) SfxItemSet aSet(m_pDoc->GetItemPool() ); aSet.Put( XFillStyleItem(drawing::FillStyle_SOLID) ); - aSet.Put( XFillColorItem( "", COL_BLACK ) ); + aSet.Put( XFillColorItem( u""_ustr, COL_BLACK ) ); aSet.Put( XFillTransparenceItem( 20 ) ); pSdrObj->SetMergedItemSetAndBroadcast(aSet); } @@ -755,7 +755,7 @@ Reference< graphic::XGraphic> SdPhotoAlbumDialog::createXGraphicFromUrl(const OU { // The same as above, except this returns an XGraphic from the image URL ::comphelper::NamedValueCollection aMediaProperties; - aMediaProperties.put( "URL", sUrl ); + aMediaProperties.put( u"URL"_ustr, sUrl ); Reference< graphic::XGraphic> xGraphic = xProvider->queryGraphic( aMediaProperties.getPropertyValues() ); return xGraphic; diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx index 6a66c2acfda2..948d2a0e77f8 100644 --- a/sd/source/ui/dlg/RemoteDialog.cxx +++ b/sd/source/ui/dlg/RemoteDialog.cxx @@ -13,10 +13,11 @@ using namespace ::sd; RemoteDialog::RemoteDialog(weld::Window* pWindow) - : GenericDialogController(pWindow, "modules/simpress/ui/remotedialog.ui", "RemoteDialog") - , m_xButtonConnect(m_xBuilder->weld_button("ok")) - , m_xClientBox(new sd::ClientBox(m_xBuilder->weld_scrolled_window("scroll"), - m_xBuilder->weld_container("tree"))) + : GenericDialogController(pWindow, u"modules/simpress/ui/remotedialog.ui"_ustr, + u"RemoteDialog"_ustr) + , m_xButtonConnect(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xClientBox(new sd::ClientBox(m_xBuilder->weld_scrolled_window(u"scroll"_ustr), + m_xBuilder->weld_container(u"tree"_ustr))) { m_xButtonConnect->connect_clicked(LINK(this, RemoteDialog, HandleConnectButton)); } diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 44e2c6f65064..4a84f49287c7 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -31,12 +31,12 @@ namespace sd { ClientBoxEntry::ClientBoxEntry(ClientBox* pClientBox, std::shared_ptr<ClientInfo> pClientInfo) - : m_xBuilder(Application::CreateBuilder(pClientBox->GetContainer(), "modules/simpress/ui/clientboxfragment.ui")) - , m_xContainer(m_xBuilder->weld_container("ClientboxFragment")) - , m_xDeviceName(m_xBuilder->weld_label("name")) - , m_xPinLabel(m_xBuilder->weld_label("pinlabel")) - , m_xPinBox(m_xBuilder->weld_entry("pin")) - , m_xDeauthoriseButton(m_xBuilder->weld_button("button")) + : m_xBuilder(Application::CreateBuilder(pClientBox->GetContainer(), u"modules/simpress/ui/clientboxfragment.ui"_ustr)) + , m_xContainer(m_xBuilder->weld_container(u"ClientboxFragment"_ustr)) + , m_xDeviceName(m_xBuilder->weld_label(u"name"_ustr)) + , m_xPinLabel(m_xBuilder->weld_label(u"pinlabel"_ustr)) + , m_xPinBox(m_xBuilder->weld_entry(u"pin"_ustr)) + , m_xDeauthoriseButton(m_xBuilder->weld_button(u"button"_ustr)) , m_xClientInfo(std::move(pClientInfo)) , m_pClientBox(pClientBox) { diff --git a/sd/source/ui/dlg/SelectLayerDlg.cxx b/sd/source/ui/dlg/SelectLayerDlg.cxx index 399f9db5d3c0..963d23dc9339 100644 --- a/sd/source/ui/dlg/SelectLayerDlg.cxx +++ b/sd/source/ui/dlg/SelectLayerDlg.cxx @@ -21,9 +21,10 @@ #include <vcl/weld.hxx> SdSelectLayerDlg::SdSelectLayerDlg(weld::Window* pParent) - : GenericDialogController(pParent, "modules/sdraw/ui/selectlayerdialog.ui", "SelectLayerDialog") - , m_xOk(m_xBuilder->weld_button("ok")) - , m_xListLB(m_xBuilder->weld_tree_view("treeview")) + : GenericDialogController(pParent, u"modules/sdraw/ui/selectlayerdialog.ui"_ustr, + u"SelectLayerDialog"_ustr) + , m_xOk(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xListLB(m_xBuilder->weld_tree_view(u"treeview"_ustr)) { m_xListLB->set_size_request(m_xListLB->get_approximate_digit_width() * 32, m_xListLB->get_height_rows(8)); diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index ad84317f0bed..46dbc2b07052 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -139,7 +139,7 @@ TemplateScanner::State TemplateScanner::InitializeEntryScanning() // Create a cursor to iterate over the templates in this folders. // We are interested only in three properties: the entry's name, // its URL, and its content type. - mxEntryResultSet.set( maFolderContent.createCursor({ TITLE, "TargetURL", "TypeDescription" }, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY)); + mxEntryResultSet.set( maFolderContent.createCursor({ TITLE, u"TargetURL"_ustr, u"TypeDescription"_ustr }, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY)); } else eNextState = ERROR; @@ -209,7 +209,7 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning() ::ucbhelper::Content aTemplateDir (mxTemplateRoot, mxFolderEnvironment, comphelper::getProcessComponentContext()); // Create a cursor to iterate over the template folders. - mxFolderResultSet.set( aTemplateDir.createCursor({ TITLE, "TargetDirURL" }, ::ucbhelper::INCLUDE_FOLDERS_ONLY)); + mxFolderResultSet.set( aTemplateDir.createCursor({ TITLE, u"TargetDirURL"_ustr }, ::ucbhelper::INCLUDE_FOLDERS_ONLY)); if (mxFolderResultSet.is()) eNextState = GATHER_FOLDER_LIST; } diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 1ab24e241c5a..ed87f6ed4aca 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -123,29 +123,29 @@ const size_t AnimationWindow::EMPTY_FRAMELIST = std::numeric_limits<size_t>::max */ AnimationWindow::AnimationWindow(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* pParent) : SfxDockingWindow(pInBindings, pCW, pParent, - "DockingAnimation", "modules/simpress/ui/dockinganimation.ui") + u"DockingAnimation"_ustr, u"modules/simpress/ui/dockinganimation.ui"_ustr) , m_xCtlDisplay(new SdDisplay) - , m_xCtlDisplayWin(new weld::CustomWeld(*m_xBuilder, "preview", *m_xCtlDisplay)) - , m_xBtnFirst(m_xBuilder->weld_button("first")) - , m_xBtnReverse(m_xBuilder->weld_button("prev")) - , m_xBtnStop(m_xBuilder->weld_button("stop")) - , m_xBtnPlay(m_xBuilder->weld_button("next")) - , m_xBtnLast(m_xBuilder->weld_button("last")) - , m_xNumFldBitmap(m_xBuilder->weld_spin_button("numbitmap")) - , m_xTimeField(m_xBuilder->weld_formatted_spin_button("duration")) + , m_xCtlDisplayWin(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr, *m_xCtlDisplay)) + , m_xBtnFirst(m_xBuilder->weld_button(u"first"_ustr)) + , m_xBtnReverse(m_xBuilder->weld_button(u"prev"_ustr)) + , m_xBtnStop(m_xBuilder->weld_button(u"stop"_ustr)) + , m_xBtnPlay(m_xBuilder->weld_button(u"next"_ustr)) + , m_xBtnLast(m_xBuilder->weld_button(u"last"_ustr)) + , m_xNumFldBitmap(m_xBuilder->weld_spin_button(u"numbitmap"_ustr)) + , m_xTimeField(m_xBuilder->weld_formatted_spin_button(u"duration"_ustr)) , m_xFormatter(new weld::TimeFormatter(*m_xTimeField)) - , m_xLbLoopCount(m_xBuilder->weld_combo_box("loopcount")) - , m_xBtnGetOneObject(m_xBuilder->weld_button("getone")) - , m_xBtnGetAllObjects(m_xBuilder->weld_button("getall")) - , m_xBtnRemoveBitmap(m_xBuilder->weld_button("delone")) - , m_xBtnRemoveAll(m_xBuilder->weld_button("delall")) - , m_xFiCount(m_xBuilder->weld_label("count")) - , m_xRbtGroup(m_xBuilder->weld_radio_button("group")) - , m_xRbtBitmap(m_xBuilder->weld_radio_button("bitmap")) - , m_xFtAdjustment(m_xBuilder->weld_label("alignmentft")) - , m_xLbAdjustment(m_xBuilder->weld_combo_box("alignment")) - , m_xBtnCreateGroup(m_xBuilder->weld_button("create")) - , m_xBtnHelp(m_xBuilder->weld_button("help")) + , m_xLbLoopCount(m_xBuilder->weld_combo_box(u"loopcount"_ustr)) + , m_xBtnGetOneObject(m_xBuilder->weld_button(u"getone"_ustr)) + , m_xBtnGetAllObjects(m_xBuilder->weld_button(u"getall"_ustr)) + , m_xBtnRemoveBitmap(m_xBuilder->weld_button(u"delone"_ustr)) + , m_xBtnRemoveAll(m_xBuilder->weld_button(u"delall"_ustr)) + , m_xFiCount(m_xBuilder->weld_label(u"count"_ustr)) + , m_xRbtGroup(m_xBuilder->weld_radio_button(u"group"_ustr)) + , m_xRbtBitmap(m_xBuilder->weld_radio_button(u"bitmap"_ustr)) + , m_xFtAdjustment(m_xBuilder->weld_label(u"alignmentft"_ustr)) + , m_xLbAdjustment(m_xBuilder->weld_combo_box(u"alignment"_ustr)) + , m_xBtnCreateGroup(m_xBuilder->weld_button(u"create"_ustr)) + , m_xBtnHelp(m_xBuilder->weld_button(u"help"_ustr)) , m_nCurrentFrame(EMPTY_FRAMELIST) , bMovie(false) , bAllObjects(false) @@ -277,7 +277,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, weld::Button&, rButton, void ) { bDisableCtrls = true; m_xBtnStop->set_sensitive(true); - pProgress.reset(new SfxProgress( nullptr, "Animator:", nFullTime )); // "Animator:" here we should think about something smart + pProgress.reset(new SfxProgress( nullptr, u"Animator:"_ustr, nFullTime )); // "Animator:" here we should think about something smart } sal_uLong nTmpTime = 0; diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index bc1d0f5cff99..278cb2c9705a 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -38,11 +38,11 @@ namespace sd { BreakDlg::BreakDlg(weld::Window* pWindow, DrawView* pDrView, DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount) - : SfxDialogController(pWindow, "modules/sdraw/ui/breakdialog.ui", "BreakDialog") - , m_xFiObjInfo(m_xBuilder->weld_label("metafiles")) - , m_xFiActInfo(m_xBuilder->weld_label("metaobjects")) - , m_xFiInsInfo(m_xBuilder->weld_label("drawingobjects")) - , m_xBtnCancel(m_xBuilder->weld_button("cancel")) + : SfxDialogController(pWindow, u"modules/sdraw/ui/breakdialog.ui"_ustr, u"BreakDialog"_ustr) + , m_xFiObjInfo(m_xBuilder->weld_label(u"metafiles"_ustr)) + , m_xFiActInfo(m_xBuilder->weld_label(u"metaobjects"_ustr)) + , m_xFiInsInfo(m_xBuilder->weld_label(u"drawingobjects"_ustr)) + , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr)) , m_pDrView(pDrView) , m_bCancel(false) , m_aUpdateIdle( "sd::BreakDlg m_aUpdateIdle" ) diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 44ad8703e9e3..6b8fe8c7e302 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -39,21 +39,21 @@ namespace sd { constexpr char TOKEN = ';'; CopyDlg::CopyDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pInView) - : SfxDialogController(pWindow, "modules/sdraw/ui/copydlg.ui", "DuplicateDialog") + : SfxDialogController(pWindow, u"modules/sdraw/ui/copydlg.ui"_ustr, u"DuplicateDialog"_ustr) , mrOutAttrs(rInAttrs) , maUIScale(pInView->GetDoc().GetUIScale()) , mpView(pInView) - , m_xNumFldCopies(m_xBuilder->weld_spin_button("copies")) - , m_xBtnSetViewData(m_xBuilder->weld_button("viewdata")) - , m_xMtrFldMoveX(m_xBuilder->weld_metric_spin_button("x", FieldUnit::CM)) - , m_xMtrFldMoveY(m_xBuilder->weld_metric_spin_button("y", FieldUnit::CM)) - , m_xMtrFldAngle(m_xBuilder->weld_metric_spin_button("angle", FieldUnit::DEGREE)) - , m_xMtrFldWidth(m_xBuilder->weld_metric_spin_button("width", FieldUnit::CM)) - , m_xMtrFldHeight(m_xBuilder->weld_metric_spin_button("height", FieldUnit::CM)) - , m_xFtEndColor(m_xBuilder->weld_label("endlabel")) - , m_xBtnSetDefault(m_xBuilder->weld_button("default")) - , m_xLbStartColor(new ColorListBox(m_xBuilder->weld_menu_button("start"), [this]{ return m_xDialog.get(); } )) - , m_xLbEndColor(new ColorListBox(m_xBuilder->weld_menu_button("end"), [this]{ return m_xDialog.get(); } )) + , m_xNumFldCopies(m_xBuilder->weld_spin_button(u"copies"_ustr)) + , m_xBtnSetViewData(m_xBuilder->weld_button(u"viewdata"_ustr)) + , m_xMtrFldMoveX(m_xBuilder->weld_metric_spin_button(u"x"_ustr, FieldUnit::CM)) + , m_xMtrFldMoveY(m_xBuilder->weld_metric_spin_button(u"y"_ustr, FieldUnit::CM)) + , m_xMtrFldAngle(m_xBuilder->weld_metric_spin_button(u"angle"_ustr, FieldUnit::DEGREE)) + , m_xMtrFldWidth(m_xBuilder->weld_metric_spin_button(u"width"_ustr, FieldUnit::CM)) + , m_xMtrFldHeight(m_xBuilder->weld_metric_spin_button(u"height"_ustr, FieldUnit::CM)) + , m_xFtEndColor(m_xBuilder->weld_label(u"endlabel"_ustr)) + , m_xBtnSetDefault(m_xBuilder->weld_button(u"default"_ustr)) + , m_xLbStartColor(new ColorListBox(m_xBuilder->weld_menu_button(u"start"_ustr), [this]{ return m_xDialog.get(); } )) + , m_xLbEndColor(new ColorListBox(m_xBuilder->weld_menu_button(u"end"_ustr), [this]{ return m_xDialog.get(); } )) { m_xLbStartColor->SetSelectHdl( LINK( this, CopyDlg, SelectColorHdl ) ); m_xBtnSetViewData->connect_clicked( LINK( this, CopyDlg, SetViewData ) ); @@ -81,7 +81,7 @@ CopyDlg::~CopyDlg() OUString::number(m_xMtrFldHeight->get_value(FieldUnit::NONE)) + OUStringChar(TOKEN) + OUString::number(static_cast<sal_uInt32>(m_xLbStartColor->GetSelectEntryColor())) + OUStringChar(TOKEN) + OUString::number(static_cast<sal_uInt32>(m_xLbEndColor->GetSelectEntryColor())); - aDlgOpt.SetUserItem("UserItem", css::uno::Any(sStr)); + aDlgOpt.SetUserItem(u"UserItem"_ustr, css::uno::Any(sStr)); } /** @@ -110,7 +110,7 @@ void CopyDlg::Reset() SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id()); if (aDlgOpt.Exists()) { - css::uno::Any aUserItem = aDlgOpt.GetUserItem("UserItem"); + css::uno::Any aUserItem = aDlgOpt.GetUserItem(u"UserItem"_ustr); aUserItem >>= aStr; } diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 6628a9ac9c8e..43535bbc45b9 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -33,15 +33,15 @@ // SdCustomShowDlg SdCustomShowDlg::SdCustomShowDlg(weld::Window* pWindow, SdDrawDocument& rDrawDoc) - : GenericDialogController(pWindow, "modules/simpress/ui/customslideshows.ui", "CustomSlideShows") + : GenericDialogController(pWindow, u"modules/simpress/ui/customslideshows.ui"_ustr, u"CustomSlideShows"_ustr) , rDoc(rDrawDoc) , pCustomShowList(nullptr) - , m_xLbCustomShows(m_xBuilder->weld_tree_view("customshowlist")) - , m_xBtnNew(m_xBuilder->weld_button("new")) - , m_xBtnEdit(m_xBuilder->weld_button("edit")) - , m_xBtnRemove(m_xBuilder->weld_button("delete")) - , m_xBtnCopy(m_xBuilder->weld_button("copy")) - , m_xBtnStartShow(m_xBuilder->weld_button("startshow")) + , m_xLbCustomShows(m_xBuilder->weld_tree_view(u"customshowlist"_ustr)) + , m_xBtnNew(m_xBuilder->weld_button(u"new"_ustr)) + , m_xBtnEdit(m_xBuilder->weld_button(u"edit"_ustr)) + , m_xBtnRemove(m_xBuilder->weld_button(u"delete"_ustr)) + , m_xBtnCopy(m_xBuilder->weld_button(u"copy"_ustr)) + , m_xBtnStartShow(m_xBuilder->weld_button(u"startshow"_ustr)) { m_xLbCustomShows->set_size_request(m_xLbCustomShows->get_approximate_digit_width() * 32, m_xLbCustomShows->get_height_rows(8)); @@ -239,17 +239,17 @@ bool SdCustomShowDlg::IsCustomShow() const // SdDefineCustomShowDlg SdDefineCustomShowDlg::SdDefineCustomShowDlg(weld::Window* pWindow, SdDrawDocument& rDrawDoc, std::unique_ptr<SdCustomShow>& rpCS) - : GenericDialogController(pWindow, "modules/simpress/ui/definecustomslideshow.ui", "DefineCustomSlideShow") + : GenericDialogController(pWindow, u"modules/simpress/ui/definecustomslideshow.ui"_ustr, u"DefineCustomSlideShow"_ustr) , rDoc(rDrawDoc) , rpCustomShow(rpCS) , bModified(false) - , m_xEdtName(m_xBuilder->weld_entry("customname")) - , m_xLbPages(m_xBuilder->weld_tree_view("pages")) - , m_xBtnAdd(m_xBuilder->weld_button("add")) - , m_xBtnRemove(m_xBuilder->weld_button("remove")) - , m_xLbCustomPages(m_xBuilder->weld_tree_view("custompages")) + , m_xEdtName(m_xBuilder->weld_entry(u"customname"_ustr)) + , m_xLbPages(m_xBuilder->weld_tree_view(u"pages"_ustr)) + , m_xBtnAdd(m_xBuilder->weld_button(u"add"_ustr)) + , m_xBtnRemove(m_xBuilder->weld_button(u"remove"_ustr)) + , m_xLbCustomPages(m_xBuilder->weld_tree_view(u"custompages"_ustr)) , m_xDropTargetHelper(new weld::ReorderingDropTarget(*m_xLbCustomPages)) - , m_xBtnOK(m_xBuilder->weld_button("ok")) + , m_xBtnOK(m_xBuilder->weld_button(u"ok"_ustr)) { Link<weld::Button&,void> aLink = LINK( this, SdDefineCustomShowDlg, ClickButtonHdl ); m_xBtnAdd->connect_clicked( aLink ); @@ -284,7 +284,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg(weld::Window* pWindow, SdDrawDocume // fill ListBox with CustomShow pages for( const auto& rpPage : rpCustomShow->PagesVector() ) { - m_xLbCustomPages->append(weld::toId(rpPage), rpPage->GetName(), ""); + m_xLbCustomPages->append(weld::toId(rpPage), rpPage->GetName(), u""_ustr); } } else diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index d2dea8ad769b..d0e0a408a1f8 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -53,8 +53,8 @@ namespace // SdPagesField SdPagesField::SdPagesField( vcl::Window* pParent, uno::Reference< frame::XFrame > xFrame ) - : InterimItemWindow(pParent, "modules/simpress/ui/pagesfieldbox.ui", "PagesFieldBox") - , m_xWidget(m_xBuilder->weld_spin_button("pagesfield")) + : InterimItemWindow(pParent, u"modules/simpress/ui/pagesfieldbox.ui"_ustr, u"PagesFieldBox"_ustr) + , m_xWidget(m_xBuilder->weld_spin_button(u"pagesfield"_ustr)) , m_xFrame(std::move(xFrame)) { InitControlBase(m_xWidget.get()); @@ -97,7 +97,7 @@ void SdPagesField::set_sensitive(bool bSensitive) Enable(bSensitive); m_xWidget->set_sensitive(bSensitive); if (!bSensitive) - m_xWidget->set_text(""); + m_xWidget->set_text(u""_ustr); } void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem ) @@ -135,9 +135,9 @@ IMPL_LINK_NOARG(SdPagesField, ModifyHdl, weld::SpinButton&, void) uno::Any a; aItem.QueryValue( a ); - uno::Sequence< beans::PropertyValue > aArgs{ comphelper::makePropertyValue("PagesPerRow", a) }; + uno::Sequence< beans::PropertyValue > aArgs{ comphelper::makePropertyValue(u"PagesPerRow"_ustr, a) }; SfxToolBoxControl::Dispatch( ::uno::Reference< ::frame::XDispatchProvider >( m_xFrame->getController(), ::uno::UNO_QUERY ), - ".uno:PagesPerRow", + u".uno:PagesPerRow"_ustr, aArgs ); } diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index 074f5d7d1301..665cc3739bf0 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -32,16 +32,16 @@ */ SdCharDlg::SdCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) - : SfxTabDialogController(pParent, "modules/sdraw/ui/drawchardialog.ui", - "DrawCharDialog", pAttr) + : SfxTabDialogController(pParent, u"modules/sdraw/ui/drawchardialog.ui"_ustr, + u"DrawCharDialog"_ustr, pAttr) , rDocShell(*pDocShell) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - AddTabPage("RID_SVXPAGE_CHAR_NAME", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), nullptr); - AddTabPage("RID_SVXPAGE_CHAR_EFFECTS", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr); - AddTabPage("RID_SVXPAGE_CHAR_POSITION", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_POSITION), nullptr); - AddTabPage("RID_SVXPAGE_BKG", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr); + AddTabPage(u"RID_SVXPAGE_CHAR_NAME"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), nullptr); + AddTabPage(u"RID_SVXPAGE_CHAR_EFFECTS"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr); + AddTabPage(u"RID_SVXPAGE_CHAR_POSITION"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_POSITION), nullptr); + AddTabPage(u"RID_SVXPAGE_BKG"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr); } void SdCharDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 844008310b3b..881ab311b75d 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -37,13 +37,13 @@ * dialog to edit field commands */ SdModifyFieldDlg::SdModifyFieldDlg(weld::Window* pWindow, const SvxFieldData* pInField, SfxItemSet aSet) - : GenericDialogController(pWindow, "modules/simpress/ui/dlgfield.ui", "EditFieldsDialog") + : GenericDialogController(pWindow, u"modules/simpress/ui/dlgfield.ui"_ustr, u"EditFieldsDialog"_ustr) , m_aInputSet(std::move(aSet)) , m_pField(pInField) - , m_xRbtFix(m_xBuilder->weld_radio_button("fixedRB")) - , m_xRbtVar(m_xBuilder->weld_radio_button("varRB")) - , m_xLbLanguage(new SvxLanguageBox(m_xBuilder->weld_combo_box("languageLB"))) - , m_xLbFormat(m_xBuilder->weld_combo_box("formatLB")) + , m_xRbtFix(m_xBuilder->weld_radio_button(u"fixedRB"_ustr)) + , m_xRbtVar(m_xBuilder->weld_radio_button(u"varRB"_ustr)) + , m_xLbLanguage(new SvxLanguageBox(m_xBuilder->weld_combo_box(u"languageLB"_ustr))) + , m_xLbFormat(m_xBuilder->weld_combo_box(u"formatLB"_ustr)) { m_xLbLanguage->SetLanguageList( SvxLanguageListFlags::ALL|SvxLanguageListFlags::ONLY_KNOWN, false ); m_xLbLanguage->connect_changed(LINK(this, SdModifyFieldDlg, LanguageChangeHdl)); diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 7207ba5bc6e9..bd36f885da52 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -44,7 +44,7 @@ namespace sd { * Constructor of tab dialog: append pages to the dialog */ OutlineBulletDlg::OutlineBulletDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) - : SfxTabDialogController(pParent, "modules/sdraw/ui/bulletsandnumbering.ui", "BulletsAndNumberingDialog") + : SfxTabDialogController(pParent, u"modules/sdraw/ui/bulletsandnumbering.ui"_ustr, u"BulletsAndNumberingDialog"_ustr) , m_aInputSet(*pAttr) , m_bTitle(false) , m_pSdView(pView) @@ -115,10 +115,10 @@ OutlineBulletDlg::OutlineBulletDlg(weld::Window* pParent, const SfxItemSet* pAtt SetInputSet(&m_aInputSet); if (m_bTitle) - RemoveTabPage("singlenum"); + RemoveTabPage(u"singlenum"_ustr); - AddTabPage("customize", RID_SVXPAGE_NUM_OPTIONS); - AddTabPage("position", RID_SVXPAGE_NUM_POSITION); + AddTabPage(u"customize"_ustr, RID_SVXPAGE_NUM_OPTIONS); + AddTabPage(u"position"_ustr, RID_SVXPAGE_NUM_POSITION); } OutlineBulletDlg::~OutlineBulletDlg() diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index 833328659be3..1ff51bf66c3e 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -37,7 +37,8 @@ */ SdPageDlg::SdPageDlg(SfxObjectShell const* pDocSh, weld::Window* pParent, const SfxItemSet* pAttr, bool bAreaPage, bool bIsImpressDoc) - : SfxTabDialogController(pParent, "modules/sdraw/ui/drawpagedialog.ui", "DrawPageDialog", pAttr) + : SfxTabDialogController(pParent, u"modules/sdraw/ui/drawpagedialog.ui"_ustr, + u"DrawPageDialog"_ustr, pAttr) , mbIsImpressDoc(bIsImpressDoc) { SvxColorListItem const* pColorListItem = pDocSh->GetItem(SID_COLOR_TABLE); @@ -54,21 +55,21 @@ SdPageDlg::SdPageDlg(SfxObjectShell const* pDocSh, weld::Window* pParent, const SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - AddTabPage("RID_SVXPAGE_PAGE", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PAGE), nullptr); - AddTabPage("RID_SVXPAGE_AREA", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_AREA), nullptr); - AddTabPage("RID_SVXPAGE_TRANSPARENCE", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TRANSPARENCE), - nullptr); + AddTabPage(u"RID_SVXPAGE_PAGE"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PAGE), nullptr); + AddTabPage(u"RID_SVXPAGE_AREA"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_AREA), nullptr); + AddTabPage(u"RID_SVXPAGE_TRANSPARENCE"_ustr, + pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TRANSPARENCE), nullptr); if (!bAreaPage) // I have to add the page before I remove it ! { - RemoveTabPage("RID_SVXPAGE_AREA"); - RemoveTabPage("RID_SVXPAGE_TRANSPARENCE"); + RemoveTabPage(u"RID_SVXPAGE_AREA"_ustr); + RemoveTabPage(u"RID_SVXPAGE_TRANSPARENCE"_ustr); } if (mbIsImpressDoc) { set_title(SdResId(STR_SLIDE_SETUP_TITLE)); - m_xTabCtrl->set_tab_label_text("RID_SVXPAGE_PAGE", SdResId(STR_SLIDE_NAME)); + m_xTabCtrl->set_tab_label_text(u"RID_SVXPAGE_PAGE"_ustr, SdResId(STR_SLIDE_NAME)); } } diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index c2d752850aec..ee147dc465a5 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -34,17 +34,17 @@ * dialog to adjust grid (scarcely ESO!) */ SdSnapLineDlg::SdSnapLineDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View const * pView) - : GenericDialogController(pWindow, "modules/sdraw/ui/dlgsnap.ui", "SnapObjectDialog") + : GenericDialogController(pWindow, u"modules/sdraw/ui/dlgsnap.ui"_ustr, u"SnapObjectDialog"_ustr) , aUIScale(pView->GetDoc().GetUIScale()) - , m_xFtX(m_xBuilder->weld_label("xlabel")) - , m_xMtrFldX(m_xBuilder->weld_metric_spin_button("x", FieldUnit::CM)) - , m_xFtY(m_xBuilder->weld_label("ylabel")) - , m_xMtrFldY(m_xBuilder->weld_metric_spin_button("y", FieldUnit::CM)) - , m_xRadioGroup(m_xBuilder->weld_widget("radiogroup")) - , m_xRbPoint(m_xBuilder->weld_radio_button("point")) - , m_xRbVert(m_xBuilder->weld_radio_button("vert")) - , m_xRbHorz(m_xBuilder->weld_radio_button("horz")) - , m_xBtnDelete(m_xBuilder->weld_button("delete")) + , m_xFtX(m_xBuilder->weld_label(u"xlabel"_ustr)) + , m_xMtrFldX(m_xBuilder->weld_metric_spin_button(u"x"_ustr, FieldUnit::CM)) + , m_xFtY(m_xBuilder->weld_label(u"ylabel"_ustr)) + , m_xMtrFldY(m_xBuilder->weld_metric_spin_button(u"y"_ustr, FieldUnit::CM)) + , m_xRadioGroup(m_xBuilder->weld_widget(u"radiogroup"_ustr)) + , m_xRbPoint(m_xBuilder->weld_radio_button(u"point"_ustr)) + , m_xRbVert(m_xBuilder->weld_radio_button(u"vert"_ustr)) + , m_xRbHorz(m_xBuilder->weld_radio_button(u"horz"_ustr)) + , m_xBtnDelete(m_xBuilder->weld_button(u"delete"_ustr)) { m_xRbHorz->connect_toggled(LINK(this, SdSnapLineDlg, ToggleHdl)); m_xRbVert->connect_toggled(LINK(this, SdSnapLineDlg, ToggleHdl)); diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index b2087c408acf..14a1125f570c 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -113,7 +113,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void) { try { - mxPlayer.set( avmedia::MediaWindow::createPlayer( aUrl, "" ), css::uno::UNO_SET_THROW ); + mxPlayer.set( avmedia::MediaWindow::createPlayer( aUrl, u""_ustr ), css::uno::UNO_SET_THROW ); mxPlayer->start(); maUpdateIdle.Start(); } @@ -212,21 +212,21 @@ SdOpenSoundFileDialog::SdOpenSoundFileDialog(weld::Window *pParent) : mpImpl(new SdFileDialog_Imp(pParent)) { OUString aDescr = SdResId(STR_ALL_FILES); - mpImpl->AddFilter( aDescr, "*.*"); + mpImpl->AddFilter( aDescr, u"*.*"_ustr); mpImpl->SetContext(sfx2::FileDialogHelper::DrawImpressOpenSound); // setup filter #if defined UNX aDescr = SdResId(STR_AU_FILE); - mpImpl->AddFilter( aDescr, "*.au;*.snd"); + mpImpl->AddFilter( aDescr, u"*.au;*.snd"_ustr); aDescr = SdResId(STR_VOC_FILE); - mpImpl->AddFilter( aDescr, "*.voc"); + mpImpl->AddFilter( aDescr, u"*.voc"_ustr); aDescr = SdResId(STR_WAV_FILE); - mpImpl->AddFilter( aDescr, "*.wav"); + mpImpl->AddFilter( aDescr, u"*.wav"_ustr); aDescr = SdResId(STR_AIFF_FILE); - mpImpl->AddFilter( aDescr, "*.aiff"); + mpImpl->AddFilter( aDescr, u"*.aiff"_ustr); aDescr = SdResId(STR_SVX_FILE); - mpImpl->AddFilter( aDescr, "*.svx"); + mpImpl->AddFilter( aDescr, u"*.svx"_ustr); #else aDescr = SdResId(STR_WAV_FILE); mpImpl->AddFilter( aDescr, "*.wav;*.mp3;*.ogg" ); diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index a6baf3e920b6..c069d3f659a7 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -53,9 +53,9 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlGlueEscDir, SfxUInt16Item ) * Constructor for gluepoint escape direction Listbox */ GlueEscDirLB::GlueEscDirLB(vcl::Window* pParent, const Reference<XFrame>& rFrame) - : InterimItemWindow(pParent, "modules/simpress/ui/gluebox.ui", "GlueBox") + : InterimItemWindow(pParent, u"modules/simpress/ui/gluebox.ui"_ustr, u"GlueBox"_ustr) , m_xFrame(rFrame) - , m_xWidget(m_xBuilder->weld_combo_box("gluetype")) + , m_xWidget(m_xBuilder->weld_combo_box(u"gluetype"_ustr)) { InitControlBase(m_xWidget.get()); @@ -103,9 +103,9 @@ IMPL_LINK(GlueEscDirLB, SelectHdl, weld::ComboBox&, rBox, void) { Any a; aItem.QueryValue( a ); - Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue("GlueEscapeDirection", a) }; + Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(u"GlueEscapeDirection"_ustr, a) }; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY ), - ".uno:GlueEscapeDirection", + u".uno:GlueEscapeDirection"_ustr, aArgs ); } } diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 92f7e9be1cb0..a69e61f647dd 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -167,14 +167,14 @@ public: using namespace ::sd; HeaderFooterDialog::HeaderFooterDialog(ViewShell* pViewShell, weld::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage) - : GenericDialogController(pParent, "modules/simpress/ui/headerfooterdialog.ui", "HeaderFooterDialog") + : GenericDialogController(pParent, u"modules/simpress/ui/headerfooterdialog.ui"_ustr, u"HeaderFooterDialog"_ustr) , mpDoc( pDoc ) , mpCurrentPage( pCurrentPage ) , mpViewShell( pViewShell ) - , mxTabCtrl(m_xBuilder->weld_notebook("tabcontrol")) - , mxPBApplyToAll(m_xBuilder->weld_button("apply_all")) - , mxPBApply(m_xBuilder->weld_button("apply")) - , mxPBCancel(m_xBuilder->weld_button("cancel")) + , mxTabCtrl(m_xBuilder->weld_notebook(u"tabcontrol"_ustr)) + , mxPBApplyToAll(m_xBuilder->weld_button(u"apply_all"_ustr)) + , mxPBApply(m_xBuilder->weld_button(u"apply"_ustr)) + , mxPBCancel(m_xBuilder->weld_button(u"cancel"_ustr)) { SdPage* pSlide; SdPage* pNotes; @@ -197,8 +197,8 @@ HeaderFooterDialog::HeaderFooterDialog(ViewShell* pViewShell, weld::Window* pPar mpCurrentPage = nullptr; } - mxSlideTabPage.reset(new HeaderFooterTabPage(mxTabCtrl->get_page("slides"), pDoc, pSlide, false)); - mxNotesHandoutsTabPage.reset(new HeaderFooterTabPage(mxTabCtrl->get_page("notes"), pDoc, pNotes, true)); + mxSlideTabPage.reset(new HeaderFooterTabPage(mxTabCtrl->get_page(u"slides"_ustr), pDoc, pSlide, false)); + mxNotesHandoutsTabPage.reset(new HeaderFooterTabPage(mxTabCtrl->get_page(u"notes"_ustr), pDoc, pNotes, true)); pDoc->StopWorkStartupDelay(); mxTabCtrl->show(); @@ -356,28 +356,28 @@ void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, SdPage* pPage, const H HeaderFooterTabPage::HeaderFooterTabPage(weld::Container* pParent, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode) : mpDoc(pDoc) , mbHandoutMode(bHandoutMode) - , mxBuilder(Application::CreateBuilder(pParent, "modules/simpress/ui/headerfootertab.ui")) - , mxContainer(mxBuilder->weld_container("HeaderFooterTab")) - , mxFTIncludeOn(mxBuilder->weld_label("include_label")) - , mxCBHeader(mxBuilder->weld_check_button("header_cb" )) - , mxHeaderBox(mxBuilder->weld_widget("header_box")) - , mxTBHeader(mxBuilder->weld_entry("header_text")) - , mxCBDateTime(mxBuilder->weld_check_button("datetime_cb")) - , mxRBDateTimeFixed(mxBuilder->weld_radio_button("rb_fixed")) - , mxRBDateTimeAutomatic(mxBuilder->weld_radio_button("rb_auto")) - , mxTBDateTimeFixed(mxBuilder->weld_entry("datetime_value")) - , mxCBDateTimeFormat(mxBuilder->weld_combo_box("datetime_format_list")) - , mxFTDateTimeLanguage(mxBuilder->weld_label("language_label")) - , mxCBDateTimeLanguage(new SvxLanguageBox(mxBuilder->weld_combo_box("language_list"))) - , mxCBFooter(mxBuilder->weld_check_button("footer_cb")) - , mxFooterBox(mxBuilder->weld_widget("footer_box" )) - , mxTBFooter(mxBuilder->weld_entry("footer_text")) - , mxCBSlideNumber(mxBuilder->weld_check_button("slide_number")) - , mxCBNotOnTitle(mxBuilder->weld_check_button("not_on_title")) - , mxReplacementA(mxBuilder->weld_label("replacement_a")) - , mxReplacementB(mxBuilder->weld_label("replacement_b")) + , mxBuilder(Application::CreateBuilder(pParent, u"modules/simpress/ui/headerfootertab.ui"_ustr)) + , mxContainer(mxBuilder->weld_container(u"HeaderFooterTab"_ustr)) + , mxFTIncludeOn(mxBuilder->weld_label(u"include_label"_ustr)) + , mxCBHeader(mxBuilder->weld_check_button(u"header_cb"_ustr )) + , mxHeaderBox(mxBuilder->weld_widget(u"header_box"_ustr)) + , mxTBHeader(mxBuilder->weld_entry(u"header_text"_ustr)) + , mxCBDateTime(mxBuilder->weld_check_button(u"datetime_cb"_ustr)) + , mxRBDateTimeFixed(mxBuilder->weld_radio_button(u"rb_fixed"_ustr)) + , mxRBDateTimeAutomatic(mxBuilder->weld_radio_button(u"rb_auto"_ustr)) + , mxTBDateTimeFixed(mxBuilder->weld_entry(u"datetime_value"_ustr)) + , mxCBDateTimeFormat(mxBuilder->weld_combo_box(u"datetime_format_list"_ustr)) + , mxFTDateTimeLanguage(mxBuilder->weld_label(u"language_label"_ustr)) + , mxCBDateTimeLanguage(new SvxLanguageBox(mxBuilder->weld_combo_box(u"language_list"_ustr))) + , mxCBFooter(mxBuilder->weld_check_button(u"footer_cb"_ustr)) + , mxFooterBox(mxBuilder->weld_widget(u"footer_box"_ustr )) + , mxTBFooter(mxBuilder->weld_entry(u"footer_text"_ustr)) + , mxCBSlideNumber(mxBuilder->weld_check_button(u"slide_number"_ustr)) + , mxCBNotOnTitle(mxBuilder->weld_check_button(u"not_on_title"_ustr)) + , mxReplacementA(mxBuilder->weld_label(u"replacement_a"_ustr)) + , mxReplacementB(mxBuilder->weld_label(u"replacement_b"_ustr)) , mxCTPreview(new PresLayoutPreview) - , mxCTPreviewWin(new weld::CustomWeld(*mxBuilder, "preview", *mxCTPreview)) + , mxCTPreviewWin(new weld::CustomWeld(*mxBuilder, u"preview"_ustr, *mxCTPreview)) { mxCTPreview->init( pActualPage ? (pActualPage->IsMasterPage() ? pActualPage : static_cast<SdPage*>(&(pActualPage->TRG_GetMasterPage()))) : diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx index f1020c0cb286..d67a74e61e37 100644 --- a/sd/source/ui/dlg/ins_paste.cxx +++ b/sd/source/ui/dlg/ins_paste.cxx @@ -20,9 +20,10 @@ #include <ins_paste.hxx> SdInsertPasteDlg::SdInsertPasteDlg(weld::Window* pWindow) - : GenericDialogController(pWindow, "modules/simpress/ui/insertslides.ui", "InsertSlidesDialog") - , m_xRbBefore(m_xBuilder->weld_radio_button("before")) - , m_xRbAfter(m_xBuilder->weld_radio_button("after")) + : GenericDialogController(pWindow, u"modules/simpress/ui/insertslides.ui"_ustr, + u"InsertSlidesDialog"_ustr) + , m_xRbBefore(m_xBuilder->weld_radio_button(u"before"_ustr)) + , m_xRbAfter(m_xBuilder->weld_radio_button(u"after"_ustr)) { m_xRbAfter->set_active(true); } diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 5c984dd2329a..c246d4132394 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -31,13 +31,13 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg( weld::Window* pWindow, const SdDrawDocument* pInDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) - : GenericDialogController(pWindow, "modules/sdraw/ui/insertslidesdialog.ui", "InsertSlidesDialog") + : GenericDialogController(pWindow, u"modules/sdraw/ui/insertslidesdialog.ui"_ustr, u"InsertSlidesDialog"_ustr) , m_pMedium(pSfxMedium) , m_pDoc(pInDoc) , m_rName(rFileName) - , m_xLbTree(new SdPageObjsTLV(m_xBuilder->weld_tree_view("tree"))) - , m_xCbxLink(m_xBuilder->weld_check_button("links")) - , m_xCbxMasters(m_xBuilder->weld_check_button("backgrounds")) + , m_xLbTree(new SdPageObjsTLV(m_xBuilder->weld_tree_view(u"tree"_ustr))) + , m_xCbxLink(m_xBuilder->weld_check_button(u"links"_ustr)) + , m_xCbxMasters(m_xBuilder->weld_check_button(u"backgrounds"_ustr)) { m_xLbTree->set_size_request(m_xLbTree->get_approximate_digit_width() * 48, m_xLbTree->get_height_rows(12)); diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx index fae355ae97cb..2680e088d87a 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.cxx +++ b/sd/source/ui/dlg/layeroptionsdlg.cxx @@ -24,14 +24,14 @@ SdInsertLayerDlg::SdInsertLayerDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& rStr) - : GenericDialogController(pWindow, "modules/sdraw/ui/insertlayer.ui", "InsertLayerDialog") - , m_xEdtName(m_xBuilder->weld_entry("name")) - , m_xEdtTitle(m_xBuilder->weld_entry("title")) - , m_xEdtDesc(m_xBuilder->weld_text_view("textview")) - , m_xCbxVisible(m_xBuilder->weld_check_button("visible")) - , m_xCbxPrintable(m_xBuilder->weld_check_button("printable")) - , m_xCbxLocked(m_xBuilder->weld_check_button("locked")) - , m_xNameFrame(m_xBuilder->weld_widget("nameframe")) + : GenericDialogController(pWindow, u"modules/sdraw/ui/insertlayer.ui"_ustr, u"InsertLayerDialog"_ustr) + , m_xEdtName(m_xBuilder->weld_entry(u"name"_ustr)) + , m_xEdtTitle(m_xBuilder->weld_entry(u"title"_ustr)) + , m_xEdtDesc(m_xBuilder->weld_text_view(u"textview"_ustr)) + , m_xCbxVisible(m_xBuilder->weld_check_button(u"visible"_ustr)) + , m_xCbxPrintable(m_xBuilder->weld_check_button(u"printable"_ustr)) + , m_xCbxLocked(m_xBuilder->weld_check_button(u"locked"_ustr)) + , m_xNameFrame(m_xBuilder->weld_widget(u"nameframe"_ustr)) { m_xDialog->set_title(rStr); diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx index ce4e069b0737..5cf702cbd164 100644 --- a/sd/source/ui/dlg/masterlayoutdlg.cxx +++ b/sd/source/ui/dlg/masterlayoutdlg.cxx @@ -25,14 +25,14 @@ using namespace ::sd; MasterLayoutDialog::MasterLayoutDialog(weld::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage) - : GenericDialogController(pParent, "modules/simpress/ui/masterlayoutdlg.ui", "MasterLayoutDialog") + : GenericDialogController(pParent, u"modules/simpress/ui/masterlayoutdlg.ui"_ustr, u"MasterLayoutDialog"_ustr) , mpDoc(pDoc) , mpCurrentPage(pCurrentPage) - , mxCBDate(m_xBuilder->weld_check_button("datetime")) - , mxCBPageNumber(m_xBuilder->weld_check_button("pagenumber")) - , mxCBSlideNumber(m_xBuilder->weld_check_button("slidenumber")) - , mxCBHeader(m_xBuilder->weld_check_button("header")) - , mxCBFooter(m_xBuilder->weld_check_button("footer")) + , mxCBDate(m_xBuilder->weld_check_button(u"datetime"_ustr)) + , mxCBPageNumber(m_xBuilder->weld_check_button(u"pagenumber"_ustr)) + , mxCBSlideNumber(m_xBuilder->weld_check_button(u"slidenumber"_ustr)) + , mxCBHeader(m_xBuilder->weld_check_button(u"header"_ustr)) + , mxCBFooter(m_xBuilder->weld_check_button(u"footer"_ustr)) { if( mpCurrentPage && !mpCurrentPage->IsMasterPage() ) { diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 0e9b7ddf5558..7025b8e6e738 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -32,10 +32,10 @@ using namespace com::sun::star; namespace sd { MorphDlg::MorphDlg(weld::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2 ) - : GenericDialogController(pParent, "modules/sdraw/ui/crossfadedialog.ui", "CrossFadeDialog") - , m_xMtfSteps(m_xBuilder->weld_spin_button("increments")) - , m_xCbxAttributes(m_xBuilder->weld_check_button("attributes")) - , m_xCbxOrientation(m_xBuilder->weld_check_button("orientation")) + : GenericDialogController(pParent, u"modules/sdraw/ui/crossfadedialog.ui"_ustr, u"CrossFadeDialog"_ustr) + , m_xMtfSteps(m_xBuilder->weld_spin_button(u"increments"_ustr)) + , m_xCbxAttributes(m_xBuilder->weld_check_button(u"attributes"_ustr)) + , m_xCbxOrientation(m_xBuilder->weld_check_button(u"orientation"_ustr)) { LoadSettings(); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 46975a6bb046..5b25db0e13e7 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -56,12 +56,12 @@ * SdNavigatorWin - FloatingWindow */ SdNavigatorWin::SdNavigatorWin(weld::Widget* pParent, SfxBindings* pInBindings, SfxNavigator* pNavigatorDlg) - : PanelLayout(pParent, "NavigatorPanel", "modules/simpress/ui/navigatorpanel.ui") - , mxToolbox(m_xBuilder->weld_toolbar("toolbox")) - , mxTlbObjects(new SdPageObjsTLV(m_xBuilder->weld_tree_view("tree"))) - , mxLbDocs(m_xBuilder->weld_combo_box("documents")) - , mxDragModeMenu(m_xBuilder->weld_menu("dragmodemenu")) - , mxShapeMenu(m_xBuilder->weld_menu("shapemenu")) + : PanelLayout(pParent, u"NavigatorPanel"_ustr, u"modules/simpress/ui/navigatorpanel.ui"_ustr) + , mxToolbox(m_xBuilder->weld_toolbar(u"toolbox"_ustr)) + , mxTlbObjects(new SdPageObjsTLV(m_xBuilder->weld_tree_view(u"tree"_ustr))) + , mxLbDocs(m_xBuilder->weld_combo_box(u"documents"_ustr)) + , mxDragModeMenu(m_xBuilder->weld_menu(u"dragmodemenu"_ustr)) + , mxShapeMenu(m_xBuilder->weld_menu(u"shapemenu"_ustr)) , mxNavigatorDlg(pNavigatorDlg) , mbDocImported ( false ) // On changes of the DragType: adjust SelectionMode of TLB! @@ -78,11 +78,11 @@ SdNavigatorWin::SdNavigatorWin(weld::Widget* pParent, SfxBindings* pInBindings, mxToolbox->connect_clicked(LINK(this, SdNavigatorWin, SelectToolboxHdl)); mxToolbox->connect_menu_toggled(LINK(this, SdNavigatorWin, DropdownClickToolBoxHdl)); - mxToolbox->set_item_menu("dragmode", mxDragModeMenu.get()); + mxToolbox->set_item_menu(u"dragmode"_ustr, mxDragModeMenu.get()); mxDragModeMenu->connect_activate(LINK(this, SdNavigatorWin, MenuSelectHdl)); // Shape filter drop down menu. - mxToolbox->set_item_menu("shapes", mxShapeMenu.get()); + mxToolbox->set_item_menu(u"shapes"_ustr, mxShapeMenu.get()); mxShapeMenu->connect_activate(LINK(this, SdNavigatorWin, ShapeFilterCallback)); mxTlbObjects->SetSdNavigator(this); @@ -228,9 +228,9 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc ) // show. if (sd::SlideShow::IsRunning( pViewShell->GetViewShellBase() ) && !sd::SlideShow::IsInteractiveSlideshow( &pViewShell->GetViewShellBase() ) ) // IASS - mxToolbox->set_item_sensitive("shapes", false); + mxToolbox->set_item_sensitive(u"shapes"_ustr, false); else - mxToolbox->set_item_sensitive("shapes", true); + mxToolbox->set_item_sensitive(u"shapes"_ustr, true); if( !mxTlbObjects->IsEqualToDoc( pDoc ) ) { @@ -290,8 +290,8 @@ IMPL_LINK(SdNavigatorWin, CommandHdl, const CommandEvent&, rCEvt, bool) return false; weld::TreeView& rTreeView = GetObjects().get_treeview(); std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(&rTreeView, - "modules/sdraw/ui/navigatorcontextmenu.ui")); - std::unique_ptr<weld::Menu> xPop = xBuilder->weld_menu("navmenu"); + u"modules/sdraw/ui/navigatorcontextmenu.ui"_ustr)); + std::unique_ptr<weld::Menu> xPop = xBuilder->weld_menu(u"navmenu"_ustr); OUString sCommand = xPop->popup_at_rect(&rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); if (!sCommand.isEmpty()) @@ -334,9 +334,9 @@ IMPL_LINK(SdNavigatorWin, SelectToolboxHdl, const OUString&, rCommand, void) else if (rCommand == "last") ePage = PAGE_LAST; else if (rCommand == "dragmode") - mxToolbox->set_menu_item_active("dragmode", !mxToolbox->get_menu_item_active("dragmode")); + mxToolbox->set_menu_item_active(u"dragmode"_ustr, !mxToolbox->get_menu_item_active(u"dragmode"_ustr)); else if (rCommand == "shapes") - mxToolbox->set_menu_item_active("shapes", !mxToolbox->get_menu_item_active("shapes")); + mxToolbox->set_menu_item_active(u"shapes"_ustr, !mxToolbox->get_menu_item_active(u"shapes"_ustr)); if (ePage != PAGE_NONE) { @@ -366,11 +366,11 @@ IMPL_LINK(SdNavigatorWin, DropdownClickToolBoxHdl, const OUString&, rCommand, vo else if (rCommand == "shapes") { bool bAll = mxTlbObjects->GetShowAllShapes(); - mxShapeMenu->set_active("named", !bAll); - mxShapeMenu->set_active("all", bAll); + mxShapeMenu->set_active(u"named"_ustr, !bAll); + mxShapeMenu->set_active(u"all"_ustr, bAll); bool bOrderFrontToBack = mxTlbObjects->GetOrderFrontToBack(); - mxShapeMenu->set_active("fronttoback", bOrderFrontToBack); - mxShapeMenu->set_active("backtofront", !bOrderFrontToBack); + mxShapeMenu->set_active(u"fronttoback"_ustr, bOrderFrontToBack); + mxShapeMenu->set_active(u"backtofront"_ustr, !bOrderFrontToBack); } } @@ -632,7 +632,7 @@ bool SdNavigatorWin::InsertFile(const OUString& rFileName) if (aFileName != maDropFileName) { SfxMedium aMed(aFileName, (StreamMode::READ | StreamMode::SHARE_DENYNONE)); - SfxFilterMatcher aMatch( "simpress" ); + SfxFilterMatcher aMatch( u"simpress"_ustr ); aMed.UseInteractionHandler( true ); nErr = aMatch.GuessFilter(aMed, pFilter); } @@ -802,7 +802,7 @@ IMPL_LINK(SdNavigatorWin, KeyInputHdl, const KeyEvent&, rKEvt, bool) void SdNavigatorWin::SetDragImage() { - mxToolbox->set_item_icon_name("dragmode", GetDragTypeSdBmpId(meDragType)); + mxToolbox->set_item_icon_name(u"dragmode"_ustr, GetDragTypeSdBmpId(meDragType)); } // for the sidebar to make the panel invisible when the shell type is outline or slide sorter @@ -856,35 +856,35 @@ void SdNavigatorControllerItem::StateChangedAtToolBoxControl( sal_uInt16 nSId, // First if (nState & NavState::BtnFirstEnabled && - !pNavigatorWin->mxToolbox->get_item_sensitive("first")) - pNavigatorWin->mxToolbox->set_item_sensitive("first", true); + !pNavigatorWin->mxToolbox->get_item_sensitive(u"first"_ustr)) + pNavigatorWin->mxToolbox->set_item_sensitive(u"first"_ustr, true); if (nState & NavState::BtnFirstDisabled && - pNavigatorWin->mxToolbox->get_item_sensitive("first")) - pNavigatorWin->mxToolbox->set_item_sensitive("first", false); + pNavigatorWin->mxToolbox->get_item_sensitive(u"first"_ustr)) + pNavigatorWin->mxToolbox->set_item_sensitive(u"first"_ustr, false); // Prev if (nState & NavState::BtnPrevEnabled && - !pNavigatorWin->mxToolbox->get_item_sensitive("previous")) - pNavigatorWin->mxToolbox->set_item_sensitive("previous", true); + !pNavigatorWin->mxToolbox->get_item_sensitive(u"previous"_ustr)) + pNavigatorWin->mxToolbox->set_item_sensitive(u"previous"_ustr, true); if (nState & NavState::BtnPrevDisabled && - pNavigatorWin->mxToolbox->get_item_sensitive("previous")) - pNavigatorWin->mxToolbox->set_item_sensitive("previous", false); + pNavigatorWin->mxToolbox->get_item_sensitive(u"previous"_ustr)) + pNavigatorWin->mxToolbox->set_item_sensitive(u"previous"_ustr, false); // Last if (nState & NavState::BtnLastEnabled && - !pNavigatorWin->mxToolbox->get_item_sensitive("last")) - pNavigatorWin->mxToolbox->set_item_sensitive("last", true); + !pNavigatorWin->mxToolbox->get_item_sensitive(u"last"_ustr)) + pNavigatorWin->mxToolbox->set_item_sensitive(u"last"_ustr, true); if (nState & NavState::BtnLastDisabled && - pNavigatorWin->mxToolbox->get_item_sensitive("last")) - pNavigatorWin->mxToolbox->set_item_sensitive("last", false); + pNavigatorWin->mxToolbox->get_item_sensitive(u"last"_ustr)) + pNavigatorWin->mxToolbox->set_item_sensitive(u"last"_ustr, false); // Next if (nState & NavState::BtnNextEnabled && - !pNavigatorWin->mxToolbox->get_item_sensitive("next")) - pNavigatorWin->mxToolbox->set_item_sensitive("next", true); + !pNavigatorWin->mxToolbox->get_item_sensitive(u"next"_ustr)) + pNavigatorWin->mxToolbox->set_item_sensitive(u"next"_ustr, true); if (nState & NavState::BtnNextDisabled && - pNavigatorWin->mxToolbox->get_item_sensitive("next")) - pNavigatorWin->mxToolbox->set_item_sensitive("next", false); + pNavigatorWin->mxToolbox->get_item_sensitive(u"next"_ustr)) + pNavigatorWin->mxToolbox->set_item_sensitive(u"next"_ustr, false); if (nState & NavState::TableUpdate) { diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 66ac46643195..6a514cf2f937 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -54,11 +54,11 @@ private: } SdParagraphNumTabPage::SdParagraphNumTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr) - : SfxTabPage(pPage, pController, "modules/sdraw/ui/paranumberingtab.ui", "DrawParaNumbering", &rAttr) + : SfxTabPage(pPage, pController, u"modules/sdraw/ui/paranumberingtab.ui"_ustr, u"DrawParaNumbering"_ustr, &rAttr) , mbModified(false) - , m_xNewStartCB(m_xBuilder->weld_check_button("checkbuttonCB_NEW_START")) - , m_xNewStartNumberCB(m_xBuilder->weld_check_button("checkbuttonCB_NUMBER_NEW_START")) - , m_xNewStartNF(m_xBuilder->weld_spin_button("spinbuttonNF_NEW_START")) + , m_xNewStartCB(m_xBuilder->weld_check_button(u"checkbuttonCB_NEW_START"_ustr)) + , m_xNewStartNumberCB(m_xBuilder->weld_check_button(u"checkbuttonCB_NUMBER_NEW_START"_ustr)) + , m_xNewStartNF(m_xBuilder->weld_spin_button(u"spinbuttonNF_NEW_START"_ustr)) { m_xNewStartCB->connect_toggled(LINK(this, SdParagraphNumTabPage, ImplNewStartHdl)); m_xNewStartNumberCB->connect_toggled(LINK(this, SdParagraphNumTabPage, ImplNewStartHdl)); @@ -135,25 +135,25 @@ IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl, weld::Toggleable&, void) } SdParagraphDlg::SdParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr) - : SfxTabDialogController(pParent, "modules/sdraw/ui/drawparadialog.ui", - "DrawParagraphPropertiesDialog", pAttr) + : SfxTabDialogController(pParent, u"modules/sdraw/ui/drawparadialog.ui"_ustr, + u"DrawParagraphPropertiesDialog"_ustr, pAttr) { - AddTabPage( "labelTP_PARA_STD", RID_SVXPAGE_STD_PARAGRAPH); + AddTabPage( u"labelTP_PARA_STD"_ustr, RID_SVXPAGE_STD_PARAGRAPH); if( SvtCJKOptions::IsAsianTypographyEnabled() ) - AddTabPage( "labelTP_PARA_ASIAN", RID_SVXPAGE_PARA_ASIAN); + AddTabPage( u"labelTP_PARA_ASIAN"_ustr, RID_SVXPAGE_PARA_ASIAN); else - RemoveTabPage( "labelTP_PARA_ASIAN" ); + RemoveTabPage( u"labelTP_PARA_ASIAN"_ustr ); - AddTabPage( "labelTP_PARA_ALIGN", RID_SVXPAGE_ALIGN_PARAGRAPH); + AddTabPage( u"labelTP_PARA_ALIGN"_ustr, RID_SVXPAGE_ALIGN_PARAGRAPH); static const bool bShowParaNumbering = ( getenv( "SD_SHOW_NUMBERING_PAGE" ) != nullptr ); if( bShowParaNumbering ) - AddTabPage( "labelNUMBERING", SdParagraphNumTabPage::Create, SdParagraphNumTabPage::GetRanges ); + AddTabPage( u"labelNUMBERING"_ustr, SdParagraphNumTabPage::Create, SdParagraphNumTabPage::GetRanges ); else - RemoveTabPage( "labelNUMBERING" ); + RemoveTabPage( u"labelNUMBERING"_ustr ); - AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR); + AddTabPage(u"labelTP_TABULATOR"_ustr, RID_SVXPAGE_TABULATOR); } void SdParagraphDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 9640c5b72fd7..96c503170a07 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -44,41 +44,41 @@ enum PresenterConsoleMode SdStartPresentationDlg::SdStartPresentationDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList) - : GenericDialogController(pWindow, "modules/simpress/ui/presentationdialog.ui", "PresentationDialog") + : GenericDialogController(pWindow, u"modules/simpress/ui/presentationdialog.ui"_ustr, u"PresentationDialog"_ustr) , pCustomShowList(pCSList) , rOutAttrs(rInAttrs) , mnMonitors(0) - , m_xRbtAll(m_xBuilder->weld_radio_button("allslides")) - , m_xRbtAtDia(m_xBuilder->weld_radio_button("from")) - , m_xRbtCustomshow(m_xBuilder->weld_radio_button("customslideshow")) - , m_xLbDias(m_xBuilder->weld_combo_box("from_cb")) - , m_xLbCustomshow(m_xBuilder->weld_combo_box("customslideshow_cb")) - , m_xRbtStandard(m_xBuilder->weld_radio_button("default")) - , m_xRbtWindow(m_xBuilder->weld_radio_button("window")) - , m_xRbtAuto(m_xBuilder->weld_radio_button("auto")) - , m_xTmfPause(m_xBuilder->weld_formatted_spin_button("pauseduration")) + , m_xRbtAll(m_xBuilder->weld_radio_button(u"allslides"_ustr)) + , m_xRbtAtDia(m_xBuilder->weld_radio_button(u"from"_ustr)) + , m_xRbtCustomshow(m_xBuilder->weld_radio_button(u"customslideshow"_ustr)) + , m_xLbDias(m_xBuilder->weld_combo_box(u"from_cb"_ustr)) + , m_xLbCustomshow(m_xBuilder->weld_combo_box(u"customslideshow_cb"_ustr)) + , m_xRbtStandard(m_xBuilder->weld_radio_button(u"default"_ustr)) + , m_xRbtWindow(m_xBuilder->weld_radio_button(u"window"_ustr)) + , m_xRbtAuto(m_xBuilder->weld_radio_button(u"auto"_ustr)) + , m_xTmfPause(m_xBuilder->weld_formatted_spin_button(u"pauseduration"_ustr)) , m_xFormatter(new weld::TimeFormatter(*m_xTmfPause)) - , m_xCbxAutoLogo(m_xBuilder->weld_check_button("showlogo")) - , m_xCbxManuel(m_xBuilder->weld_check_button("manualslides")) - , m_xCbxMousepointer(m_xBuilder->weld_check_button("pointervisible")) - , m_xCbxPen(m_xBuilder->weld_check_button("pointeraspen")) - , m_xCbxAnimationAllowed(m_xBuilder->weld_check_button("animationsallowed")) - , m_xCbxChangePage(m_xBuilder->weld_check_button("changeslidesbyclick")) - , m_xCbxAlwaysOnTop(m_xBuilder->weld_check_button("alwaysontop")) - , m_xCbxShowNavigationButton(m_xBuilder->weld_check_button("shownavigationbutton")) - , m_xLbNavigationButtonsSize(m_xBuilder->weld_combo_box("navigation_buttons_size_cb")) - , m_xFtNavigationButtonsSize(m_xBuilder->weld_label("navbar_btn_size_label")) - , m_xFrameEnableRemote(m_xBuilder->weld_frame("frameremote")) - , m_xCbxEnableRemote(m_xBuilder->weld_check_button("enableremote")) - , m_xCbxEnableRemoteInsecure(m_xBuilder->weld_check_button("enableremoteinsecure")) - , m_xCbxInteractiveMode(m_xBuilder->weld_check_button("enableinteractivemode")) - , m_xLbConsole(m_xBuilder->weld_combo_box("console_cb")) - , m_xFtMonitor(m_xBuilder->weld_label("presdisplay_label")) - , m_xLBMonitor(m_xBuilder->weld_combo_box("presdisplay_cb")) - , m_xMonitor(m_xBuilder->weld_label("monitor_str")) - , m_xAllMonitors(m_xBuilder->weld_label("allmonitors_str")) - , m_xMonitorExternal(m_xBuilder->weld_label("externalmonitor_str")) - , m_xExternal(m_xBuilder->weld_label("external_str")) + , m_xCbxAutoLogo(m_xBuilder->weld_check_button(u"showlogo"_ustr)) + , m_xCbxManuel(m_xBuilder->weld_check_button(u"manualslides"_ustr)) + , m_xCbxMousepointer(m_xBuilder->weld_check_button(u"pointervisible"_ustr)) + , m_xCbxPen(m_xBuilder->weld_check_button(u"pointeraspen"_ustr)) + , m_xCbxAnimationAllowed(m_xBuilder->weld_check_button(u"animationsallowed"_ustr)) + , m_xCbxChangePage(m_xBuilder->weld_check_button(u"changeslidesbyclick"_ustr)) + , m_xCbxAlwaysOnTop(m_xBuilder->weld_check_button(u"alwaysontop"_ustr)) + , m_xCbxShowNavigationButton(m_xBuilder->weld_check_button(u"shownavigationbutton"_ustr)) + , m_xLbNavigationButtonsSize(m_xBuilder->weld_combo_box(u"navigation_buttons_size_cb"_ustr)) + , m_xFtNavigationButtonsSize(m_xBuilder->weld_label(u"navbar_btn_size_label"_ustr)) + , m_xFrameEnableRemote(m_xBuilder->weld_frame(u"frameremote"_ustr)) + , m_xCbxEnableRemote(m_xBuilder->weld_check_button(u"enableremote"_ustr)) + , m_xCbxEnableRemoteInsecure(m_xBuilder->weld_check_button(u"enableremoteinsecure"_ustr)) + , m_xCbxInteractiveMode(m_xBuilder->weld_check_button(u"enableinteractivemode"_ustr)) + , m_xLbConsole(m_xBuilder->weld_combo_box(u"console_cb"_ustr)) + , m_xFtMonitor(m_xBuilder->weld_label(u"presdisplay_label"_ustr)) + , m_xLBMonitor(m_xBuilder->weld_combo_box(u"presdisplay_cb"_ustr)) + , m_xMonitor(m_xBuilder->weld_label(u"monitor_str"_ustr)) + , m_xAllMonitors(m_xBuilder->weld_label(u"allmonitors_str"_ustr)) + , m_xMonitorExternal(m_xBuilder->weld_label(u"externalmonitor_str"_ustr)) + , m_xExternal(m_xBuilder->weld_label(u"external_str"_ustr)) { m_xFormatter->SetExtFormat(ExtTimeFieldFormat::LongDuration); m_xFormatter->EnableEmptyField(false); diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index d7305eb446b7..dc14c5daf5ca 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -48,7 +48,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg(SfxObjectShell const * pDocSh, SfxStyleSheetBase& rStyleBase, PresentationObjects _ePO, SfxStyleSheetBasePool* pSSPool) - : SfxTabDialogController(pParent, "modules/sdraw/ui/drawprtldialog.ui", "DrawPRTLDialog") + : SfxTabDialogController(pParent, u"modules/sdraw/ui/drawprtldialog.ui"_ustr, u"DrawPRTLDialog"_ustr) , mpDocShell(pDocSh) , ePO(_ePO) , aInputSet(*rStyleBase.GetItemSet().GetPool(), svl::Items<SID_PARAM_NUM_PRESET, SID_PARAM_CUR_NUM_LEVEL>) @@ -124,43 +124,43 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg(SfxObjectShell const * pDocSh, SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - AddTabPage( "RID_SVXPAGE_LINE", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINE ), nullptr ); - AddTabPage( "RID_SVXPAGE_AREA", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), nullptr ); - AddTabPage( "RID_SVXPAGE_SHADOW", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_SHADOW ), nullptr ); - AddTabPage( "RID_SVXPAGE_TRANSPARENCE", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), nullptr ); - AddTabPage( "RID_SVXPAGE_CHAR_NAME", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), nullptr ); - AddTabPage( "RID_SVXPAGE_CHAR_EFFECTS", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), nullptr ); - AddTabPage( "RID_SVXPAGE_STD_PARAGRAPH", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_STD_PARAGRAPH ), nullptr ); - AddTabPage( "RID_SVXPAGE_TEXTATTR", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TEXTATTR ), nullptr ); - AddTabPage( "RID_SVXPAGE_PICK_BULLET", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PICK_BULLET ), nullptr ); - AddTabPage( "RID_SVXPAGE_PICK_SINGLE_NUM", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PICK_SINGLE_NUM ), nullptr ); - AddTabPage( "RID_SVXPAGE_PICK_BMP", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PICK_BMP ), nullptr ); - AddTabPage( "RID_SVXPAGE_NUM_OPTIONS", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUM_OPTIONS ), nullptr ); - AddTabPage( "RID_SVXPAGE_TABULATOR", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TABULATOR ), nullptr ); - AddTabPage( "RID_SVXPAGE_PARA_ASIAN", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PARA_ASIAN ), nullptr ); - AddTabPage( "RID_SVXPAGE_ALIGN_PARAGRAPH", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGN_PARAGRAPH ), nullptr ); - AddTabPage( "RID_SVXPAGE_BKG", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr); + AddTabPage( u"RID_SVXPAGE_LINE"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINE ), nullptr ); + AddTabPage( u"RID_SVXPAGE_AREA"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), nullptr ); + AddTabPage( u"RID_SVXPAGE_SHADOW"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_SHADOW ), nullptr ); + AddTabPage( u"RID_SVXPAGE_TRANSPARENCE"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), nullptr ); + AddTabPage( u"RID_SVXPAGE_CHAR_NAME"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), nullptr ); + AddTabPage( u"RID_SVXPAGE_CHAR_EFFECTS"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), nullptr ); + AddTabPage( u"RID_SVXPAGE_STD_PARAGRAPH"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_STD_PARAGRAPH ), nullptr ); + AddTabPage( u"RID_SVXPAGE_TEXTATTR"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TEXTATTR ), nullptr ); + AddTabPage( u"RID_SVXPAGE_PICK_BULLET"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PICK_BULLET ), nullptr ); + AddTabPage( u"RID_SVXPAGE_PICK_SINGLE_NUM"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PICK_SINGLE_NUM ), nullptr ); + AddTabPage( u"RID_SVXPAGE_PICK_BMP"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PICK_BMP ), nullptr ); + AddTabPage( u"RID_SVXPAGE_NUM_OPTIONS"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUM_OPTIONS ), nullptr ); + AddTabPage( u"RID_SVXPAGE_TABULATOR"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TABULATOR ), nullptr ); + AddTabPage( u"RID_SVXPAGE_PARA_ASIAN"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PARA_ASIAN ), nullptr ); + AddTabPage( u"RID_SVXPAGE_ALIGN_PARAGRAPH"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGN_PARAGRAPH ), nullptr ); + AddTabPage( u"RID_SVXPAGE_BKG"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr); if (!SvtCJKOptions::IsAsianTypographyEnabled() || bBackground) - RemoveTabPage( "RID_SVXPAGE_PARA_ASIAN" ); + RemoveTabPage( u"RID_SVXPAGE_PARA_ASIAN"_ustr ); if (bBackground) { - RemoveTabPage( "RID_SVXPAGE_LINE"); - - RemoveTabPage( "RID_SVXPAGE_SHADOW"); - RemoveTabPage( "RID_SVXPAGE_TRANSPARENCE"); - RemoveTabPage( "RID_SVXPAGE_CHAR_NAME"); - RemoveTabPage( "RID_SVXPAGE_CHAR_EFFECTS"); - RemoveTabPage( "RID_SVXPAGE_STD_PARAGRAPH"); - RemoveTabPage( "RID_SVXPAGE_TEXTATTR"); - RemoveTabPage( "RID_SVXPAGE_PICK_BULLET"); - RemoveTabPage( "RID_SVXPAGE_PICK_SINGLE_NUM"); - RemoveTabPage( "RID_SVXPAGE_PICK_BMP"); - RemoveTabPage( "RID_SVXPAGE_NUM_OPTIONS"); - RemoveTabPage( "RID_SVXPAGE_TABULATOR"); - RemoveTabPage( "RID_SVXPAGE_ALIGN_PARAGRAPH"); - RemoveTabPage( "RID_SVXPAGE_BKG" ); + RemoveTabPage( u"RID_SVXPAGE_LINE"_ustr); + + RemoveTabPage( u"RID_SVXPAGE_SHADOW"_ustr); + RemoveTabPage( u"RID_SVXPAGE_TRANSPARENCE"_ustr); + RemoveTabPage( u"RID_SVXPAGE_CHAR_NAME"_ustr); + RemoveTabPage( u"RID_SVXPAGE_CHAR_EFFECTS"_ustr); + RemoveTabPage( u"RID_SVXPAGE_STD_PARAGRAPH"_ustr); + RemoveTabPage( u"RID_SVXPAGE_TEXTATTR"_ustr); + RemoveTabPage( u"RID_SVXPAGE_PICK_BULLET"_ustr); + RemoveTabPage( u"RID_SVXPAGE_PICK_SINGLE_NUM"_ustr); + RemoveTabPage( u"RID_SVXPAGE_PICK_BMP"_ustr); + RemoveTabPage( u"RID_SVXPAGE_NUM_OPTIONS"_ustr); + RemoveTabPage( u"RID_SVXPAGE_TABULATOR"_ustr); + RemoveTabPage( u"RID_SVXPAGE_ALIGN_PARAGRAPH"_ustr); + RemoveTabPage( u"RID_SVXPAGE_BKG"_ustr ); } // set title and add corresponding pages to dialog diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 0349fe688919..e95820b39ae2 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -29,37 +29,37 @@ * dialog to adjust print options */ SdPrintOptions::SdPrintOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/simpress/ui/prntopts.ui", "prntopts", &rInAttrs) + : SfxTabPage(pPage, pController, u"modules/simpress/ui/prntopts.ui"_ustr, u"prntopts"_ustr, &rInAttrs) , m_bDrawMode(false) - , m_xFrmContent(m_xBuilder->weld_frame("contentframe")) - , m_xCbxDraw(m_xBuilder->weld_check_button("drawingcb")) - , m_xCbxNotes(m_xBuilder->weld_check_button("notecb")) - , m_xCbxHandout(m_xBuilder->weld_check_button("handoutcb")) - , m_xCbxOutline(m_xBuilder->weld_check_button("outlinecb")) - , m_xRbtColor(m_xBuilder->weld_radio_button("defaultrb")) - , m_xRbtGrayscale(m_xBuilder->weld_radio_button("grayscalerb")) - , m_xRbtBlackWhite(m_xBuilder->weld_radio_button("blackwhiterb")) - , m_xRbQualityImg(m_xBuilder->weld_widget("lockquality")) - , m_xCbxPagename(m_xBuilder->weld_check_button("pagenmcb")) - , m_xCbxPagenameImg(m_xBuilder->weld_widget("lockpagenmcb")) - , m_xCbxDate(m_xBuilder->weld_check_button("datecb")) - , m_xCbxDateImg(m_xBuilder->weld_widget("lockdatecb")) - , m_xCbxTime(m_xBuilder->weld_check_button("timecb")) - , m_xCbxTimeImg(m_xBuilder->weld_widget("locktimecb")) - , m_xCbxHiddenPages(m_xBuilder->weld_check_button("hiddenpgcb")) - , m_xCbxHiddenPagesImg(m_xBuilder->weld_widget("lockhiddenpgcb")) - , m_xRbtDefault(m_xBuilder->weld_radio_button("pagedefaultrb")) - , m_xRbtPagesize(m_xBuilder->weld_radio_button("fittopgrb")) - , m_xRbtPagetile(m_xBuilder->weld_radio_button("tilepgrb")) - , m_xRbtBooklet(m_xBuilder->weld_radio_button("brouchrb")) - , m_xGridPageOpt(m_xBuilder->weld_widget("pageoptions")) - , m_xRbtPageOptImg(m_xBuilder->weld_widget("lockpageoptions")) - , m_xCbxFront(m_xBuilder->weld_check_button("frontcb")) - , m_xCbxFrontImg(m_xBuilder->weld_widget("lockfrontcb")) - , m_xCbxBack(m_xBuilder->weld_check_button("backcb")) - , m_xCbxBackImg(m_xBuilder->weld_widget("lockbackcb")) - , m_xCbxPaperbin(m_xBuilder->weld_check_button("papertryfrmprntrcb")) - , m_xCbxPaperbinImg(m_xBuilder->weld_widget("lockpapertryfrmprntrcb")) + , m_xFrmContent(m_xBuilder->weld_frame(u"contentframe"_ustr)) + , m_xCbxDraw(m_xBuilder->weld_check_button(u"drawingcb"_ustr)) + , m_xCbxNotes(m_xBuilder->weld_check_button(u"notecb"_ustr)) + , m_xCbxHandout(m_xBuilder->weld_check_button(u"handoutcb"_ustr)) + , m_xCbxOutline(m_xBuilder->weld_check_button(u"outlinecb"_ustr)) + , m_xRbtColor(m_xBuilder->weld_radio_button(u"defaultrb"_ustr)) + , m_xRbtGrayscale(m_xBuilder->weld_radio_button(u"grayscalerb"_ustr)) + , m_xRbtBlackWhite(m_xBuilder->weld_radio_button(u"blackwhiterb"_ustr)) + , m_xRbQualityImg(m_xBuilder->weld_widget(u"lockquality"_ustr)) + , m_xCbxPagename(m_xBuilder->weld_check_button(u"pagenmcb"_ustr)) + , m_xCbxPagenameImg(m_xBuilder->weld_widget(u"lockpagenmcb"_ustr)) + , m_xCbxDate(m_xBuilder->weld_check_button(u"datecb"_ustr)) + , m_xCbxDateImg(m_xBuilder->weld_widget(u"lockdatecb"_ustr)) + , m_xCbxTime(m_xBuilder->weld_check_button(u"timecb"_ustr)) + , m_xCbxTimeImg(m_xBuilder->weld_widget(u"locktimecb"_ustr)) + , m_xCbxHiddenPages(m_xBuilder->weld_check_button(u"hiddenpgcb"_ustr)) + , m_xCbxHiddenPagesImg(m_xBuilder->weld_widget(u"lockhiddenpgcb"_ustr)) + , m_xRbtDefault(m_xBuilder->weld_radio_button(u"pagedefaultrb"_ustr)) + , m_xRbtPagesize(m_xBuilder->weld_radio_button(u"fittopgrb"_ustr)) + , m_xRbtPagetile(m_xBuilder->weld_radio_button(u"tilepgrb"_ustr)) + , m_xRbtBooklet(m_xBuilder->weld_radio_button(u"brouchrb"_ustr)) + , m_xGridPageOpt(m_xBuilder->weld_widget(u"pageoptions"_ustr)) + , m_xRbtPageOptImg(m_xBuilder->weld_widget(u"lockpageoptions"_ustr)) + , m_xCbxFront(m_xBuilder->weld_check_button(u"frontcb"_ustr)) + , m_xCbxFrontImg(m_xBuilder->weld_widget(u"lockfrontcb"_ustr)) + , m_xCbxBack(m_xBuilder->weld_check_button(u"backcb"_ustr)) + , m_xCbxBackImg(m_xBuilder->weld_widget(u"lockbackcb"_ustr)) + , m_xCbxPaperbin(m_xBuilder->weld_check_button(u"papertryfrmprntrcb"_ustr)) + , m_xCbxPaperbinImg(m_xBuilder->weld_widget(u"lockpapertryfrmprntrcb"_ustr)) { Link<weld::Toggleable&,void> aLink = LINK( this, SdPrintOptions, ClickBookletHdl ); m_xRbtDefault->connect_toggled( aLink ); @@ -85,7 +85,7 @@ SdPrintOptions::~SdPrintOptions() OUString SdPrintOptions::GetAllStrings() { OUString sAllStrings; - OUString labels[] = { "label3", "label2", "printlbl", "contentlbl" }; + OUString labels[] = { u"label3"_ustr, u"label2"_ustr, u"printlbl"_ustr, u"contentlbl"_ustr }; for (const auto& label : labels) { @@ -93,9 +93,9 @@ OUString SdPrintOptions::GetAllStrings() sAllStrings += pString->get_label() + " "; } - OUString checkButton[] = { "frontcb", "backcb", "papertryfrmprntrcb", "pagenmcb", - "datecb", "timecb", "hiddenpgcb", "drawingcb", - "notecb", "handoutcb", "outlinecb" }; + OUString checkButton[] = { u"frontcb"_ustr, u"backcb"_ustr, u"papertryfrmprntrcb"_ustr, u"pagenmcb"_ustr, + u"datecb"_ustr, u"timecb"_ustr, u"hiddenpgcb"_ustr, u"drawingcb"_ustr, + u"notecb"_ustr, u"handoutcb"_ustr, u"outlinecb"_ustr }; for (const auto& check : checkButton) { @@ -103,8 +103,8 @@ OUString SdPrintOptions::GetAllStrings() sAllStrings += pString->get_label() + " "; } - OUString radioButton[] = { "pagedefaultrb", "fittopgrb", "tilepgrb", "brouchrb", - "defaultrb", "grayscalerb", "blackwhiterb" }; + OUString radioButton[] = { u"pagedefaultrb"_ustr, u"fittopgrb"_ustr, u"tilepgrb"_ustr, u"brouchrb"_ustr, + u"defaultrb"_ustr, u"grayscalerb"_ustr, u"blackwhiterb"_ustr }; for (const auto& radio : radioButton) { diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index d0d0839bbb41..0e129f4206d1 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -38,16 +38,16 @@ SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell, weld::Window* pWindow, const SfxItemSet& rInAttrs) - : GenericDialogController(pWindow, "modules/simpress/ui/slidedesigndialog.ui", "SlideDesignDialog") + : GenericDialogController(pWindow, u"modules/simpress/ui/slidedesigndialog.ui"_ustr, u"SlideDesignDialog"_ustr) , mpDocSh(pDocShell) , mrOutAttrs(rInAttrs) , maStrNone(SdResId(STR_NULL)) - , m_xCbxMasterPage(m_xBuilder->weld_check_button("masterpage")) - , m_xCbxCheckMasters(m_xBuilder->weld_check_button("checkmasters")) - , m_xBtnLoad(m_xBuilder->weld_button("load")) - , m_xVS(new ValueSet(m_xBuilder->weld_scrolled_window("selectwin", true))) - , m_xVSWin(new weld::CustomWeld(*m_xBuilder, "select", *m_xVS)) - , m_xLabel(m_xBuilder->weld_label("label1")) + , m_xCbxMasterPage(m_xBuilder->weld_check_button(u"masterpage"_ustr)) + , m_xCbxCheckMasters(m_xBuilder->weld_check_button(u"checkmasters"_ustr)) + , m_xBtnLoad(m_xBuilder->weld_button(u"load"_ustr)) + , m_xVS(new ValueSet(m_xBuilder->weld_scrolled_window(u"selectwin"_ustr, true))) + , m_xVSWin(new weld::CustomWeld(*m_xBuilder, u"select"_ustr, *m_xVS)) + , m_xLabel(m_xBuilder->weld_label(u"label1"_ustr)) { if (mpDocSh->GetDoc()->GetDocumentType() == DocumentType::Draw) { diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 3e1c8069f3bd..f569febe0a2f 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -143,7 +143,7 @@ SdPageObjsTLV::SdPageObjsTransferable* SdPageObjsTLV::SdPageObjsTransferable::ge SotClipboardFormatId SdPageObjsTLV::SdPageObjsTransferable::GetListBoxDropFormatId() { if (mnListBoxDropFormatId == static_cast<SotClipboardFormatId>(SAL_MAX_UINT32)) - mnListBoxDropFormatId = SotExchange::RegisterFormatMimeType("application/x-openoffice-treelistbox-moveonly;windows_formatname=\"SV_LBOX_DD_FORMAT_MOVE\""); + mnListBoxDropFormatId = SotExchange::RegisterFormatMimeType(u"application/x-openoffice-treelistbox-moveonly;windows_formatname=\"SV_LBOX_DD_FORMAT_MOVE\""_ustr); return mnListBoxDropFormatId; } @@ -933,7 +933,7 @@ OUString SdPageObjsTLV::GetObjectName( OUString sShapeType; const SdrCustomShapeGeometryItem& rGeometryItem = pObject->GetMergedItem(SDRATTR_CUSTOMSHAPE_GEOMETRY); - const uno::Any* pAny = rGeometryItem.GetPropertyValueByName("Type"); + const uno::Any* pAny = rGeometryItem.GetPropertyValueByName(u"Type"_ustr); if (pAny && (*pAny >>= sShapeType)) sObjName = SdResId(STR_NAVIGATOR_CUSTOMSHAPE) + u": " + sShapeType; } @@ -1206,7 +1206,7 @@ void SdPageObjsTLV::AddShapeList ( else if (pShape != nullptr) aIcon = BMP_GROUP; - OUString aUserData("1"); + OUString aUserData(u"1"_ustr); if (pShape != nullptr) aUserData = weld::toId(pShape); diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx index 63354ab7ed58..705980f5b4ee 100644 --- a/sd/source/ui/dlg/sduiexp.cxx +++ b/sd/source/ui/dlg/sduiexp.cxx @@ -34,7 +34,7 @@ public: // css::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() override { - return "com.sun.star.presentation.comp.CreateDialogFactoryService"; + return u"com.sun.star.presentation.comp.CreateDialogFactoryService"_ustr; } virtual sal_Bool SAL_CALL supportsService(const OUString& serviceName) override { @@ -42,7 +42,7 @@ public: } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { - return { "com.sun.star.presentation.CreateDialogFactoryService" }; + return { u"com.sun.star.presentation.CreateDialogFactoryService"_ustr }; } // XUnoTunnel diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 70930be48f0e..bc1338a1cc30 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -41,8 +41,8 @@ SdTabTemplateDlg::SdTabTemplateDlg(weld::Window* pParent, SfxStyleSheetBase& rStyleBase, SdrModel const * pModel, SdrView* pView) - : SfxStyleDialogController(pParent, "modules/simpress/ui/templatedialog.ui", - "TemplateDialog", rStyleBase) + : SfxStyleDialogController(pParent, u"modules/simpress/ui/templatedialog.ui"_ustr, + u"TemplateDialog"_ustr, rStyleBase) , rDocShell(*pDocShell) , pSdrView(pView) , pColorList(pModel->GetColorList()) @@ -55,24 +55,24 @@ SdTabTemplateDlg::SdTabTemplateDlg(weld::Window* pParent, { // fill Listbox and set Select-Handler - AddTabPage("line", RID_SVXPAGE_LINE); - AddTabPage("area", RID_SVXPAGE_AREA); - AddTabPage("shadowing", RID_SVXPAGE_SHADOW); - AddTabPage("transparency", RID_SVXPAGE_TRANSPARENCE); - AddTabPage("font", RID_SVXPAGE_CHAR_NAME); - AddTabPage("fonteffect", RID_SVXPAGE_CHAR_EFFECTS); - AddTabPage("background", RID_SVXPAGE_BKG); - AddTabPage("indents", RID_SVXPAGE_STD_PARAGRAPH); - AddTabPage("text", RID_SVXPAGE_TEXTATTR); - AddTabPage("animation", RID_SVXPAGE_TEXTANIMATION); - AddTabPage("dimensioning", RID_SVXPAGE_MEASURE); - AddTabPage("connector", RID_SVXPAGE_CONNECTION); - AddTabPage("alignment", RID_SVXPAGE_ALIGN_PARAGRAPH); - AddTabPage("tabs", RID_SVXPAGE_TABULATOR); + AddTabPage(u"line"_ustr, RID_SVXPAGE_LINE); + AddTabPage(u"area"_ustr, RID_SVXPAGE_AREA); + AddTabPage(u"shadowing"_ustr, RID_SVXPAGE_SHADOW); + AddTabPage(u"transparency"_ustr, RID_SVXPAGE_TRANSPARENCE); + AddTabPage(u"font"_ustr, RID_SVXPAGE_CHAR_NAME); + AddTabPage(u"fonteffect"_ustr, RID_SVXPAGE_CHAR_EFFECTS); + AddTabPage(u"background"_ustr, RID_SVXPAGE_BKG); + AddTabPage(u"indents"_ustr, RID_SVXPAGE_STD_PARAGRAPH); + AddTabPage(u"text"_ustr, RID_SVXPAGE_TEXTATTR); + AddTabPage(u"animation"_ustr, RID_SVXPAGE_TEXTANIMATION); + AddTabPage(u"dimensioning"_ustr, RID_SVXPAGE_MEASURE); + AddTabPage(u"connector"_ustr, RID_SVXPAGE_CONNECTION); + AddTabPage(u"alignment"_ustr, RID_SVXPAGE_ALIGN_PARAGRAPH); + AddTabPage(u"tabs"_ustr, RID_SVXPAGE_TABULATOR); if( SvtCJKOptions::IsAsianTypographyEnabled() ) - AddTabPage("asiantypo", RID_SVXPAGE_PARA_ASIAN); + AddTabPage(u"asiantypo"_ustr, RID_SVXPAGE_PARA_ASIAN); else - RemoveTabPage("asiantypo"); + RemoveTabPage(u"asiantypo"_ustr); } void SdTabTemplateDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index f29a6cf7764b..d9b0b7be6a74 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -69,8 +69,8 @@ constexpr OUStringLiteral pStarDrawXMLContent( u"content.xml" ); * Constructor of the Tab dialog: appends the pages to the dialog */ SdActionDlg::SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View const * pView) - : SfxSingleTabDialogController(pParent, pAttr, "modules/simpress/ui/interactiondialog.ui", - "InteractionDialog") + : SfxSingleTabDialogController(pParent, pAttr, u"modules/simpress/ui/interactiondialog.ui"_ustr, + u"InteractionDialog"_ustr) { std::unique_ptr<SfxTabPage> xNewPage = SdTPAction::Create(get_content_area(), this, *pAttr); @@ -85,23 +85,23 @@ SdActionDlg::SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::V * Action-TabPage */ SdTPAction::SdTPAction(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/simpress/ui/interactionpage.ui", "InteractionPage", &rInAttrs) + : SfxTabPage(pPage, pController, u"modules/simpress/ui/interactionpage.ui"_ustr, u"InteractionPage"_ustr, &rInAttrs) , mpView(nullptr) , mpDoc(nullptr) , bTreeUpdated(false) - , m_xLbAction(m_xBuilder->weld_combo_box("listbox")) - , m_xFtTree(m_xBuilder->weld_label("fttree")) - , m_xLbTree(new SdPageObjsTLV(m_xBuilder->weld_tree_view("tree"))) - , m_xLbTreeDocument(new SdPageObjsTLV(m_xBuilder->weld_tree_view("treedoc"))) - , m_xLbOLEAction(m_xBuilder->weld_tree_view("oleaction")) - , m_xFrame(m_xBuilder->weld_frame("frame")) - , m_xEdtSound(m_xBuilder->weld_entry("sound")) - , m_xEdtBookmark(m_xBuilder->weld_entry("bookmark")) - , m_xEdtDocument(m_xBuilder->weld_entry("document")) - , m_xEdtProgram(m_xBuilder->weld_entry("program")) - , m_xEdtMacro(m_xBuilder->weld_entry("macro")) - , m_xBtnSearch(m_xBuilder->weld_button("browse")) - , m_xBtnSeek(m_xBuilder->weld_button("find")) + , m_xLbAction(m_xBuilder->weld_combo_box(u"listbox"_ustr)) + , m_xFtTree(m_xBuilder->weld_label(u"fttree"_ustr)) + , m_xLbTree(new SdPageObjsTLV(m_xBuilder->weld_tree_view(u"tree"_ustr))) + , m_xLbTreeDocument(new SdPageObjsTLV(m_xBuilder->weld_tree_view(u"treedoc"_ustr))) + , m_xLbOLEAction(m_xBuilder->weld_tree_view(u"oleaction"_ustr)) + , m_xFrame(m_xBuilder->weld_frame(u"frame"_ustr)) + , m_xEdtSound(m_xBuilder->weld_entry(u"sound"_ustr)) + , m_xEdtBookmark(m_xBuilder->weld_entry(u"bookmark"_ustr)) + , m_xEdtDocument(m_xBuilder->weld_entry(u"document"_ustr)) + , m_xEdtProgram(m_xBuilder->weld_entry(u"program"_ustr)) + , m_xEdtMacro(m_xBuilder->weld_entry(u"macro"_ustr)) + , m_xBtnSearch(m_xBuilder->weld_button(u"browse"_ustr)) + , m_xBtnSeek(m_xBuilder->weld_button(u"find"_ustr)) { m_xLbOLEAction->set_size_request(m_xLbOLEAction->get_approximate_digit_width() * 48, m_xLbOLEAction->get_height_rows(12)); @@ -408,7 +408,7 @@ void SdTPAction::OpenFileDialog() // links on the desktop to directories. aFileDialog.AddFilter ( SfxResId(STR_SFX_FILTERNAME_ALL), - "*.*"); + u"*.*"_ustr); if( aFileDialog.Execute() == ERRCODE_NONE ) { diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 823baef412c8..29cd8dba742f 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -192,16 +192,16 @@ std::unique_ptr<SfxTabPage> SdTpOptionsSnap::Create( weld::Container* pPage, wel |* \************************************************************************/ SdTpOptionsContents::SdTpOptionsContents(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/simpress/ui/sdviewpage.ui", "SdViewPage", &rInAttrs) + : SfxTabPage(pPage, pController, u"modules/simpress/ui/sdviewpage.ui"_ustr, u"SdViewPage"_ustr, &rInAttrs) , m_bDrawMode(false) - , m_xCbxRuler(m_xBuilder->weld_check_button("ruler")) - , m_xCbxRulerImg(m_xBuilder->weld_widget("lockruler")) - , m_xCbxDragStripes(m_xBuilder->weld_check_button("dragstripes")) - , m_xCbxDragStripesImg(m_xBuilder->weld_widget("lockdragstripes")) - , m_xCbxHandlesBezier(m_xBuilder->weld_check_button("handlesbezier")) - , m_xCbxHandlesBezierImg(m_xBuilder->weld_widget("lockhandlesbezier")) - , m_xCbxMoveOutline(m_xBuilder->weld_check_button("moveoutline")) - , m_xCbxMoveOutlineImg(m_xBuilder->weld_widget("lockmoveoutline")) + , m_xCbxRuler(m_xBuilder->weld_check_button(u"ruler"_ustr)) + , m_xCbxRulerImg(m_xBuilder->weld_widget(u"lockruler"_ustr)) + , m_xCbxDragStripes(m_xBuilder->weld_check_button(u"dragstripes"_ustr)) + , m_xCbxDragStripesImg(m_xBuilder->weld_widget(u"lockdragstripes"_ustr)) + , m_xCbxHandlesBezier(m_xBuilder->weld_check_button(u"handlesbezier"_ustr)) + , m_xCbxHandlesBezierImg(m_xBuilder->weld_widget(u"lockhandlesbezier"_ustr)) + , m_xCbxMoveOutline(m_xBuilder->weld_check_button(u"moveoutline"_ustr)) + , m_xCbxMoveOutlineImg(m_xBuilder->weld_widget(u"lockmoveoutline"_ustr)) { } @@ -212,7 +212,7 @@ SdTpOptionsContents::~SdTpOptionsContents() OUString SdTpOptionsContents::GetAllStrings() { OUString sAllStrings; - OUString labels[] = { "label1" }; + OUString labels[] = { u"label1"_ustr }; for (const auto& label : labels) { @@ -220,7 +220,7 @@ OUString SdTpOptionsContents::GetAllStrings() sAllStrings += pString->get_label() + " "; } - OUString checkButton[] = { "ruler", "dragstripes", "handlesbezier", "moveoutline" }; + OUString checkButton[] = { u"ruler"_ustr, u"dragstripes"_ustr, u"handlesbezier"_ustr, u"moveoutline"_ustr }; for (const auto& check : checkButton) { @@ -333,43 +333,43 @@ void SdTpOptionsContents::PageCreated( const SfxAllItemSet& aSet ) #define TOKEN ':' SdTpOptionsMisc::SdTpOptionsMisc(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/simpress/ui/optimpressgeneralpage.ui", "OptSavePage", &rInAttrs) + : SfxTabPage(pPage, pController, u"modules/simpress/ui/optimpressgeneralpage.ui"_ustr, u"OptSavePage"_ustr, &rInAttrs) , nWidth(0) , nHeight(0) , m_bDrawMode(false) - , m_xCbxQuickEdit(m_xBuilder->weld_check_button("qickedit")) - , m_xCbxQuickEditImg(m_xBuilder->weld_widget("lockqickedit")) - , m_xCbxPickThrough(m_xBuilder->weld_check_button("textselected")) - , m_xCbxPickThroughImg(m_xBuilder->weld_widget("locktextselected")) - , m_xNewDocumentFrame(m_xBuilder->weld_frame("newdocumentframe")) - , m_xCbxStartWithTemplate(m_xBuilder->weld_check_button("startwithwizard")) - , m_xCbxStartWithTemplateImg(m_xBuilder->weld_widget("lockstartwithwizard")) - , m_xCbxMasterPageCache(m_xBuilder->weld_check_button("backgroundback")) - , m_xCbxMasterPageCacheImg(m_xBuilder->weld_widget("lockbackgroundback")) - , m_xCbxCopy(m_xBuilder->weld_check_button("copywhenmove")) - , m_xCbxCopyImg(m_xBuilder->weld_widget("lockcopywhenmove")) - , m_xCbxMarkedHitMovesAlways(m_xBuilder->weld_check_button("objalwymov")) - , m_xCbxMarkedHitMovesAlwaysImg(m_xBuilder->weld_widget("lockobjalwymov")) - , m_xLbMetric(m_xBuilder->weld_combo_box("units")) - , m_xLbMetricImg(m_xBuilder->weld_widget("lockunits")) - , m_xMtrFldTabstop(m_xBuilder->weld_metric_spin_button("metricFields", FieldUnit::MM)) - , m_xMtrFldTabstopImg(m_xBuilder->weld_widget("locktabstop")) - , m_xCbxCompatibility(m_xBuilder->weld_check_button("cbCompatibility")) - , m_xCbxCompatibilityImg(m_xBuilder->weld_widget("lockcbCompatibility")) - , m_xScaleFrame(m_xBuilder->weld_frame("scaleframe")) - , m_xCbScale(m_xBuilder->weld_combo_box("scaleBox")) - , m_xCbScaleImg(m_xBuilder->weld_widget("lockscaleBox")) - , m_xNewDocLb(m_xBuilder->weld_label("newdoclbl")) - , m_xFiInfo1(m_xBuilder->weld_label("info1")) - , m_xMtrFldOriginalWidth(m_xBuilder->weld_metric_spin_button("metricWidthFields", FieldUnit::MM)) - , m_xWidthLb(m_xBuilder->weld_label("widthlbl")) - , m_xHeightLb(m_xBuilder->weld_label("heightlbl")) - , m_xFiInfo2(m_xBuilder->weld_label("info2")) - , m_xMtrFldOriginalHeight(m_xBuilder->weld_metric_spin_button("metricHeightFields", FieldUnit::MM)) - , m_xCbxDistort(m_xBuilder->weld_check_button("distortcb")) - , m_xCbxDistortImg(m_xBuilder->weld_widget("lockdistortcb")) - , m_xMtrFldInfo1(m_xBuilder->weld_metric_spin_button("metricInfo1Fields", FieldUnit::MM)) - , m_xMtrFldInfo2(m_xBuilder->weld_metric_spin_button("metricInfo2Fields", FieldUnit::MM)) + , m_xCbxQuickEdit(m_xBuilder->weld_check_button(u"qickedit"_ustr)) + , m_xCbxQuickEditImg(m_xBuilder->weld_widget(u"lockqickedit"_ustr)) + , m_xCbxPickThrough(m_xBuilder->weld_check_button(u"textselected"_ustr)) + , m_xCbxPickThroughImg(m_xBuilder->weld_widget(u"locktextselected"_ustr)) + , m_xNewDocumentFrame(m_xBuilder->weld_frame(u"newdocumentframe"_ustr)) + , m_xCbxStartWithTemplate(m_xBuilder->weld_check_button(u"startwithwizard"_ustr)) + , m_xCbxStartWithTemplateImg(m_xBuilder->weld_widget(u"lockstartwithwizard"_ustr)) + , m_xCbxMasterPageCache(m_xBuilder->weld_check_button(u"backgroundback"_ustr)) + , m_xCbxMasterPageCacheImg(m_xBuilder->weld_widget(u"lockbackgroundback"_ustr)) + , m_xCbxCopy(m_xBuilder->weld_check_button(u"copywhenmove"_ustr)) + , m_xCbxCopyImg(m_xBuilder->weld_widget(u"lockcopywhenmove"_ustr)) + , m_xCbxMarkedHitMovesAlways(m_xBuilder->weld_check_button(u"objalwymov"_ustr)) + , m_xCbxMarkedHitMovesAlwaysImg(m_xBuilder->weld_widget(u"lockobjalwymov"_ustr)) + , m_xLbMetric(m_xBuilder->weld_combo_box(u"units"_ustr)) + , m_xLbMetricImg(m_xBuilder->weld_widget(u"lockunits"_ustr)) + , m_xMtrFldTabstop(m_xBuilder->weld_metric_spin_button(u"metricFields"_ustr, FieldUnit::MM)) + , m_xMtrFldTabstopImg(m_xBuilder->weld_widget(u"locktabstop"_ustr)) + , m_xCbxCompatibility(m_xBuilder->weld_check_button(u"cbCompatibility"_ustr)) + , m_xCbxCompatibilityImg(m_xBuilder->weld_widget(u"lockcbCompatibility"_ustr)) + , m_xScaleFrame(m_xBuilder->weld_frame(u"scaleframe"_ustr)) + , m_xCbScale(m_xBuilder->weld_combo_box(u"scaleBox"_ustr)) + , m_xCbScaleImg(m_xBuilder->weld_widget(u"lockscaleBox"_ustr)) + , m_xNewDocLb(m_xBuilder->weld_label(u"newdoclbl"_ustr)) + , m_xFiInfo1(m_xBuilder->weld_label(u"info1"_ustr)) + , m_xMtrFldOriginalWidth(m_xBuilder->weld_metric_spin_button(u"metricWidthFields"_ustr, FieldUnit::MM)) + , m_xWidthLb(m_xBuilder->weld_label(u"widthlbl"_ustr)) + , m_xHeightLb(m_xBuilder->weld_label(u"heightlbl"_ustr)) + , m_xFiInfo2(m_xBuilder->weld_label(u"info2"_ustr)) + , m_xMtrFldOriginalHeight(m_xBuilder->weld_metric_spin_button(u"metricHeightFields"_ustr, FieldUnit::MM)) + , m_xCbxDistort(m_xBuilder->weld_check_button(u"distortcb"_ustr)) + , m_xCbxDistortImg(m_xBuilder->weld_widget(u"lockdistortcb"_ustr)) + , m_xMtrFldInfo1(m_xBuilder->weld_metric_spin_button(u"metricInfo1Fields"_ustr, FieldUnit::MM)) + , m_xMtrFldInfo2(m_xBuilder->weld_metric_spin_button(u"metricInfo2Fields"_ustr, FieldUnit::MM)) { SetExchangeSupport(); @@ -500,8 +500,8 @@ OUString SdTpOptionsMisc::GetAllStrings() { OUString sAllStrings; OUString labels[] - = { "newdoclbl", "label4", "label6", "tabstoplabel", "label1", "label7", "label2", - "label5", "label8", "widthlbl", "info1", "heightlbl", "info2" }; + = { u"newdoclbl"_ustr, u"label4"_ustr, u"label6"_ustr, u"tabstoplabel"_ustr, u"label1"_ustr, u"label7"_ustr, u"label2"_ustr, + u"label5"_ustr, u"label8"_ustr, u"widthlbl"_ustr, u"info1"_ustr, u"heightlbl"_ustr, u"info2"_ustr }; for (const auto& label : labels) { @@ -509,9 +509,9 @@ OUString SdTpOptionsMisc::GetAllStrings() sAllStrings += pString->get_label() + " "; } - OUString checkButton[] = { "startwithwizard", "copywhenmove", "backgroundback", - "objalwymov", "distortcb", "cbCompatibility", - "qickedit", "textselected"}; + OUString checkButton[] = { u"startwithwizard"_ustr, u"copywhenmove"_ustr, u"backgroundback"_ustr, + u"objalwymov"_ustr, u"distortcb"_ustr, u"cbCompatibility"_ustr, + u"qickedit"_ustr, u"textselected"_ustr}; for (const auto& check : checkButton) { diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 30760381e58f..4fc6d1b412ec 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -31,21 +31,21 @@ #define VECTORIZE_MAX_EXTENT 512 SdVectorizeDlg::SdVectorizeDlg(weld::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell) - : GenericDialogController(pParent, "modules/sdraw/ui/vectorize.ui", "VectorizeDialog") + : GenericDialogController(pParent, u"modules/sdraw/ui/vectorize.ui"_ustr, u"VectorizeDialog"_ustr) , m_pDocSh(pDocShell) , aBmp(rBmp) , m_aBmpWin(m_xDialog.get()) , m_aMtfWin(m_xDialog.get()) - , m_xNmLayers(m_xBuilder->weld_spin_button("colors")) - , m_xMtReduce(m_xBuilder->weld_metric_spin_button("points", FieldUnit::PIXEL)) - , m_xFtFillHoles(m_xBuilder->weld_label("tilesft")) - , m_xMtFillHoles(m_xBuilder->weld_metric_spin_button("tiles", FieldUnit::PIXEL)) - , m_xCbFillHoles(m_xBuilder->weld_check_button("fillholes")) - , m_xBmpWin(new weld::CustomWeld(*m_xBuilder, "source", m_aBmpWin)) - , m_xMtfWin(new weld::CustomWeld(*m_xBuilder, "vectorized", m_aMtfWin)) - , m_xPrgs(m_xBuilder->weld_progress_bar("progressbar")) - , m_xBtnOK(m_xBuilder->weld_button("ok")) - , m_xBtnPreview(m_xBuilder->weld_button("preview")) + , m_xNmLayers(m_xBuilder->weld_spin_button(u"colors"_ustr)) + , m_xMtReduce(m_xBuilder->weld_metric_spin_button(u"points"_ustr, FieldUnit::PIXEL)) + , m_xFtFillHoles(m_xBuilder->weld_label(u"tilesft"_ustr)) + , m_xMtFillHoles(m_xBuilder->weld_metric_spin_button(u"tiles"_ustr, FieldUnit::PIXEL)) + , m_xCbFillHoles(m_xBuilder->weld_check_button(u"fillholes"_ustr)) + , m_xBmpWin(new weld::CustomWeld(*m_xBuilder, u"source"_ustr, m_aBmpWin)) + , m_xMtfWin(new weld::CustomWeld(*m_xBuilder, u"vectorized"_ustr, m_aMtfWin)) + , m_xPrgs(m_xBuilder->weld_progress_bar(u"progressbar"_ustr)) + , m_xBtnOK(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xBtnPreview(m_xBuilder->weld_button(u"preview"_ustr)) { const int nWidth = m_xFtFillHoles->get_approximate_digit_width() * 32; const int nHeight = m_xFtFillHoles->get_text_height() * 16; diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 958484c275f7..6a3ea2edfda1 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -355,7 +355,7 @@ bool DrawDocShell::IsNewPageNameValid( OUString & rInOutPageName, bool bResetStr else { // check for upper/lower case roman numbering - OUString sReserved("cdilmvx"); + OUString sReserved(u"cdilmvx"_ustr); // skip all following characters contained in one reserved class if (sReserved.indexOf(sRemainder[0]) == -1) diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index aa99dc76b2a4..4b1e790428f8 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -421,7 +421,7 @@ void DrawDocShell::Execute( SfxRequest& rReq ) SfxBindings& rBindings( mpViewShell->GetFrame()->GetBindings() ); if ( sfx2::SfxNotebookBar::IsActive() ) - sfx2::SfxNotebookBar::ExecMethod( rBindings, pFile ? pFile->GetValue() : "" ); + sfx2::SfxNotebookBar::ExecMethod( rBindings, pFile ? pFile->GetValue() : u""_ustr ); else sfx2::SfxNotebookBar::CloseMethod( rBindings ); } diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 71a920fa4fb9..cadc59826f47 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -84,7 +84,7 @@ namespace sd { SFX_IMPL_OBJECTFACTORY( DrawDocShell, SvGlobalName(SO3_SIMPRESS_CLASSID), - "simpress" ) + u"simpress"_ustr ) void DrawDocShell::Construct( bool bClipboard ) { diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx index f0f5af956288..0588cb3ca64d 100644 --- a/sd/source/ui/docshell/grdocsh.cxx +++ b/sd/source/ui/docshell/grdocsh.cxx @@ -40,7 +40,7 @@ void GraphicDocShell::InitInterface_Impl() GetStaticInterface()->RegisterChildWindow(SID_SEARCH_DLG); } -SFX_IMPL_OBJECTFACTORY(GraphicDocShell, SvGlobalName(SO3_SDRAW_CLASSID_60), "sdraw") +SFX_IMPL_OBJECTFACTORY(GraphicDocShell, SvGlobalName(SO3_SDRAW_CLASSID_60), u"sdraw"_ustr) GraphicDocShell::GraphicDocShell(SfxObjectCreateMode eMode) : DrawDocShell(eMode, /*bDataObject*/ true, DocumentType::Draw) diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 56ade027b8f3..765026f1da31 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -245,7 +245,7 @@ void Configuration::ThrowIfDisposed() const { if (m_bDisposed) { - throw lang::DisposedException ("Configuration object has already been disposed", + throw lang::DisposedException (u"Configuration object has already been disposed"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 15daf362f906..fb8a320fdfc4 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -485,14 +485,14 @@ void ConfigurationController::ThrowIfDisposed () const { if (mbIsDisposed) { - throw lang::DisposedException ("ConfigurationController object has already been disposed", + throw lang::DisposedException (u"ConfigurationController object has already been disposed"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } if (mpImplementation == nullptr) { OSL_ASSERT(mpImplementation != nullptr); - throw RuntimeException("ConfigurationController not initialized", + throw RuntimeException(u"ConfigurationController not initialized"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx index e5ee500f0185..532c5e121899 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx @@ -43,7 +43,7 @@ void ConfigurationControllerBroadcaster::AddListener( const Any& rUserData) { if ( ! rxListener.is()) - throw lang::IllegalArgumentException("invalid listener", + throw lang::IllegalArgumentException(u"invalid listener"_ustr, mxConfigurationController, 0); @@ -59,7 +59,7 @@ void ConfigurationControllerBroadcaster::RemoveListener( const Reference<XConfigurationChangeListener>& rxListener) { if ( ! rxListener.is()) - throw lang::IllegalArgumentException("invalid listener", + throw lang::IllegalArgumentException(u"invalid listener"_ustr, mxConfigurationController, 0); diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 21d7e6932bad..97e412507689 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -374,7 +374,7 @@ void SAL_CALL ResourceId::initialize (const Sequence<Any>& aArguments) OUString ResourceId::getImplementationName() { - return "com.sun.star.comp.Draw.framework.ResourceId"; + return u"com.sun.star.comp.Draw.framework.ResourceId"_ustr; } sal_Bool ResourceId::supportsService(OUString const & ServiceName) @@ -384,7 +384,7 @@ sal_Bool ResourceId::supportsService(OUString const & ServiceName) css::uno::Sequence<OUString> ResourceId::getSupportedServiceNames() { - return {"com.sun.star.drawing.framework.ResourceId"}; + return {u"com.sun.star.drawing.framework.ResourceId"_ustr}; } /** When eMode is DIRECTLY then the anchor of the called object and the diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index b6c5e8c42dc8..d57cb02a6eaf 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -35,7 +35,7 @@ void SAL_CALL UpdateRequest::execute(const Reference<XConfiguration>&) // becomes empty. } -OUString SAL_CALL UpdateRequest::getName() { return "UpdateRequest"; } +OUString SAL_CALL UpdateRequest::getName() { return u"UpdateRequest"_ustr; } void SAL_CALL UpdateRequest::setName(const OUString&) { diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 2168df8c7a8b..0d32c1831e76 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -203,7 +203,7 @@ Reference<XResource> SAL_CALL BasicPaneFactory::createResource ( { // The requested pane can not be created by any of the factories // managed by the called BasicPaneFactory object. - throw lang::IllegalArgumentException("BasicPaneFactory::createPane() called for unknown resource id", + throw lang::IllegalArgumentException(u"BasicPaneFactory::createPane() called for unknown resource id"_ustr, nullptr, 0); } @@ -266,7 +266,7 @@ void SAL_CALL BasicPaneFactory::releaseResource ( // The given XPane reference is either empty or the pane was not // created by any of the factories managed by the called // BasicPaneFactory object. - throw lang::IllegalArgumentException("BasicPaneFactory::releasePane() called for pane that was not created by same factory.", + throw lang::IllegalArgumentException(u"BasicPaneFactory::releasePane() called for pane that was not created by same factory."_ustr, nullptr, 0); } @@ -409,7 +409,7 @@ void BasicPaneFactory::ThrowIfDisposed() const { if (m_bDisposed) { - throw lang::DisposedException ("BasicPaneFactory object has already been disposed", + throw lang::DisposedException (u"BasicPaneFactory object has already been disposed"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index 0c6ac16d4a5e..0265fe3e1234 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -134,7 +134,7 @@ void BasicToolBarFactory::ThrowIfDisposed() const { if (m_bDisposed) { - throw lang::DisposedException ("BasicToolBarFactory object has already been disposed", + throw lang::DisposedException (u"BasicToolBarFactory object has already been disposed"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 61118d650bbe..20cb7ed6df2f 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -312,14 +312,14 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( &rWindow, PageKind::Standard, pFrameView); - pViewShell->GetContentWindow()->set_id("impress_win"); + pViewShell->GetContentWindow()->set_id(u"impress_win"_ustr); } else if (rsViewURL == FrameworkHelper::msDrawViewURL) { pViewShell = std::shared_ptr<GraphicViewShell>( new GraphicViewShell(*mpBase, &rWindow, pFrameView), o3tl::default_delete<GraphicViewShell>()); - pViewShell->GetContentWindow()->set_id("draw_win"); + pViewShell->GetContentWindow()->set_id(u"draw_win"_ustr); } else if (rsViewURL == FrameworkHelper::msOutlineViewURL) { @@ -329,7 +329,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( *mpBase, &rWindow, pFrameView); - pViewShell->GetContentWindow()->set_id("outline_win"); + pViewShell->GetContentWindow()->set_id(u"outline_win"_ustr); } else if (rsViewURL == FrameworkHelper::msNotesViewURL) { @@ -339,7 +339,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( &rWindow, PageKind::Notes, pFrameView); - pViewShell->GetContentWindow()->set_id("notes_win"); + pViewShell->GetContentWindow()->set_id(u"notes_win"_ustr); } else if (rsViewURL == FrameworkHelper::msHandoutViewURL) { @@ -349,7 +349,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( &rWindow, PageKind::Handout, pFrameView); - pViewShell->GetContentWindow()->set_id("handout_win"); + pViewShell->GetContentWindow()->set_id(u"handout_win"_ustr); } else if (rsViewURL == FrameworkHelper::msPresentationViewURL) { @@ -358,7 +358,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( *mpBase, &rWindow, pFrameView); - pViewShell->GetContentWindow()->set_id("presentation_win"); + pViewShell->GetContentWindow()->set_id(u"presentation_win"_ustr); } else if (rsViewURL == FrameworkHelper::msSlideSorterURL) { @@ -367,12 +367,12 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( *mpBase, &rWindow, pFrameView); - pViewShell->GetContentWindow()->set_id("slidesorter"); + pViewShell->GetContentWindow()->set_id(u"slidesorter"_ustr); } else if (rsViewURL == FrameworkHelper::msNotesPanelViewURL) { pViewShell = std::make_shared<NotesPanelViewShell>(&rFrame, *mpBase, &rWindow, pFrameView); - pViewShell->GetContentWindow()->set_id("notes_panel_win"); + pViewShell->GetContentWindow()->set_id(u"notes_panel_win"_ustr); } return pViewShell; diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 202032b3d6f9..6441b5af2785 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -209,7 +209,7 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas() Reference<lang::XMultiServiceFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); return Reference<rendering::XCanvas>( - xFactory->createInstanceWithArguments("com.sun.star.rendering.SpriteCanvas.VCL", + xFactory->createInstanceWithArguments(u"com.sun.star.rendering.SpriteCanvas.VCL"_ustr, aArg), UNO_QUERY); } diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index c128a5351f14..0aaea2cfcb10 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -155,7 +155,7 @@ void Pane::ThrowIfDisposed() const { if (rBHelper.bDisposed || rBHelper.bInDispose) { - throw lang::DisposedException ("Pane object has already been disposed", + throw lang::DisposedException (u"Pane object has already been disposed"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index d859ac3fbe83..ce0b168ce803 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -123,7 +123,7 @@ void PresentationFactory::ThrowIfDisposed() const { if (m_bDisposed) { - throw lang::DisposedException ("PresentationFactory object has already been disposed", + throw lang::DisposedException (u"PresentationFactory object has already been disposed"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 2b590a5387a1..1225521893ec 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -120,7 +120,7 @@ sal_Bool SAL_CALL ViewShellWrapper::select( const css::uno::Any& aSelection ) { try { - Any aNumber = xSet->getPropertyValue("Number"); + Any aNumber = xSet->getPropertyValue(u"Number"_ustr); sal_Int32 nPageNumber = 0; aNumber >>= nPageNumber; nPageNumber -=1; // Transform 1-based page numbers to 0-based ones. diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 501eb0d81af9..31d92148e6ab 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -65,8 +65,8 @@ ModuleController::ModuleController(const rtl::Reference<::sd::DrawController>& r "private:resource/view/SlideSorter", "private:resource/view/PresentationView" }); ProcessFactory( - "com.sun.star.drawing.framework.BasicToolBarFactory", - { "private:resource/toolbar/ViewTabBar" }); + u"com.sun.star.drawing.framework.BasicToolBarFactory"_ustr, + { u"private:resource/toolbar/ViewTabBar"_ustr }); try { @@ -150,7 +150,7 @@ void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL) else if (iFactory->second == "com.sun.star.drawing.framework.BasicToolBarFactory") xFactory = uno::Reference<css::drawing::framework::XResourceFactory>(new BasicToolBarFactory(mxController)); else - throw RuntimeException("unknown factory"); + throw RuntimeException(u"unknown factory"_ustr); // Remember that this factory has been instanced. maLoadedFactories[iFactory->second] = xFactory; diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 452203cd65a9..c2727aefbc25 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -90,7 +90,7 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& } else if( rSrcLevel.GetNumberingType() == css::style::NumberingType::CHAR_SPECIAL ) { - aNewLevel.SetListFormat("", "", nLevel); + aNewLevel.SetListFormat(u""_ustr, u""_ustr, nLevel); aNumRule.SetLevel(nLevel, aNewLevel ); } } diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index e163665ea6e5..ddc8d5c972fe 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -126,12 +126,12 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) pOL->SetUpdateLayout(false); // remove old selected text - pOV->InsertText( "" ); + pOV->InsertText( u""_ustr ); // prepare undo EditUndoManager& rUndoMgr = pOL->GetUndoManager(); rUndoMgr.EnterListAction(SdResId(STR_UNDO_INSERT_SPECCHAR), - "", 0, mpViewShell->GetViewShellBase().GetViewShellId() ); + u""_ustr, 0, mpViewShell->GetViewShellBase().GetViewShellId() ); // insert given text OUString aStr( cMark ); @@ -240,7 +240,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest const & rReq ) With that, we get unique attributes (and since there is no DeleteSelected() in OutlinerView, it is deleted by inserting an empty string). */ - pOV->InsertText( "" ); + pOV->InsertText( u""_ustr ); SfxItemSetFixed<EE_CHAR_FONTINFO, EE_CHAR_FONTINFO> aOldSet( mpDoc->GetPool() ); aOldSet.Put( pOV->GetAttribs() ); @@ -248,7 +248,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest const & rReq ) EditUndoManager& rUndoMgr = pOL->GetUndoManager(); ViewShellId nViewShellId = mpViewShell ? mpViewShell->GetViewShellBase().GetViewShellId() : ViewShellId(-1); rUndoMgr.EnterListAction(SdResId(STR_UNDO_INSERT_SPECCHAR), - "", 0, nViewShellId ); + u""_ustr, 0, nViewShellId ); pOV->InsertText(aChars, true); // set attributes (set font) diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index 3935f64a1da4..d5956e02b295 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -69,7 +69,7 @@ void FuChar::DoExecute( SfxRequest& rReq ) ScopedVclPtr<SfxAbstractTabDialog> pDlg( pFact->CreateSdTabCharDialog(mpViewShell->GetFrameWeld(), &aNewAttr, mpDoc->GetDocSh() ) ); if (rReq.GetSlot() == SID_CHAR_DLG_EFFECT) { - pDlg->SetCurPageId("RID_SVXPAGE_CHAR_EFFECTS"); + pDlg->SetCurPageId(u"RID_SVXPAGE_CHAR_EFFECTS"_ustr); } sal_uInt16 nResult = pDlg->Execute(); diff --git a/sd/source/ui/func/fuexecuteinteraction.cxx b/sd/source/ui/func/fuexecuteinteraction.cxx index 0970740f06cf..1ab2fbc6733b 100644 --- a/sd/source/ui/func/fuexecuteinteraction.cxx +++ b/sd/source/ui/func/fuexecuteinteraction.cxx @@ -154,8 +154,9 @@ void FuExecuteInteraction::DoExecute(SfxRequest&) #if HAVE_FEATURE_AVMEDIA try { - mxPlayer.set(avmedia::MediaWindow::createPlayer(pInfo->GetBookmark(), "" /*TODO?*/), - uno::UNO_SET_THROW); + mxPlayer.set( + avmedia::MediaWindow::createPlayer(pInfo->GetBookmark(), u""_ustr /*TODO?*/), + uno::UNO_SET_THROW); mxPlayer->start(); } catch (uno::Exception&) diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index d66e00466072..342ad075f200 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -261,7 +261,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma // except in a few cases (?) if( pObj ) { - OUString sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand(".uno:FormatPaintbrush" ) ); + OUString sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand(u".uno:FormatPaintbrush"_ustr ) ); mpDoc->BegUndo( sLabel ); if (dynamic_cast< sdr::table::SdrTableObj* >( pObj ) == nullptr) mpDoc->AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, false, true ) ); diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index a312439bb646..95908e2e72b0 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -197,7 +197,7 @@ void FuHangulHanjaConversion::StartChineseConversion() return; Reference< ui::dialogs::XExecutableDialog > xDialog( - xMCF->createInstanceWithContext("com.sun.star.linguistic2.ChineseTranslationDialog" + xMCF->createInstanceWithContext(u"com.sun.star.linguistic2.ChineseTranslationDialog"_ustr , xContext), UNO_QUERY); Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY ); if( xInit.is() ) @@ -223,9 +223,9 @@ void FuHangulHanjaConversion::StartChineseConversion() { 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( Exception& ) { diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index e8409c815b25..bba66778728f 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -262,7 +262,7 @@ void FuInsertClipboard::DoExecute( SfxRequest& ) if (!pDrViewSh) return; - INetBookmark aINetBookmark( "", "" ); + INetBookmark aINetBookmark( u""_ustr, u""_ustr ); if( ( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) && aDataHelper.GetINetBookmark( SotClipboardFormatId::NETSCAPE_BOOKMARK, aINetBookmark ) ) || @@ -271,7 +271,7 @@ void FuInsertClipboard::DoExecute( SfxRequest& ) ( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) && aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) ) { - pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "" ); + pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), u""_ustr ); } } @@ -408,15 +408,15 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) // via LibreOfficeKit) if (nSlotId == SID_INSERT_DIAGRAM) { - pOleObj->SetProgName( "StarChart"); + pOleObj->SetProgName( u"StarChart"_ustr); } else if (nSlotId == SID_ATTR_TABLE) { - pOleObj->SetProgName( "StarCalc" ); + pOleObj->SetProgName( u"StarCalc"_ustr ); } else if (nSlotId == SID_INSERT_MATH) { - pOleObj->SetProgName( "StarMath" ); + pOleObj->SetProgName( u"StarMath"_ustr ); } pOleObj->SetLogicRect(aRect); @@ -733,7 +733,7 @@ void FuInsertAVMedia::DoExecute( SfxRequest& 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); if( mpWindow ) mpWindow->LeaveWait(); diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 20d52abd26ec..8b67b00424b1 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -176,7 +176,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) lcl_AddFilter( aFilterVector, pFilter ); // get Powerpoint filter - pFilter = aMatch.GetFilter4Extension( ".ppt" ); + pFilter = aMatch.GetFilter4Extension( u".ppt"_ustr ); lcl_AddFilter( aFilterVector, pFilter ); // Get other draw/impress filters @@ -220,7 +220,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) } // end with "All files" as fallback - xFilterManager->appendFilter( SdResId( STR_ALL_FILES ), "*.*" ); + xFilterManager->appendFilter( SdResId( STR_ALL_FILES ), u"*.*"_ustr ); } catch (const IllegalArgumentException&) { @@ -709,13 +709,13 @@ void FuInsertFile::GetSupportedFilterVector( ::std::vector< OUString >& rFilterV rFilterVector.clear(); - if( ( pSearchFilter = rMatcher.GetFilter4Mime( "text/plain" )) != nullptr ) + if( ( pSearchFilter = rMatcher.GetFilter4Mime( u"text/plain"_ustr )) != nullptr ) rFilterVector.push_back( pSearchFilter->GetMimeType() ); - if( ( pSearchFilter = rMatcher.GetFilter4Mime( "application/rtf" ) ) != nullptr ) + if( ( pSearchFilter = rMatcher.GetFilter4Mime( u"application/rtf"_ustr ) ) != nullptr ) rFilterVector.push_back( pSearchFilter->GetMimeType() ); - if( ( pSearchFilter = rMatcher.GetFilter4Mime( "text/html" ) ) != nullptr ) + if( ( pSearchFilter = rMatcher.GetFilter4Mime( u"text/html"_ustr ) ) != nullptr ) rFilterVector.push_back( pSearchFilter->GetMimeType() ); } diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 5f1021dcf327..c169f8925dcb 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -396,7 +396,7 @@ void FuMorph::ImpInsertPolygons( if ( bLineColor ) { const basegfx::BColor aLineColor(basegfx::interpolate(aStartLineCol.getBColor(), aEndLineCol.getBColor(), fFactor)); - aSet.Put( XLineColorItem( "", Color(aLineColor))); + aSet.Put( XLineColorItem( u""_ustr, Color(aLineColor))); } else if ( bIgnoreLine ) aSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) ); @@ -405,7 +405,7 @@ void FuMorph::ImpInsertPolygons( if ( bFillColor ) { const basegfx::BColor aFillColor(basegfx::interpolate(aStartFillCol.getBColor(), aEndFillCol.getBColor(), fFactor)); - aSet.Put( XFillColorItem( "", Color(aFillColor))); + aSet.Put( XFillColorItem( u""_ustr, Color(aFillColor))); } else if ( bIgnoreFill ) aSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) ); diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 9bfb188efe62..0eebf6bad8b8 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -261,7 +261,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& mpPage->IsBackgroundFullSize() : static_cast<SdPage&>(mpPage->TRG_GetMasterPage()).IsBackgroundFullSize(); SfxGrabBagItem grabBag(SID_ATTR_CHAR_GRABBAG); - grabBag.GetGrabBag()["BackgroundFullSize"] <<= bFullSize; + grabBag.GetGrabBag()[u"BackgroundFullSize"_ustr] <<= bFullSize; aNewAttr.Put(grabBag); @@ -297,7 +297,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& { const XFillBitmapItem& rBitmap = aMergedAttr.Get(XATTR_FILLBITMAP); const GraphicObject& rGraphicObj = rBitmap.GetGraphicObject(); - GraphicHelper::ExportGraphic(pParent, rGraphicObj.GetGraphic(), ""); + GraphicHelper::ExportGraphic(pParent, rGraphicObj.GetGraphic(), u""_ustr); } } else if (nId == SID_SELECT_BACKGROUND) @@ -338,7 +338,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& // MigrateItemSet makes sure the XFillBitmapItem will have a unique name SfxItemSetFixed<XATTR_FILLBITMAP, XATTR_FILLBITMAP> aMigrateSet( mpDoc->GetPool() ); - aMigrateSet.Put(XFillBitmapItem("background", std::move(aGraphic))); + aMigrateSet.Put(XFillBitmapItem(u"background"_ustr, std::move(aGraphic))); SdrModel::MigrateItemSet( &aMigrateSet, &*pTempSet, mpDoc ); pTempSet->Put( XFillBmpStretchItem( true )); @@ -399,7 +399,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& { // MigrateItemSet guarantees unique gradient names SfxItemSetFixed<XATTR_FILLGRADIENT, XATTR_FILLGRADIENT> aMigrateSet( mpDoc->GetPool() ); - aMigrateSet.Put( XFillGradientItem("gradient", pTempGradItem->GetGradientValue()) ); + aMigrateSet.Put( XFillGradientItem(u"gradient"_ustr, pTempGradItem->GetGradientValue()) ); SdrModel::MigrateItemSet( &aMigrateSet, &*pTempSet, mpDoc); } @@ -408,7 +408,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& { // MigrateItemSet guarantees unique hatch names SfxItemSetFixed<XATTR_FILLHATCH, XATTR_FILLHATCH> aMigrateSet( mpDoc->GetPool() ); - aMigrateSet.Put( XFillHatchItem("hatch", pTempHatchItem->GetHatchValue()) ); + aMigrateSet.Put( XFillHatchItem(u"hatch"_ustr, pTempHatchItem->GetHatchValue()) ); SdrModel::MigrateItemSet( &aMigrateSet, &*pTempSet, mpDoc); } @@ -549,7 +549,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) { SfxGrabBagItem const*const pGrabBag(static_cast<SfxGrabBagItem const*>(pPoolItem)); const auto pGrabBagInner = pGrabBag->GetGrabBag(); - const auto iter = pGrabBagInner.find("BackgroundFullSize"); + const auto iter = pGrabBagInner.find(u"BackgroundFullSize"_ustr); assert(iter != pGrabBagInner.end()); if (iter->second >>= bFullSize) { diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 2c0c22ecde09..82c390166d00 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -142,7 +142,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) Reference< XPropertySet > xInfo( xStyles->getByName( pNameItem->GetValue() ), UNO_QUERY_THROW ); OUString aUIName; - xInfo->getPropertyValue( "DisplayName" ) >>= aUIName; + xInfo->getPropertyValue( u"DisplayName"_ustr ) >>= aUIName; if ( !aUIName.isEmpty() ) rReq.AppendItem( SfxStringItem( nSId, aUIName ) ); } diff --git a/sd/source/ui/inc/TableDesignPane.hxx b/sd/source/ui/inc/TableDesignPane.hxx index 33fe87006f4a..40118f2daa69 100644 --- a/sd/source/ui/inc/TableDesignPane.hxx +++ b/sd/source/ui/inc/TableDesignPane.hxx @@ -116,8 +116,8 @@ private: std::unique_ptr<TableDesignWidget> m_xImpl; public: TableDesignPane( weld::Widget* pParent, ViewShellBase& rBase ) - : PanelLayout(pParent, "TableDesignPanel", - "modules/simpress/ui/tabledesignpanel.ui") + : PanelLayout(pParent, u"TableDesignPanel"_ustr, + u"modules/simpress/ui/tabledesignpanel.ui"_ustr) , m_xImpl(new TableDesignWidget(*m_xBuilder, rBase)) { } diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 5791204c8fb8..0cae01c25918 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -683,7 +683,7 @@ void PresenterCanvas::ThrowIfDisposed() { if (m_bDisposed || ! mxSharedCanvas.is()) { - throw lang::DisposedException ("PresenterCanvas object has already been disposed", + throw lang::DisposedException (u"PresenterCanvas object has already been disposed"_ustr, static_cast<uno::XWeak*>(this)); } } @@ -781,7 +781,7 @@ void PresenterCustomSprite::ThrowIfDisposed() { if (m_bDisposed || ! mxSprite.is()) { - throw lang::DisposedException ("PresenterCustomSprite object has already been disposed", + throw lang::DisposedException (u"PresenterCustomSprite object has already been disposed"_ustr, static_cast<uno::XWeak*>(this)); } } diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index ec22beeedc37..0f40a723add5 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -56,7 +56,7 @@ PresenterHelper::~PresenterHelper() void SAL_CALL PresenterHelper::initialize (const Sequence<Any>&) {} OUString PresenterHelper::getImplementationName() { - return "com.sun.star.comp.Draw.PresenterHelper"; + return u"com.sun.star.comp.Draw.PresenterHelper"_ustr; } sal_Bool PresenterHelper::supportsService(OUString const & ServiceName) { @@ -64,7 +64,7 @@ sal_Bool PresenterHelper::supportsService(OUString const & ServiceName) { } css::uno::Sequence<OUString> PresenterHelper::getSupportedServiceNames() { - return {"com.sun.star.drawing.PresenterHelper"}; + return {u"com.sun.star.drawing.PresenterHelper"_ustr}; } //----- XPaneHelper ---------------------------------------------------- @@ -127,7 +127,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createSharedCanvas ( || ! rxSharedWindow.is() || ! rxWindow.is()) { - throw RuntimeException("illegal argument", static_cast<XWeak*>(this)); + throw RuntimeException(u"illegal argument"_ustr, static_cast<XWeak*>(this)); } if (rxWindow == rxSharedWindow) @@ -165,7 +165,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas ( xFactory->createInstanceWithArguments( !rsOptionalCanvasServiceName.isEmpty() ? rsOptionalCanvasServiceName - : OUString("com.sun.star.rendering.Canvas.VCL"), + : u"com.sun.star.rendering.Canvas.VCL"_ustr, aArg), UNO_QUERY); } diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 26068492f4fc..c42dc8faa9a9 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -93,7 +93,7 @@ void SAL_CALL PresenterPreviewCache::initialize (const Sequence<Any>& rArguments } OUString PresenterPreviewCache::getImplementationName() { - return "com.sun.star.comp.Draw.PresenterPreviewCache"; + return u"com.sun.star.comp.Draw.PresenterPreviewCache"_ustr; } sal_Bool PresenterPreviewCache::supportsService(OUString const & ServiceName) { @@ -101,7 +101,7 @@ sal_Bool PresenterPreviewCache::supportsService(OUString const & ServiceName) { } css::uno::Sequence<OUString> PresenterPreviewCache::getSupportedServiceNames() { - return {"com.sun.star.drawing.PresenterPreviewCache"}; + return {u"com.sun.star.drawing.PresenterPreviewCache"_ustr}; } //----- XSlidePreviewCache ---------------------------------------------------- @@ -193,7 +193,7 @@ void PresenterPreviewCache::ThrowIfDisposed() { if (m_bDisposed) { - throw lang::DisposedException ("PresenterPreviewCache object has already been disposed", + throw lang::DisposedException (u"PresenterPreviewCache object has already been disposed"_ustr, static_cast<uno::XWeak*>(this)); } } diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index 1b57b195ac70..707b50b90fe4 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -47,14 +47,14 @@ void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments) if (rArguments.hasElements()) { - throw RuntimeException("SlideRenderer: invalid number of arguments", + throw RuntimeException(u"SlideRenderer: invalid number of arguments"_ustr, static_cast<XWeak*>(this)); } } OUString SlideRenderer::getImplementationName() { - return "com.sun.star.comp.Draw.SlideRenderer"; + return u"com.sun.star.comp.Draw.SlideRenderer"_ustr; } sal_Bool SlideRenderer::supportsService(OUString const & ServiceName) @@ -64,7 +64,7 @@ sal_Bool SlideRenderer::supportsService(OUString const & ServiceName) css::uno::Sequence<OUString> SlideRenderer::getSupportedServiceNames() { - return {"com.sun.star.drawing.SlideRenderer"}; + return {u"com.sun.star.drawing.SlideRenderer"_ustr}; } //----- XSlideRenderer -------------------------------------------------------- @@ -129,14 +129,14 @@ BitmapEx SlideRenderer::CreatePreview ( { const SdPage* pPage = SdPage::getImplementation(rxSlide); if (pPage == nullptr) - throw lang::IllegalArgumentException("SlideRenderer::createPreview() called with invalid slide", + throw lang::IllegalArgumentException(u"SlideRenderer::createPreview() called with invalid slide"_ustr, static_cast<XWeak*>(this), 0); // Determine the size of the current slide and its aspect ratio. Size aPageSize = pPage->GetSize(); if (aPageSize.Height() <= 0) - throw lang::IllegalArgumentException("SlideRenderer::createPreview() called with invalid size", + throw lang::IllegalArgumentException(u"SlideRenderer::createPreview() called with invalid size"_ustr, static_cast<XWeak*>(this), 1); @@ -182,7 +182,7 @@ void SlideRenderer::ThrowIfDisposed() { if (m_bDisposed) { - throw lang::DisposedException ("SlideRenderer object has already been disposed", + throw lang::DisposedException (u"SlideRenderer object has already been disposed"_ustr, static_cast<uno::XWeak*>(this)); } } diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx index c3738d894217..f7556f5b0b15 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.cxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx @@ -119,15 +119,15 @@ uno::Sequence<sal_Int8> ImagePreparer::preparePreview( xFilter->setSourceDocument( xSourceDoc ); uno::Sequence< beans::PropertyValue > aFilterData{ - comphelper::makePropertyValue("PixelWidth", aWidth), - comphelper::makePropertyValue("PixelHeight", aHeight), - comphelper::makePropertyValue("ColorMode", sal_Int32(0)) // 0: Color, 1: B&W + comphelper::makePropertyValue(u"PixelWidth"_ustr, aWidth), + comphelper::makePropertyValue(u"PixelHeight"_ustr, aHeight), + comphelper::makePropertyValue(u"ColorMode"_ustr, sal_Int32(0)) // 0: Color, 1: B&W }; uno::Sequence< beans::PropertyValue > aProps{ - comphelper::makePropertyValue("MediaType", OUString( "image/png" )), - comphelper::makePropertyValue("URL", aFileURL), - comphelper::makePropertyValue("FilterData", aFilterData) + comphelper::makePropertyValue(u"MediaType"_ustr, u"image/png"_ustr), + comphelper::makePropertyValue(u"URL"_ustr, aFileURL), + comphelper::makePropertyValue(u"FilterData"_ustr, aFilterData) }; xFilter->filter( aProps ); diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx index b4a10c70bdef..23ac8e9aa4b2 100644 --- a/sd/source/ui/remotecontrol/Receiver.cxx +++ b/sd/source/ui/remotecontrol/Receiver.cxx @@ -149,7 +149,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) try { // std::cerr << "pointer_coordination in the is" << std::endl; - xSlideShow->setProperty(beans::PropertyValue("PointerPosition", -1, Any(pos), + xSlideShow->setProperty(beans::PropertyValue(u"PointerPosition"_ustr, -1, Any(pos), beans::PropertyState_DIRECT_VALUE)); } catch (Exception&) @@ -159,7 +159,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) try { - xSlideShow->setProperty(beans::PropertyValue("PointerVisible", -1, Any(true), + xSlideShow->setProperty(beans::PropertyValue(u"PointerVisible"_ustr, -1, Any(true), beans::PropertyState_DIRECT_VALUE)); } catch (Exception&) @@ -176,7 +176,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) if (xSlideShow.is()) try { xSlideShow->setProperty( - beans::PropertyValue( "PointerVisible" , + beans::PropertyValue( u"PointerVisible"_ustr , -1, Any( false ), beans::PropertyState_DIRECT_VALUE ) ); @@ -205,7 +205,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) if (xSlideShow.is()) try { xSlideShow->setProperty( - beans::PropertyValue( "PointerPosition" , + beans::PropertyValue( u"PointerPosition"_ustr , -1, Any( pos ), beans::PropertyState_DIRECT_VALUE ) ); diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index d20a14513e83..aec4fb1be445 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -76,7 +76,7 @@ IPRemoteServer::~IPRemoteServer() void IPRemoteServer::execute() { SAL_INFO("sdremote", "IPRemoteServer::execute called"); - osl::SocketAddr aAddr( "0.0.0.0", PORT ); + osl::SocketAddr aAddr( u"0.0.0.0"_ustr, PORT ); if ( !mSocket.bind( aAddr ) ) { SAL_WARN( "sdremote", "bind failed" << mSocket.getErrorAsString() ); @@ -157,7 +157,7 @@ void IPRemoteServer::handleAcceptedConnection( BufferedStreamSocket *pSocket ) if ( rName == pClient->mName ) { Reference<XNameAccess> xSetItem( xConfig->getByName(rName), UNO_QUERY ); - Any axPin(xSetItem->getByName("PIN")); + Any axPin(xSetItem->getByName(u"PIN"_ustr)); OUString sPin; axPin >>= sPin; @@ -280,7 +280,7 @@ bool IPRemoteServer::connectClient(const std::shared_ptr<ClientInfo>& pClient, s else xConfig->insertByName( apClient->mName, Any( xChild ) ); aValue <<= apClient->mPin; - xChild->replaceByName("PIN", aValue); + xChild->replaceByName(u"PIN"_ustr, aValue); aChanges->commit(); } diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx index 76e056120ec8..70251b8cc740 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx @@ -103,7 +103,7 @@ AllMasterPagesSelector::AllMasterPagesSelector ( ViewShellBase& rBase, const std::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) - : MasterPagesSelector(pParent, rDocument, rBase, rpContainer, rxSidebar, "modules/simpress/ui/masterpagepanelall.ui", "allvalueset"), + : MasterPagesSelector(pParent, rDocument, rBase, rpContainer, rxSidebar, u"modules/simpress/ui/masterpagepanelall.ui"_ustr, u"allvalueset"_ustr), mpSortedMasterPages(new SortedMasterPageDescriptorList()) { MasterPagesSelector::Fill(); diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index e0e1c6a07cbe..2e3bd5a4ede7 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -67,7 +67,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector ( ViewShellBase& rBase, const std::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) - : MasterPagesSelector (pParent, rDocument, rBase, rpContainer, rxSidebar, "modules/simpress/ui/masterpagepanel.ui", "usedvalueset") + : MasterPagesSelector (pParent, rDocument, rBase, rpContainer, rxSidebar, u"modules/simpress/ui/masterpagepanel.ui"_ustr, u"usedvalueset"_ustr) { Link<sd::tools::EventMultiplexerEvent&,void> aLink (LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener)); rBase.GetEventMultiplexer()->AddEventListener(aLink); @@ -142,7 +142,7 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList) OUString CurrentMasterPagesSelector::GetContextMenuUIFile() const { - return "modules/simpress/ui/currentmastermenu.ui"; + return u"modules/simpress/ui/currentmastermenu.ui"_ustr; } void CurrentMasterPagesSelector::UpdateSelection() @@ -213,13 +213,13 @@ void CurrentMasterPagesSelector::ProcessPopupMenu(weld::Menu& rMenu) { // Disable the delete entry when there is only one master page. if (mrDocument.GetMasterPageUserCount(GetSelectedMasterPage()) > 0) - rMenu.set_sensitive("delete", false); + rMenu.set_sensitive(u"delete"_ustr, false); std::shared_ptr<DrawViewShell> pDrawViewShell ( std::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell())); if (pDrawViewShell && pDrawViewShell->GetEditMode() == EditMode::MasterPage) { - rMenu.set_sensitive("edit", false); + rMenu.set_sensitive(u"edit"_ustr, false); } MasterPagesSelector::ProcessPopupMenu(rMenu); diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 98ab853fb5bf..c5d2684102e7 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -155,10 +155,10 @@ LayoutMenu::LayoutMenu ( weld::Widget* pParent, ViewShellBase& rViewShellBase, css::uno::Reference<css::ui::XSidebar> xSidebar) - : PanelLayout( pParent, "LayoutPanel", "modules/simpress/ui/layoutpanel.ui" ), + : PanelLayout( pParent, u"LayoutPanel"_ustr, u"modules/simpress/ui/layoutpanel.ui"_ustr ), mrBase(rViewShellBase), mxLayoutValueSet(new LayoutValueSet(*this)), - mxLayoutValueSetWin(new weld::CustomWeld(*m_xBuilder, "layoutvalueset", *mxLayoutValueSet)), + mxLayoutValueSetWin(new weld::CustomWeld(*m_xBuilder, u"layoutvalueset"_ustr, *mxLayoutValueSet)), mbIsMainViewChangePending(false), mxSidebar(std::move(xSidebar)), mbIsDisposed(false) @@ -198,7 +198,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) mxListener = new ::sd::tools::SlotStateListener( aStateChangeLink, Reference<frame::XDispatchProvider>(mrBase.GetController()->getFrame(), UNO_QUERY), - ".uno:VerticalTextState"); + u".uno:VerticalTextState"_ustr); } LayoutMenu::~LayoutMenu() @@ -583,8 +583,8 @@ void LayoutMenu::ShowContextMenu(const Point* pPos) // Setup the menu. ::tools::Rectangle aRect(aMenuPosition, Size(1, 1)); weld::Widget* pPopupParent = mxLayoutValueSet->GetDrawingArea(); - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, "modules/simpress/ui/layoutmenu.ui")); - std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu("menu")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, u"modules/simpress/ui/layoutmenu.ui"_ustr)); + std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu(u"menu"_ustr)); // Disable the SID_INSERTPAGE_LAYOUT_MENU item when // the document is read-only. @@ -592,7 +592,7 @@ void LayoutMenu::ShowContextMenu(const Point* pPos) const SfxItemState aState ( mrBase.GetViewFrame().GetDispatcher()->QueryState(SID_INSERTPAGE, aResult)); if (aState == SfxItemState::DISABLED) - xMenu->set_sensitive("insert", false); + xMenu->set_sensitive(u"insert"_ustr, false); // Show the menu. OnMenuItemSelected(xMenu->popup_at_rect(pPopupParent, aRect)); diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 20d8528077a1..f762144cecce 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -787,7 +787,7 @@ Reference<frame::XModel> MasterPageContainer::Implementation::GetModel() // Create a new model. mxModel.set( ::comphelper::getProcessServiceFactory()->createInstance( - "com.sun.star.presentation.PresentationDocument"), + u"com.sun.star.presentation.PresentationDocument"_ustr), uno::UNO_QUERY); // Initialize the model. @@ -814,7 +814,7 @@ Reference<frame::XModel> MasterPageContainer::Implementation::GetModel() uno::Reference<beans::XPropertySet> xProperties(xNewPage, uno::UNO_QUERY); if (xProperties.is()) xProperties->setPropertyValue( - "Layout", + u"Layout"_ustr, Any(sal_Int16(AUTOLAYOUT_TITLE))); } } diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 776426158af8..c1417dd538ce 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -56,7 +56,7 @@ MasterPagesSelector::MasterPagesSelector ( css::uno::Reference<css::ui::XSidebar> xSidebar, const OUString& rUIFileName, const OUString& rValueSetName) - : PanelLayout( pParent, "MasterPagePanel", rUIFileName ), + : PanelLayout( pParent, u"MasterPagePanel"_ustr, rUIFileName ), mpContainer(std::move(pContainer)), mxPreviewValueSet(new PreviewValueSet), mxPreviewValueSetWin(new weld::CustomWeld(*m_xBuilder, rValueSetName, *mxPreviewValueSet)), @@ -141,7 +141,7 @@ void MasterPagesSelector::Fill() OUString MasterPagesSelector::GetContextMenuUIFile() const { - return "modules/simpress/ui/mastermenu.ui"; + return u"modules/simpress/ui/mastermenu.ui"_ustr; } IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler, ValueSet*, void) @@ -194,7 +194,7 @@ void MasterPagesSelector::ShowContextMenu(const Point* pPos) // Setup the menu. weld::Widget* pParent = mxPreviewValueSet->GetDrawingArea(); std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pParent, GetContextMenuUIFile())); - std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu("menu")); + std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu(u"menu"_ustr)); ProcessPopupMenu(*xMenu); ::tools::Rectangle aRect(aPosition, Size(1,1)); // Show the menu. @@ -205,9 +205,9 @@ void MasterPagesSelector::ProcessPopupMenu(weld::Menu& rMenu) { // Disable some entries. if (mpContainer->GetPreviewSize() == MasterPageContainer::SMALL) - rMenu.set_sensitive("small", false); + rMenu.set_sensitive(u"small"_ustr, false); else - rMenu.set_sensitive("large", false); + rMenu.set_sensitive(u"large"_ustr, false); } void MasterPagesSelector::ExecuteCommand(const OUString &rIdent) diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index e71cd48a8c1b..175ea84e6beb 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -61,9 +61,9 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( { // Process arguments. const ::comphelper::NamedValueCollection aArguments (rArguments); - Reference<frame::XFrame> xFrame (aArguments.getOrDefault("Frame", Reference<frame::XFrame>())); - Reference<awt::XWindow> xParentWindow (aArguments.getOrDefault("ParentWindow", Reference<awt::XWindow>())); - Reference<ui::XSidebar> xSidebar (aArguments.getOrDefault("Sidebar", Reference<ui::XSidebar>())); + Reference<frame::XFrame> xFrame (aArguments.getOrDefault(u"Frame"_ustr, Reference<frame::XFrame>())); + Reference<awt::XWindow> xParentWindow (aArguments.getOrDefault(u"ParentWindow"_ustr, Reference<awt::XWindow>())); + Reference<ui::XSidebar> xSidebar (aArguments.getOrDefault(u"Sidebar"_ustr, Reference<ui::XSidebar>())); // Throw exceptions when the arguments are not as expected. weld::Widget* pParent(nullptr); @@ -72,10 +72,10 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( if (!pParent) throw RuntimeException( - "PanelFactory::createUIElement called without ParentWindow"); + u"PanelFactory::createUIElement called without ParentWindow"_ustr); if ( ! xFrame.is()) throw RuntimeException( - "PanelFactory::createUIElement called without XFrame"); + u"PanelFactory::createUIElement called without XFrame"_ustr); // Tunnel through the controller to obtain a ViewShellBase. ViewShellBase* pBase = nullptr; @@ -83,10 +83,10 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( if (pController != nullptr) pBase = pController->GetViewShellBase(); if (pBase == nullptr) - throw RuntimeException("can not get ViewShellBase for frame"); + throw RuntimeException(u"can not get ViewShellBase for frame"_ustr); // Get bindings from given arguments. - const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings", sal_uInt64(0))); + const sal_uInt64 nBindingsValue (aArguments.getOrDefault(u"SfxBindings"_ustr, sal_uInt64(0))); SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue); // Create a framework view. @@ -129,7 +129,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( } OUString PanelFactory::getImplementationName() { - return "org.openoffice.comp.Draw.framework.PanelFactory"; + return u"org.openoffice.comp.Draw.framework.PanelFactory"_ustr; } sal_Bool PanelFactory::supportsService(OUString const & ServiceName) { @@ -137,7 +137,7 @@ sal_Bool PanelFactory::supportsService(OUString const & ServiceName) { } css::uno::Sequence<OUString> PanelFactory::getSupportedServiceNames() { - return {"com.sun.star.drawing.framework.PanelFactory"}; + return {u"com.sun.star.drawing.framework.PanelFactory"_ustr}; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index 6e5a46c736a1..ef8e7fca3353 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -57,7 +57,7 @@ RecentMasterPagesSelector::RecentMasterPagesSelector ( ViewShellBase& rBase, const std::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) - : MasterPagesSelector (pParent, rDocument, rBase, rpContainer, rxSidebar, "modules/simpress/ui/masterpagepanelrecent.ui", "recentvalueset") + : MasterPagesSelector (pParent, rDocument, rBase, rpContainer, rxSidebar, u"modules/simpress/ui/masterpagepanelrecent.ui"_ustr, u"recentvalueset"_ustr) { } diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx index be339116f6c3..7b64cdd8266c 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx @@ -40,11 +40,11 @@ namespace { OUString GetPathToImpressConfigurationRoot() { - return "/org.openoffice.Office.Impress/"; + return u"/org.openoffice.Office.Impress/"_ustr; } OUString GetPathToSetNode() { - return "MultiPaneGUI/ToolPanel/RecentlyUsedMasterPages"; + return u"MultiPaneGUI/ToolPanel/RecentlyUsedMasterPages"_ustr; } } // end of anonymous namespace diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index 6cd8d6b4c858..d44b6502c6a1 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -90,26 +90,26 @@ SlideBackground::SlideBackground( ViewShellBase& rBase, css::uno::Reference<css::frame::XFrame> xFrame, SfxBindings* pBindings) : - PanelLayout( pParent, "SlideBackgroundPanel", "modules/simpress/ui/sidebarslidebackground.ui" ), + PanelLayout( pParent, u"SlideBackgroundPanel"_ustr, u"modules/simpress/ui/sidebarslidebackground.ui"_ustr ), mrBase( rBase ), - mxPaperSizeBox(new SvxPaperSizeListBox(m_xBuilder->weld_combo_box("paperformat"))), - mxPaperOrientation(m_xBuilder->weld_combo_box("orientation")), - mxMasterSlide(m_xBuilder->weld_combo_box("masterslide")), - mxBackgroundLabel(m_xBuilder->weld_label("label3")), - mxFillStyle(m_xBuilder->weld_combo_box("fillstyle")), - mxFillLB(new ColorListBox(m_xBuilder->weld_menu_button("fillattr"), [this]{ return GetFrameWeld(); })), - mxFillAttr(m_xBuilder->weld_combo_box("fillattr1")), - mxFillGrad1(new ColorListBox(m_xBuilder->weld_menu_button("fillattr2"), [this]{ return GetFrameWeld(); })), - mxFillGrad2(new ColorListBox(m_xBuilder->weld_menu_button("fillattr3"), [this]{ return GetFrameWeld(); })), - mxInsertImage(m_xBuilder->weld_button("button2")), - mxDspMasterBackground(m_xBuilder->weld_check_button("displaymasterbackground")), - mxDspMasterObjects(m_xBuilder->weld_check_button("displaymasterobjects")), - mxCloseMaster(m_xBuilder->weld_button("closemasterslide")), - mxEditMaster(m_xBuilder->weld_button("masterslidebutton")), - mxMasterLabel(m_xBuilder->weld_label("masterlabel")), - mxMarginSelectBox(m_xBuilder->weld_combo_box("marginLB")), - mxCustomEntry(m_xBuilder->weld_label("customlabel")), - mxMarginLabel(m_xBuilder->weld_label("labelmargin")), + mxPaperSizeBox(new SvxPaperSizeListBox(m_xBuilder->weld_combo_box(u"paperformat"_ustr))), + mxPaperOrientation(m_xBuilder->weld_combo_box(u"orientation"_ustr)), + mxMasterSlide(m_xBuilder->weld_combo_box(u"masterslide"_ustr)), + mxBackgroundLabel(m_xBuilder->weld_label(u"label3"_ustr)), + mxFillStyle(m_xBuilder->weld_combo_box(u"fillstyle"_ustr)), + mxFillLB(new ColorListBox(m_xBuilder->weld_menu_button(u"fillattr"_ustr), [this]{ return GetFrameWeld(); })), + mxFillAttr(m_xBuilder->weld_combo_box(u"fillattr1"_ustr)), + mxFillGrad1(new ColorListBox(m_xBuilder->weld_menu_button(u"fillattr2"_ustr), [this]{ return GetFrameWeld(); })), + mxFillGrad2(new ColorListBox(m_xBuilder->weld_menu_button(u"fillattr3"_ustr), [this]{ return GetFrameWeld(); })), + mxInsertImage(m_xBuilder->weld_button(u"button2"_ustr)), + mxDspMasterBackground(m_xBuilder->weld_check_button(u"displaymasterbackground"_ustr)), + mxDspMasterObjects(m_xBuilder->weld_check_button(u"displaymasterobjects"_ustr)), + mxCloseMaster(m_xBuilder->weld_button(u"closemasterslide"_ustr)), + mxEditMaster(m_xBuilder->weld_button(u"masterslidebutton"_ustr)), + mxMasterLabel(m_xBuilder->weld_label(u"masterlabel"_ustr)), + mxMarginSelectBox(m_xBuilder->weld_combo_box(u"marginLB"_ustr)), + mxCustomEntry(m_xBuilder->weld_label(u"customlabel"_ustr)), + mxMarginLabel(m_xBuilder->weld_label(u"labelmargin"_ustr)), maPaperSizeController(SID_ATTR_PAGE_SIZE, *pBindings, *this), maPaperOrientationController(SID_ATTR_PAGE, *pBindings, *this), maPaperMarginLRController(SID_ATTR_PAGE_LRSPACE, *pBindings, *this), @@ -530,7 +530,7 @@ void SlideBackground::SetPanelTitle( const OUString& rTitle ) if ( !xDecks.is() ) return; - Reference<ui::XDeck> xDeck ( xDecks->getByName("PropertyDeck"), uno::UNO_QUERY); + Reference<ui::XDeck> xDeck ( xDecks->getByName(u"PropertyDeck"_ustr), uno::UNO_QUERY); if ( !xDeck.is() ) return; @@ -538,9 +538,9 @@ void SlideBackground::SetPanelTitle( const OUString& rTitle ) if ( !xPanels.is() ) return; - if (xPanels->hasByName("SlideBackgroundPanel")) + if (xPanels->hasByName(u"SlideBackgroundPanel"_ustr)) { - Reference<ui::XPanel> xPanel ( xPanels->getByName("SlideBackgroundPanel"), uno::UNO_QUERY); + Reference<ui::XPanel> xPanel ( xPanels->getByName(u"SlideBackgroundPanel"_ustr), uno::UNO_QUERY); if ( !xPanel.is() ) return; @@ -1138,7 +1138,7 @@ IMPL_LINK_NOARG(SlideBackground, FillColorHdl, ColorListBox&, void) // the name doesn't really matter, it'll be converted to unique one eventually, // but it has to be non-empty - XFillGradientItem aItem("gradient", aGradient); + XFillGradientItem aItem(u"gradient"_ustr, aGradient); GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_GRADIENT, SfxCallMode::RECORD, { &aItem }); } break; diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index a9b53acf119d..e0ba0adfc7df 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -144,7 +144,7 @@ void SlideShowRestarter::StartPresentation() mpDispatcher->Execute(SID_PRESENTATION, SfxCallMode::ASYNCHRON); if (mpSlideShow.is()) { - Sequence aProperties{ comphelper::makePropertyValue("FirstPage", + Sequence aProperties{ comphelper::makePropertyValue(u"FirstPage"_ustr, "page" + OUString::number(mnCurrentSlideNumber+1)) }; mpSlideShow->startWithArguments(aProperties); } diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 39e3e6a21221..f7c6cd0f0915 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -258,7 +258,7 @@ void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView, vcl::W // XServiceInfo OUString SAL_CALL SlideShow::getImplementationName( ) { - return "com.sun.star.comp.sd.SlideShow"; + return u"com.sun.star.comp.sd.SlideShow"_ustr; } sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName ) @@ -268,7 +268,7 @@ sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames( ) { - return { "com.sun.star.presentation.Presentation" }; + return { u"com.sun.star.presentation.Presentation"_ustr }; } // XPropertySet @@ -798,8 +798,8 @@ void SAL_CALL SlideShow::end() // In case mbMouseAsPen was set, a new layer DrawnInSlideshow might have been generated // during slideshow, which is not known to FrameView yet. - if (any2bool(getPropertyValue("UsePen")) - && pViewShell->GetDoc()->GetLayerAdmin().GetLayer("DrawnInSlideshow")) + if (any2bool(getPropertyValue(u"UsePen"_ustr)) + && pViewShell->GetDoc()->GetLayerAdmin().GetLayer(u"DrawnInSlideshow"_ustr)) { SdrLayerIDSet aDocLayerIDSet; pViewShell->GetDoc()->GetLayerAdmin().getVisibleLayersODF(aDocLayerIDSet); @@ -831,7 +831,7 @@ void SAL_CALL SlideShow::end() void SAL_CALL SlideShow::rehearseTimings() { - Sequence< PropertyValue > aArguments{ comphelper::makePropertyValue("RehearseTimings", true) }; + Sequence< PropertyValue > aArguments{ comphelper::makePropertyValue(u"RehearseTimings"_ustr, true) }; startWithArguments( aArguments ); } @@ -959,10 +959,10 @@ void SlideShow::endInteractivePreview() void SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode ) { Sequence< PropertyValue > aArguments{ - comphelper::makePropertyValue("Preview", true), - comphelper::makePropertyValue("FirstPage", xDrawPage), - comphelper::makePropertyValue("AnimationNode", xAnimationNode), - comphelper::makePropertyValue("ParentWindow", Reference< XWindow >()), + comphelper::makePropertyValue(u"Preview"_ustr, true), + comphelper::makePropertyValue(u"FirstPage"_ustr, xDrawPage), + comphelper::makePropertyValue(u"AnimationNode"_ustr, xAnimationNode), + comphelper::makePropertyValue(u"ParentWindow"_ustr, Reference< XWindow >()), }; startWithArguments( aArguments ); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index b096fd53a1f1..94ca9b708dc7 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -651,7 +651,7 @@ void SlideshowImpl::disposing(std::unique_lock<std::mutex>&) if( mxShow.is() && mpDoc ) NotifyDocumentEvent( *mpDoc, - "OnEndPresentation" ); + u"OnEndPresentation"_ustr ); if( mbAutoSaveWasOn ) setAutoSaveState( true ); @@ -853,7 +853,7 @@ void SlideshowImpl::startInteractivePreview( const Reference< XDrawPage >& xDraw // mpSlideController = std::make_shared<AnimationSlideController>( xSlides, AnimationSlideController::PREVIEW ); sal_Int32 nSlideNumber = 0; Reference< XPropertySet > xSet( xDrawPage, UNO_QUERY_THROW ); - xSet->getPropertyValue( "Number" ) >>= nSlideNumber; + xSet->getPropertyValue( u"Number"_ustr ) >>= nSlideNumber; mpSlideController->insertSlideNumber( nSlideNumber-1 ); mpSlideController->setPreviewNode( xAnimationNode ); @@ -965,7 +965,7 @@ bool SlideshowImpl::startPreview( sal_Int32 nSlideNumber = 0; Reference< XPropertySet > xSet( mxPreviewDrawPage, UNO_QUERY_THROW ); - xSet->getPropertyValue( "Number" ) >>= nSlideNumber; + xSet->getPropertyValue( u"Number"_ustr ) >>= nSlideNumber; mpSlideController->insertSlideNumber( nSlideNumber-1 ); mpSlideController->setPreviewNode( xAnimationNode ); @@ -1259,7 +1259,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp if (xBitmap.is()) { mxShow->setProperty( - beans::PropertyValue( "WaitSymbolBitmap" , + beans::PropertyValue( u"WaitSymbolBitmap"_ustr , -1, Any( xBitmap ), beans::PropertyState_DIRECT_VALUE ) ); @@ -1271,7 +1271,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp if (xPointerBitmap.is()) { mxShow->setProperty( - beans::PropertyValue( "PointerSymbolBitmap" , + beans::PropertyValue( u"PointerSymbolBitmap"_ustr , -1, Any( xPointerBitmap ), beans::PropertyState_DIRECT_VALUE ) ); @@ -1279,9 +1279,9 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp if (officecfg::Office::Impress::Misc::Start::ShowNavigationPanel::get()) { NavbarButtonSize btnScale = static_cast<NavbarButtonSize>(officecfg::Office::Impress::Layout::Display::NavigationBtnScale::get()); - OUString prevSlidePath = ""; - OUString nextSlidePath = ""; - OUString menuPath = ""; + OUString prevSlidePath = u""_ustr; + OUString nextSlidePath = u""_ustr; + OUString menuPath = u""_ustr; switch (btnScale) { case NavbarButtonSize::Large: @@ -1313,7 +1313,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp vcl::unotools::xBitmapFromBitmapEx(prevSlideBm)); if (xPrevSBitmap.is()) { - mxShow->setProperty(beans::PropertyValue("NavigationSlidePrev", -1, + mxShow->setProperty(beans::PropertyValue(u"NavigationSlidePrev"_ustr, -1, Any(xPrevSBitmap), beans::PropertyState_DIRECT_VALUE)); } @@ -1322,7 +1322,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp vcl::unotools::xBitmapFromBitmapEx(menuSlideBm)); if (xMenuSBitmap.is()) { - mxShow->setProperty(beans::PropertyValue("NavigationSlideMenu", -1, + mxShow->setProperty(beans::PropertyValue(u"NavigationSlideMenu"_ustr, -1, Any(xMenuSBitmap), beans::PropertyState_DIRECT_VALUE)); } @@ -1331,7 +1331,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp vcl::unotools::xBitmapFromBitmapEx(nextSlideBm)); if (xNextSBitmap.is()) { - mxShow->setProperty(beans::PropertyValue("NavigationSlideNext", -1, + mxShow->setProperty(beans::PropertyValue(u"NavigationSlideNext"_ustr, -1, Any(xNextSBitmap), beans::PropertyState_DIRECT_VALUE)); } @@ -1355,7 +1355,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp // it visible (if activated) NotifyDocumentEvent( *mpDoc, - "OnStartPresentation"); + u"OnStartPresentation"_ustr); } displaySlideIndex( mpSlideController->getStartSlideIndex() ); @@ -1725,7 +1725,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape ) #if HAVE_FEATURE_AVMEDIA try { - mxPlayer.set(avmedia::MediaWindow::createPlayer(pEvent->maStrBookmark, ""/*TODO?*/), uno::UNO_SET_THROW ); + mxPlayer.set(avmedia::MediaWindow::createPlayer(pEvent->maStrBookmark, u""_ustr/*TODO?*/), uno::UNO_SET_THROW ); mxPlayer->start(); } catch( uno::Exception& ) @@ -2234,30 +2234,30 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void) if( !mbWasPaused ) pause(); - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(nullptr, "modules/simpress/ui/slidecontextmenu.ui")); - std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu("menu")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(nullptr, u"modules/simpress/ui/slidecontextmenu.ui"_ustr)); + std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu(u"menu"_ustr)); OUString sNextImage(BMP_MENU_NEXT), sPrevImage(BMP_MENU_PREV); - xMenu->insert(0, "next", SdResId(RID_SVXSTR_MENU_NEXT), &sNextImage, nullptr, nullptr, TRISTATE_INDET); - xMenu->insert(1, "prev", SdResId(RID_SVXSTR_MENU_PREV), &sPrevImage, nullptr, nullptr, TRISTATE_INDET); + xMenu->insert(0, u"next"_ustr, SdResId(RID_SVXSTR_MENU_NEXT), &sNextImage, nullptr, nullptr, TRISTATE_INDET); + xMenu->insert(1, u"prev"_ustr, SdResId(RID_SVXSTR_MENU_PREV), &sPrevImage, nullptr, nullptr, TRISTATE_INDET); // Adding button to display if in Pen mode - xMenu->set_active("pen", mbUsePen); + xMenu->set_active(u"pen"_ustr, mbUsePen); const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode(); - xMenu->set_visible("next", mpSlideController->getNextSlideIndex() != -1); - xMenu->set_visible("prev", (mpSlideController->getPreviousSlideIndex() != -1 ) || (eMode == SHOWWINDOWMODE_END) || (eMode == SHOWWINDOWMODE_PAUSE) || (eMode == SHOWWINDOWMODE_BLANK)); - xMenu->set_visible("edit", mpViewShell->GetDoc()->GetStartWithPresentation() != 0); + xMenu->set_visible(u"next"_ustr, mpSlideController->getNextSlideIndex() != -1); + xMenu->set_visible(u"prev"_ustr, (mpSlideController->getPreviousSlideIndex() != -1 ) || (eMode == SHOWWINDOWMODE_END) || (eMode == SHOWWINDOWMODE_PAUSE) || (eMode == SHOWWINDOWMODE_BLANK)); + xMenu->set_visible(u"edit"_ustr, mpViewShell->GetDoc()->GetStartWithPresentation() != 0); - std::unique_ptr<weld::Menu> xPageMenu(xBuilder->weld_menu("gotomenu")); + std::unique_ptr<weld::Menu> xPageMenu(xBuilder->weld_menu(u"gotomenu"_ustr)); OUString sFirstImage(BMP_MENU_FIRST), sLastImage(BMP_MENU_LAST); - xPageMenu->insert(0, "first", SdResId(RID_SVXSTR_MENU_FIRST), &sFirstImage, nullptr, nullptr, TRISTATE_INDET); - xPageMenu->insert(1, "last", SdResId(RID_SVXSTR_MENU_LAST), &sLastImage, nullptr, nullptr, TRISTATE_INDET); + xPageMenu->insert(0, u"first"_ustr, SdResId(RID_SVXSTR_MENU_FIRST), &sFirstImage, nullptr, nullptr, TRISTATE_INDET); + xPageMenu->insert(1, u"last"_ustr, SdResId(RID_SVXSTR_MENU_LAST), &sLastImage, nullptr, nullptr, TRISTATE_INDET); // populate slide goto list const sal_Int32 nPageNumberCount = mpSlideController->getSlideNumberCount(); if( nPageNumberCount <= 1 ) { - xMenu->set_visible("goto", false); + xMenu->set_visible(u"goto"_ustr, false); } else { @@ -2265,8 +2265,8 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void) if( (eMode == SHOWWINDOWMODE_END) || (eMode == SHOWWINDOWMODE_PAUSE) || (eMode == SHOWWINDOWMODE_BLANK) ) nCurrentSlideNumber = -1; - xPageMenu->set_visible("first", mpSlideController->getSlideNumber(0) != nCurrentSlideNumber); - xPageMenu->set_visible("last", mpSlideController->getSlideNumber(mpSlideController->getSlideIndexCount() - 1) != nCurrentSlideNumber); + xPageMenu->set_visible(u"first"_ustr, mpSlideController->getSlideNumber(0) != nCurrentSlideNumber); + xPageMenu->set_visible(u"last"_ustr, mpSlideController->getSlideNumber(mpSlideController->getSlideIndexCount() - 1) != nCurrentSlideNumber); sal_Int32 nPageNumber; @@ -2286,14 +2286,14 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void) } } - std::unique_ptr<weld::Menu> xBlankMenu(xBuilder->weld_menu("screenmenu")); + std::unique_ptr<weld::Menu> xBlankMenu(xBuilder->weld_menu(u"screenmenu"_ustr)); if (mpShowWindow->GetShowWindowMode() == SHOWWINDOWMODE_BLANK) { xBlankMenu->set_active((mpShowWindow->GetBlankColor() == COL_WHITE) ? "white" : "black", true); } - std::unique_ptr<weld::Menu> xWidthMenu(xBuilder->weld_menu("widthmenu")); + std::unique_ptr<weld::Menu> xWidthMenu(xBuilder->weld_menu(u"widthmenu"_ustr)); // populate color width list sal_Int32 nIterator; @@ -2690,7 +2690,7 @@ void SlideshowImpl::setActiveXToolbarsVisible( bool bVisible ) { Reference< frame::XLayoutManager > xLayoutManager; Reference< beans::XPropertySet > xFrameProps( pViewFrame->GetFrame().GetFrameInterface(), UNO_QUERY_THROW ); - if ( ( xFrameProps->getPropertyValue( "LayoutManager" ) + if ( ( xFrameProps->getPropertyValue( u"LayoutManager"_ustr ) >>= xLayoutManager ) && xLayoutManager.is() ) { @@ -2788,7 +2788,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn) aURL.Complete = "vnd.sun.star.autorecovery:/setAutoSaveState"; xParser->parseStrict(aURL); - Sequence< beans::PropertyValue > aArgs{ comphelper::makePropertyValue("AutoSaveState", bOn) }; + Sequence< beans::PropertyValue > aArgs{ comphelper::makePropertyValue(u"AutoSaveState"_ustr, bOn) }; uno::Reference< frame::XDispatch > xAutoSave = frame::theAutoRecovery::get(xContext); xAutoSave->dispatch(aURL, aArgs); @@ -3432,7 +3432,7 @@ void SlideshowImpl::sendHintSlideChanged(const SdrPage* pChangedPage) const return; mxShow->setProperty( - beans::PropertyValue( "HintSlideChanged" , + beans::PropertyValue( u"HintSlideChanged"_ustr , -1, Any( GetXDrawPageForSdrPage(const_cast<SdrPage*>(pChangedPage)) ), beans::PropertyState_DIRECT_VALUE ) ); diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index d6addc3f87fe..38dba39bc801 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -127,7 +127,7 @@ SlideShowView::SlideShowView( ShowWindow& rOutputWindow, { Reference< beans::XPropertySet > xCanvasProps( getCanvas(), uno::UNO_QUERY_THROW ); - xCanvasProps->setPropertyValue("UnsafeScrolling", + xCanvasProps->setPropertyValue(u"UnsafeScrolling"_ustr, uno::Any( true ) ); } catch( uno::Exception& ) diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index a0dcc9f0cb42..1bad31cc1e19 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -213,7 +213,7 @@ CacheKey RequestQueue::GetFront() ::osl::MutexGuard aGuard (maMutex); if (mpRequestQueue->empty()) - throw css::uno::RuntimeException("RequestQueue::GetFront(): queue is empty", + throw css::uno::RuntimeException(u"RequestQueue::GetFront(): queue is empty"_ustr, nullptr); return mpRequestQueue->begin()->maKey; @@ -224,7 +224,7 @@ RequestPriorityClass RequestQueue::GetFrontPriorityClass() ::osl::MutexGuard aGuard (maMutex); if (mpRequestQueue->empty()) - throw css::uno::RuntimeException("RequestQueue::GetFrontPriorityClass(): queue is empty", + throw css::uno::RuntimeException(u"RequestQueue::GetFrontPriorityClass(): queue is empty"_ustr, nullptr); return mpRequestQueue->begin()->meClass; diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 684cb2da5f7e..7a531a3fbff3 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -234,7 +234,7 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript { Any aPage; aPage <<= rpDescriptor->GetPage()->getUnoPage(); - xSet->setPropertyValue( "CurrentPage", aPage ); + xSet->setPropertyValue( u"CurrentPage"_ustr, aPage ); } } catch (const Exception&) diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index f744c24174c1..dd7ef94de5d5 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -191,7 +191,7 @@ void Listener::ConnectToController() { try { - xSet->addPropertyChangeListener("CurrentPage", this); + xSet->addPropertyChangeListener(u"CurrentPage"_ustr, this); } catch (beans::UnknownPropertyException&) { @@ -199,7 +199,7 @@ void Listener::ConnectToController() } try { - xSet->addPropertyChangeListener("IsMasterPageMode", this); + xSet->addPropertyChangeListener(u"IsMasterPageMode"_ustr, this); } catch (beans::UnknownPropertyException&) { @@ -230,8 +230,8 @@ void Listener::DisconnectFromController() // Remove the property listener. if (xSet.is()) { - xSet->removePropertyChangeListener( "CurrentPage", this ); - xSet->removePropertyChangeListener( "IsMasterPageMode", this); + xSet->removePropertyChangeListener( u"CurrentPage"_ustr, this ); + xSet->removePropertyChangeListener( u"IsMasterPageMode"_ustr, this); } // Remove the dispose listener. @@ -416,7 +416,7 @@ void SAL_CALL Listener::propertyChange ( { if (m_bDisposed) { - throw lang::DisposedException ("SlideSorterController object has already been disposed", + throw lang::DisposedException (u"SlideSorterController object has already been disposed"_ustr, static_cast<uno::XWeak*>(this)); } @@ -428,7 +428,7 @@ void SAL_CALL Listener::propertyChange ( { try { - Any aPageNumber = xPageSet->getPropertyValue ("Number"); + Any aPageNumber = xPageSet->getPropertyValue (u"Number"_ustr); sal_Int32 nCurrentPage = 0; aPageNumber >>= nCurrentPage; // The selection is already set but we call SelectPage() @@ -504,7 +504,7 @@ void Listener::UpdateEditMode() { try { - Any aValue (xSet->getPropertyValue( "IsMasterPageMode" )); + Any aValue (xSet->getPropertyValue( u"IsMasterPageMode"_ustr )); aValue >>= bIsMasterPageMode; } catch (beans::UnknownPropertyException&) diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 8c64617ee1d2..f71244c1baef 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -936,7 +936,7 @@ void SlotManager::RenameSlide(const SfxRequest& rRequest) } } OUString aNewName = aNameDlg->GetName(); - collectUIInformation({{"OldName", aOldName}, {"NewName", aNewName}}, "RENAME"); + collectUIInformation({{"OldName", aOldName}, {"NewName", aNewName}}, u"RENAME"_ustr); aNameDlg.disposeAndClear(); } // Tell the slide sorter about the name change (necessary for @@ -1104,7 +1104,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) PageSelector::UpdateLock aUpdateLock (mrSlideSorter); mrSlideSorter.GetController().GetPageSelector().DeselectAllPages(); mrSlideSorter.GetController().GetPageSelector().SelectPage(pNewPage); - collectUIInformation({{"POS", OUString::number(nInsertionIndex + 2)}}, "Insert_New_Page_or_Slide"); + collectUIInformation({{"POS", OUString::number(nInsertionIndex + 2)}}, u"Insert_New_Page_or_Slide"_ustr); } void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest) @@ -1152,7 +1152,7 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest) rSelector.SelectPage(it); } - collectUIInformation({{"POS", OUString::number(nInsertPosition + 2)}}, "Duplicate"); + collectUIInformation({{"POS", OUString::number(nInsertPosition + 2)}}, u"Duplicate"_ustr); } void SlotManager::ChangeSlideExclusionState ( diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 15dd9d393632..4dcfefb30971 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -194,7 +194,7 @@ sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSli { try { - const Any aNumber (xSet->getPropertyValue("Number")); + const Any aNumber (xSet->getPropertyValue(u"Number"_ustr)); sal_Int16 nNumber (-1); aNumber >>= nNumber; nNumber -= 1; @@ -628,7 +628,7 @@ bool SlideSorterModel::DeleteSlide (const SdPage* pPage) maPageDescriptors.erase(iter); UpdateIndices(nIndex); - collectUIInformation(OUString::number(nIndex + 1), "Delete_Slide_or_Page"); + collectUIInformation(OUString::number(nIndex + 1), u"Delete_Slide_or_Page"_ustr); } return bMarkedSelected; } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index d17332b57176..3eb048984b70 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -130,7 +130,7 @@ SlideSorterViewShell::SlideSorterViewShell ( : ViewShell (pParentWindow, rViewShellBase), mbIsArrangeGUIElementsPending(true) { - GetContentWindow()->set_id("slidesorter"); + GetContentWindow()->set_id(u"slidesorter"_ustr); meShellType = ST_SLIDE_SORTER; if (pFrameViewArgument != nullptr) @@ -139,7 +139,7 @@ SlideSorterViewShell::SlideSorterViewShell ( mpFrameView = new FrameView(GetDoc()); GetFrameView()->Connect(); - SetName ("SlideSorterViewShell"); + SetName (u"SlideSorterViewShell"_ustr); pParentWindow->SetStyle(pParentWindow->GetStyle() | WB_DIALOGCONTROL); } diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index d84e37bb9c63..1b9262d954e3 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -100,9 +100,9 @@ constexpr std::u16string_view aTableStyleBaseName = u"table"; TableDesignWidget::TableDesignWidget(weld::Builder& rBuilder, ViewShellBase& rBase) : mrBase(rBase) - , m_xMenu(rBuilder.weld_menu("menu")) - , m_xValueSet(new TableValueSet(rBuilder.weld_scrolled_window("previewswin", true))) - , m_xValueSetWin(new weld::CustomWeld(rBuilder, "previews", *m_xValueSet)) + , m_xMenu(rBuilder.weld_menu(u"menu"_ustr)) + , m_xValueSet(new TableValueSet(rBuilder.weld_scrolled_window(u"previewswin"_ustr, true))) + , m_xValueSetWin(new weld::CustomWeld(rBuilder, u"previews"_ustr, *m_xValueSet)) { m_xValueSet->SetStyle(m_xValueSet->GetStyle() | WB_NO_DIRECTSELECT | WB_FLATVALUESET | WB_ITEMBORDER); m_xValueSet->SetExtraSpacing(8); @@ -126,8 +126,8 @@ TableDesignWidget::TableDesignWidget(weld::Builder& rBuilder, ViewShellBase& rBa Reference< XController > xController( mrBase.GetController(), UNO_SET_THROW ); Reference< XStyleFamiliesSupplier > xFamiliesSupp( xController->getModel(), UNO_QUERY_THROW ); Reference< XNameAccess > xFamilies( xFamiliesSupp->getStyleFamilies() ); - mxTableFamily.set( xFamilies->getByName( "table" ), UNO_QUERY_THROW ); - mxCellFamily.set( xFamilies->getByName( "cell" ), UNO_QUERY_THROW ); + mxTableFamily.set( xFamilies->getByName( u"table"_ustr ), UNO_QUERY_THROW ); + mxCellFamily.set( xFamilies->getByName( u"cell"_ustr ), UNO_QUERY_THROW ); } catch (const Exception&) { @@ -170,18 +170,18 @@ IMPL_LINK(TableDesignWidget, implContextMenuHandler, const Point*, pPoint, void) { Reference<XStyle> xStyle(mxTableFamily->getByIndex(nClickedItemId - 1), UNO_QUERY_THROW); - m_xMenu->set_visible("clone", true); - m_xMenu->set_visible("format", true); - m_xMenu->set_visible("delete", xStyle->isUserDefined()); - m_xMenu->set_visible("reset", !xStyle->isUserDefined()); - m_xMenu->set_sensitive("reset", Reference<util::XModifiable>(xStyle, UNO_QUERY_THROW)->isModified()); + m_xMenu->set_visible(u"clone"_ustr, true); + m_xMenu->set_visible(u"format"_ustr, true); + m_xMenu->set_visible(u"delete"_ustr, xStyle->isUserDefined()); + m_xMenu->set_visible(u"reset"_ustr, !xStyle->isUserDefined()); + m_xMenu->set_sensitive(u"reset"_ustr, Reference<util::XModifiable>(xStyle, UNO_QUERY_THROW)->isModified()); } else { - m_xMenu->set_visible("clone", false); - m_xMenu->set_visible("format", false); - m_xMenu->set_visible("delete", false); - m_xMenu->set_visible("reset", false); + m_xMenu->set_visible(u"clone"_ustr, false); + m_xMenu->set_visible(u"format"_ustr, false); + m_xMenu->set_visible(u"delete"_ustr, false); + m_xMenu->set_visible(u"reset"_ustr, false); } } catch (Exception&) @@ -231,15 +231,15 @@ void TableDesignWidget::InsertStyle() const OUString aName(getNewStyleName(xTableFamily, aTableStyleBaseName)); xTableFamily->insertByName(aName, Any(xTableStyle)); - Reference<XStyle> xCellStyle(mxCellFamily->getByName("default"), UNO_QUERY_THROW); + Reference<XStyle> xCellStyle(mxCellFamily->getByName(u"default"_ustr), UNO_QUERY_THROW); - xTableStyle->replaceByName("body", Any(xCellStyle)); - xTableStyle->replaceByName("odd-rows" , Any(xCellStyle)); - xTableStyle->replaceByName("odd-columns" , Any(xCellStyle)); - xTableStyle->replaceByName("first-row" , Any(xCellStyle)); - xTableStyle->replaceByName("first-column" , Any(xCellStyle)); - xTableStyle->replaceByName("last-row" , Any(xCellStyle)); - xTableStyle->replaceByName("last-column" , Any(xCellStyle)); + xTableStyle->replaceByName(u"body"_ustr, Any(xCellStyle)); + xTableStyle->replaceByName(u"odd-rows"_ustr , Any(xCellStyle)); + xTableStyle->replaceByName(u"odd-columns"_ustr , Any(xCellStyle)); + xTableStyle->replaceByName(u"first-row"_ustr , Any(xCellStyle)); + xTableStyle->replaceByName(u"first-column"_ustr , Any(xCellStyle)); + xTableStyle->replaceByName(u"last-row"_ustr , Any(xCellStyle)); + xTableStyle->replaceByName(u"last-column"_ustr , Any(xCellStyle)); updateControls(); selectStyle(aName); @@ -666,7 +666,7 @@ void TableDesignWidget::updateControls() if( mxSelectedTable.is() ) { - Reference< XNamed > xNamed( mxSelectedTable->getPropertyValue( "TableTemplate" ), UNO_QUERY ); + Reference< XNamed > xNamed( mxSelectedTable->getPropertyValue( u"TableTemplate"_ustr ), UNO_QUERY ); if( xNamed.is() ) selectStyle(xNamed->getName()); } @@ -689,7 +689,7 @@ void TableDesignWidget::endTextEditForStyle(const Reference<XInterface>& rStyle) if (!mxSelectedTable) return; - Reference<XInterface> xTableStyle(mxSelectedTable->getPropertyValue("TableTemplate"), UNO_QUERY); + Reference<XInterface> xTableStyle(mxSelectedTable->getPropertyValue(u"TableTemplate"_ustr), UNO_QUERY); if (xTableStyle != rStyle) return; @@ -1031,7 +1031,7 @@ void TableDesignWidget::FillDesignPreviewControl() Reference< XPropertySet > xPageSet( mxView->getCurrentPage(), UNO_QUERY ); if( xPageSet.is() ) { - xPageSet->getPropertyValue("IsBackgroundDark") >>= bIsPageDark; + xPageSet->getPropertyValue(u"IsBackgroundDark"_ustr) >>= bIsPageDark; } } diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 642a4b77d453..9c2a0db99f51 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -68,8 +68,8 @@ static void apply_table_style( SdrTableObj* pObj, SdrModel const * pModel, const try { - Reference< XNameContainer > xTableFamily( xPool->getByName( "table" ), UNO_QUERY_THROW ); - OUString aStdName( "default" ); + Reference< XNameContainer > xTableFamily( xPool->getByName( u"table"_ustr ), UNO_QUERY_THROW ); + OUString aStdName( u"default"_ustr ); if( !sTableStyle.isEmpty() ) aStdName = sTableStyle; Reference< XIndexAccess > xStyle( xTableFamily->getByName( aStdName ), UNO_QUERY_THROW ); diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 59cf49569d92..4943787d03f2 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -434,7 +434,7 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange ( if (m_bDisposed) { throw lang::DisposedException ( - "SlideSorterController object has already been disposed", + u"SlideSorterController object has already been disposed"_ustr, static_cast<uno::XWeak*>(this)); } diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index d3fc73bf93cc..9425f0b16791 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -117,7 +117,7 @@ Image PreviewRenderer::RenderPage ( if (Initialize(pPage, aPixelSize, bObeyHighContrastMode)) { PaintPage(pPage, bDisplayPresentationObjects); - PaintSubstitutionText(""); + PaintSubstitutionText(u""_ustr); PaintFrame(); Size aSize (mpPreviewDevice->GetOutputSizePixel()); diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index 9b75b322ee64..b239782e7c7f 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -143,7 +143,7 @@ void SlotStateListener::ThrowIfDisposed() { if (m_bDisposed) { - throw lang::DisposedException ("SlideSorterController object has already been disposed", + throw lang::DisposedException (u"SlideSorterController object has already been disposed"_ustr, static_cast<uno::XWeak*>(this)); } } diff --git a/sd/source/ui/uitest/uiobject.cxx b/sd/source/ui/uitest/uiobject.cxx index 352c82d70e20..24d507efdc73 100644 --- a/sd/source/ui/uitest/uiobject.cxx +++ b/sd/source/ui/uitest/uiobject.cxx @@ -94,9 +94,9 @@ StringMap ImpressWindowUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["SelectedText"] = getViewShell(mxWindow)->GetSelectionText(false); - aMap["CurrentSlide"] = OUString::number(getViewShell(mxWindow)->GetCurPagePos() + 1); - aMap["Zoom"] = OUString::number(getViewShell(mxWindow)->GetZoom()); + aMap[u"SelectedText"_ustr] = getViewShell(mxWindow)->GetSelectionText(false); + aMap[u"CurrentSlide"_ustr] = OUString::number(getViewShell(mxWindow)->GetCurPagePos() + 1); + aMap[u"Zoom"_ustr] = OUString::number(getViewShell(mxWindow)->GetZoom()); return aMap; } @@ -105,9 +105,9 @@ void ImpressWindowUIObject::execute(const OUString& rAction, const StringMap& rP { if (rAction == "SET") { - if (rParameters.find("ZOOM") != rParameters.end()) + if (rParameters.find(u"ZOOM"_ustr) != rParameters.end()) { - auto itr = rParameters.find("ZOOM"); + auto itr = rParameters.find(u"ZOOM"_ustr); OUString aVal = itr->second; sal_Int32 nVal = aVal.toInt32(); getViewShell(mxWindow)->SetZoom(nVal); @@ -115,9 +115,9 @@ void ImpressWindowUIObject::execute(const OUString& rAction, const StringMap& rP } else if (rAction == "GOTO") { - if (rParameters.find("PAGE") != rParameters.end()) + if (rParameters.find(u"PAGE"_ustr) != rParameters.end()) { - auto itr = rParameters.find("PAGE"); + auto itr = rParameters.find(u"PAGE"_ustr); OUString aVal = itr->second; sal_Int32 nVal = aVal.toInt32(); getViewShell(mxWindow)->SwitchPage(nVal - 1); @@ -125,9 +125,9 @@ void ImpressWindowUIObject::execute(const OUString& rAction, const StringMap& rP } else if (rAction == "SELECT") { - if (rParameters.find("OBJECT") != rParameters.end()) + if (rParameters.find(u"OBJECT"_ustr) != rParameters.end()) { - auto itr = rParameters.find("OBJECT"); + auto itr = rParameters.find(u"OBJECT"_ustr); OUString aName = itr->second; SdrObject* pObj = getObject(mxWindow, aName); SdrPageView* pPageView = getViewShell(mxWindow)->GetView()->GetSdrPageView(); @@ -140,7 +140,7 @@ void ImpressWindowUIObject::execute(const OUString& rAction, const StringMap& rP assert(pViewFrm && "ImpressWindowUIObject::execute: no viewframe"); pViewFrm->ShowChildWindow(SID_SIDEBAR); - auto itr = rParameters.find("PANEL"); + auto itr = rParameters.find(u"PANEL"_ustr); if (itr != rParameters.end()) { OUString aVal = itr->second; @@ -174,7 +174,7 @@ std::set<OUString> ImpressWindowUIObject::get_children() const return aRet; } -OUString ImpressWindowUIObject::get_name() const { return "ImpressWindowUIObject"; } +OUString ImpressWindowUIObject::get_name() const { return u"ImpressWindowUIObject"_ustr; } std::unique_ptr<UIObject> ImpressWindowUIObject::create(vcl::Window* pWindow) { diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 0fa76487843b..813b07477076 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -215,7 +215,7 @@ OUString SAL_CALL DrawController::getImplementationName( ) // Do not throw an exception at the moment. This leads to a crash // under Solaris on reload. See issue i70929 for details. // ThrowIfDisposed(); - return "DrawController" ; + return u"DrawController"_ustr ; } constexpr OUString ssServiceName = u"com.sun.star.drawing.DrawingDocumentDrawView"_ustr; @@ -801,7 +801,7 @@ void DrawController::ThrowIfDisposed() const { SAL_WARN("sd", "Calling disposed DrawController object. Throwing exception."); throw lang::DisposedException ( - "DrawController object has already been disposed", + u"DrawController object has already been disposed"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 790fb24a9cc3..edab1fabb0e4 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -529,7 +529,7 @@ Any SdUnoDrawView::getDrawViewMode() const // XServiceInfo OUString SAL_CALL SdUnoDrawView::getImplementationName( ) { - return "com.sun.star.comp.sd.SdUnoDrawView" ; + return u"com.sun.star.comp.sd.SdUnoDrawView"_ustr ; } sal_Bool SAL_CALL SdUnoDrawView::supportsService( const OUString& ServiceName ) @@ -539,7 +539,7 @@ sal_Bool SAL_CALL SdUnoDrawView::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL SdUnoDrawView::getSupportedServiceNames( ) { - return { "com.sun.star.drawing.DrawingDocumentDrawView" }; + return { u"com.sun.star.drawing.DrawingDocumentDrawView"_ustr }; } } // end of namespace sd diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx index e2f95934d0e6..e0ca7ed67f26 100644 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx @@ -133,7 +133,7 @@ Any SAL_CALL SdUnoOutlineView::getFastPropertyValue ( // XServiceInfo OUString SAL_CALL SdUnoOutlineView::getImplementationName( ) { - return "com.sun.star.comp.sd.SdUnoOutlineView"; + return u"com.sun.star.comp.sd.SdUnoOutlineView"_ustr; } sal_Bool SAL_CALL SdUnoOutlineView::supportsService( const OUString& ServiceName ) @@ -143,7 +143,7 @@ sal_Bool SAL_CALL SdUnoOutlineView::supportsService( const OUString& ServiceName Sequence< OUString > SAL_CALL SdUnoOutlineView::getSupportedServiceNames( ) { - return { "com.sun.star.presentation.OutlineView" }; + return { u"com.sun.star.presentation.OutlineView"_ustr }; } } // end of namespace sd diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx index 904b4c507195..99bfda00b550 100644 --- a/sd/source/ui/unoidl/SdUnoSlideView.cxx +++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx @@ -63,7 +63,7 @@ sal_Bool SAL_CALL SdUnoSlideView::select (const Any& aSelection) { try { - Any aNumber = xSet->getPropertyValue("Number"); + Any aNumber = xSet->getPropertyValue(u"Number"_ustr); sal_Int32 nPageNumber = 0; aNumber >>= nPageNumber; nPageNumber -=1; // Transform 1-based page numbers to 0-based ones. @@ -118,7 +118,7 @@ void SAL_CALL SdUnoSlideView::setCurrentPage ( if (xProperties.is()) { sal_uInt16 nPageNumber(0); - if (xProperties->getPropertyValue("Number") >>= nPageNumber) + if (xProperties->getPropertyValue(u"Number"_ustr) >>= nPageNumber) { mrSlideSorter.GetController().GetCurrentSlideManager()->SwitchCurrentSlide( nPageNumber-1); @@ -153,7 +153,7 @@ Any SAL_CALL SdUnoSlideView::getFastPropertyValue ( // XServiceInfo OUString SAL_CALL SdUnoSlideView::getImplementationName( ) { - return "com.sun.star.comp.sd.SdUnoSlideView"; + return u"com.sun.star.comp.sd.SdUnoSlideView"_ustr; } sal_Bool SAL_CALL SdUnoSlideView::supportsService( const OUString& ServiceName ) @@ -163,7 +163,7 @@ sal_Bool SAL_CALL SdUnoSlideView::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL SdUnoSlideView::getSupportedServiceNames( ) { - return { "com.sun.star.presentation.SlidesView" }; + return { u"com.sun.star.presentation.SlidesView"_ustr }; } } // end of namespace sd diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index b5a3e4a1b6af..cc610d2dd36c 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -158,65 +158,65 @@ enum SdDocumentSettingsPropertyHandles { static PropertyMapEntry const aImpressSettingsInfoMap[] = { - { OUString("IsPrintDrawing"), HANDLE_PRINTDRAWING, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, - { OUString("IsPrintNotes"), HANDLE_PRINTNOTES, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, - { OUString("IsPrintHandout"), HANDLE_PRINTHANDOUT, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, - { OUString("IsPrintOutline"), HANDLE_PRINTOUTLINE, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, - { OUString("SlidesPerHandout"), HANDLE_SLIDESPERHANDOUT, ::cppu::UnoType<sal_Int16>::get(), 0, MID_PRINTER }, - { OUString("HandoutsHorizontal"), HANDLE_HANDOUTHORIZONTAL, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + { u"IsPrintDrawing"_ustr, HANDLE_PRINTDRAWING, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + { u"IsPrintNotes"_ustr, HANDLE_PRINTNOTES, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + { u"IsPrintHandout"_ustr, HANDLE_PRINTHANDOUT, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + { u"IsPrintOutline"_ustr, HANDLE_PRINTOUTLINE, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + { u"SlidesPerHandout"_ustr, HANDLE_SLIDESPERHANDOUT, ::cppu::UnoType<sal_Int16>::get(), 0, MID_PRINTER }, + { u"HandoutsHorizontal"_ustr, HANDLE_HANDOUTHORIZONTAL, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, }; static PropertyMapEntry const aDrawSettingsInfoMap[] = { - { OUString("MeasureUnit"), HANDLE_MEASUREUNIT, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { OUString("ScaleNumerator"), HANDLE_SCALE_NUM, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { OUString("ScaleDenominator"), HANDLE_SCALE_DOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"MeasureUnit"_ustr, HANDLE_MEASUREUNIT, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"ScaleNumerator"_ustr, HANDLE_SCALE_NUM, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"ScaleDenominator"_ustr, HANDLE_SCALE_DOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, }; static PropertyMapEntry const aCommonSettingsInfoMap[] = { - { OUString("DefaultTabStop"), HANDLE_TABSTOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { OUString("PrinterName"), HANDLE_PRINTERNAME, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("PrinterSetup"), HANDLE_PRINTERJOB, cppu::UnoType<uno::Sequence < sal_Int8 >>::get(), 0, MID_PRINTER }, - { OUString("PrinterPaperFromSetup"), HANDLE_PRINTERPAPERSIZE, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, - - { OUString("IsPrintPageName"), HANDLE_PRINTPAGENAME, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, - { OUString("IsPrintDate"), HANDLE_PRINTDATE, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, - { OUString("IsPrintTime"), HANDLE_PRINTTIME, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, - { OUString("IsPrintHiddenPages"), HANDLE_PRINTHIDDENPAGES, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, - { OUString("IsPrintFitPage"), HANDLE_PRINTFITPAGE, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, - { OUString("IsPrintTilePage"), HANDLE_PRINTTILEPAGE, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, - { OUString("IsPrintBooklet"), HANDLE_PRINTBOOKLET, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, - { OUString("IsPrintBookletFront"), HANDLE_PRINTBOOKLETFRONT, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, - { OUString("IsPrintBookletBack"), HANDLE_PRINTBOOKLETBACK, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, - { OUString("PrintQuality"), HANDLE_PRINTQUALITY, ::cppu::UnoType<sal_Int32>::get(), 0, MID_PRINTER }, - { OUString("ColorTableURL"), HANDLE_COLORTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("DashTableURL"), HANDLE_DASHTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("LineEndTableURL"), HANDLE_LINEENDTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("HatchTableURL"), HANDLE_HATCHTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("GradientTableURL"), HANDLE_GRADIENTTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { OUString("BitmapTableURL"), HANDLE_BITMAPTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, - - { OUString("ForbiddenCharacters"), HANDLE_FORBIDDENCHARS, cppu::UnoType<XForbiddenCharacters>::get(), 0, 0 }, - { OUString("ApplyUserData"), HANDLE_APPLYUSERDATA, cppu::UnoType<bool>::get(), 0, 0 }, - { OUString("SaveThumbnail"), HANDLE_SAVETHUMBNAIL, cppu::UnoType<bool>::get(), 0, 0 }, - - { OUString("PageNumberFormat"), HANDLE_PAGENUMFMT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { OUString("ParagraphSummation"), HANDLE_PARAGRAPHSUMMATION, cppu::UnoType<bool>::get(), 0, 0 }, - { OUString("CharacterCompressionType"),HANDLE_CHARCOMPRESS, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { OUString("IsKernAsianPunctuation"),HANDLE_ASIANPUNCT, cppu::UnoType<bool>::get(), 0, 0 }, - { OUString("UpdateFromTemplate"), HANDLE_UPDATEFROMTEMPLATE, cppu::UnoType<bool>::get(), 0, 0 }, - { OUString("PrinterIndependentLayout"),HANDLE_PRINTER_INDEPENDENT_LAYOUT,::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"DefaultTabStop"_ustr, HANDLE_TABSTOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"PrinterName"_ustr, HANDLE_PRINTERNAME, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { u"PrinterSetup"_ustr, HANDLE_PRINTERJOB, cppu::UnoType<uno::Sequence < sal_Int8 >>::get(), 0, MID_PRINTER }, + { u"PrinterPaperFromSetup"_ustr, HANDLE_PRINTERPAPERSIZE, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + + { u"IsPrintPageName"_ustr, HANDLE_PRINTPAGENAME, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + { u"IsPrintDate"_ustr, HANDLE_PRINTDATE, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + { u"IsPrintTime"_ustr, HANDLE_PRINTTIME, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + { u"IsPrintHiddenPages"_ustr, HANDLE_PRINTHIDDENPAGES, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + { u"IsPrintFitPage"_ustr, HANDLE_PRINTFITPAGE, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + { u"IsPrintTilePage"_ustr, HANDLE_PRINTTILEPAGE, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + { u"IsPrintBooklet"_ustr, HANDLE_PRINTBOOKLET, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + { u"IsPrintBookletFront"_ustr, HANDLE_PRINTBOOKLETFRONT, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + { u"IsPrintBookletBack"_ustr, HANDLE_PRINTBOOKLETBACK, cppu::UnoType<bool>::get(), 0, MID_PRINTER }, + { u"PrintQuality"_ustr, HANDLE_PRINTQUALITY, ::cppu::UnoType<sal_Int32>::get(), 0, MID_PRINTER }, + { u"ColorTableURL"_ustr, HANDLE_COLORTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { u"DashTableURL"_ustr, HANDLE_DASHTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { u"LineEndTableURL"_ustr, HANDLE_LINEENDTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { u"HatchTableURL"_ustr, HANDLE_HATCHTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { u"GradientTableURL"_ustr, HANDLE_GRADIENTTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { u"BitmapTableURL"_ustr, HANDLE_BITMAPTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 }, + + { u"ForbiddenCharacters"_ustr, HANDLE_FORBIDDENCHARS, cppu::UnoType<XForbiddenCharacters>::get(), 0, 0 }, + { u"ApplyUserData"_ustr, HANDLE_APPLYUSERDATA, cppu::UnoType<bool>::get(), 0, 0 }, + { u"SaveThumbnail"_ustr, HANDLE_SAVETHUMBNAIL, cppu::UnoType<bool>::get(), 0, 0 }, + + { u"PageNumberFormat"_ustr, HANDLE_PAGENUMFMT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"ParagraphSummation"_ustr, HANDLE_PARAGRAPHSUMMATION, cppu::UnoType<bool>::get(), 0, 0 }, + { u"CharacterCompressionType"_ustr,HANDLE_CHARCOMPRESS, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"IsKernAsianPunctuation"_ustr,HANDLE_ASIANPUNCT, cppu::UnoType<bool>::get(), 0, 0 }, + { u"UpdateFromTemplate"_ustr, HANDLE_UPDATEFROMTEMPLATE, cppu::UnoType<bool>::get(), 0, 0 }, + { u"PrinterIndependentLayout"_ustr,HANDLE_PRINTER_INDEPENDENT_LAYOUT,::cppu::UnoType<sal_Int16>::get(), 0, 0 }, // --> #i33095# - { OUString("LoadReadonly"), HANDLE_LOAD_READONLY, cppu::UnoType<bool>::get(), 0, 0 }, - { OUString("ModifyPasswordInfo"), HANDLE_MODIFY_PASSWD, cppu::UnoType<uno::Sequence < beans::PropertyValue >>::get(), 0, 0 }, - { OUString("SaveVersionOnClose"), HANDLE_SAVE_VERSION, cppu::UnoType<bool>::get(), 0, 0 }, - { OUString("EmbedFonts"), HANDLE_EMBED_FONTS, cppu::UnoType<bool>::get(), 0, 0 }, - { OUString("EmbedOnlyUsedFonts"), HANDLE_EMBED_USED_FONTS, cppu::UnoType<bool>::get(), 0, 0 }, - { OUString("EmbedLatinScriptFonts"), HANDLE_EMBED_LATIN_SCRIPT_FONTS, cppu::UnoType<bool>::get(), 0, 0 }, - { OUString("EmbedAsianScriptFonts"), HANDLE_EMBED_ASIAN_SCRIPT_FONTS, cppu::UnoType<bool>::get(), 0, 0 }, - { OUString("EmbedComplexScriptFonts"), HANDLE_EMBED_COMPLEX_SCRIPT_FONTS, cppu::UnoType<bool>::get(), 0, 0 }, - { OUString("ImagePreferredDPI"), HANDLE_IMAGE_PREFERRED_DPI, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"LoadReadonly"_ustr, HANDLE_LOAD_READONLY, cppu::UnoType<bool>::get(), 0, 0 }, + { u"ModifyPasswordInfo"_ustr, HANDLE_MODIFY_PASSWD, cppu::UnoType<uno::Sequence < beans::PropertyValue >>::get(), 0, 0 }, + { u"SaveVersionOnClose"_ustr, HANDLE_SAVE_VERSION, cppu::UnoType<bool>::get(), 0, 0 }, + { u"EmbedFonts"_ustr, HANDLE_EMBED_FONTS, cppu::UnoType<bool>::get(), 0, 0 }, + { u"EmbedOnlyUsedFonts"_ustr, HANDLE_EMBED_USED_FONTS, cppu::UnoType<bool>::get(), 0, 0 }, + { u"EmbedLatinScriptFonts"_ustr, HANDLE_EMBED_LATIN_SCRIPT_FONTS, cppu::UnoType<bool>::get(), 0, 0 }, + { u"EmbedAsianScriptFonts"_ustr, HANDLE_EMBED_ASIAN_SCRIPT_FONTS, cppu::UnoType<bool>::get(), 0, 0 }, + { u"EmbedComplexScriptFonts"_ustr, HANDLE_EMBED_COMPLEX_SCRIPT_FONTS, cppu::UnoType<bool>::get(), 0, 0 }, + { u"ImagePreferredDPI"_ustr, HANDLE_IMAGE_PREFERRED_DPI, cppu::UnoType<sal_Int32>::get(), 0, 0 }, }; rtl::Reference<PropertySetInfo> xInfo = new PropertySetInfo( aCommonSettingsInfoMap ); @@ -272,7 +272,7 @@ void DocumentSettings::AssignURL( XPropertyListType t, const Any* pValue, if( !( *pValue >>= aURL ) ) return; - if( LoadList( t, aURL, ""/*TODO?*/, uno::Reference< embed::XStorage >() ) ) + if( LoadList( t, aURL, u""_ustr/*TODO?*/, uno::Reference< embed::XStorage >() ) ) *pOk = *pChanged = true; } @@ -354,7 +354,7 @@ uno::Sequence<beans::PropertyValue> try { // create Settings/ sub storage. - uno::Reference< embed::XStorage > xSubStorage = xStorage->openStorageElement( "Settings" , + uno::Reference< embed::XStorage > xSubStorage = xStorage->openStorageElement( u"Settings"_ustr , embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE ); if( !xSubStorage.is() ) return aRet; @@ -412,7 +412,7 @@ DocumentSettings::_setPropertyValues(const PropertyMapEntry** ppEntries, ::sd::DrawDocShell* pDocSh = mxModel->GetDocShell(); if( nullptr == pDoc || nullptr == pDocSh ) { - throw RuntimeException("Document or Shell missing", + throw RuntimeException(u"Document or Shell missing"_ustr, static_cast<OWeakObject *>(this)); } @@ -947,13 +947,13 @@ DocumentSettings::_setPropertyValues(const PropertyMapEntry** ppEntries, uno::Sequence< beans::PropertyValue > aInfo; if ( !( *pValues >>= aInfo ) ) throw lang::IllegalArgumentException( - "Value of type Sequence<PropertyValue> expected!", + u"Value of type Sequence<PropertyValue> expected!"_ustr, uno::Reference< uno::XInterface >(), 2 ); if ( !pDocSh->SetModifyPasswordInfo( aInfo ) ) throw beans::PropertyVetoException( - "The hash is not allowed to be changed now!" ); + u"The hash is not allowed to be changed now!"_ustr ); bOk = true ; @@ -1089,7 +1089,7 @@ DocumentSettings::_getPropertyValues( ::sd::DrawDocShell* pDocSh = mxModel->GetDocShell(); if( nullptr == pDoc || nullptr == pDocSh ) { - throw RuntimeException("Document or Shell missing", + throw RuntimeException(u"Document or Shell missing"_ustr, static_cast<OWeakObject *>(this)); } @@ -1412,7 +1412,7 @@ void SAL_CALL DocumentSettings::firePropertiesChangeEvent( const Sequence< OUStr // XServiceInfo OUString SAL_CALL DocumentSettings::getImplementationName( ) { - return "com.sun.star.comp.Draw.DocumentSettings"; + return u"com.sun.star.comp.Draw.DocumentSettings"_ustr; } sal_Bool SAL_CALL DocumentSettings::supportsService( const OUString& ServiceName ) @@ -1422,8 +1422,8 @@ sal_Bool SAL_CALL DocumentSettings::supportsService( const OUString& ServiceName Sequence< OUString > SAL_CALL DocumentSettings::getSupportedServiceNames( ) { - return { "com.sun.star.document.Settings" , - mxModel->IsImpressDocument()?OUString("com.sun.star.presentation.DocumentSettings"):OUString("com.sun.star.drawing.DocumentSettings") }; + return { u"com.sun.star.document.Settings"_ustr , + mxModel->IsImpressDocument()?u"com.sun.star.presentation.DocumentSettings"_ustr:u"com.sun.star.drawing.DocumentSettings"_ustr }; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index 74f4eb0a30e4..68f3e96c8210 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -541,7 +541,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::appendChild( const Ref // XServiceInfo OUString RandomAnimationNode::getImplementationName() { - return "sd::RandomAnimationNode" ; + return u"sd::RandomAnimationNode"_ustr ; } // XServiceInfo @@ -553,7 +553,7 @@ sal_Bool RandomAnimationNode::supportsService(const OUString& ServiceName) // XServiceInfo Sequence< OUString > RandomAnimationNode::getSupportedServiceNames() { - return { "com.sun.star.animations.ParallelTimeContainer", "com.sun.star.comp.sd.RandomAnimationNode" }; + return { u"com.sun.star.animations.ParallelTimeContainer"_ustr, u"com.sun.star.comp.sd.RandomAnimationNode"_ustr }; } } diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index b3f3dabff605..ba1994708b1e 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -77,7 +77,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes try { rtl::Reference<SotStorage> aStorage = new SotStorage(pInStrm, false); - if ( !aStorage->GetError() && aStorage->IsStream( "PowerPoint Document" ) ) + if ( !aStorage->GetError() && aStorage->IsStream( u"PowerPoint Document"_ustr ) ) return aTypeName; } catch (const css::ucb::ContentCreationException&) @@ -101,7 +101,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes if ( ( n8 & 0xf0 ) == 0 ) // we are supporting binary cgm format only, so // this is a small test to exclude cgm text - return "impress_CGM_Computer_Graphics_Metafile"; + return u"impress_CGM_Computer_Graphics_Metafile"_ustr; } } else @@ -118,10 +118,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes else if ( aTypeName == "pcd_Photo_CD_Base16" ) nBase = 0; FilterConfigItem aFilterConfigItem( u"Office.Common/Filter/Graphic/Import/PCD" ); - aFilterConfigItem.WriteInt32( "Resolution" , nBase ); + aFilterConfigItem.WriteInt32( u"Resolution"_ustr , nBase ); } - SfxFilterMatcher aMatch("sdraw"); + SfxFilterMatcher aMatch(u"sdraw"_ustr); std::shared_ptr<const SfxFilter> pFilter = aMatch.GetFilter4FilterName( aName ); if ( pFilter ) return pFilter->GetRealTypeName(); @@ -134,7 +134,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes // XServiceInfo OUString SAL_CALL SdFilterDetect::getImplementationName() { - return "com.sun.star.comp.draw.FormatDetector"; + return u"com.sun.star.comp.draw.FormatDetector"_ustr; } // XServiceInfo @@ -146,7 +146,7 @@ sal_Bool SAL_CALL SdFilterDetect::supportsService( const OUString& sServiceName // XServiceInfo Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() { - return { "com.sun.star.frame.ExtendedTypeDetection" }; + return { u"com.sun.star.frame.ExtendedTypeDetection"_ustr }; } diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index 4a58c93d2473..87b52623c194 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -60,7 +60,7 @@ SdXCustomPresentation::~SdXCustomPresentation() noexcept // XServiceInfo OUString SAL_CALL SdXCustomPresentation::getImplementationName() { - return "SdXCustomPresentation" ; + return u"SdXCustomPresentation"_ustr ; } sal_Bool SAL_CALL SdXCustomPresentation::supportsService( const OUString& ServiceName ) @@ -70,7 +70,7 @@ sal_Bool SAL_CALL SdXCustomPresentation::supportsService( const OUString& Servic uno::Sequence< OUString > SAL_CALL SdXCustomPresentation::getSupportedServiceNames() { - return { "com.sun.star.presentation.CustomPresentation" }; + return { u"com.sun.star.presentation.CustomPresentation"_ustr }; } // XIndexContainer @@ -274,7 +274,7 @@ SdXCustomPresentationAccess::~SdXCustomPresentationAccess() noexcept // XServiceInfo OUString SAL_CALL SdXCustomPresentationAccess::getImplementationName() { - return "SdXCustomPresentationAccess"; + return u"SdXCustomPresentationAccess"_ustr; } sal_Bool SAL_CALL SdXCustomPresentationAccess::supportsService( const OUString& ServiceName ) @@ -284,7 +284,7 @@ sal_Bool SAL_CALL SdXCustomPresentationAccess::supportsService( const OUString& uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getSupportedServiceNames() { - return { "com.sun.star.presentation.CustomPresentationAccess" }; + return { u"com.sun.star.presentation.CustomPresentationAccess"_ustr }; } // XSingleServiceFactory diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 1f1880f81527..f6bfcb9265cd 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -91,7 +91,7 @@ SdLayer::~SdLayer() noexcept // XServiceInfo OUString SAL_CALL SdLayer::getImplementationName() { - return "SdUnoLayer"; + return u"SdUnoLayer"_ustr; } sal_Bool SAL_CALL SdLayer::supportsService( const OUString& ServiceName ) @@ -101,7 +101,7 @@ sal_Bool SAL_CALL SdLayer::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL SdLayer::getSupportedServiceNames() { - return { "com.sun.star.drawing.Layer" }; + return { u"com.sun.star.drawing.Layer"_ustr }; } // beans::XPropertySet @@ -400,7 +400,7 @@ void SAL_CALL SdLayerManager::removeEventListener( const uno::Reference< lang::X // XServiceInfo OUString SAL_CALL SdLayerManager::getImplementationName() { - return "SdUnoLayerManager"; + return u"SdUnoLayerManager"_ustr; } sal_Bool SAL_CALL SdLayerManager::supportsService( const OUString& ServiceName ) @@ -410,7 +410,7 @@ sal_Bool SAL_CALL SdLayerManager::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL SdLayerManager::getSupportedServiceNames() { - return {"com.sun.star.drawing.LayerManager"}; + return {u"com.sun.star.drawing.LayerManager"_ustr}; } // XLayerManager diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index f5b3b2705250..ad3cc80b2695 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1110,7 +1110,7 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create( uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( const OUString& aServiceSpecifier ) { - return create(aServiceSpecifier, ""); + return create(aServiceSpecifier, u""_ustr); } css::uno::Reference<css::uno::XInterface> @@ -1139,50 +1139,50 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getAvailableServiceNames( const uno::Sequence< OUString > aSNS_ORG( SvxFmMSFactory::getAvailableServiceNames() ); - uno::Sequence< OUString > aSNS_Common{ "com.sun.star.drawing.DashTable", - "com.sun.star.drawing.GradientTable", - "com.sun.star.drawing.HatchTable", - "com.sun.star.drawing.BitmapTable", - "com.sun.star.drawing.TransparencyGradientTable", - "com.sun.star.drawing.MarkerTable", - "com.sun.star.text.NumberingRules", - "com.sun.star.drawing.Background", - "com.sun.star.document.Settings", + uno::Sequence< OUString > aSNS_Common{ u"com.sun.star.drawing.DashTable"_ustr, + u"com.sun.star.drawing.GradientTable"_ustr, + u"com.sun.star.drawing.HatchTable"_ustr, + u"com.sun.star.drawing.BitmapTable"_ustr, + u"com.sun.star.drawing.TransparencyGradientTable"_ustr, + u"com.sun.star.drawing.MarkerTable"_ustr, + u"com.sun.star.text.NumberingRules"_ustr, + u"com.sun.star.drawing.Background"_ustr, + u"com.sun.star.document.Settings"_ustr, sUNO_Service_ImageMapRectangleObject, sUNO_Service_ImageMapCircleObject, sUNO_Service_ImageMapPolygonObject, - "com.sun.star.xml.NamespaceMap", + u"com.sun.star.xml.NamespaceMap"_ustr, // Support creation of GraphicStorageHandler and EmbeddedObjectResolver - "com.sun.star.document.ExportGraphicStorageHandler", - "com.sun.star.document.ImportGraphicStorageHandler", - "com.sun.star.document.ExportEmbeddedObjectResolver", - "com.sun.star.document.ImportEmbeddedObjectResolver", - "com.sun.star.drawing.TableShape" }; + u"com.sun.star.document.ExportGraphicStorageHandler"_ustr, + u"com.sun.star.document.ImportGraphicStorageHandler"_ustr, + u"com.sun.star.document.ExportEmbeddedObjectResolver"_ustr, + u"com.sun.star.document.ImportEmbeddedObjectResolver"_ustr, + u"com.sun.star.drawing.TableShape"_ustr }; uno::Sequence< OUString > aSNS_Specific; if(mbImpressDoc) - aSNS_Specific = { "com.sun.star.presentation.TitleTextShape", - "com.sun.star.presentation.OutlinerShape", - "com.sun.star.presentation.SubtitleShape", - "com.sun.star.presentation.GraphicObjectShape", - "com.sun.star.presentation.ChartShape", - "com.sun.star.presentation.PageShape", - "com.sun.star.presentation.OLE2Shape", - "com.sun.star.presentation.TableShape", - "com.sun.star.presentation.OrgChartShape", - "com.sun.star.presentation.NotesShape", - "com.sun.star.presentation.HandoutShape", - "com.sun.star.presentation.DocumentSettings", - "com.sun.star.presentation.FooterShape", - "com.sun.star.presentation.HeaderShape", - "com.sun.star.presentation.SlideNumberShape", - "com.sun.star.presentation.DateTimeShape", - "com.sun.star.presentation.CalcShape", - "com.sun.star.presentation.MediaShape" }; + aSNS_Specific = { u"com.sun.star.presentation.TitleTextShape"_ustr, + u"com.sun.star.presentation.OutlinerShape"_ustr, + u"com.sun.star.presentation.SubtitleShape"_ustr, + u"com.sun.star.presentation.GraphicObjectShape"_ustr, + u"com.sun.star.presentation.ChartShape"_ustr, + u"com.sun.star.presentation.PageShape"_ustr, + u"com.sun.star.presentation.OLE2Shape"_ustr, + u"com.sun.star.presentation.TableShape"_ustr, + u"com.sun.star.presentation.OrgChartShape"_ustr, + u"com.sun.star.presentation.NotesShape"_ustr, + u"com.sun.star.presentation.HandoutShape"_ustr, + u"com.sun.star.presentation.DocumentSettings"_ustr, + u"com.sun.star.presentation.FooterShape"_ustr, + u"com.sun.star.presentation.HeaderShape"_ustr, + u"com.sun.star.presentation.SlideNumberShape"_ustr, + u"com.sun.star.presentation.DateTimeShape"_ustr, + u"com.sun.star.presentation.CalcShape"_ustr, + u"com.sun.star.presentation.MediaShape"_ustr }; else - aSNS_Specific = { "com.sun.star.drawing.DocumentSettings" }; + aSNS_Specific = { u"com.sun.star.drawing.DocumentSettings"_ustr }; return comphelper::concatSequences( aSNS_ORG, aSNS_Common, aSNS_Specific ); } @@ -1190,7 +1190,7 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getAvailableServiceNames( // lang::XServiceInfo OUString SAL_CALL SdXImpressDocument::getImplementationName() { - return "SdXImpressDocument"; + return u"SdXImpressDocument"_ustr; /* // Matching the .component information: return mbImpressDoc ? OUString("com.sun.star.comp.Draw.PresentationDocument") @@ -1207,10 +1207,10 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames( { ::SolarMutexGuard aGuard; - return { "com.sun.star.document.OfficeDocument", - "com.sun.star.drawing.GenericDrawingDocument", - "com.sun.star.drawing.DrawingDocumentFactory", - mbImpressDoc?OUString("com.sun.star.presentation.PresentationDocument"):OUString("com.sun.star.drawing.DrawingDocument") }; + return { u"com.sun.star.document.OfficeDocument"_ustr, + u"com.sun.star.drawing.GenericDrawingDocument"_ustr, + u"com.sun.star.drawing.DrawingDocumentFactory"_ustr, + mbImpressDoc?u"com.sun.star.presentation.PresentationDocument"_ustr:u"com.sun.star.drawing.DrawingDocument"_ustr }; } // XPropertySet @@ -1547,7 +1547,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SdXImpressDocument::getRenderer( const ::tools::Rectangle aVisArea( mpDocShell->GetVisArea( embed::Aspects::MSOLE_DOCPRINT ) ); aPageSize = awt::Size( aVisArea.GetWidth(), aVisArea.GetHeight() ); } - aRenderer = { comphelper::makePropertyValue("PageSize", aPageSize) }; + aRenderer = { comphelper::makePropertyValue(u"PageSize"_ustr, aPageSize) }; } return aRenderer; } @@ -1680,9 +1680,9 @@ static void ImplPDFExportShapeInteraction( const uno::Reference< drawing::XShape if (xShape->getShapeType() == "com.sun.star.drawing.MediaShape" || xShape->getShapeType() == "com.sun.star.presentation.MediaShape") { OUString title; - xShapePropSet->getPropertyValue("Title") >>= title; + xShapePropSet->getPropertyValue(u"Title"_ustr) >>= title; OUString description; - xShapePropSet->getPropertyValue("Description") >>= description; + xShapePropSet->getPropertyValue(u"Description"_ustr) >>= description; OUString const altText(title.isEmpty() ? description : description.isEmpty() @@ -1690,16 +1690,16 @@ static void ImplPDFExportShapeInteraction( const uno::Reference< drawing::XShape : OUString::Concat(title) + OUString::Concat("\n") + OUString::Concat(description)); OUString aMediaURL; - xShapePropSet->getPropertyValue("MediaURL") >>= aMediaURL; + xShapePropSet->getPropertyValue(u"MediaURL"_ustr) >>= aMediaURL; if (!aMediaURL.isEmpty()) { SdrObject const*const pSdrObj(SdrObject::getSdrObjectFromXShape(xShape)); - OUString const mimeType(xShapePropSet->getPropertyValue("MediaMimeType").get<OUString>()); + OUString const mimeType(xShapePropSet->getPropertyValue(u"MediaMimeType"_ustr).get<OUString>()); sal_Int32 nScreenId = rPDFExtOutDevData.CreateScreen(aLinkRect, altText, mimeType, rPDFExtOutDevData.GetCurrentPageNumber(), pSdrObj); if (aMediaURL.startsWith("vnd.sun.star.Package:")) { OUString aTempFileURL; - xShapePropSet->getPropertyValue("PrivateTempFileURL") >>= aTempFileURL; + xShapePropSet->getPropertyValue(u"PrivateTempFileURL"_ustr) >>= aTempFileURL; rPDFExtOutDevData.SetScreenStream(nScreenId, aTempFileURL); } else @@ -1708,7 +1708,7 @@ static void ImplPDFExportShapeInteraction( const uno::Reference< drawing::XShape } presentation::ClickAction eCa; - uno::Any aAny( xShapePropSet->getPropertyValue( "OnClick" ) ); + uno::Any aAny( xShapePropSet->getPropertyValue( u"OnClick"_ustr ) ); if ( aAny >>= eCa ) { OUString const actionName(SdResId(SdTPAction::GetClickActionSdResId(eCa))); @@ -1756,7 +1756,7 @@ static void ImplPDFExportShapeInteraction( const uno::Reference< drawing::XShape case presentation::ClickAction_DOCUMENT : { OUString aBookmark; - xShapePropSet->getPropertyValue( "Bookmark" ) >>= aBookmark; + xShapePropSet->getPropertyValue( u"Bookmark"_ustr ) >>= aBookmark; if( !aBookmark.isEmpty() ) { switch( eCa ) @@ -2000,8 +2000,8 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r // if necessary, the master page interactions will be exported first bool bIsBackgroundObjectsVisible = false; // #i39428# IsBackgroundObjectsVisible not available for Draw - if ( mbImpressDoc && xPagePropSet->getPropertySetInfo()->hasPropertyByName( "IsBackgroundObjectsVisible" ) ) - xPagePropSet->getPropertyValue( "IsBackgroundObjectsVisible" ) >>= bIsBackgroundObjectsVisible; + if ( mbImpressDoc && xPagePropSet->getPropertySetInfo()->hasPropertyByName( u"IsBackgroundObjectsVisible"_ustr ) ) + xPagePropSet->getPropertyValue( u"IsBackgroundObjectsVisible"_ustr ) >>= bIsBackgroundObjectsVisible; if ( bIsBackgroundObjectsVisible && !pPDFExtOutDevData->GetIsExportNotesPages() ) { uno::Reference< drawing::XMasterPageTarget > xMasterPageTarget( xPage, uno::UNO_QUERY ); @@ -2652,7 +2652,7 @@ void SdXImpressDocument::initializeForTiledRendering(const css::uno::Sequence<cs { { "NewTheme", uno::Any(sThemeName) } })); - comphelper::dispatchCommand(".uno:ChangeTheme", aPropertyValues); + comphelper::dispatchCommand(u".uno:ChangeTheme"_ustr, aPropertyValues); } } @@ -3166,7 +3166,7 @@ void SAL_CALL SdDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPag OUString SAL_CALL SdDrawPagesAccess::getImplementationName( ) { - return "SdDrawPagesAccess"; + return u"SdDrawPagesAccess"_ustr; } sal_Bool SAL_CALL SdDrawPagesAccess::supportsService( const OUString& ServiceName ) @@ -3176,7 +3176,7 @@ sal_Bool SAL_CALL SdDrawPagesAccess::supportsService( const OUString& ServiceNam uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getSupportedServiceNames( ) { - return { "com.sun.star.drawing.DrawPages" }; + return { u"com.sun.star.drawing.DrawPages"_ustr }; } // XComponent @@ -3413,7 +3413,7 @@ void SAL_CALL SdMasterPagesAccess::remove( const uno::Reference< drawing::XDrawP OUString SAL_CALL SdMasterPagesAccess::getImplementationName( ) { - return "SdMasterPagesAccess"; + return u"SdMasterPagesAccess"_ustr; } sal_Bool SAL_CALL SdMasterPagesAccess::supportsService( const OUString& ServiceName ) @@ -3423,7 +3423,7 @@ sal_Bool SAL_CALL SdMasterPagesAccess::supportsService( const OUString& ServiceN uno::Sequence< OUString > SAL_CALL SdMasterPagesAccess::getSupportedServiceNames( ) { - return { "com.sun.star.drawing.MasterPages" }; + return { u"com.sun.star.drawing.MasterPages"_ustr }; } SdDocLinkTargets::SdDocLinkTargets(SdXImpressDocument& rMyModel) @@ -3530,7 +3530,7 @@ SdPage* SdDocLinkTarget::FindPage( std::u16string_view rName ) const // XServiceInfo OUString SAL_CALL SdDocLinkTargets::getImplementationName() { - return "SdDocLinkTargets"; + return u"SdDocLinkTargets"_ustr; } sal_Bool SAL_CALL SdDocLinkTargets::supportsService( const OUString& ServiceName ) @@ -3540,7 +3540,7 @@ sal_Bool SAL_CALL SdDocLinkTargets::supportsService( const OUString& ServiceName uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getSupportedServiceNames() { - return { "com.sun.star.document.LinkTargets" }; + return { u"com.sun.star.document.LinkTargets"_ustr }; } SdDocLinkTargetType::SdDocLinkTargetType(SdXImpressDocument* pModel, sal_uInt16 nT) @@ -3599,7 +3599,7 @@ uno::Reference< container::XNameAccess > SAL_CALL SdDocLinkTargetType::getLinks( // XServiceInfo OUString SAL_CALL SdDocLinkTargetType::getImplementationName() { - return "SdDocLinkTargetType"; + return u"SdDocLinkTargetType"_ustr; } sal_Bool SAL_CALL SdDocLinkTargetType::supportsService( const OUString& ServiceName ) @@ -3609,7 +3609,7 @@ sal_Bool SAL_CALL SdDocLinkTargetType::supportsService( const OUString& ServiceN uno::Sequence< OUString > SAL_CALL SdDocLinkTargetType::getSupportedServiceNames() { - return { "com.sun.star.document.LinkTargetSupplier" }; + return { u"com.sun.star.document.LinkTargetSupplier"_ustr }; } SdDocLinkTarget::SdDocLinkTarget( SdXImpressDocument* pModel, sal_uInt16 nT ) @@ -3760,7 +3760,7 @@ sal_Bool SAL_CALL SdDocLinkTarget::hasElements() // XServiceInfo OUString SAL_CALL SdDocLinkTarget::getImplementationName() { - return "SdDocLinkTarget"; + return u"SdDocLinkTarget"_ustr; } sal_Bool SAL_CALL SdDocLinkTarget::supportsService( const OUString& ServiceName ) @@ -3770,7 +3770,7 @@ sal_Bool SAL_CALL SdDocLinkTarget::supportsService( const OUString& ServiceName uno::Sequence< OUString > SAL_CALL SdDocLinkTarget::getSupportedServiceNames() { - return { "com.sun.star.document.LinkTargets" }; + return { u"com.sun.star.document.LinkTargets"_ustr }; } rtl::Reference< SdXImpressDocument > SdXImpressDocument::GetModel( SdDrawDocument const & rDocument ) diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx index 65642ece9c04..571bca850472 100644 --- a/sd/source/ui/unoidl/unomodule.cxx +++ b/sd/source/ui/unoidl/unomodule.cxx @@ -105,7 +105,7 @@ uno::Reference< frame::XDispatch > SAL_CALL SdUnoModule::queryDispatch( const ut // XServiceInfo OUString SAL_CALL SdUnoModule::getImplementationName( ) { - return "com.sun.star.comp.Draw.DrawingModule"; + return u"com.sun.star.comp.Draw.DrawingModule"_ustr; } sal_Bool SAL_CALL SdUnoModule::supportsService( const OUString& sServiceName ) @@ -115,7 +115,7 @@ sal_Bool SAL_CALL SdUnoModule::supportsService( const OUString& sServiceName ) uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames( ) { - return { "com.sun.star.drawing.ModuleDispatcher" }; + return { u"com.sun.star.drawing.ModuleDispatcher"_ustr }; } diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 07415ce3304e..39e81fdc2c49 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -1095,7 +1095,7 @@ namespace o3tl { static void clearEventsInAnimationInfo( SdAnimationInfo* pInfo ) { - pInfo->SetBookmark( "" ); + pInfo->SetBookmark( u""_ustr ); pInfo->mbSecondSoundOn = false; pInfo->mbSecondPlayFull = false; pInfo->meClickAction = presentation::ClickAction_NONE; @@ -1466,7 +1466,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; - aAny <<= OUString( "StarOffice" ); + aAny <<= u"StarOffice"_ustr; pProperties->Name = gaStrLibrary; pProperties->Handle = -1; pProperties->Value = aAny; @@ -1600,7 +1600,7 @@ sal_Bool SAL_CALL SdUnoEventsAccess::hasElements( ) // XServiceInfo OUString SAL_CALL SdUnoEventsAccess::getImplementationName( ) { - return "SdUnoEventsAccess"; + return u"SdUnoEventsAccess"_ustr; } sal_Bool SAL_CALL SdUnoEventsAccess::supportsService( const OUString& ServiceName ) diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 1526d913661f..6e0f2ad52b13 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1439,17 +1439,17 @@ Reference< drawing::XShape > SdGenericDrawPage::CreateShape(SdrObject *pObj) co if( GetPage()->GetPageKind() == PageKind::Notes && GetPage()->IsMasterPage() ) { // fake an empty PageShape if it's a title shape on the master page - pShape->SetShapeType("com.sun.star.presentation.PageShape"); + pShape->SetShapeType(u"com.sun.star.presentation.PageShape"_ustr); } else { - pShape->SetShapeType("com.sun.star.presentation.TitleTextShape"); + pShape->SetShapeType(u"com.sun.star.presentation.TitleTextShape"_ustr); } eKind = PresObjKind::NONE; break; case SdrObjKind::OutlineText: pShape = new SvxShapeText( pObj ); - pShape->SetShapeType("com.sun.star.presentation.OutlinerShape"); + pShape->SetShapeType(u"com.sun.star.presentation.OutlinerShape"_ustr); eKind = PresObjKind::NONE; break; default: ; @@ -1463,7 +1463,7 @@ Reference< drawing::XShape > SdGenericDrawPage::CreateShape(SdrObject *pObj) co if( eKind != PresObjKind::NONE ) { - OUString aShapeType("com.sun.star.presentation."); + OUString aShapeType(u"com.sun.star.presentation."_ustr); switch( eKind ) { @@ -2047,7 +2047,7 @@ SdrObject* SdPageLinkTargets::FindObject( std::u16string_view rName ) const noex // XServiceInfo OUString SAL_CALL SdPageLinkTargets::getImplementationName() { - return "SdPageLinkTargets"; + return u"SdPageLinkTargets"_ustr; } sal_Bool SAL_CALL SdPageLinkTargets::supportsService( const OUString& ServiceName ) @@ -2057,7 +2057,7 @@ sal_Bool SAL_CALL SdPageLinkTargets::supportsService( const OUString& ServiceNam Sequence< OUString > SAL_CALL SdPageLinkTargets::getSupportedServiceNames() { - return { "com.sun.star.document.LinkTargets" }; + return { u"com.sun.star.document.LinkTargets"_ustr }; } // SdDrawPage @@ -2235,7 +2235,7 @@ OUString SdDrawPage::getUiNameFromPageApiName( const OUString& rApiName ) // XServiceInfo OUString SAL_CALL SdDrawPage::getImplementationName() { - return "SdDrawPage"; + return u"SdDrawPage"_ustr; } Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames() @@ -2750,7 +2750,7 @@ Sequence< sal_Int8 > SAL_CALL SdMasterPage::getImplementationId() // XServiceInfo OUString SAL_CALL SdMasterPage::getImplementationName() { - return "SdMasterPage"; + return u"SdMasterPage"_ustr; } Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames() diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 1d436d794eda..95e01bbaa984 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -163,7 +163,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) // XServiceInfo OUString SAL_CALL SdUnoPageBackground::getImplementationName() { - return "SdUnoPageBackground"; + return u"SdUnoPageBackground"_ustr; } sal_Bool SAL_CALL SdUnoPageBackground::supportsService( const OUString& ServiceName ) diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 39bbbd84fa6f..3b8c62994b76 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -376,37 +376,37 @@ namespace { beans::PropertyValue aOptionsUIFile; aOptionsUIFile.Name = "OptionsUIFile"; if( mbImpress ) - aOptionsUIFile.Value <<= OUString("modules/simpress/ui/impressprinteroptions.ui"); + aOptionsUIFile.Value <<= u"modules/simpress/ui/impressprinteroptions.ui"_ustr; else - aOptionsUIFile.Value <<= OUString("modules/sdraw/ui/drawprinteroptions.ui"); + aOptionsUIFile.Value <<= u"modules/sdraw/ui/drawprinteroptions.ui"_ustr; maProperties.push_back(aOptionsUIFile); SvtModuleOptions aOpt; OUString aAppGroupname(SdResId(STR_IMPRESS_PRINT_UI_GROUP_NAME)); aAppGroupname = aAppGroupname.replaceFirst("%s", aOpt.GetModuleName( mbImpress ? SvtModuleOptions::EModule::IMPRESS : SvtModuleOptions::EModule::DRAW)); - AddDialogControl(vcl::PrinterOptionsHelper::setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage")); + AddDialogControl(vcl::PrinterOptionsHelper::setGroupControlOpt(u"tabcontrol-page2"_ustr, aAppGroupname, u".HelpID:vcl:PrintDialog:TabPage:AppPage"_ustr)); uno::Sequence< OUString > aHelpIds, aWidgetIds; if( mbImpress ) { - aHelpIds = { ".HelpID:vcl:PrintDialog:PageContentType:ListBox" }; + aHelpIds = { u".HelpID:vcl:PrintDialog:PageContentType:ListBox"_ustr }; AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt( - "impressdocument", + u"impressdocument"_ustr, SdResId(STR_IMPRESS_PRINT_UI_CONTENT), aHelpIds, - "PageContentType" , + u"PageContentType"_ustr , CreateChoice(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES)), 0) ); - aHelpIds = { ".HelpID:vcl:PrintDialog:SlidesPerPage:ListBox" }; - vcl::PrinterOptionsHelper::UIControlOptions aContentOpt( "PageContentType" , 1 ); + aHelpIds = { u".HelpID:vcl:PrintDialog:SlidesPerPage:ListBox"_ustr }; + vcl::PrinterOptionsHelper::UIControlOptions aContentOpt( u"PageContentType"_ustr , 1 ); AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt( - "slidesperpage", + u"slidesperpage"_ustr, SdResId(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE), aHelpIds, - "SlidesPerPage" , + u"SlidesPerPage"_ustr , GetSlidesPerPageSequence(), 0, Sequence< sal_Bool >(), @@ -414,13 +414,13 @@ namespace { ) ); - aHelpIds = { ".HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox" }; - vcl::PrinterOptionsHelper::UIControlOptions aSlidesPerPageOpt( "SlidesPerPage" , -1, true ); + aHelpIds = { u".HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox"_ustr }; + vcl::PrinterOptionsHelper::UIControlOptions aSlidesPerPageOpt( u"SlidesPerPage"_ustr , -1, true ); AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt( - "slidesperpageorder", + u"slidesperpageorder"_ustr, SdResId(STR_IMPRESS_PRINT_UI_ORDER), aHelpIds, - "SlidesPerPageOrder" , + u"SlidesPerPageOrder"_ustr , CreateChoice(STR_IMPRESS_PRINT_UI_ORDER_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_ORDER_CHOICES)), 0, Sequence< sal_Bool >(), @@ -428,34 +428,34 @@ namespace { ); } - AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("contents", - SdResId(STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT), "" ) ); + AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt(u"contents"_ustr, + SdResId(STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT), u""_ustr ) ); if( mbImpress ) { - AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printname", + AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt(u"printname"_ustr, SdResId(STR_IMPRESS_PRINT_UI_IS_PRINT_NAME), - ".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" , - "IsPrintName" , + u".HelpID:vcl:PrintDialog:IsPrintName:CheckBox"_ustr , + u"IsPrintName"_ustr , officecfg::Office::Impress::Print::Other::PageName::get() ) ); } else { - AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printname", + AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt(u"printname"_ustr, SdResId(STR_DRAW_PRINT_UI_IS_PRINT_NAME), - ".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" , - "IsPrintName" , + u".HelpID:vcl:PrintDialog:IsPrintName:CheckBox"_ustr , + u"IsPrintName"_ustr , officecfg::Office::Draw::Print::Other::PageName::get() ) ); } - AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printdatetime", + AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt(u"printdatetime"_ustr, SdResId(STR_IMPRESS_PRINT_UI_IS_PRINT_DATE), - ".HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox" , - "IsPrintDateTime" , + u".HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox"_ustr , + u"IsPrintDateTime"_ustr , // Separate settings for time and date in Impress/Draw -> Print page, check that both are set mbImpress ? officecfg::Office::Impress::Print::Other::Date::get() && @@ -467,41 +467,41 @@ namespace { if( mbImpress ) { - AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printhidden", + AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt(u"printhidden"_ustr, SdResId(STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN), - ".HelpID:vcl:PrintDialog:IsPrintHidden:CheckBox" , - "IsPrintHidden" , + u".HelpID:vcl:PrintDialog:IsPrintHidden:CheckBox"_ustr , + u"IsPrintHidden"_ustr , officecfg::Office::Impress::Print::Other::HiddenPage::get() ) ); } - AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("color", - SdResId(STR_IMPRESS_PRINT_UI_QUALITY), "" ) ); + AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt(u"color"_ustr, + SdResId(STR_IMPRESS_PRINT_UI_QUALITY), u""_ustr ) ); - aHelpIds = { ".HelpID:vcl:PrintDialog:Quality:RadioButton:0", - ".HelpID:vcl:PrintDialog:Quality:RadioButton:1", - ".HelpID:vcl:PrintDialog:Quality:RadioButton:2" }; - aWidgetIds = { "originalcolors", "grayscale", "blackandwhite" }; + aHelpIds = { u".HelpID:vcl:PrintDialog:Quality:RadioButton:0"_ustr, + u".HelpID:vcl:PrintDialog:Quality:RadioButton:1"_ustr, + u".HelpID:vcl:PrintDialog:Quality:RadioButton:2"_ustr }; + aWidgetIds = { u"originalcolors"_ustr, u"grayscale"_ustr, u"blackandwhite"_ustr }; AddDialogControl( vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt( aWidgetIds, - "", + u""_ustr, aHelpIds, - "Quality" , + u"Quality"_ustr , CreateChoice(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES)), mbImpress ? officecfg::Office::Impress::Print::Other::Quality::get() : officecfg::Office::Draw::Print::Other::Quality::get() ) ); - AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("pagesizes", - SdResId(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS), "" ) ); + AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt(u"pagesizes"_ustr, + SdResId(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS), u""_ustr ) ); - aHelpIds = { ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:0", - ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:1", - ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:2", - ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:3" }; - aWidgetIds = { "originalsize", "fittoprintable", "distributeonmultiple", "tilesheet" }; + aHelpIds = { u".HelpID:vcl:PrintDialog:PageOptions:RadioButton:0"_ustr, + u".HelpID:vcl:PrintDialog:PageOptions:RadioButton:1"_ustr, + u".HelpID:vcl:PrintDialog:PageOptions:RadioButton:2"_ustr, + u".HelpID:vcl:PrintDialog:PageOptions:RadioButton:3"_ustr }; + aWidgetIds = { u"originalsize"_ustr, u"fittoprintable"_ustr, u"distributeonmultiple"_ustr, u"tilesheet"_ustr }; // Mutually exclusive page options settings are stored in separate config keys... // TODO: There is no config key to set the distributeonmultiple option as default @@ -516,12 +516,12 @@ namespace { { nDefaultChoice = 3; } - vcl::PrinterOptionsHelper::UIControlOptions aPageOptionsOpt("PrintProspect", 0); + vcl::PrinterOptionsHelper::UIControlOptions aPageOptionsOpt(u"PrintProspect"_ustr, 0); AddDialogControl( vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt( aWidgetIds, - "", + u""_ustr, aHelpIds, - "PageOptions" , + u"PageOptions"_ustr , mbImpress ? CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES)) : CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW)), nDefaultChoice, @@ -532,15 +532,15 @@ namespace { vcl::PrinterOptionsHelper::UIControlOptions aBrochureOpt; aBrochureOpt.maGroupHint = "LayoutPage" ; - AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("pagesides", - SdResId(STR_IMPRESS_PRINT_UI_PAGE_SIDES), "", + AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt(u"pagesides"_ustr, + SdResId(STR_IMPRESS_PRINT_UI_PAGE_SIDES), u""_ustr, aBrochureOpt ) ); // brochure printing - AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("brochure", + AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt(u"brochure"_ustr, SdResId(STR_IMPRESS_PRINT_UI_BROCHURE), - ".HelpID:vcl:PrintDialog:PrintProspect:CheckBox" , - "PrintProspect" , + u".HelpID:vcl:PrintDialog:PrintProspect:CheckBox"_ustr , + u"PrintProspect"_ustr , mbImpress ? officecfg::Office::Impress::Print::Page::Booklet::get() : officecfg::Office::Draw::Print::Page::Booklet::get(), aBrochureOpt @@ -548,14 +548,14 @@ namespace { ); vcl::PrinterOptionsHelper::UIControlOptions - aIncludeOpt( "PrintProspect" , -1, false ); + aIncludeOpt( u"PrintProspect"_ustr , -1, false ); aIncludeOpt.maGroupHint = "LayoutPage" ; - aHelpIds = { ".HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox" }; + aHelpIds = { u".HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox"_ustr }; AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt( - "brochureinclude", + u"brochureinclude"_ustr, SdResId(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE), aHelpIds, - "PrintProspectInclude" , + u"PrintProspectInclude"_ustr , CreateChoice(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST)), 0, Sequence< sal_Bool >(), @@ -566,10 +566,10 @@ namespace { // paper tray (on options page) vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt; aPaperTrayOpt.maGroupHint = "OptionsPageOptGroup" ; - AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printpaperfromsetup", + AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt(u"printpaperfromsetup"_ustr, SdResId(STR_IMPRESS_PRINT_UI_PAPER_TRAY), - ".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox" , - "PrintPaperFromSetup" , + u".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox"_ustr , + u"PrintPaperFromSetup"_ustr , false, aPaperTrayOpt ) @@ -578,9 +578,9 @@ namespace { vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; aPrintRangeOpt.mbInternalOnly = true; aPrintRangeOpt.maGroupHint = "PrintRange" ; - AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("printrange", + AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt(u"printrange"_ustr, mbImpress ? SdResId(STR_IMPRESS_PRINT_UI_SLIDE_RANGE) : SdResId(STR_IMPRESS_PRINT_UI_PAGE_RANGE), - "", + u""_ustr, aPrintRangeOpt ) ); @@ -620,11 +620,11 @@ namespace { CreateChoice( STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE, SAL_N_ELEMENTS(STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE ) ), nPrintRange ) ); */ - OUString aPrintRangeName( "PrintContent" ); - aHelpIds = { ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0", - ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1", - ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" }; - aWidgetIds = { "rbAllPages", "rbRangePages", "rbRangeSelection" }; + OUString aPrintRangeName( u"PrintContent"_ustr ); + aHelpIds = { u".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0"_ustr, + u".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1"_ustr, + u".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2"_ustr }; + aWidgetIds = { u"rbAllPages"_ustr, u"rbRangePages"_ustr, u"rbRangeSelection"_ustr }; AddDialogControl( vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, aPrintRangeName, @@ -634,12 +634,12 @@ namespace { ); // create an Edit dependent on "Pages" selected vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, true ); - AddDialogControl(vcl::PrinterOptionsHelper::setEditControlOpt("pagerange", "", - ".HelpID:vcl:PrintDialog:PageRange:Edit", "PageRange", + AddDialogControl(vcl::PrinterOptionsHelper::setEditControlOpt(u"pagerange"_ustr, u""_ustr, + u".HelpID:vcl:PrintDialog:PageRange:Edit"_ustr, u"PageRange"_ustr, aPageRange, aPageRangeOpt)); vcl::PrinterOptionsHelper::UIControlOptions aEvenOddOpt(aPrintRangeName, -1, true); - AddDialogControl(vcl::PrinterOptionsHelper::setChoiceListControlOpt("evenoddbox", "", - uno::Sequence<OUString>(), "EvenOdd", uno::Sequence<OUString>(), + AddDialogControl(vcl::PrinterOptionsHelper::setChoiceListControlOpt(u"evenoddbox"_ustr, u""_ustr, + uno::Sequence<OUString>(), u"EvenOdd"_ustr, uno::Sequence<OUString>(), 0, uno::Sequence<sal_Bool>(), aEvenOddOpt)); } @@ -875,7 +875,7 @@ namespace { const DrawModeFlags nDrawMode, const Orientation eOrientation, const sal_uInt16 nPaperTray) - : PrinterPage(ePageKind, rMapMode, bPrintMarkedOnly, "", + : PrinterPage(ePageKind, rMapMode, bPrintMarkedOnly, u""_ustr, Point(), nDrawMode, eOrientation, nPaperTray), mnFirstPageIndex(nFirstPageIndex), mnSecondPageIndex(nSecondPageIndex), @@ -1188,7 +1188,7 @@ public: // The RenderDevice property is handled specially: its value is // stored in mpPrinter instead of being retrieved on demand. - Any aDev( getValue( "RenderDevice" ) ); + Any aDev( getValue( u"RenderDevice"_ustr ) ); Reference<awt::XDevice> xRenderDevice; if (aDev >>= xRenderDevice) @@ -1228,11 +1228,11 @@ public: css::uno::Sequence<css::beans::PropertyValue> GetProperties () const { css::uno::Sequence<css::beans::PropertyValue> aProperties{ - comphelper::makePropertyValue("ExtraPrintUIOptions", + comphelper::makePropertyValue(u"ExtraPrintUIOptions"_ustr, comphelper::containerToSequence(m_aUIProperties)), - comphelper::makePropertyValue("PageSize", maPrintSize), + comphelper::makePropertyValue(u"PageSize"_ustr, maPrintSize), // FIXME: is this always true ? - comphelper::makePropertyValue("PageIncludesNonprintableArea", true) + comphelper::makePropertyValue(u"PageIncludesNonprintableArea"_ustr, true) }; return aProperties; diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index 09f73f056558..d94a556750b3 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -58,7 +58,7 @@ GraphicObjectBar::GraphicObjectBar ( SetPool( &pDocShell->GetPool() ); SetUndoManager( pDocShell->GetUndoManager() ); SetRepeatTarget( mpView ); - SetName( "Graphic objectbar"); + SetName( u"Graphic objectbar"_ustr); } GraphicObjectBar::~GraphicObjectBar() diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx index 929b607dbbdd..17baf9ccf507 100644 --- a/sd/source/ui/view/ImpressViewShellBase.cxx +++ b/sd/source/ui/view/ImpressViewShellBase.cxx @@ -42,7 +42,7 @@ SfxViewShell* ImpressViewShellBase::CreateInstance ( SfxViewFrame& rFrame, SfxViewShell *pOldView) { ImpressViewShellBase* pBase = new ImpressViewShellBase(rFrame, pOldView); - pBase->LateInit(comphelper::LibreOfficeKit::isActive() ? framework::FrameworkHelper::msImpressViewURL : ""); + pBase->LateInit(comphelper::LibreOfficeKit::isActive() ? framework::FrameworkHelper::msImpressViewURL : u""_ustr); return pBase; } void ImpressViewShellBase::RegisterFactory( SfxInterfaceId nPrio ) diff --git a/sd/source/ui/view/NotesPanelViewShell.cxx b/sd/source/ui/view/NotesPanelViewShell.cxx index a34660280459..0b1904293b05 100644 --- a/sd/source/ui/view/NotesPanelViewShell.cxx +++ b/sd/source/ui/view/NotesPanelViewShell.cxx @@ -94,7 +94,7 @@ SFX_IMPL_INTERFACE(NotesPanelViewShell, SfxShell) void NotesPanelViewShell::InitInterface_Impl() { - GetStaticInterface()->RegisterPopupMenu("drawtext"); + GetStaticInterface()->RegisterPopupMenu(u"drawtext"_ustr); GetStaticInterface()->RegisterChildWindow(SvxHlinkDlgWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(::sd::SpellDialogChildWindow::GetChildWindowId()); @@ -158,7 +158,7 @@ void NotesPanelViewShell::Construct() // Apply settings of FrameView ReadFrameViewData(mpFrameView); - SetName("NotesPanelViewShell"); + SetName(u"NotesPanelViewShell"_ustr); // TODO: Help ID // GetActiveWindow()->SetHelpId(HID_SDNOTESPANEL); } @@ -1404,7 +1404,7 @@ void NotesPanelViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) } else { - GetViewFrame()->GetDispatcher()->ExecutePopup("drawtext"); + GetViewFrame()->GetDispatcher()->ExecutePopup(u"drawtext"_ustr); } } else diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index 525c0813d9d6..aef3d5e247d9 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -71,10 +71,10 @@ PresentationViewShellBase::PresentationViewShellBase ( UNO_QUERY); if (xFrameSet.is()) { - Reference<beans::XPropertySet> xLayouterSet(xFrameSet->getPropertyValue("LayoutManager"), UNO_QUERY); + Reference<beans::XPropertySet> xLayouterSet(xFrameSet->getPropertyValue(u"LayoutManager"_ustr), UNO_QUERY); if (xLayouterSet.is()) { - xLayouterSet->setPropertyValue("AutomaticToolbars", Any(false)); + xLayouterSet->setPropertyValue(u"AutomaticToolbars"_ustr, Any(false)); } } } diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index afb5c135e1d6..545b3b748685 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -552,7 +552,7 @@ void ToolBarManager::Implementation::SetValid (bool bValid) try { Reference<beans::XPropertySet> xFrameProperties (xFrame, UNO_QUERY_THROW); - Any aValue (xFrameProperties->getPropertyValue("LayoutManager")); + Any aValue (xFrameProperties->getPropertyValue(u"LayoutManager"_ustr)); aValue >>= mxLayouter; // tdf#119997 if mpSynchronousLayouterLock was created before mxLayouter was // set then update it now that its available diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index f03eca21b088..bf125e126b0d 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1186,7 +1186,7 @@ void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot() pHelper->RequestView( FrameworkHelper::GetViewURL(pFrameView->GetViewShellTypeOnLoad()), FrameworkHelper::msCenterPaneURL); - pHelper->RunOnConfigurationEvent("ConfigurationUpdateEnd", CurrentPageSetter(mrBase)); + pHelper->RunOnConfigurationEvent(u"ConfigurationUpdateEnd"_ustr, CurrentPageSetter(mrBase)); } void ViewShellBase::Implementation::SetUserWantsTabBar(bool inValue) @@ -1504,7 +1504,7 @@ void CurrentPageSetter::operator() (bool) // Switch to the page last edited by setting the CurrentPage // property. Reference<beans::XPropertySet> xSet (mrBase.GetController(), UNO_QUERY_THROW); - xSet->setPropertyValue ("CurrentPage", aPage); + xSet->setPropertyValue (u"CurrentPage"_ustr, aPage); } catch (const RuntimeException&) { diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 099a333ae5d2..e6e91016bf6b 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -486,8 +486,8 @@ void ViewTabBar::UpdateTabBarButtons() TabBarControl::TabBarControl ( vcl::Window* pParentWindow, ::rtl::Reference<ViewTabBar> pViewTabBar) - : InterimItemWindow(pParentWindow, "modules/simpress/ui/tabviewbar.ui", "TabViewBar") - , mxTabControl(m_xBuilder->weld_notebook("tabcontrol")) + : InterimItemWindow(pParentWindow, u"modules/simpress/ui/tabviewbar.ui"_ustr, u"TabViewBar"_ustr) + , mxTabControl(m_xBuilder->weld_notebook(u"tabcontrol"_ustr)) , mpViewTabBar(std::move(pViewTabBar)) , mnAllocatedWidth(0) { diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index a5b62e495033..7310b2e19e2b 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -109,7 +109,7 @@ TextObjectBar::TextObjectBar ( } } - SetName( "TextObjectBar"); + SetName( u"TextObjectBar"_ustr); // SetHelpId( SD_IF_SDDRAWTEXTOBJECTBAR ); } diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 69568b497e77..37df200a18e6 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -232,7 +232,7 @@ bool hasCustomPropertyField(std::vector<editeng::Section> const & aSections, std OUString getWeightString(SfxItemSet const & rItemSet) { - OUString sWeightString = "NORMAL"; + OUString sWeightString = u"NORMAL"_ustr; if (const SfxPoolItem* pItem = rItemSet.GetItem(EE_CHAR_WEIGHT, false)) { @@ -447,7 +447,7 @@ private: case svx::ClassificationType::PARAGRAPH: { nParagraph++; - pOutliner->Insert(""); + pOutliner->Insert(u""_ustr); SfxItemSetFixed<EE_ITEMS_START, EE_ITEMS_END> aItemSet(m_rDrawViewShell.GetDoc()->GetPool()); @@ -609,7 +609,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); if( rMarkList.GetMarkCount() == 1 ) { - pUndoManager->EnterListAction("", "", 0, GetViewShellBase().GetViewShellId()); + pUndoManager->EnterListAction(u""_ustr, u""_ustr, 0, GetViewShellBase().GetViewShellId()); mpDrawView->BegUndo(); SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); @@ -1383,12 +1383,12 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (nState == RET_YES) { - GraphicHelper::ExportGraphic(pFrame, pObj->GetTransformedGraphic(), ""); + GraphicHelper::ExportGraphic(pFrame, pObj->GetTransformedGraphic(), u""_ustr); } else if (nState == RET_NO) { const GraphicObject& aGraphicObject(pObj->GetGraphicObject()); - GraphicHelper::ExportGraphic(pFrame, aGraphicObject.GetGraphic(), ""); + GraphicHelper::ExportGraphic(pFrame, aGraphicObject.GetGraphic(), u""_ustr); } } } @@ -3386,7 +3386,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (comphelper::LibreOfficeKit::isActive()) { GetViewFrame()->ShowChildWindow(SID_SIDEBAR); - OUString panelId = "SdNavigatorPanel"; + OUString panelId = u"SdNavigatorPanel"_ustr; ::sfx2::sidebar::Sidebar::TogglePanel( panelId, GetViewFrame()->GetFrame().GetFrameInterface()); @@ -3635,7 +3635,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_ADDITIONS_DIALOG: { - OUString sAdditionsTag = ""; + OUString sAdditionsTag = u""_ustr; const SfxStringItem* pStringArg = rReq.GetArg<SfxStringItem>(FN_PARAM_ADDITIONS_TAG); if (pStringArg) diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 8c547d8525fc..574d4c17601a 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -540,7 +540,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) if( !mpDrawView->InsertData( aDataHelper, aPos, nDnDAction, false ) ) { - INetBookmark aINetBookmark( "", "" ); + INetBookmark aINetBookmark( u""_ustr, u""_ustr ); if( ( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) && aDataHelper.GetINetBookmark( SotClipboardFormatId::NETSCAPE_BOOKMARK, aINetBookmark ) ) || @@ -549,7 +549,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) ( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) && aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) ) { - InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "" ); + InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), u""_ustr ); } } } @@ -919,19 +919,19 @@ void DrawViewShell::ShowSnapLineContextMenu(weld::Window* pParent, const ::tools SdrPageView& rPageView, const sal_uInt16 nSnapLineIndex) { const SdrHelpLine& rHelpLine (rPageView.GetHelpLines()[nSnapLineIndex]); - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(nullptr, "modules/simpress/ui/snapmenu.ui")); - std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu("menu")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(nullptr, u"modules/simpress/ui/snapmenu.ui"_ustr)); + std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu(u"menu"_ustr)); if (rHelpLine.GetKind() == SdrHelpLineKind::Point) { xMenu->append(OUString::number(SID_SET_SNAPITEM), SdResId(STR_POPUP_EDIT_SNAPPOINT)); - xMenu->append_separator("separator"); + xMenu->append_separator(u"separator"_ustr); xMenu->append(OUString::number(SID_DELETE_SNAPITEM), SdResId(STR_POPUP_DELETE_SNAPPOINT)); } else { xMenu->append(OUString::number(SID_SET_SNAPITEM), SdResId(STR_POPUP_EDIT_SNAPLINE)); - xMenu->append_separator("separator"); + xMenu->append_separator(u"separator"_ustr); xMenu->append(OUString::number(SID_DELETE_SNAPITEM), SdResId(STR_POPUP_DELETE_SNAPLINE)); } diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index fa744fe49bcd..d1d9db893dc3 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -521,7 +521,7 @@ void DrawViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans // in LO 6.2 to 6.4. The ODF defaults were corrected when reading draw:layer-set, but // not in reading config settings, because there the name is not known. const SdrLayerAdmin& rLayerAdmin = GetDocSh()->GetDoc()->GetLayerAdmin(); - if (rLayerAdmin.GetLayer("DrawnInSlideshow")) + if (rLayerAdmin.GetLayer(u"DrawnInSlideshow"_ustr)) { SdrLayerIDSet aSdrLayerIDSet; rLayerAdmin.getVisibleLayersODF( aSdrLayerIDSet ); diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index e02b54f48845..befb7d582b39 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -272,8 +272,8 @@ void DrawViewShell::ExecBmpMask( SfxRequest const & rReq ) if (xNewObj->IsLinkedGraphic()) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "modules/sdraw/ui/queryunlinkimagedialog.ui")); - std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("QueryUnlinkImageDialog")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), u"modules/sdraw/ui/queryunlinkimagedialog.ui"_ustr)); + std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog(u"QueryUnlinkImageDialog"_ustr)); if (RET_YES == xQueryBox->run()) xNewObj->ReleaseGraphicLink(); diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 42adc21e3ba1..6e55a789bd34 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -311,7 +311,7 @@ bool DrawViewShell::ShouldDisableEditHyperlink() const if( xPropSet.is() ) { uno::Reference< beans::XPropertySetInfo > xPropInfo( xPropSet->getPropertySetInfo() ); - if( xPropInfo.is() && xPropInfo->hasPropertyByName( "TargetURL") ) + if( xPropInfo.is() && xPropInfo->hasPropertyByName( u"TargetURL"_ustr) ) { bDisableEditHyperlink = false; } @@ -1802,7 +1802,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq) { rPageProperties.PutItem( XFillStyleItem( drawing::FillStyle_SOLID ) ); if (const XFillColorItem* pColorItem = static_cast<const XFillColorItem*>(pArgs->GetItem(SID_ATTR_PAGE_COLOR))) - rPageProperties.PutItem(XFillColorItem("", pColorItem->GetColorValue())); + rPageProperties.PutItem(XFillColorItem(u""_ustr, pColorItem->GetColorValue())); else rPageProperties.PutItem(pArgs->Get(XATTR_FILLCOLOR)); } diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 915b5454f7e3..2b43362f3a98 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -332,7 +332,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) mbIsRulerDrag = false; - SetName ("DrawViewShell"); + SetName (u"DrawViewShell"_ustr); mnLockCount = 0; diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index 1a6bb3aee913..a72b76acdd13 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -120,7 +120,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) } else if (nSId == SID_NAVIGATOR_OBJECT) { - OUString aBookmarkStr("#"); + OUString aBookmarkStr(u"#"_ustr); const SfxItemSet* pArgs = rReq.GetArgs(); OUString aTarget = pArgs->Get(SID_NAVIGATOR_OBJECT).GetValue(); aBookmarkStr += aTarget; diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index f83976e27782..8455258ef4da 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -975,7 +975,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) GetActiveWindow()->PixelToLogic( ::tools::Rectangle( Point(), GetActiveWindow()->GetOutputSizePixel() ).Center() ), nAction, false, nFormat ) ) { - INetBookmark aINetBookmark( "", "" ); + INetBookmark aINetBookmark( u""_ustr, u""_ustr ); if( ( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) && aDataHelper.GetINetBookmark( SotClipboardFormatId::NETSCAPE_BOOKMARK, aINetBookmark ) ) || @@ -984,7 +984,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) ( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) && aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) ) { - InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "" ); + InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), u""_ustr ); } } } @@ -1573,25 +1573,25 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, if (!bIsButton && pMarkedObj->GetObjIdentifier() == SdrObjKind::UNO) { const Reference<beans::XPropertySetInfo> xInfo(xPropSet->getPropertySetInfo()); - bIsButton = xInfo.is() && xInfo->hasPropertyByName("ButtonType") - && xInfo->hasPropertyByName("Label") - && xInfo->hasPropertyByName("TargetURL"); + bIsButton = xInfo.is() && xInfo->hasPropertyByName(u"ButtonType"_ustr) + && xInfo->hasPropertyByName(u"Label"_ustr) + && xInfo->hasPropertyByName(u"TargetURL"_ustr); } if (bIsButton) { bNewObj = false; - xPropSet->setPropertyValue("Label", Any(rText)); - xPropSet->setPropertyValue("TargetURL", Any(sTargetURL)); + xPropSet->setPropertyValue(u"Label"_ustr, Any(rText)); + xPropSet->setPropertyValue(u"TargetURL"_ustr, Any(sTargetURL)); if (!rTarget.isEmpty()) - xPropSet->setPropertyValue("TargetFrame", Any(rTarget)); + xPropSet->setPropertyValue(u"TargetFrame"_ustr, Any(rTarget)); - xPropSet->setPropertyValue("ButtonType", Any(form::FormButtonType_URL)); + xPropSet->setPropertyValue(u"ButtonType"_ustr, Any(form::FormButtonType_URL)); #if HAVE_FEATURE_AVMEDIA - if (::avmedia::MediaWindow::isMediaURL(rURL, ""/*TODO?*/)) + if (::avmedia::MediaWindow::isMediaURL(rURL, u""_ustr/*TODO?*/)) { - xPropSet->setPropertyValue("DispatchURLInternal", Any(true)); + xPropSet->setPropertyValue(u"DispatchURLInternal"_ustr, Any(true)); } #endif } @@ -1626,16 +1626,16 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, Reference< awt::XControlModel > xControlModel( pUnoCtrl->GetUnoControlModel(), uno::UNO_SET_THROW ); Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY_THROW ); - xPropSet->setPropertyValue( "Label" , Any( rText ) ); - xPropSet->setPropertyValue( "TargetURL" , Any( sTargetURL ) ); + xPropSet->setPropertyValue( u"Label"_ustr , Any( rText ) ); + xPropSet->setPropertyValue( u"TargetURL"_ustr , Any( sTargetURL ) ); if( !rTarget.isEmpty() ) - xPropSet->setPropertyValue( "TargetFrame" , Any( rTarget ) ); + xPropSet->setPropertyValue( u"TargetFrame"_ustr , Any( rTarget ) ); - xPropSet->setPropertyValue( "ButtonType" , Any( form::FormButtonType_URL ) ); + xPropSet->setPropertyValue( u"ButtonType"_ustr , Any( form::FormButtonType_URL ) ); #if HAVE_FEATURE_AVMEDIA - if ( ::avmedia::MediaWindow::isMediaURL( rURL, ""/*TODO?*/ ) ) - xPropSet->setPropertyValue( "DispatchURLInternal" , Any( true ) ); + if ( ::avmedia::MediaWindow::isMediaURL( rURL, u""_ustr/*TODO?*/ ) ) + xPropSet->setPropertyValue( u"DispatchURLInternal"_ustr , Any( true ) ); #endif Point aPos; @@ -1714,7 +1714,7 @@ namespace slideshowhelp SdPage* pSlide = rDoc.GetSdPage(nStartingSlide, PageKind::Standard); const OUString& rStartingSlide = pSlide ? pSlide->GetName() : OUString(); - Sequence< PropertyValue > aArguments{ comphelper::makePropertyValue("FirstPage", + Sequence< PropertyValue > aArguments{ comphelper::makePropertyValue(u"FirstPage"_ustr, rStartingSlide) }; xPresentation->startWithArguments( aArguments ); } diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index a7d3866d60e9..0514adc8c1ea 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -794,7 +794,7 @@ OUString DrawViewShell::GetSelectionText(bool bCompleteWords) ESelection aSel = pOlView->GetSelection(); OUString aStrCurrentDelimiters = pOl->GetWordDelimiters(); - pOl->SetWordDelimiters(" .,;\"'"); + pOl->SetWordDelimiters(u" .,;\"'"_ustr); aStrSelection = pOl->GetWord( aSel.nEndPara, aSel.nEndPos ); pOl->SetWordDelimiters( aStrCurrentDelimiters ); } diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index 55b9648e0400..9e28be77c467 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -58,7 +58,7 @@ SFX_IMPL_INTERFACE(DrawViewShell, SfxShell) void DrawViewShell::InitInterface_Impl() { - GetStaticInterface()->RegisterPopupMenu("drawtext"); + GetStaticInterface()->RegisterPopupMenu(u"drawtext"_ustr); GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true); @@ -86,7 +86,7 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell) void GraphicViewShell::InitInterface_Impl() { - GetStaticInterface()->RegisterPopupMenu("drawtext"); + GetStaticInterface()->RegisterPopupMenu(u"drawtext"_ustr); GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 1f485581afa6..b945695d97de 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -104,7 +104,7 @@ SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell) void OutlineViewShell::InitInterface_Impl() { - GetStaticInterface()->RegisterPopupMenu("outline"); + GetStaticInterface()->RegisterPopupMenu(u"outline"_ustr); GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS, SfxVisibilityFlags::Standard | SfxVisibilityFlags::FullScreen | SfxVisibilityFlags::Server, ToolbarId::Outline_Toolbox); @@ -155,7 +155,7 @@ void OutlineViewShell::Construct() pLastPage = GetActualPage(); - SetName( "OutlineViewShell" ); + SetName( u"OutlineViewShell"_ustr ); GetActiveWindow()->SetHelpId( HID_SDOUTLINEVIEWSHELL ); } @@ -1362,7 +1362,7 @@ void OutlineViewShell::Command( const CommandEvent& rCEvt, ::sd::Window* pWin ) } else { - GetViewFrame()->GetDispatcher()->ExecutePopup("outline"); + GetViewFrame()->GetDispatcher()->ExecutePopup(u"outline"_ustr); } } else diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index ddcbf362d3cf..61365c8cfbf2 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -115,7 +115,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie mrOutlineViewShell.GetViewShellBase().GetEventMultiplexer()->AddEventListener(aLink); Reference<XFrame> xFrame = mrOutlineViewShell.GetViewShellBase().GetFrame()->GetFrame().GetFrameInterface(); - maSlideImage = vcl::CommandInfoProvider::GetImageForCommand(".uno:ShowSlide", xFrame, vcl::ImageType::Size26); + maSlideImage = vcl::CommandInfoProvider::GetImageForCommand(u".uno:ShowSlide"_ustr, xFrame, vcl::ImageType::Size26); // Tell undo manager of the document about the undo manager of the // outliner, so that the former can synchronize with the later. @@ -1392,7 +1392,7 @@ void OutlineView::IgnoreCurrentPageChanges (bool bIgnoreChanges) and or the drawing document model. It will create needed undo actions */ void OutlineView::BeginModelChange() { - mrOutliner.GetUndoManager().EnterListAction("", "", 0, mrOutlineViewShell.GetViewShellBase().GetViewShellId()); + mrOutliner.GetUndoManager().EnterListAction(u""_ustr, u""_ustr, 0, mrOutlineViewShell.GetViewShellBase().GetViewShellId()); BegUndo(SdResId(STR_UNDO_CHANGE_TITLE_AND_LAYOUT)); } diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index a17f240106f3..9703c7c3f022 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -323,7 +323,7 @@ void View::DoPaste (::sd::Window* pWindow) sal_Int8 nDnDAction = DND_ACTION_COPY; if( !InsertData( aDataHelper, aPos, nDnDAction, false ) ) { - INetBookmark aINetBookmark( "", "" ); + INetBookmark aINetBookmark( u""_ustr, u""_ustr ); if( ( aDataHelper.HasFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ) && aDataHelper.GetINetBookmark( SotClipboardFormatId::NETSCAPE_BOOKMARK, aINetBookmark ) ) || @@ -332,7 +332,7 @@ void View::DoPaste (::sd::Window* pWindow) ( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) && aDataHelper.GetINetBookmark( SotClipboardFormatId::UNIFORMRESOURCELOCATOR, aINetBookmark ) ) ) { - pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), "" ); + pDrViewSh->InsertURLField( aINetBookmark.GetURL(), aINetBookmark.GetDescription(), u""_ustr ); } } } @@ -670,13 +670,13 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, { if(pIAOHandle->getOverlayObjectList().isHitPixel(rEvt.maPosPixel)) { - uno::Any const data(aDataHelper.GetAny(SotClipboardFormatId::XFA, "")); + uno::Any const data(aDataHelper.GetAny(SotClipboardFormatId::XFA, u""_ustr)); uno::Sequence<beans::NamedValue> props; if (data >>= props) { ::comphelper::SequenceAsHashMap const map(props); Color aColor(COL_BLACK); - auto const it = map.find("FillColor"); + auto const it = map.find(u"FillColor"_ustr); if (it != map.end()) { XFillColorItem color; diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index a9e82b3ec4b7..a40edc2baed1 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -1033,11 +1033,11 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, svt::EmbeddedObjectRef::TryRunningState( xObj ); uno::Reference< beans::XPropertySet > xProps( xObj->getComponent(), uno::UNO_QUERY ); if ( xProps.is() && - ( xProps->getPropertyValue( "DisableDataTableDialog" ) >>= bDisableDataTableDialog ) && + ( xProps->getPropertyValue( u"DisableDataTableDialog"_ustr ) >>= bDisableDataTableDialog ) && bDisableDataTableDialog ) { - xProps->setPropertyValue( "DisableDataTableDialog" , uno::Any( false ) ); - xProps->setPropertyValue( "DisableComplexChartTypes" , uno::Any( false ) ); + xProps->setPropertyValue( u"DisableDataTableDialog"_ustr , uno::Any( false ) ); + xProps->setPropertyValue( u"DisableComplexChartTypes"_ustr , uno::Any( false ) ); uno::Reference< util::XModifiable > xModifiable( xProps, uno::UNO_QUERY ); if ( xModifiable.is() ) { @@ -1086,7 +1086,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, embed::InsertedObjectInfo aInfo = xClipboardCreator->createInstanceInitFromClipboard( xTmpStor, - "DummyName" , + u"DummyName"_ustr , uno::Sequence< beans::PropertyValue >() ); // TODO/LATER: in future InsertedObjectInfo will be used to get container related information @@ -1336,7 +1336,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, if(!bReturn && pPickObj && CHECK_FORMAT_TRANS( SotClipboardFormatId::XFA ) ) { - uno::Any const data(aDataHelper.GetAny(SotClipboardFormatId::XFA, "")); + uno::Any const data(aDataHelper.GetAny(SotClipboardFormatId::XFA, u""_ustr)); uno::Sequence<beans::NamedValue> props; if (data >>= props) { @@ -1350,14 +1350,14 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, ::comphelper::SequenceAsHashMap const map(props); drawing::FillStyle eFill(drawing::FillStyle_BITMAP); // default to something that's ignored Color aColor(COL_BLACK); - auto it = map.find("FillStyle"); + auto it = map.find(u"FillStyle"_ustr); if (it != map.end()) { XFillStyleItem style; style.PutValue(it->second, 0); eFill = style.GetValue(); } - it = map.find("FillColor"); + it = map.find(u"FillColor"_ustr); if (it != map.end()) { XFillColorItem color; @@ -1391,12 +1391,12 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, { // area fill if(eFill == drawing::FillStyle_SOLID ) - aSet.Put(XFillColorItem("", aColor)); + aSet.Put(XFillColorItem(u""_ustr, aColor)); aSet.Put( XFillStyleItem( eFill ) ); } else - aSet.Put( XLineColorItem( "", aColor ) ); + aSet.Put( XLineColorItem( u""_ustr, aColor ) ); // add text color pPickObj->SetMergedItemSetAndBroadcast( aSet ); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index f46c876dac2b..d46cac5ff7eb 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -341,7 +341,7 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, sal_Int8& rAction, if( mnAction == DND_ACTION_LINK && pPV && dynamic_cast< SdrMediaObj *>( pPickObj ) ) { pNewMediaObj = SdrObject::Clone(static_cast<SdrMediaObj&>(*pPickObj), pPickObj->getSdrModelFromSdrObject()); - pNewMediaObj->setURL(rMediaURL, ""/*TODO?*/); + pNewMediaObj->setURL(rMediaURL, u""_ustr/*TODO?*/); BegUndo(SdResId(STR_UNDO_DRAGDROP)); ReplaceObjectAtView(pPickObj, *pPV, pNewMediaObj.get()); @@ -437,7 +437,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void) aCurrentDropFile = aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ); #if HAVE_FEATURE_AVMEDIA - if( !::avmedia::MediaWindow::isMediaURL( aCurrentDropFile, ""/*TODO?*/ ) ) + if( !::avmedia::MediaWindow::isMediaURL( aCurrentDropFile, u""_ustr/*TODO?*/ ) ) #else #endif { @@ -499,7 +499,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void) #if HAVE_FEATURE_AVMEDIA if (!bHandled) { - bool bShallowDetect = ::avmedia::MediaWindow::isMediaURL(aCurrentDropFile, ""/*TODO?*/); + bool bShallowDetect = ::avmedia::MediaWindow::isMediaURL(aCurrentDropFile, u""_ustr/*TODO?*/); if (bShallowDetect) { mxDropMediaSizeListener.set(new avmedia::PlayerListener( @@ -526,7 +526,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void) mxDropMediaSizeListener.clear(); })); } - bHandled = bShallowDetect && ::avmedia::MediaWindow::isMediaURL(aCurrentDropFile, ""/*TODO?*/, true, mxDropMediaSizeListener); + bHandled = bShallowDetect && ::avmedia::MediaWindow::isMediaURL(aCurrentDropFile, u""_ustr/*TODO?*/, true, mxDropMediaSizeListener); } #endif @@ -543,7 +543,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void) //TODO/MBA: testing OUString aName; uno::Sequence < beans::PropertyValue > aMedium{ comphelper::makePropertyValue( - "URL", aCurrentDropFile) }; + u"URL"_ustr, aCurrentDropFile) }; uno::Reference < embed::XEmbeddedObject > xObj = mpDocSh->GetEmbeddedObjectContainer(). InsertEmbeddedObject( aMedium, aName ); diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index b09a254e9fe7..21b3bd1aed43 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -276,7 +276,7 @@ void TabControl::Command(const CommandEvent& rCEvt) if ( rCEvt.GetCommand() == CommandEventId::ContextMenu ) { SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); - pDispatcher->ExecutePopup("pagetab"); + pDispatcher->ExecutePopup(u"pagetab"_ustr); } } diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 11afe137b7af..d5d23631f701 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -225,7 +225,7 @@ void ViewShell::construct() mpVerticalScrollBar->SetScrollHdl(LINK(this, ViewShell, VScrollHdl)); } - SetName ("ViewShell"); + SetName (u"ViewShell"_ustr); GetDoc()->StartOnlineSpelling(false); |