sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |
10
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |
16 -
sd/source/ui/accessibility/AccessibleOutlineView.cxx |
2
sd/source/ui/accessibility/AccessiblePageShape.cxx |
24 -
sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx |
2
sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx |
2
sd/source/ui/accessibility/AccessiblePresentationShape.cxx |
2
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx |
8
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx |
10
sd/source/ui/accessibility/SdShapeTypes.cxx |
28 -
sd/source/ui/animations/CustomAnimationDialog.cxx |
148 +++++-----
sd/source/ui/animations/CustomAnimationList.cxx |
18 -
sd/source/ui/animations/CustomAnimationPane.cxx |
58 +--
sd/source/ui/animations/SlideTransitionPane.cxx |
32 +-
sd/source/ui/animations/motionpathtag.cxx |
4
sd/source/ui/annotations/annotationmanager.cxx |
16 -
sd/source/ui/annotations/annotationwindow.cxx |
98 +++---
sd/source/ui/app/optsitem.cxx |
12
sd/source/ui/app/scalectrl.cxx |
4
sd/source/ui/app/sddll.cxx |
4
sd/source/ui/app/sdmod.cxx |
2
sd/source/ui/app/sdmod2.cxx |
6
sd/source/ui/app/sdpopup.cxx |
34 +-
sd/source/ui/app/sdxfer.cxx |
6
sd/source/ui/app/tmplctrl.cxx |
4
sd/source/ui/controller/displaymodecontroller.cxx |
18 -
sd/source/ui/controller/slidelayoutcontroller.cxx |
24 -
sd/source/ui/dlg/BulletAndPositionDlg.cxx |
107 +++----
sd/source/ui/dlg/LayerTabBar.cxx |
2
sd/source/ui/dlg/PaneShells.cxx |
12
sd/source/ui/dlg/PhotoAlbumDialog.cxx |
76 ++---
sd/source/ui/dlg/RemoteDialog.cxx |
9
sd/source/ui/dlg/RemoteDialogClientBox.cxx |
12
sd/source/ui/dlg/SelectLayerDlg.cxx |
7
sd/source/ui/dlg/TemplateScanner.cxx |
4
sd/source/ui/dlg/animobjs.cxx |
44 +-
sd/source/ui/dlg/brkdlg.cxx |
10
sd/source/ui/dlg/copydlg.cxx |
28 -
sd/source/ui/dlg/custsdlg.cxx |
30 +-
sd/source/ui/dlg/diactrl.cxx |
10
sd/source/ui/dlg/dlgchar.cxx |
12
sd/source/ui/dlg/dlgfield.cxx |
10
sd/source/ui/dlg/dlgolbul.cxx |
8
sd/source/ui/dlg/dlgpage.cxx |
17 -
sd/source/ui/dlg/dlgsnap.cxx |
20 -
sd/source/ui/dlg/filedlg.cxx |
14
sd/source/ui/dlg/gluectrl.cxx |
8
sd/source/ui/dlg/headerfooterdlg.cxx |
56 +--
sd/source/ui/dlg/ins_paste.cxx |
7
sd/source/ui/dlg/inspagob.cxx |
8
sd/source/ui/dlg/layeroptionsdlg.cxx |
16 -
sd/source/ui/dlg/masterlayoutdlg.cxx |
12
sd/source/ui/dlg/morphdlg.cxx |
8
sd/source/ui/dlg/navigatr.cxx |
72 ++--
sd/source/ui/dlg/paragr.cxx |
26 -
sd/source/ui/dlg/present.cxx |
62 ++--
sd/source/ui/dlg/prltempl.cxx |
66 ++--
sd/source/ui/dlg/prntopts.cxx |
72 ++--
sd/source/ui/dlg/sdpreslt.cxx |
14
sd/source/ui/dlg/sdtreelb.cxx |
6
sd/source/ui/dlg/sduiexp.cxx |
4
sd/source/ui/dlg/tabtempl.cxx |
36 +-
sd/source/ui/dlg/tpaction.cxx |
34 +-
sd/source/ui/dlg/tpoption.cxx |
100 +++---
sd/source/ui/dlg/vectdlg.cxx |
22 -
sd/source/ui/docshell/docshel2.cxx |
2
sd/source/ui/docshell/docshel3.cxx |
2
sd/source/ui/docshell/docshell.cxx |
2
sd/source/ui/docshell/grdocsh.cxx |
2
sd/source/ui/framework/configuration/Configuration.cxx |
2
sd/source/ui/framework/configuration/ConfigurationController.cxx |
4
sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx |
4
sd/source/ui/framework/configuration/ResourceId.cxx |
4
sd/source/ui/framework/configuration/UpdateRequest.cxx |
2
sd/source/ui/framework/factories/BasicPaneFactory.cxx |
6
sd/source/ui/framework/factories/BasicToolBarFactory.cxx |
2
sd/source/ui/framework/factories/BasicViewFactory.cxx |
16 -
sd/source/ui/framework/factories/FullScreenPane.cxx |
2
sd/source/ui/framework/factories/Pane.cxx |
2
sd/source/ui/framework/factories/PresentationFactory.cxx |
2
sd/source/ui/framework/factories/ViewShellWrapper.cxx |
2
sd/source/ui/framework/module/ModuleController.cxx |
6
sd/source/ui/func/bulmaper.cxx |
2
sd/source/ui/func/fubullet.cxx |
8
sd/source/ui/func/fuchar.cxx |
2
sd/source/ui/func/fuexecuteinteraction.cxx |
5
sd/source/ui/func/fuformatpaintbrush.cxx |
2
sd/source/ui/func/fuhhconv.cxx |
8
sd/source/ui/func/fuinsert.cxx |
12
sd/source/ui/func/fuinsfil.cxx |
10
sd/source/ui/func/fumorph.cxx |
4
sd/source/ui/func/fupage.cxx |
12
sd/source/ui/func/futempl.cxx |
2
sd/source/ui/inc/TableDesignPane.hxx |
4
sd/source/ui/presenter/PresenterCanvas.cxx |
4
sd/source/ui/presenter/PresenterHelper.cxx |
8
sd/source/ui/presenter/PresenterPreviewCache.cxx |
6
sd/source/ui/presenter/SlideRenderer.cxx |
12
sd/source/ui/remotecontrol/ImagePreparer.cxx |
12
sd/source/ui/remotecontrol/Receiver.cxx |
8
sd/source/ui/remotecontrol/Server.cxx |
6
sd/source/ui/sidebar/AllMasterPagesSelector.cxx |
2
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx |
8
sd/source/ui/sidebar/LayoutMenu.cxx |
12
sd/source/ui/sidebar/MasterPageContainer.cxx |
4
sd/source/ui/sidebar/MasterPagesSelector.cxx |
10
sd/source/ui/sidebar/PanelFactory.cxx |
18 -
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx |
2
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx |
4
sd/source/ui/sidebar/SlideBackground.cxx |
46 +--
sd/source/ui/slideshow/SlideShowRestarter.cxx |
2
sd/source/ui/slideshow/slideshow.cxx |
18 -
sd/source/ui/slideshow/slideshowimpl.cxx |
64 ++--
sd/source/ui/slideshow/slideshowviewimpl.cxx |
2
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx |
4
sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx |
2
sd/source/ui/slidesorter/controller/SlsListener.cxx |
14
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |
6
sd/source/ui/slidesorter/model/SlideSorterModel.cxx |
4
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |
4
sd/source/ui/table/TableDesignPane.cxx |
50 +--
sd/source/ui/table/tablefunction.cxx |
4
sd/source/ui/tools/EventMultiplexer.cxx |
2
sd/source/ui/tools/PreviewRenderer.cxx |
2
sd/source/ui/tools/SlotStateListener.cxx |
2
sd/source/ui/uitest/uiobject.cxx |
22 -
sd/source/ui/unoidl/DrawController.cxx |
4
sd/source/ui/unoidl/SdUnoDrawView.cxx |
4
sd/source/ui/unoidl/SdUnoOutlineView.cxx |
4
sd/source/ui/unoidl/SdUnoSlideView.cxx |
8
sd/source/ui/unoidl/UnoDocumentSettings.cxx |
118 +++----
sd/source/ui/unoidl/randomnode.cxx |
4
sd/source/ui/unoidl/sddetect.cxx |
12
sd/source/ui/unoidl/unocpres.cxx |
8
sd/source/ui/unoidl/unolayer.cxx |
8
sd/source/ui/unoidl/unomodel.cxx |
122 ++++----
sd/source/ui/unoidl/unomodule.cxx |
4
sd/source/ui/unoidl/unoobj.cxx |
6
sd/source/ui/unoidl/unopage.cxx |
16 -
sd/source/ui/unoidl/unopback.cxx |
2
sd/source/ui/view/DocumentRenderer.cxx |
148 +++++-----
sd/source/ui/view/GraphicObjectBar.cxx |
2
sd/source/ui/view/ImpressViewShellBase.cxx |
2
sd/source/ui/view/NotesPanelViewShell.cxx |
6
sd/source/ui/view/PresentationViewShellBase.cxx |
4
sd/source/ui/view/ToolBarManager.cxx |
2
sd/source/ui/view/ViewShellBase.cxx |
4
sd/source/ui/view/ViewTabBar.cxx |
4
sd/source/ui/view/drtxtob.cxx |
2
sd/source/ui/view/drviews2.cxx |
14
sd/source/ui/view/drviews4.cxx |
12
sd/source/ui/view/drviews5.cxx |
2
sd/source/ui/view/drviews6.cxx |
4
sd/source/ui/view/drviews7.cxx |
4
sd/source/ui/view/drviewsa.cxx |
2
sd/source/ui/view/drviewsd.cxx |
2
sd/source/ui/view/drviewse.cxx |
36 +-
sd/source/ui/view/drviewsf.cxx |
2
sd/source/ui/view/drvwshrg.cxx |
4
sd/source/ui/view/outlnvsh.cxx |
6
sd/source/ui/view/outlview.cxx |
4
sd/source/ui/view/sdview2.cxx |
8
sd/source/ui/view/sdview3.cxx |
18 -
sd/source/ui/view/sdview4.cxx |
10
sd/source/ui/view/tabcontr.cxx |
2
sd/source/ui/view/viewshel.cxx |
2
166 files changed, 1391 insertions(+), 1385 deletions(-)
New commits:
commit a4d53515faac28e7749b0c4d9a4e6b59aad63225
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri May 17 12:41:24 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue May 28 09:25:32 2024 +0200
loplugin:ostr in sd/../ui
Change-Id: I19acde24fd8a4014807318d97433b81814cadd75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167768
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
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));
-e
... etc. - the rest is truncated
