toolkit/qa/cppunit/Dialog.cxx | 5
toolkit/qa/cppunit/EventContainer.cxx | 19 -
toolkit/qa/cppunit/UnitConversion.cxx | 24 -
toolkit/source/awt/animatedimagespeer.cxx | 6
toolkit/source/awt/asynccallback.cxx | 4
toolkit/source/awt/vclxaccessiblecomponent.cxx | 4
toolkit/source/awt/vclxmenu.cxx | 10
toolkit/source/awt/vclxpointer.cxx | 4
toolkit/source/awt/vclxprinter.cxx | 8
toolkit/source/awt/vclxtabpagecontainer.cxx | 2
toolkit/source/awt/vclxtoolkit.cxx | 24 -
toolkit/source/awt/vclxwindow1.cxx | 4
toolkit/source/awt/vclxwindows.cxx | 16
toolkit/source/controls/animatedimages.cxx | 12
toolkit/source/controls/controlmodelcontainerbase.cxx | 76 ++--
toolkit/source/controls/dialogcontrol.cxx | 44 +-
toolkit/source/controls/filectrl.cxx | 2
toolkit/source/controls/formattedcontrol.cxx | 10
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 6
toolkit/source/controls/grid/defaultgriddatamodel.cxx | 4
toolkit/source/controls/grid/gridcolumn.cxx | 4
toolkit/source/controls/grid/gridcontrol.cxx | 10
toolkit/source/controls/grid/gridcontrol.hxx | 4
toolkit/source/controls/grid/sortablegriddatamodel.cxx | 4
toolkit/source/controls/roadmapcontrol.cxx | 18 -
toolkit/source/controls/roadmapentry.cxx | 12
toolkit/source/controls/spinningprogress.cxx | 10
toolkit/source/controls/stdtabcontroller.cxx | 8
toolkit/source/controls/stdtabcontrollermodel.cxx | 8
toolkit/source/controls/svtxgridcontrol.cxx | 4
toolkit/source/controls/table/cellvalueconversion.cxx | 2
toolkit/source/controls/tabpagecontainer.cxx | 12
toolkit/source/controls/tabpagemodel.cxx | 16
toolkit/source/controls/tkscrollbar.cxx | 10
toolkit/source/controls/tkspinbutton.cxx | 14
toolkit/source/controls/tree/treecontrol.cxx | 6
toolkit/source/controls/tree/treecontrol.hxx | 2
toolkit/source/controls/tree/treecontrolpeer.cxx | 2
toolkit/source/controls/tree/treedatamodel.cxx | 8
toolkit/source/controls/unocontrol.cxx | 12
toolkit/source/controls/unocontrolcontainer.cxx | 18 -
toolkit/source/controls/unocontrolcontainermodel.cxx | 4
toolkit/source/controls/unocontrolmodel.cxx | 4
toolkit/source/controls/unocontrols.cxx | 258 ++++++++--------
toolkit/source/hatchwindow/documentcloser.cxx | 10
toolkit/source/hatchwindow/hatchwindowfactory.cxx | 4
toolkit/source/helper/tkresmgr.cxx | 2
toolkit/source/helper/vclunohelper.cxx | 2
48 files changed, 377 insertions(+), 375 deletions(-)
New commits:
commit ea49dde289c9c5799c8b85983bae1c0ab294a3cb
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue May 14 09:41:33 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed May 15 14:22:39 2024 +0200
loplugin:ostr in toolkit
Change-Id: Ia70d03713bfb7621196d2bd12473d3cf1c2ef1b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167654
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/toolkit/qa/cppunit/Dialog.cxx b/toolkit/qa/cppunit/Dialog.cxx
index 6ddf3f725840..c6f6f5699a8e 100644
--- a/toolkit/qa/cppunit/Dialog.cxx
+++ b/toolkit/qa/cppunit/Dialog.cxx
@@ -48,11 +48,12 @@ CPPUNIT_TEST_FIXTURE(DialogTest, testDialogSizeable)
uno::Reference<lang::XMultiComponentFactory>
xFactory(mxContext->getServiceManager(),
uno::UNO_SET_THROW);
uno::Reference<awt::XControlModel> xControlModel(
-
xFactory->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel",
mxContext),
+
xFactory->createInstanceWithContext(u"com.sun.star.awt.UnoControlDialogModel"_ustr,
+ mxContext),
uno::UNO_QUERY_THROW);
uno::Reference<beans::XPropertySet> xPropSet(xControlModel,
uno::UNO_QUERY_THROW);
- xPropSet->setPropertyValue("Sizeable", uno::Any(true));
+ xPropSet->setPropertyValue(u"Sizeable"_ustr, uno::Any(true));
uno::Reference<awt::XUnoControlDialog> xControl =
awt::UnoControlDialog::create(mxContext);
xControl->setModel(xControlModel);
diff --git a/toolkit/qa/cppunit/EventContainer.cxx
b/toolkit/qa/cppunit/EventContainer.cxx
index ad62f93105e8..ab13e9fdf4f7 100644
--- a/toolkit/qa/cppunit/EventContainer.cxx
+++ b/toolkit/qa/cppunit/EventContainer.cxx
@@ -52,7 +52,8 @@ CPPUNIT_TEST_FIXTURE(EventContainerTest, testInsertOrder)
{
Reference<XMultiComponentFactory> xFactory(mxContext->getServiceManager(),
UNO_SET_THROW);
Reference<XControlModel> xControlModel(
-
xFactory->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel",
mxContext),
+
xFactory->createInstanceWithContext(u"com.sun.star.awt.UnoControlDialogModel"_ustr,
+ mxContext),
UNO_QUERY_THROW);
Reference<beans::XPropertySet> xPropSet(xControlModel, UNO_QUERY_THROW);
@@ -63,19 +64,19 @@ CPPUNIT_TEST_FIXTURE(EventContainerTest, testInsertOrder)
script::ScriptEventDescriptor descr2;
script::ScriptEventDescriptor descr3;
script::ScriptEventDescriptor descr4;
- xEvents->insertByName("b", Any(descr1));
- xEvents->insertByName("a", Any(descr2));
- xEvents->insertByName("1", Any(descr3));
- xEvents->insertByName("A", Any(descr4));
+ xEvents->insertByName(u"b"_ustr, Any(descr1));
+ xEvents->insertByName(u"a"_ustr, Any(descr2));
+ xEvents->insertByName(u"1"_ustr, Any(descr3));
+ xEvents->insertByName(u"A"_ustr, Any(descr4));
Sequence<OUString> aEventNames(xEvents->getElementNames());
sal_Int32 nEventCount = aEventNames.getLength();
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(4), nEventCount);
- CPPUNIT_ASSERT_EQUAL(OUString("b"), aEventNames[0]);
- CPPUNIT_ASSERT_EQUAL(OUString("a"), aEventNames[1]);
- CPPUNIT_ASSERT_EQUAL(OUString("1"), aEventNames[2]);
- CPPUNIT_ASSERT_EQUAL(OUString("A"), aEventNames[3]);
+ CPPUNIT_ASSERT_EQUAL(u"b"_ustr, aEventNames[0]);
+ CPPUNIT_ASSERT_EQUAL(u"a"_ustr, aEventNames[1]);
+ CPPUNIT_ASSERT_EQUAL(u"1"_ustr, aEventNames[2]);
+ CPPUNIT_ASSERT_EQUAL(u"A"_ustr, aEventNames[3]);
css::uno::Reference<css::lang::XComponent>(xControlModel,
css::uno::UNO_QUERY_THROW)->dispose();
}
diff --git a/toolkit/qa/cppunit/UnitConversion.cxx
b/toolkit/qa/cppunit/UnitConversion.cxx
index 5e28667f5a8e..f6136c6cdc8f 100644
--- a/toolkit/qa/cppunit/UnitConversion.cxx
+++ b/toolkit/qa/cppunit/UnitConversion.cxx
@@ -59,7 +59,7 @@ uno::Reference<awt::XWindowPeer>
createFloatingWindow(uno::Reference<lang::XMultiServiceFactory> const& xMSF,
sal_Int32 const nX,
sal_Int32 const nY, sal_Int32 const nWidth, sal_Int32
const nHeight)
{
- uno::Reference<awt::XToolkit> const
xTk(xMSF->createInstance("com.sun.star.awt.Toolkit"),
+ uno::Reference<awt::XToolkit> const
xTk(xMSF->createInstance(u"com.sun.star.awt.Toolkit"_ustr),
uno::UNO_QUERY);
awt::WindowDescriptor descriptor;
@@ -176,19 +176,19 @@ void ToolkitTest::testXUnitConversion()
std::abs(aSizeInMM_100TH.Height -
aSizeInMM_10TH.Height * 10) < 10);
// new
- checkSize(xConv, aSize, util::MeasureUnit::PIXEL, "pixel");
- checkSize(xConv, aSize, util::MeasureUnit::APPFONT, "appfont");
- checkSize(xConv, aSize, util::MeasureUnit::SYSFONT, "sysfont");
+ checkSize(xConv, aSize, util::MeasureUnit::PIXEL, u"pixel"_ustr);
+ checkSize(xConv, aSize, util::MeasureUnit::APPFONT, u"appfont"_ustr);
+ checkSize(xConv, aSize, util::MeasureUnit::SYSFONT, u"sysfont"_ustr);
// simply check some more parameters
- checkSize(xConv, aSize, util::MeasureUnit::MM, "mm");
- checkSize(xConv, aSize, util::MeasureUnit::CM, "cm");
- checkSize(xConv, aSize, util::MeasureUnit::INCH_1000TH, "1/1000inch");
- checkSize(xConv, aSize, util::MeasureUnit::INCH_100TH, "1/100inch");
- checkSize(xConv, aSize, util::MeasureUnit::INCH_10TH, "1/10inch");
- checkSize(xConv, aSize, util::MeasureUnit::INCH, "inch");
- checkSize(xConv, aSize, util::MeasureUnit::POINT, "point");
- checkSize(xConv, aSize, util::MeasureUnit::TWIP, "twip");
+ checkSize(xConv, aSize, util::MeasureUnit::MM, u"mm"_ustr);
+ checkSize(xConv, aSize, util::MeasureUnit::CM, u"cm"_ustr);
+ checkSize(xConv, aSize, util::MeasureUnit::INCH_1000TH,
u"1/1000inch"_ustr);
+ checkSize(xConv, aSize, util::MeasureUnit::INCH_100TH, u"1/100inch"_ustr);
+ checkSize(xConv, aSize, util::MeasureUnit::INCH_10TH, u"1/10inch"_ustr);
+ checkSize(xConv, aSize, util::MeasureUnit::INCH, u"inch"_ustr);
+ checkSize(xConv, aSize, util::MeasureUnit::POINT, u"point"_ustr);
+ checkSize(xConv, aSize, util::MeasureUnit::TWIP, u"twip"_ustr);
// convert the 1/100mm window size back to pixel
awt::Size const aNewSize
diff --git a/toolkit/source/awt/animatedimagespeer.cxx
b/toolkit/source/awt/animatedimagespeer.cxx
index 379a82388ba2..3c5e5ee9c4bf 100644
--- a/toolkit/source/awt/animatedimagespeer.cxx
+++ b/toolkit/source/awt/animatedimagespeer.cxx
@@ -92,12 +92,12 @@ namespace toolkit
if ( i_isHighContrast )
{
// try (to find) the high-contrast version of the graphic
first
- aMediaProperties.put( "URL", lcl_getHighContrastURL(
i_cachedImage.sImageURL ) );
+ aMediaProperties.put( u"URL"_ustr, lcl_getHighContrastURL(
i_cachedImage.sImageURL ) );
i_cachedImage.xGraphic = i_graphicProvider->queryGraphic(
aMediaProperties.getPropertyValues() );
}
if ( !i_cachedImage.xGraphic.is() )
{
- aMediaProperties.put( "URL", i_cachedImage.sImageURL );
+ aMediaProperties.put( u"URL"_ustr, i_cachedImage.sImageURL
);
i_cachedImage.xGraphic = i_graphicProvider->queryGraphic(
aMediaProperties.getPropertyValues() );
}
}
@@ -113,7 +113,7 @@ namespace toolkit
if ( i_graphic.is() )
{
const Reference< XPropertySet > xGraphicProps( i_graphic,
UNO_QUERY_THROW );
- OSL_VERIFY( xGraphicProps->getPropertyValue("SizePixel")
>>= aSizePixel );
+ OSL_VERIFY(
xGraphicProps->getPropertyValue(u"SizePixel"_ustr) >>= aSizePixel );
}
}
catch( const Exception& )
diff --git a/toolkit/source/awt/asynccallback.cxx
b/toolkit/source/awt/asynccallback.cxx
index f6804d9c2366..4d5e07e47bc1 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -67,7 +67,7 @@ private:
// com.sun.star.uno.XServiceInfo:
OUString SAL_CALL AsyncCallback::getImplementationName()
{
- return "com.sun.star.awt.comp.AsyncCallback";
+ return u"com.sun.star.awt.comp.AsyncCallback"_ustr;
}
sal_Bool SAL_CALL AsyncCallback::supportsService(OUString const & serviceName)
@@ -77,7 +77,7 @@ sal_Bool SAL_CALL AsyncCallback::supportsService(OUString
const & serviceName)
css::uno::Sequence< OUString > SAL_CALL
AsyncCallback::getSupportedServiceNames()
{
- return { "com.sun.star.awt.AsyncCallback" };
+ return { u"com.sun.star.awt.AsyncCallback"_ustr };
}
// css::awt::XRequestCallback:
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx
b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index a1a31902c0a9..453bf38056c8 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -81,7 +81,7 @@ VCLXAccessibleComponent::~VCLXAccessibleComponent()
OUString VCLXAccessibleComponent::getImplementationName()
{
- return "com.sun.star.comp.toolkit.AccessibleWindow";
+ return u"com.sun.star.comp.toolkit.AccessibleWindow"_ustr;
}
sal_Bool VCLXAccessibleComponent::supportsService( const OUString&
rServiceName )
@@ -91,7 +91,7 @@ sal_Bool VCLXAccessibleComponent::supportsService( const
OUString& rServiceName
uno::Sequence< OUString > VCLXAccessibleComponent::getSupportedServiceNames()
{
- uno::Sequence< OUString > aNames { "com.sun.star.awt.AccessibleWindow" };
+ uno::Sequence< OUString > aNames {
u"com.sun.star.awt.AccessibleWindow"_ustr };
return aNames;
}
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 6515258861b4..d7b8a7ba44e7 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -171,7 +171,7 @@ OUString SAL_CALL VCLXMenu::getImplementationName( )
const bool bIsPopupMenu = IsPopupMenu();
aGuard.unlock();
- OUString implName( "stardiv.Toolkit." );
+ OUString implName( u"stardiv.Toolkit."_ustr );
if ( bIsPopupMenu )
implName += "VCLXPopupMenu";
else
@@ -188,12 +188,12 @@ css::uno::Sequence< OUString > SAL_CALL
VCLXMenu::getSupportedServiceNames( )
if ( bIsPopupMenu )
return css::uno::Sequence<OUString>{
- "com.sun.star.awt.PopupMenu",
- "stardiv.vcl.PopupMenu"};
+ u"com.sun.star.awt.PopupMenu"_ustr,
+ u"stardiv.vcl.PopupMenu"_ustr};
else
return css::uno::Sequence<OUString>{
- "com.sun.star.awt.MenuBar",
- "stardiv.vcl.MenuBar"};
+ u"com.sun.star.awt.MenuBar"_ustr,
+ u"stardiv.vcl.MenuBar"_ustr};
}
sal_Bool SAL_CALL VCLXMenu::supportsService(const OUString& rServiceName )
diff --git a/toolkit/source/awt/vclxpointer.cxx
b/toolkit/source/awt/vclxpointer.cxx
index b54161041373..34509e9f2923 100644
--- a/toolkit/source/awt/vclxpointer.cxx
+++ b/toolkit/source/awt/vclxpointer.cxx
@@ -45,7 +45,7 @@ sal_Int32 VCLXPointer::getType()
OUString VCLXPointer::getImplementationName()
{
- return "stardiv.Toolkit.VCLXPointer";
+ return u"stardiv.Toolkit.VCLXPointer"_ustr;
}
sal_Bool VCLXPointer::supportsService(OUString const & ServiceName)
@@ -56,7 +56,7 @@ sal_Bool VCLXPointer::supportsService(OUString const &
ServiceName)
css::uno::Sequence<OUString> VCLXPointer::getSupportedServiceNames()
{
return css::uno::Sequence<OUString>{
- "com.sun.star.awt.Pointer", "stardiv.vcl.Pointer"};
+ u"com.sun.star.awt.Pointer"_ustr, u"stardiv.vcl.Pointer"_ustr};
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/toolkit/source/awt/vclxprinter.cxx
b/toolkit/source/awt/vclxprinter.cxx
index 168902f36427..51a098bbcd8e 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -83,8 +83,8 @@ css::uno::Reference< css::beans::XPropertySetInfo >
VCLXPrinterPropertySet::getP
{
static ::cppu::OPropertyArrayHelper s_PropertyArrayHelper(
css::uno::Sequence<css::beans::Property>{
- css::beans::Property( "Orientation", PROPERTY_Orientation,
cppu::UnoType<sal_Int16>::get(), 0 ),
- css::beans::Property( "Horizontal", PROPERTY_Horizontal,
cppu::UnoType<bool>::get(), 0 )},
+ css::beans::Property( u"Orientation"_ustr,
PROPERTY_Orientation, cppu::UnoType<sal_Int16>::get(), 0 ),
+ css::beans::Property( u"Horizontal"_ustr,
PROPERTY_Horizontal, cppu::UnoType<bool>::get(), 0 )},
false);
return s_PropertyArrayHelper;
@@ -352,7 +352,7 @@ css::uno::Reference< css::awt::XInfoPrinter >
VCLXPrinterServer::createInfoPrint
OUString VCLXPrinterServer::getImplementationName()
{
- return "stardiv.Toolkit.VCLXPrinterServer";
+ return u"stardiv.Toolkit.VCLXPrinterServer"_ustr;
}
sal_Bool VCLXPrinterServer::supportsService(OUString const & ServiceName)
@@ -363,7 +363,7 @@ sal_Bool VCLXPrinterServer::supportsService(OUString const
& ServiceName)
css::uno::Sequence<OUString> VCLXPrinterServer::getSupportedServiceNames()
{
return css::uno::Sequence<OUString>{
- "com.sun.star.awt.PrinterServer", "stardiv.vcl.PrinterServer"};
+ u"com.sun.star.awt.PrinterServer"_ustr,
u"stardiv.vcl.PrinterServer"_ustr};
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 9df3a701c8a0..e2788f715d6f 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -174,7 +174,7 @@ void SAL_CALL VCLXTabPageContainer::elementInserted( const
css::container::Conta
sal_Int16 nPageID = xP->getTabPageID();
if (!xControl->getPeer().is())
- throw RuntimeException("No peer for tabpage container!");
+ throw RuntimeException(u"No peer for tabpage container!"_ustr);
VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow(xControl->getPeer());
TabPage* pPage = static_cast<TabPage*>(pWindow.get());
pTabCtrl->InsertPage(nPageID,pPage->GetText());
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 046e4f011b58..b9d479e685fc 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1168,7 +1168,7 @@ void SVTXRoadmap::propertyChange( const
css::beans::PropertyChangeEvent& evt )
css::uno::Reference< css::uno::XInterface > xRoadmapItem = evt.Source;
sal_Int32 nID = 0;
css::uno::Reference< css::beans::XPropertySet > xPropertySet(
xRoadmapItem, css::uno::UNO_QUERY );
- css::uno::Any aValue = xPropertySet->getPropertyValue("ID");
+ css::uno::Any aValue = xPropertySet->getPropertyValue(u"ID"_ustr);
aValue >>= nID;
OUString sPropertyName = evt.PropertyName;
@@ -1213,11 +1213,11 @@ RMItemData SVTXRoadmap::GetRMItemData( const
css::container::ContainerEvent& _rE
css::uno::Reference< css::beans::XPropertySet > xPropertySet(
xRoadmapItem, css::uno::UNO_QUERY );
if ( xPropertySet.is() )
{
- css::uno::Any aValue = xPropertySet->getPropertyValue("Label");
+ css::uno::Any aValue = xPropertySet->getPropertyValue(u"Label"_ustr);
aValue >>= aCurRMItemData.Label;
- aValue = xPropertySet->getPropertyValue("ID");
+ aValue = xPropertySet->getPropertyValue(u"ID"_ustr);
aValue >>= aCurRMItemData.n_ID;
- aValue = xPropertySet->getPropertyValue("Enabled");
+ aValue = xPropertySet->getPropertyValue(u"Enabled"_ustr);
aValue >>= aCurRMItemData.b_Enabled;
}
else
@@ -1382,7 +1382,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow(
rtl::Reference<VCLXWindow>* ppNewCom
if ( aServiceName == "tabcontrolnotabs" )
{
nWinBits |= WB_NOBORDER;
- nType = ImplGetComponentType( "tabcontrol" );
+ nType = ImplGetComponentType( u"tabcontrol"_ustr );
}
if ( !pParent )
{
@@ -2121,7 +2121,7 @@ css::uno::Reference<
css::datatransfer::clipboard::XClipboard > SAL_CALL VCLXToo
// XServiceInfo
OUString VCLXToolkit::getImplementationName()
{
- return "stardiv.Toolkit.VCLXToolkit";
+ return u"stardiv.Toolkit.VCLXToolkit"_ustr;
}
sal_Bool VCLXToolkit::supportsService( const OUString& rServiceName )
@@ -2132,7 +2132,7 @@ sal_Bool VCLXToolkit::supportsService( const OUString&
rServiceName )
css::uno::Sequence< OUString > VCLXToolkit::getSupportedServiceNames()
{
return css::uno::Sequence<OUString>{
- "com.sun.star.awt.Toolkit", "stardiv.vcl.VclToolkit"};
+ u"com.sun.star.awt.Toolkit"_ustr, u"stardiv.vcl.VclToolkit"_ustr};
}
// css::awt::XExtendedToolkit:
@@ -2545,7 +2545,7 @@ void SAL_CALL VCLXToolkit::keyPress( const
css::awt::KeyEvent & aKeyEvent )
css::uno::Reference<css::awt::XWindow> xWindow ( aKeyEvent.Source,
css::uno::UNO_QUERY_THROW );
VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow );
if( !pWindow )
- throw css::uno::RuntimeException( "invalid event source" );
+ throw css::uno::RuntimeException( u"invalid event source"_ustr );
::KeyEvent aVCLKeyEvent = VCLUnoHelper::createVCLKeyEvent( aKeyEvent );
::Application::PostKeyEvent( VclEventId::WindowKeyInput, pWindow,
&aVCLKeyEvent );
@@ -2556,7 +2556,7 @@ void SAL_CALL VCLXToolkit::keyRelease( const
css::awt::KeyEvent & aKeyEvent )
css::uno::Reference<css::awt::XWindow> xWindow ( aKeyEvent.Source,
css::uno::UNO_QUERY_THROW );
VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow );
if( !pWindow )
- throw css::uno::RuntimeException( "invalid event source" );
+ throw css::uno::RuntimeException( u"invalid event source"_ustr );
::KeyEvent aVCLKeyEvent = VCLUnoHelper::createVCLKeyEvent( aKeyEvent );
::Application::PostKeyEvent( VclEventId::WindowKeyUp, pWindow,
&aVCLKeyEvent );
@@ -2568,7 +2568,7 @@ void SAL_CALL VCLXToolkit::mousePress( const
css::awt::MouseEvent & aMouseEvent
css::uno::Reference<css::awt::XWindow> xWindow ( aMouseEvent.Source,
css::uno::UNO_QUERY_THROW );
VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow );
if( !pWindow )
- throw css::uno::RuntimeException( "invalid event source" );
+ throw css::uno::RuntimeException( u"invalid event source"_ustr );
::MouseEvent aVCLMouseEvent = VCLUnoHelper::createVCLMouseEvent(
aMouseEvent );
::Application::PostMouseEvent( VclEventId::WindowMouseButtonDown, pWindow,
&aVCLMouseEvent );
@@ -2579,7 +2579,7 @@ void SAL_CALL VCLXToolkit::mouseRelease( const
css::awt::MouseEvent & aMouseEven
css::uno::Reference<css::awt::XWindow> xWindow ( aMouseEvent.Source,
css::uno::UNO_QUERY_THROW );
VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow );
if( !pWindow )
- throw css::uno::RuntimeException( "invalid event source" );
+ throw css::uno::RuntimeException( u"invalid event source"_ustr );
::MouseEvent aVCLMouseEvent = VCLUnoHelper::createVCLMouseEvent(
aMouseEvent );
::Application::PostMouseEvent( VclEventId::WindowMouseButtonUp, pWindow,
&aVCLMouseEvent );
@@ -2590,7 +2590,7 @@ void SAL_CALL VCLXToolkit::mouseMove( const
css::awt::MouseEvent & aMouseEvent )
css::uno::Reference<css::awt::XWindow> xWindow ( aMouseEvent.Source,
css::uno::UNO_QUERY_THROW );
VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow );
if( !pWindow )
- throw css::uno::RuntimeException( "invalid event source" );
+ throw css::uno::RuntimeException( u"invalid event source"_ustr );
::MouseEvent aVCLMouseEvent = VCLUnoHelper::createVCLMouseEvent(
aMouseEvent );
::Application::PostMouseEvent( VclEventId::WindowMouseMove, pWindow,
&aVCLMouseEvent );
diff --git a/toolkit/source/awt/vclxwindow1.cxx
b/toolkit/source/awt/vclxwindow1.cxx
index a55245cafc68..2bc54416d64c 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -39,7 +39,7 @@ void VCLXWindow::SetSystemParent_Impl(const css::uno::Any&
rHandle)
VclPtr<vcl::Window> pWindow = GetWindow();
if (pWindow->GetType() != WindowType::WORKWINDOW)
{
- throw css::uno::RuntimeException("not a work window");
+ throw css::uno::RuntimeException(u"not a work window"_ustr);
}
// use sal_Int64 here to accommodate all int types
@@ -65,7 +65,7 @@ void VCLXWindow::SetSystemParent_Impl(const css::uno::Any&
rHandle)
}
if (bThrow)
{
- throw css::uno::RuntimeException("incorrect window handle type");
+ throw css::uno::RuntimeException(u"incorrect window handle type"_ustr);
}
// create system parent data
SystemParentData aSysParentData;
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 73f1920e59d0..ee9127a99a7f 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2035,7 +2035,7 @@ namespace
Reference< uno::XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
Reference< XGraphicProvider >
xProvider(graphic::GraphicProvider::create(xContext));
::comphelper::NamedValueCollection aMediaProperties;
- aMediaProperties.put( "URL", i_rImageURL );
+ aMediaProperties.put( u"URL"_ustr, i_rImageURL );
Reference< XGraphic > xGraphic = xProvider->queryGraphic(
aMediaProperties.getPropertyValues() );
return Image( xGraphic );
}
@@ -2112,10 +2112,10 @@ void SAL_CALL VCLXListBox::itemListChanged( const
EventObject& i_rEvent )
uno::Reference< beans::XPropertySet > xPropSet( i_rEvent.Source,
uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySetInfo > xPSI(
xPropSet->getPropertySetInfo(), uno::UNO_SET_THROW );
uno::Reference< resource::XStringResourceResolver >
xStringResourceResolver;
- if ( xPSI->hasPropertyByName("ResourceResolver") )
+ if ( xPSI->hasPropertyByName(u"ResourceResolver"_ustr) )
{
xStringResourceResolver.set(
- xPropSet->getPropertyValue("ResourceResolver"),
+ xPropSet->getPropertyValue(u"ResourceResolver"_ustr),
uno::UNO_QUERY
);
}
@@ -2590,8 +2590,8 @@ uno::Sequence< beans::NamedValue > SAL_CALL
VCLXMultiPage::getTabProps( sal_Int3
uno::Sequence< beans::NamedValue > props
{
- { "Title", css::uno::Any(pTabControl->GetPageText(
sal::static_int_cast< sal_uInt16 >( ID ) )) },
- { "Position", css::uno::Any(pTabControl->GetPagePos(
sal::static_int_cast< sal_uInt16 >( ID ) )) }
+ { u"Title"_ustr, css::uno::Any(pTabControl->GetPageText(
sal::static_int_cast< sal_uInt16 >( ID ) )) },
+ { u"Position"_ustr, css::uno::Any(pTabControl->GetPagePos(
sal::static_int_cast< sal_uInt16 >( ID ) )) }
};
return props;
}
@@ -4435,10 +4435,10 @@ void SAL_CALL VCLXComboBox::itemListChanged( const
EventObject& i_rEvent )
uno::Reference< beans::XPropertySetInfo > xPSI(
xPropSet->getPropertySetInfo(), uno::UNO_SET_THROW );
// bool localize = xPSI->hasPropertyByName("ResourceResolver");
uno::Reference< resource::XStringResourceResolver >
xStringResourceResolver;
- if ( xPSI->hasPropertyByName("ResourceResolver") )
+ if ( xPSI->hasPropertyByName(u"ResourceResolver"_ustr) )
{
xStringResourceResolver.set(
- xPropSet->getPropertyValue("ResourceResolver"),
+ xPropSet->getPropertyValue(u"ResourceResolver"_ustr),
uno::UNO_QUERY
);
}
@@ -6959,7 +6959,7 @@ void SVTXFormattedField::SetValue(const css::uno::Any&
rValue)
if (!rValue.hasValue())
{
- pField->SetText("");
+ pField->SetText(u""_ustr);
}
else
{
diff --git a/toolkit/source/controls/animatedimages.cxx
b/toolkit/source/controls/animatedimages.cxx
index dec4a8c5330c..6b7399f072c6 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -87,7 +87,7 @@ public:
OUString AnimatedImagesControl::GetComponentServiceName() const
{
- return "AnimatedImages";
+ return u"AnimatedImages"_ustr;
}
@@ -118,7 +118,7 @@ public:
OUString SAL_CALL AnimatedImagesControl::getImplementationName( )
{
- return "org.openoffice.comp.toolkit.AnimatedImagesControl";
+ return u"org.openoffice.comp.toolkit.AnimatedImagesControl"_ustr;
}
@@ -271,19 +271,19 @@ namespace toolkit {
OUString SAL_CALL AnimatedImagesControlModel::getServiceName()
{
- return "com.sun.star.awt.AnimatedImagesControlModel";
+ return u"com.sun.star.awt.AnimatedImagesControlModel"_ustr;
}
OUString SAL_CALL AnimatedImagesControlModel::getImplementationName( )
{
- return "org.openoffice.comp.toolkit.AnimatedImagesControlModel";
+ return u"org.openoffice.comp.toolkit.AnimatedImagesControlModel"_ustr;
}
Sequence< OUString > SAL_CALL
AnimatedImagesControlModel::getSupportedServiceNames()
{
- return { "com.sun.star.awt.AnimatedImagesControlModel",
"com.sun.star.awt.UnoControlModel" };
+ return { u"com.sun.star.awt.AnimatedImagesControlModel"_ustr,
u"com.sun.star.awt.UnoControlModel"_ustr };
}
@@ -313,7 +313,7 @@ namespace toolkit {
switch ( i_propertyId )
{
case BASEPROPERTY_DEFAULTCONTROL:
- return Any( OUString("com.sun.star.awt.AnimatedImagesControl") );
+ return Any( u"com.sun.star.awt.AnimatedImagesControl"_ustr );
case BASEPROPERTY_BORDER:
return Any( css::awt::VisualEffect::NONE );
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 882d78dbfadf..f39f12a9c816 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -73,7 +73,7 @@ namespace
const Sequence< OUString >& lcl_getLanguageDependentProperties()
{
// note: properties must be sorted
- static Sequence<OUString> s_aLanguageDependentProperties{ "HelpText",
"Title" };
+ static Sequence<OUString> s_aLanguageDependentProperties{
u"HelpText"_ustr, u"Title"_ustr };
return s_aLanguageDependentProperties;
}
@@ -317,7 +317,7 @@ Reference< XInterface >
ControlModelContainerBase::createInstance( const OUStrin
Reference< XAggregation > xAgg( xCloneAccess, UNO_QUERY );
if ( xAgg.is() )
{
- if ( xSI->supportsService("com.sun.star.awt.UnoControlModel") )
+ if (
xSI->supportsService(u"com.sun.star.awt.UnoControlModel"_ustr) )
{
// release 3 of the 4 references we have to the object
xAgg.clear();
@@ -343,33 +343,33 @@ Reference< XInterface >
ControlModelContainerBase::createInstanceWithArguments(
Sequence< OUString > ControlModelContainerBase::getAvailableServiceNames()
{
- return { "com.sun.star.awt.UnoControlEditModel",
- "com.sun.star.awt.UnoControlFormattedFieldModel",
- "com.sun.star.awt.UnoControlFileControlModel",
- "com.sun.star.awt.UnoControlButtonModel",
- "com.sun.star.awt.UnoControlImageControlModel",
- "com.sun.star.awt.UnoControlRadioButtonModel",
- "com.sun.star.awt.UnoControlCheckBoxModel",
- "com.sun.star.awt.UnoControlFixedTextModel",
- "com.sun.star.awt.UnoControlGroupBoxModel",
- "com.sun.star.awt.UnoControlListBoxModel",
- "com.sun.star.awt.UnoControlComboBoxModel",
- "com.sun.star.awt.UnoControlDateFieldModel",
- "com.sun.star.awt.UnoControlTimeFieldModel",
- "com.sun.star.awt.UnoControlNumericFieldModel",
- "com.sun.star.awt.UnoControlCurrencyFieldModel",
- "com.sun.star.awt.UnoControlPatternFieldModel",
- "com.sun.star.awt.UnoControlProgressBarModel",
- "com.sun.star.awt.UnoControlScrollBarModel",
- "com.sun.star.awt.UnoControlFixedLineModel",
- "com.sun.star.awt.UnoControlRoadmapModel",
- "com.sun.star.awt.tree.TreeControlModel",
- "com.sun.star.awt.grid.UnoControlGridModel",
- "com.sun.star.awt.UnoControlFixedHyperlinkModel",
- "com.sun.star.awt.tab.UnoControlTabPageContainerModel",
- "com.sun.star.awt.tab.UnoControlTabPageModel",
- "com.sun.star.awt.UnoMultiPageModel",
- "com.sun.star.awt.UnoFrameModel"
+ return { u"com.sun.star.awt.UnoControlEditModel"_ustr,
+ u"com.sun.star.awt.UnoControlFormattedFieldModel"_ustr,
+ u"com.sun.star.awt.UnoControlFileControlModel"_ustr,
+ u"com.sun.star.awt.UnoControlButtonModel"_ustr,
+ u"com.sun.star.awt.UnoControlImageControlModel"_ustr,
+ u"com.sun.star.awt.UnoControlRadioButtonModel"_ustr,
+ u"com.sun.star.awt.UnoControlCheckBoxModel"_ustr,
+ u"com.sun.star.awt.UnoControlFixedTextModel"_ustr,
+ u"com.sun.star.awt.UnoControlGroupBoxModel"_ustr,
+ u"com.sun.star.awt.UnoControlListBoxModel"_ustr,
+ u"com.sun.star.awt.UnoControlComboBoxModel"_ustr,
+ u"com.sun.star.awt.UnoControlDateFieldModel"_ustr,
+ u"com.sun.star.awt.UnoControlTimeFieldModel"_ustr,
+ u"com.sun.star.awt.UnoControlNumericFieldModel"_ustr,
+ u"com.sun.star.awt.UnoControlCurrencyFieldModel"_ustr,
+ u"com.sun.star.awt.UnoControlPatternFieldModel"_ustr,
+ u"com.sun.star.awt.UnoControlProgressBarModel"_ustr,
+ u"com.sun.star.awt.UnoControlScrollBarModel"_ustr,
+ u"com.sun.star.awt.UnoControlFixedLineModel"_ustr,
+ u"com.sun.star.awt.UnoControlRoadmapModel"_ustr,
+ u"com.sun.star.awt.tree.TreeControlModel"_ustr,
+ u"com.sun.star.awt.grid.UnoControlGridModel"_ustr,
+ u"com.sun.star.awt.UnoControlFixedHyperlinkModel"_ustr,
+ u"com.sun.star.awt.tab.UnoControlTabPageContainerModel"_ustr,
+ u"com.sun.star.awt.tab.UnoControlTabPageModel"_ustr,
+ u"com.sun.star.awt.UnoMultiPageModel"_ustr,
+ u"com.sun.star.awt.UnoFrameModel"_ustr
};
}
@@ -875,7 +875,7 @@ void ControlModelContainerBase::implUpdateGroupStructure()
// we'll need this in every state
xModelSI.set(rControlModel, css::uno::UNO_QUERY);
// is it a radio button?
- bool bIsRadioButton = xModelSI.is() && xModelSI->supportsService(
"com.sun.star.awt.UnoControlRadioButtonModel" );
+ bool bIsRadioButton = xModelSI.is() && xModelSI->supportsService(
u"com.sun.star.awt.UnoControlRadioButtonModel"_ustr );
switch ( eState )
{
@@ -1285,10 +1285,10 @@ void ControlContainerBase::ImplSetPosSize( Reference<
XControl >& rxCtrl )
Reference< XPropertySet > xP( rxCtrl->getModel(), UNO_QUERY );
sal_Int32 nX = 0, nY = 0, nWidth = 0, nHeight = 0;
- xP->getPropertyValue("PositionX") >>= nX;
- xP->getPropertyValue("PositionY") >>= nY;
- xP->getPropertyValue("Width") >>= nWidth;
- xP->getPropertyValue("Height") >>= nHeight;
+ xP->getPropertyValue(u"PositionX"_ustr) >>= nX;
+ xP->getPropertyValue(u"PositionY"_ustr) >>= nY;
+ xP->getPropertyValue(u"Width"_ustr) >>= nWidth;
+ xP->getPropertyValue(u"Height"_ustr) >>= nHeight;
MapMode aMode( MapUnit::MapAppFont );
OutputDevice*pOutDev = Application::GetDefaultDevice();
if ( pOutDev )
@@ -1581,10 +1581,10 @@ void ControlContainerBase::addingControl( const
Reference< XControl >& _rxContro
if ( xProps.is() )
{
const Sequence< OUString > aNames {
- "PositionX",
- "PositionY",
- "Width",
- "Height"
+ u"PositionX"_ustr,
+ u"PositionY"_ustr,
+ u"Width"_ustr,
+ u"Height"_ustr
};
xProps->addPropertiesChangeListener( aNames, this );
diff --git a/toolkit/source/controls/dialogcontrol.cxx
b/toolkit/source/controls/dialogcontrol.cxx
index 29dba64dcfc0..56a1d0ffa066 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -152,7 +152,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "stardiv.Toolkit.UnoControlDialogModel"; }
+ { return u"stardiv.Toolkit.UnoControlDialogModel"_ustr; }
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
@@ -229,7 +229,7 @@ rtl::Reference<UnoControlModel>
UnoControlDialogModel::Clone() const
OUString UnoControlDialogModel::getServiceName( )
{
- return "stardiv.vcl.controlmodel.Dialog";
+ return u"stardiv.vcl.controlmodel.Dialog"_ustr;
}
Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -320,9 +320,9 @@ OUString UnoDialogControl::GetComponentServiceName() const
bool bDecoration( true );
ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>=
bDecoration;
if ( bDecoration )
- return "Dialog";
+ return u"Dialog"_ustr;
else
- return "TabPage";
+ return u"TabPage"_ustr;
}
void UnoDialogControl::dispose()
@@ -380,7 +380,7 @@ void UnoDialogControl::createPeer( const Reference<
XToolkit > & rxToolkit, cons
OUString UnoDialogControl::getImplementationName()
{
- return "stardiv.Toolkit.UnoDialogControl";
+ return u"stardiv.Toolkit.UnoDialogControl"_ustr;
}
sal_Bool UnoDialogControl::supportsService(OUString const & ServiceName)
@@ -391,8 +391,8 @@ sal_Bool UnoDialogControl::supportsService(OUString const &
ServiceName)
css::uno::Sequence<OUString> UnoDialogControl::getSupportedServiceNames()
{
return css::uno::Sequence<OUString>{
- "com.sun.star.awt.UnoControlDialog",
- "stardiv.vcl.control.Dialog"};
+ u"com.sun.star.awt.UnoControlDialog"_ustr,
+ u"stardiv.vcl.control.Dialog"_ustr};
}
void UnoDialogControl::PrepareWindowDescriptor( css::awt::WindowDescriptor&
rDesc )
@@ -510,7 +510,7 @@ void SAL_CALL UnoDialogControl::windowResized( const
css::awt::WindowEvent& e )
// update the position because of property change event.
mbSizeModified = true;
// Properties in a sequence must be sorted!
- Sequence< OUString > aProps{ "Height", "Width" };
+ Sequence< OUString > aProps{ u"Height"_ustr, u"Width"_ustr };
Sequence< Any > aValues{
Any(sal_Int32(
std::clamp(aAppFontSize.Height(), tools::Long(SAL_MIN_INT32),
tools::Long(SAL_MAX_INT32)))),
@@ -537,7 +537,7 @@ void SAL_CALL UnoDialogControl::windowMoved( const
css::awt::WindowEvent& e )
// Remember that changes have been done by listener. No need to
// update the position because of property change event.
mbPosModified = true;
- Sequence< OUString > aProps{ "PositionX", "PositionY" };
+ Sequence< OUString > aProps{ u"PositionX"_ustr, u"PositionY"_ustr };
Sequence< Any > aValues{
Any(sal_Int32(
std::clamp(aTmp.Width(), tools::Long(SAL_MIN_INT32),
tools::Long(SAL_MAX_INT32)))),
@@ -640,9 +640,9 @@ void UnoDialogControl::ImplModelPropertiesChanged( const
Sequence< PropertyChang
else if (bOwnModel && rEvt.PropertyName == "Graphic")
{
uno::Reference<graphic::XGraphic> xGraphic;
- if (ImplGetPropertyValue("Graphic") >>= xGraphic)
+ if (ImplGetPropertyValue(u"Graphic"_ustr) >>= xGraphic)
{
- ImplSetPropertyValue("Graphic", uno::Any(xGraphic), true);
+ ImplSetPropertyValue(u"Graphic"_ustr, uno::Any(xGraphic),
true);
}
break;
}
@@ -776,9 +776,9 @@ OUString UnoMultiPageControl::GetComponentServiceName()
const
bool bDecoration( true );
ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>=
bDecoration;
if ( bDecoration )
- return "tabcontrol";
+ return u"tabcontrol"_ustr;
// Hopefully we can tweak the tabcontrol to display without tabs
- return "tabcontrolnotabs";
+ return u"tabcontrolnotabs"_ustr;
}
void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >&
_rxControl )
@@ -887,14 +887,14 @@ rtl::Reference<UnoControlModel>
UnoMultiPageModel::Clone() const
OUString UnoMultiPageModel::getServiceName()
{
- return "com.sun.star.awt.UnoMultiPageModel";
+ return u"com.sun.star.awt.UnoMultiPageModel"_ustr;
}
uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
{
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
- return uno::Any( OUString( "com.sun.star.awt.UnoControlMultiPage" ) );
+ return uno::Any( u"com.sun.star.awt.UnoControlMultiPage"_ustr );
}
return ControlModelContainerBase::ImplGetDefaultValue( nPropId );
}
@@ -921,7 +921,7 @@ void UnoMultiPageModel::insertByName( const OUString&
aName, const Any& aElement
throw IllegalArgumentException();
// Only a Page model can be inserted into the multipage
- if ( !xInfo->supportsService( "com.sun.star.awt.UnoPageModel" ) )
+ if ( !xInfo->supportsService( u"com.sun.star.awt.UnoPageModel"_ustr ) )
throw IllegalArgumentException();
return ControlModelContainerBase::insertByName( aName, aElement );
@@ -947,7 +947,7 @@ UnoPageControl::~UnoPageControl()
OUString UnoPageControl::GetComponentServiceName() const
{
- return "tabpage";
+ return u"tabpage"_ustr;
}
@@ -993,14 +993,14 @@ rtl::Reference<UnoControlModel> UnoPageModel::Clone()
const
OUString UnoPageModel::getServiceName()
{
- return "com.sun.star.awt.UnoPageModel";
+ return u"com.sun.star.awt.UnoPageModel"_ustr;
}
uno::Any UnoPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
{
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
- return uno::Any( OUString( "com.sun.star.awt.UnoControlPage" ) );
+ return uno::Any( u"com.sun.star.awt.UnoControlPage"_ustr );
}
return ControlModelContainerBase::ImplGetDefaultValue( nPropId );
}
@@ -1040,7 +1040,7 @@ UnoFrameControl::~UnoFrameControl()
OUString UnoFrameControl::GetComponentServiceName() const
{
- return "frame";
+ return u"frame"_ustr;
}
void UnoFrameControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
@@ -1139,7 +1139,7 @@ rtl::Reference<UnoControlModel> UnoFrameModel::Clone()
const
OUString UnoFrameModel::getServiceName()
{
- return "com.sun.star.awt.UnoFrameModel";
+ return u"com.sun.star.awt.UnoFrameModel"_ustr;
}
uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1148,7 +1148,7 @@ uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16
nPropId ) const
{
case BASEPROPERTY_DEFAULTCONTROL:
{
- return uno::Any( OUString( "com.sun.star.awt.UnoControlFrame" ) );
+ return uno::Any( u"com.sun.star.awt.UnoControlFrame"_ustr );
}
case BASEPROPERTY_SCROLLWIDTH:
case BASEPROPERTY_SCROLLHEIGHT:
diff --git a/toolkit/source/controls/filectrl.cxx
b/toolkit/source/controls/filectrl.cxx
index 25835bf063ab..e71991607919 100644
--- a/toolkit/source/controls/filectrl.cxx
+++ b/toolkit/source/controls/filectrl.cxx
@@ -159,7 +159,7 @@ void FileControl::Resize()
}
else
{
- OUString aSmallText( "..." );
+ OUString aSmallText( u"..."_ustr );
maButton->SetText( aSmallText );
nButtonTextWidth = maButton->GetTextWidth( aSmallText );
}
diff --git a/toolkit/source/controls/formattedcontrol.cxx
b/toolkit/source/controls/formattedcontrol.cxx
index cf3094c35857..82f6294dc888 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -150,7 +150,7 @@ namespace toolkit
OUString UnoControlFormattedFieldModel::getServiceName()
{
- return "stardiv.vcl.controlmodel.FormattedField";
+ return u"stardiv.vcl.controlmodel.FormattedField"_ustr;
}
@@ -360,7 +360,7 @@ namespace toolkit
Any aReturn;
switch (nPropId)
{
- case BASEPROPERTY_DEFAULTCONTROL: aReturn <<=
OUString("stardiv.vcl.control.FormattedField"); break;
+ case BASEPROPERTY_DEFAULTCONTROL: aReturn <<=
u"stardiv.vcl.control.FormattedField"_ustr; break;
case BASEPROPERTY_TREATASNUMBER: aReturn <<= true; break;
@@ -396,7 +396,7 @@ namespace toolkit
OUString UnoControlFormattedFieldModel::getImplementationName()
{
- return "stardiv.Toolkit.UnoControlFormattedFieldModel";
+ return u"stardiv.Toolkit.UnoControlFormattedFieldModel"_ustr;
}
css::uno::Sequence<OUString>
@@ -420,7 +420,7 @@ namespace toolkit
OUString UnoFormattedFieldControl::GetComponentServiceName() const
{
- return "FormattedField";
+ return u"FormattedField"_ustr;
}
@@ -443,7 +443,7 @@ namespace toolkit
OUString UnoFormattedFieldControl::getImplementationName()
{
- return "stardiv.Toolkit.UnoFormattedFieldControl";
+ return u"stardiv.Toolkit.UnoFormattedFieldControl"_ustr;
}
css::uno::Sequence<OUString>
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index a7dfe1b9e255..d650de56b252 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -139,7 +139,7 @@ private:
GridColumn* const pGridColumn = dynamic_cast<GridColumn*>(
i_column.get() );
if ( pGridColumn == nullptr )
- throw css::lang::IllegalArgumentException( "invalid column
implementation", *this, 1 );
+ throw css::lang::IllegalArgumentException( u"invalid column
implementation"_ustr, *this, 1 );
m_aColumns.push_back( pGridColumn );
sal_Int32 index = m_aColumns.size() - 1;
@@ -298,7 +298,7 @@ private:
OUString SAL_CALL DefaultGridColumnModel::getImplementationName( )
{
- return "stardiv.Toolkit.DefaultGridColumnModel";
+ return u"stardiv.Toolkit.DefaultGridColumnModel"_ustr;
}
sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const OUString&
i_serviceName )
@@ -308,7 +308,7 @@ private:
Sequence< OUString > SAL_CALL
DefaultGridColumnModel::getSupportedServiceNames( )
{
- return { "com.sun.star.awt.grid.DefaultGridColumnModel" };
+ return { u"com.sun.star.awt.grid.DefaultGridColumnModel"_ustr };
}
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index 3b803d4a2e39..83d15eb6dcec 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -480,7 +480,7 @@ private:
OUString SAL_CALL DefaultGridDataModel::getImplementationName( )
{
- return "stardiv.Toolkit.DefaultGridDataModel";
+ return u"stardiv.Toolkit.DefaultGridDataModel"_ustr;
}
sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const OUString&
ServiceName )
@@ -490,7 +490,7 @@ private:
Sequence< OUString > SAL_CALL
DefaultGridDataModel::getSupportedServiceNames( )
{
- return { "com.sun.star.awt.grid.DefaultGridDataModel" };
+ return { u"com.sun.star.awt.grid.DefaultGridDataModel"_ustr };
}
diff --git a/toolkit/source/controls/grid/gridcolumn.cxx
b/toolkit/source/controls/grid/gridcolumn.cxx
index a5165a63cd71..effa1b13584a 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.cxx
@@ -256,7 +256,7 @@ namespace toolkit
OUString SAL_CALL GridColumn::getImplementationName( )
{
- return "org.openoffice.comp.toolkit.GridColumn";
+ return u"org.openoffice.comp.toolkit.GridColumn"_ustr;
}
sal_Bool SAL_CALL GridColumn::supportsService( const OUString&
i_serviceName )
@@ -266,7 +266,7 @@ namespace toolkit
css::uno::Sequence< OUString > SAL_CALL
GridColumn::getSupportedServiceNames( )
{
- return { "com.sun.star.awt.grid.GridColumn" };
+ return { u"com.sun.star.awt.grid.GridColumn"_ustr };
}
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx
b/toolkit/source/controls/grid/gridcontrol.cxx
index 39f4abf531df..71859cc5d35d 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -213,7 +213,7 @@ void UnoGridModel::setFastPropertyValue_NoBroadcast(
std::unique_lock<std::mutex
OUString UnoGridModel::getServiceName()
{
- return "com.sun.star.awt.grid.UnoControlGridModel";
+ return u"com.sun.star.awt.grid.UnoControlGridModel"_ustr;
}
@@ -222,7 +222,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId )
const
switch( nPropId )
{
case BASEPROPERTY_DEFAULTCONTROL:
- return uno::Any( OUString("com.sun.star.awt.grid.UnoControlGrid")
);
+ return uno::Any( u"com.sun.star.awt.grid.UnoControlGrid"_ustr );
case BASEPROPERTY_GRID_SELECTIONMODE:
return uno::Any( SelectionType(1) );
case BASEPROPERTY_GRID_SHOWROWHEADER:
@@ -281,7 +281,7 @@ UnoGridControl::~UnoGridControl()
OUString UnoGridControl::GetComponentServiceName() const
{
- return "Grid";
+ return u"Grid"_ustr;
}
@@ -315,7 +315,7 @@ namespace
try
{
Reference< XContainer > const xColModel(
- xModelProps->getPropertyValue("ColumnModel"),
+ xModelProps->getPropertyValue(u"ColumnModel"_ustr),
UNO_QUERY_THROW );
if ( i_add )
xColModel->addContainerListener( i_listener.get() );
@@ -323,7 +323,7 @@ namespace
xColModel->removeContainerListener( i_listener.get() );
Reference< XGridDataModel > const xDataModel(
- xModelProps->getPropertyValue("GridDataModel"),
+ xModelProps->getPropertyValue(u"GridDataModel"_ustr),
UNO_QUERY_THROW
);
Reference< XMutableGridDataModel > const xMutableDataModel(
xDataModel, UNO_QUERY );
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx
b/toolkit/source/controls/grid/gridcontrol.hxx
index 9b7eae0eaa25..7bc7750359c1 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -64,7 +64,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "stardiv.Toolkit.GridControlModel"; }
+ { return u"stardiv.Toolkit.GridControlModel"_ustr; }
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
@@ -115,7 +115,7 @@ public:
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "stardiv.Toolkit.GridControl"; }
+ { return u"stardiv.Toolkit.GridControl"_ustr; }
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 2d5056a8a0ab..4ca74107805b 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -889,7 +889,7 @@ void lcl_clear( STLCONTAINER& i_container )
OUString SAL_CALL SortableGridDataModel::getImplementationName( )
{
- return "org.openoffice.comp.toolkit.SortableGridDataModel";
+ return u"org.openoffice.comp.toolkit.SortableGridDataModel"_ustr;
}
sal_Bool SAL_CALL SortableGridDataModel::supportsService( const OUString&
i_serviceName )
@@ -899,7 +899,7 @@ void lcl_clear( STLCONTAINER& i_container )
Sequence< OUString > SAL_CALL
SortableGridDataModel::getSupportedServiceNames( )
{
- return { "com.sun.star.awt.grid.SortableGridDataModel" };
+ return { u"com.sun.star.awt.grid.SortableGridDataModel"_ustr };
}
diff --git a/toolkit/source/controls/roadmapcontrol.cxx
b/toolkit/source/controls/roadmapcontrol.cxx
index e46a607ef3ae..aec4ac24192e 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -66,12 +66,12 @@ namespace toolkit
OUString UnoControlRoadmapModel::getServiceName()
{
- return "stardiv.vcl.controlmodel.Roadmap";
+ return u"stardiv.vcl.controlmodel.Roadmap"_ustr;
}
OUString UnoControlRoadmapModel::getImplementationName()
{
- return "stardiv.Toolkit.UnoControlRoadmapModel";
+ return u"stardiv.Toolkit.UnoControlRoadmapModel"_ustr;
}
css::uno::Sequence<OUString>
@@ -105,7 +105,7 @@ namespace toolkit
aReturn <<= sal_Int16(2); // No Border
break;
case BASEPROPERTY_DEFAULTCONTROL:
- aReturn <<= OUString( "stardiv.vcl.control.Roadmap" );
+ aReturn <<= u"stardiv.vcl.control.Roadmap"_ustr;
break;
default : aReturn =
UnoControlRoadmapModel_Base::ImplGetDefaultValue( nPropId ); break;
}
@@ -176,7 +176,7 @@ namespace toolkit
if ( !xRoadmapItem.is() )
throw IllegalArgumentException();
Reference< XServiceInfo > xServiceInfo( xRoadmapItem, UNO_QUERY );
- bool bIsRoadmapItem =
xServiceInfo->supportsService("com.sun.star.awt.RoadmapItem");
+ bool bIsRoadmapItem =
xServiceInfo->supportsService(u"com.sun.star.awt.RoadmapItem"_ustr);
if ( !bIsRoadmapItem )
throw IllegalArgumentException();
}
@@ -189,11 +189,11 @@ namespace toolkit
if ( xProps.is() )
{
sal_Int32 LocID = 0;
- Any aValue = xPropertySet->getPropertyValue("ID");
+ Any aValue = xPropertySet->getPropertyValue(u"ID"_ustr);
aValue >>= LocID;
if (LocID < 0) // index may not be smaller than zero
{
- xPropertySet->setPropertyValue("ID", Any(GetUniqueID()) );
+ xPropertySet->setPropertyValue(u"ID"_ustr, Any(GetUniqueID())
);
}
}
}
@@ -216,7 +216,7 @@ namespace toolkit
{
CurRoadmapItem = rRoadmapItem;
Reference< XPropertySet > xPropertySet( CurRoadmapItem,
UNO_QUERY );
- aAny = xPropertySet->getPropertyValue("ID");
+ aAny = xPropertySet->getPropertyValue(u"ID"_ustr);
aAny >>= n_CurItemID;
if (n_CurItemID == CurID)
{
@@ -374,7 +374,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const
Reference< XControlModel >&
OUString UnoRoadmapControl::GetComponentServiceName() const
{
- return "Roadmap";
+ return u"Roadmap"_ustr;
}
@@ -470,7 +470,7 @@ void SAL_CALL UnoRoadmapControl::propertyChange( const
PropertyChangeEvent& evt
OUString UnoRoadmapControl::getImplementationName()
{
- return "stardiv.Toolkit.UnoRoadmapControl";
+ return u"stardiv.Toolkit.UnoRoadmapControl"_ustr;
}
css::uno::Sequence<OUString> UnoRoadmapControl::getSupportedServiceNames()
diff --git a/toolkit/source/controls/roadmapentry.cxx
b/toolkit/source/controls/roadmapentry.cxx
index 3de60f7071a2..c5f37715db57 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.cxx
@@ -27,22 +27,22 @@ ORoadmapEntry::ORoadmapEntry() : OPropertyContainer(
GetBroadcastHelper() )
{
// registerProperty or registerMayBeVoidProperty or
registerPropertyNoMember
- registerProperty( "Label", RM_PROPERTY_ID_LABEL,
+ registerProperty( u"Label"_ustr, RM_PROPERTY_ID_LABEL,
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::CONSTRAINED,
& m_sLabel, cppu::UnoType<decltype(m_sLabel)>::get() );
m_nID = -1;
- registerProperty( "ID", RM_PROPERTY_ID_ID,
+ registerProperty( u"ID"_ustr, RM_PROPERTY_ID_ID,
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::CONSTRAINED,
& m_nID, cppu::UnoType<decltype(m_nID)>::get() );
m_bEnabled = true;
- registerProperty( "Enabled", RM_PROPERTY_ID_ENABLED,
+ registerProperty( u"Enabled"_ustr, RM_PROPERTY_ID_ENABLED,
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT,
& m_bEnabled, cppu::UnoType<decltype(m_bEnabled)>::get() );
- registerProperty( "Interactive", RM_PROPERTY_ID_INTERACTIVE,
+ registerProperty( u"Interactive"_ustr, RM_PROPERTY_ID_INTERACTIVE,
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT,
& m_bInteractive,
cppu::UnoType<decltype(m_bInteractive)>::get() );
@@ -74,7 +74,7 @@ css::uno::Reference< css:: beans::XPropertySetInfo > SAL_CALL
OUString SAL_CALL ORoadmapEntry::getImplementationName( )
{
- return "com.sun.star.comp.toolkit.RoadmapItem";
+ return u"com.sun.star.comp.toolkit.RoadmapItem"_ustr;
}
sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName )
@@ -84,7 +84,7 @@ sal_Bool SAL_CALL ORoadmapEntry::supportsService( const
OUString& ServiceName )
css::uno::Sequence< OUString > SAL_CALL
ORoadmapEntry::getSupportedServiceNames( )
{
- return { "com.sun.star.awt.RoadmapItem" };
+ return { u"com.sun.star.awt.RoadmapItem"_ustr };
}
::cppu::IPropertyArrayHelper& ORoadmapEntry::getInfoHelper()
diff --git a/toolkit/source/controls/spinningprogress.cxx
b/toolkit/source/controls/spinningprogress.cxx
index 851d624a3dd2..7d6d37c4ab82 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -98,21 +98,21 @@ protected:
OUString SAL_CALL SpinningProgressControlModel::getServiceName()
{
- return "com.sun.star.awt.SpinningProgressControlModel";
+ return u"com.sun.star.awt.SpinningProgressControlModel"_ustr;
}
OUString SAL_CALL SpinningProgressControlModel::getImplementationName( )
{
- return "org.openoffice.comp.toolkit.SpinningProgressControlModel";
+ return
u"org.openoffice.comp.toolkit.SpinningProgressControlModel"_ustr;
}
Sequence< OUString > SAL_CALL
SpinningProgressControlModel::getSupportedServiceNames()
{
- return { "com.sun.star.awt.SpinningProgressControlModel",
- "com.sun.star.awt.AnimatedImagesControlModel",
- "com.sun.star.awt.UnoControlModel" };
+ return { u"com.sun.star.awt.SpinningProgressControlModel"_ustr,
+ u"com.sun.star.awt.AnimatedImagesControlModel"_ustr,
+ u"com.sun.star.awt.UnoControlModel"_ustr };
}
}
diff --git a/toolkit/source/controls/stdtabcontroller.cxx
b/toolkit/source/controls/stdtabcontroller.cxx
index e645c8b41570..d017b76fe652 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -367,7 +367,7 @@ void StdTabController::activateLast( )
OUString StdTabController::getImplementationName()
{
- return "stardiv.Toolkit.StdTabController";
+ return u"stardiv.Toolkit.StdTabController"_ustr;
}
sal_Bool StdTabController::supportsService(OUString const & ServiceName)
@@ -378,15 +378,15 @@ sal_Bool StdTabController::supportsService(OUString const
& ServiceName)
css::uno::Sequence<OUString> StdTabController::getSupportedServiceNames()
{
return css::uno::Sequence<OUString>{
- "com.sun.star.awt.TabController",
- "stardiv.vcl.control.TabController"};
+ u"com.sun.star.awt.TabController"_ustr,
+ u"stardiv.vcl.control.TabController"_ustr};
}
Reference< XControl > StdTabController::FindControl( Sequence< Reference<
XControl > >& rCtrls,
const Reference< XControlModel > & rxCtrlModel )
{
if (!rxCtrlModel.is())
- throw lang::IllegalArgumentException("No valid XControlModel",
+ throw lang::IllegalArgumentException(u"No valid XControlModel"_ustr,
uno::Reference<uno::XInterface>(), 0);
auto pCtrl = std::find_if(std::cbegin(rCtrls), std::cend(rCtrls),
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx
b/toolkit/source/controls/stdtabcontrollermodel.cxx
index 07ea5c3d3977..b9775268b95c 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@@ -367,7 +367,7 @@ void StdTabControllerModel::getGroupByName( const OUString&
rName, css::uno::Seq
// css::io::XPersistObject
OUString StdTabControllerModel::getServiceName( )
{
- return "stardiv.vcl.controlmodel.TabController";
+ return u"stardiv.vcl.controlmodel.TabController"_ustr;
}
void StdTabControllerModel::write( const css::uno::Reference<
css::io::XObjectOutputStream >& OutStream )
@@ -412,7 +412,7 @@ void StdTabControllerModel::read( const
css::uno::Reference< css::io::XObjectInp
OUString StdTabControllerModel::getImplementationName()
{
- return "stardiv.Toolkit.StdTabControllerModel";
+ return u"stardiv.Toolkit.StdTabControllerModel"_ustr;
}
sal_Bool StdTabControllerModel::supportsService(OUString const & ServiceName)
@@ -423,8 +423,8 @@ sal_Bool StdTabControllerModel::supportsService(OUString
const & ServiceName)
css::uno::Sequence<OUString> StdTabControllerModel::getSupportedServiceNames()
{
return css::uno::Sequence<OUString>{
- "com.sun.star.awt.TabControllerModel",
- "stardiv.vcl.controlmodel.TabController"};
+ u"com.sun.star.awt.TabControllerModel"_ustr,
+ u"stardiv.vcl.controlmodel.TabController"_ustr};
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/toolkit/source/controls/svtxgridcontrol.cxx
b/toolkit/source/controls/svtxgridcontrol.cxx
index 1ca789db9a1f..0f2c3f6c1cb5 100644
--- a/toolkit/source/controls/svtxgridcontrol.cxx
+++ b/toolkit/source/controls/svtxgridcontrol.cxx
@@ -397,7 +397,7 @@ void SVTXGridControl::setProperty( const OUString&
PropertyName, const Any& aVal
{
Reference< XGridDataModel > const xDataModel( aValue, UNO_QUERY );
if ( !xDataModel.is() )
- throw GridInvalidDataException("Invalid data model.", *this );
+ throw GridInvalidDataException(u"Invalid data model."_ustr,
*this );
m_xTableModel->setDataModel( xDataModel );
impl_checkTableModelInit();
@@ -409,7 +409,7 @@ void SVTXGridControl::setProperty( const OUString&
PropertyName, const Any& aVal
// obtain new col model
Reference< XGridColumnModel > const xColumnModel( aValue,
UNO_QUERY );
if ( !xColumnModel.is() )
- throw GridInvalidModelException("Invalid column model.", *this
);
+ throw GridInvalidModelException(u"Invalid column model."_ustr,
*this );
// remove all old columns
m_xTableModel->removeAllColumns();
diff --git a/toolkit/source/controls/table/cellvalueconversion.cxx
b/toolkit/source/controls/table/cellvalueconversion.cxx
index e07ef354948f..4c74d6f960a9 100644
--- a/toolkit/source/controls/table/cellvalueconversion.cxx
+++ b/toolkit/source/controls/table/cellvalueconversion.cxx
@@ -262,7 +262,7 @@ bool CellValueConversion::ensureNumberFormatter()
css::util::Date const aNullDate(1, 1, 1900);
Reference<XPropertySet> const
xFormatSettings(xSupplier->getNumberFormatSettings(),
UNO_SET_THROW);
- xFormatSettings->setPropertyValue("NullDate", Any(aNullDate));
+ xFormatSettings->setPropertyValue(u"NullDate"_ustr, Any(aNullDate));
// knit
xFormatter->attachNumberFormatsSupplier(xSupplier);
diff --git a/toolkit/source/controls/tabpagecontainer.cxx
b/toolkit/source/controls/tabpagecontainer.cxx
index 2a3ace044023..ce6e4dc0e427 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -60,7 +60,7 @@
UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Referenc
OUString UnoControlTabPageContainerModel::getServiceName()
{
- return "com.sun.star.awt.tab.UnoControlTabPageContainerModel";
+ return u"com.sun.star.awt.tab.UnoControlTabPageContainerModel"_ustr;
}
uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16
nPropId ) const
@@ -68,7 +68,7 @@ uno::Any
UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropI
switch(nPropId)
{
case BASEPROPERTY_DEFAULTCONTROL:
- return uno::Any(
OUString("com.sun.star.awt.tab.UnoControlTabPageContainer") );
+ return uno::Any(
u"com.sun.star.awt.tab.UnoControlTabPageContainer"_ustr );
case BASEPROPERTY_BORDER:
return uno::Any(sal_Int16(0)); // No Border
default:
@@ -95,7 +95,7 @@ namespace
try
{
Reference< XPropertySetInfo > const xPSI(
i_parentModel->getPropertySetInfo() );
- bool const isGeometryControlModel = xPSI.is() &&
xPSI->hasPropertyByName("PositionX");
+ bool const isGeometryControlModel = xPSI.is() &&
xPSI->hasPropertyByName(u"PositionX"_ustr);
Reference< XInterface > xInstance;
if ( isGeometryControlModel )
@@ -213,7 +213,7 @@ UnoControlTabPageContainer::UnoControlTabPageContainer(
const uno::Reference< un
OUString UnoControlTabPageContainer::GetComponentServiceName() const
{
- return "TabPageContainer";
+ return u"TabPageContainer"_ustr;
}
void SAL_CALL UnoControlTabPageContainer::dispose( )
@@ -304,7 +304,7 @@ void UnoControlTabPageContainer::updateFromModel()
{
UnoControlTabPageContainer_Base::updateFromModel();
if (!getPeer().is())
- throw RuntimeException("No peer for tabpage container!");
+ throw RuntimeException(u"No peer for tabpage container!"_ustr);
Reference< XContainerListener > xContainerListener( getPeer(), UNO_QUERY );
ENSURE_OR_RETURN_VOID( xContainerListener.is(),
"UnoListBoxControl::updateFromModel: a peer which is no ItemListListener?!" );
@@ -323,7 +323,7 @@ void SAL_CALL UnoControlTabPageContainer::addControl( const
OUString& Name, cons
SolarMutexGuard aSolarGuard;
ControlContainerBase::addControl(Name,Control);
if (!getPeer().is())
- throw RuntimeException("No peer for tabpage container!");
+ throw RuntimeException(u"No peer for tabpage container!"_ustr);
Reference< XContainerListener > xContainerListener( getPeer(), UNO_QUERY );
ContainerEvent aEvent;
aEvent.Source = getModel();
diff --git a/toolkit/source/controls/tabpagemodel.cxx
b/toolkit/source/controls/tabpagemodel.cxx
index 7185f8241947..9d8fc6b4caa2 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -57,7 +57,7 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference<
XComponentContext > c
OUString SAL_CALL UnoControlTabPageModel::getImplementationName()
{
- return "stardiv.Toolkit.UnoControlTabPageModel";
+ return u"stardiv.Toolkit.UnoControlTabPageModel"_ustr;
}
css::uno::Sequence< OUString > SAL_CALL
UnoControlTabPageModel::getSupportedServiceNames()
@@ -70,7 +70,7 @@ css::uno::Sequence< OUString > SAL_CALL
UnoControlTabPageModel::getSupportedServ
OUString UnoControlTabPageModel::getServiceName( )
{
- return "com.sun.star.awt.tab.UnoControlTabPageModel";
+ return u"com.sun.star.awt.tab.UnoControlTabPageModel"_ustr;
}
Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -80,7 +80,7 @@ Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16
nPropId ) const
switch ( nPropId )
{
case BASEPROPERTY_DEFAULTCONTROL:
- aAny <<= OUString("com.sun.star.awt.tab.UnoControlTabPage");
+ aAny <<= u"com.sun.star.awt.tab.UnoControlTabPage"_ustr;
break;
case BASEPROPERTY_USERFORMCONTAINEES:
{
@@ -168,12 +168,12 @@ UnoControlTabPage::~UnoControlTabPage()
OUString UnoControlTabPage::GetComponentServiceName() const
{
- return "TabPageModel";
+ return u"TabPageModel"_ustr;
}
OUString SAL_CALL UnoControlTabPage::getImplementationName()
{
- return "stardiv.Toolkit.UnoControlTabPage";
+ return u"stardiv.Toolkit.UnoControlTabPage"_ustr;
}
sal_Bool SAL_CALL UnoControlTabPage::supportsService(OUString const &
ServiceName)
@@ -183,7 +183,7 @@ sal_Bool SAL_CALL
UnoControlTabPage::supportsService(OUString const & ServiceNam
css::uno::Sequence<OUString> SAL_CALL
UnoControlTabPage::getSupportedServiceNames()
{
- return { "com.sun.star.awt.tab.UnoControlTabPage" };
+ return { u"com.sun.star.awt.tab.UnoControlTabPage"_ustr };
}
void SAL_CALL UnoControlTabPage::disposing( const lang::EventObject& Source )
@@ -242,7 +242,7 @@ void SAL_CALL UnoControlTabPage::windowResized( const
css::awt::WindowEvent& e )
// update the position because of property change event.
mbSizeModified = true;
// Properties in a sequence must be sorted!
- Sequence< OUString > aProps{ "Height", "Width" };
+ Sequence< OUString > aProps{ u"Height"_ustr, u"Width"_ustr };
Sequence< Any > aValues{ Any(aAppFontSize.Height()),
Any(aAppFontSize.Width()) };
ImplSetPropertyValues( aProps, aValues, true );
@@ -264,7 +264,7 @@ void SAL_CALL UnoControlTabPage::windowMoved( const
css::awt::WindowEvent& e )
// Remember that changes have been done by listener. No need to
// update the position because of property change event.
mbPosModified = true;
- Sequence< OUString > aProps{ "PositionX", "PositionY" };
+ Sequence< OUString > aProps{ u"PositionX"_ustr, u"PositionY"_ustr };
Sequence< Any > aValues{ Any(aTmp.Width()), Any(aTmp.Height()) };
ImplSetPropertyValues( aProps, aValues, true );
diff --git a/toolkit/source/controls/tkscrollbar.cxx
b/toolkit/source/controls/tkscrollbar.cxx
index ff2c8cd623f7..bc1861f1e5ab 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -46,12 +46,12 @@ namespace toolkit
OUString UnoControlScrollBarModel::getServiceName( )
{
- return "stardiv.vcl.controlmodel.ScrollBar";
+ return u"stardiv.vcl.controlmodel.ScrollBar"_ustr;
}
OUString UnoControlScrollBarModel::getImplementationName()
{
- return "stardiv.Toolkit.UnoControlScrollBarModel";
+ return u"stardiv.Toolkit.UnoControlScrollBarModel"_ustr;
}
css::uno::Sequence<OUString>
@@ -72,7 +72,7 @@ namespace toolkit
case BASEPROPERTY_LIVE_SCROLL:
return uno::Any( false );
case BASEPROPERTY_DEFAULTCONTROL:
- return uno::Any( OUString( "stardiv.vcl.control.ScrollBar" ) );
+ return uno::Any( u"stardiv.vcl.control.ScrollBar"_ustr );
default:
return UnoControlModel::ImplGetDefaultValue( nPropId );
@@ -103,7 +103,7 @@ namespace toolkit
OUString UnoScrollBarControl::GetComponentServiceName() const
{
- return "ScrollBar";
+ return u"ScrollBar"_ustr;
}
// css::uno::XInterface
@@ -289,7 +289,7 @@ namespace toolkit
OUString UnoScrollBarControl::getImplementationName()
{
- return "stardiv.Toolkit.UnoScrollBarControl";
+ return u"stardiv.Toolkit.UnoScrollBarControl"_ustr;
}
css::uno::Sequence<OUString>
UnoScrollBarControl::getSupportedServiceNames()
diff --git a/toolkit/source/controls/tkspinbutton.cxx
b/toolkit/source/controls/tkspinbutton.cxx
index 59dad491c59b..a4ace04773db 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -143,7 +143,7 @@ public:
OUString UnoSpinButtonModel::getServiceName( )
{
- return "com.sun.star.awt.UnoControlSpinButtonModel";
+ return u"com.sun.star.awt.UnoControlSpinButtonModel"_ustr;
}
@@ -152,7 +152,7 @@ public:
switch ( nPropId )
{
case BASEPROPERTY_DEFAULTCONTROL:
- return Any( OUString("com.sun.star.awt.UnoControlSpinButton") );
+ return Any( u"com.sun.star.awt.UnoControlSpinButton"_ustr );
case BASEPROPERTY_BORDER:
return Any( sal_Int16(0) );
@@ -182,13 +182,13 @@ public:
OUString SAL_CALL UnoSpinButtonModel::getImplementationName( )
{
- return "stardiv.Toolkit.UnoSpinButtonModel";
+ return u"stardiv.Toolkit.UnoSpinButtonModel"_ustr;
}
Sequence< OUString > SAL_CALL
UnoSpinButtonModel::getSupportedServiceNames()
{
- const css::uno::Sequence<OUString> vals {
"com.sun.star.awt.UnoControlSpinButtonModel" };
+ const css::uno::Sequence<OUString> vals {
u"com.sun.star.awt.UnoControlSpinButtonModel"_ustr };
return comphelper::concatSequences(
UnoControlModel::getSupportedServiceNames(), vals );
}
@@ -204,7 +204,7 @@ public:
OUString UnoSpinButtonControl::GetComponentServiceName() const
{
- return "SpinButton";
+ return u"SpinButton"_ustr;
}
@@ -242,13 +242,13 @@ public:
OUString SAL_CALL UnoSpinButtonControl::getImplementationName( )
{
- return "stardiv.Toolkit.UnoSpinButtonControl";
+ return u"stardiv.Toolkit.UnoSpinButtonControl"_ustr;
}
Sequence< OUString > SAL_CALL
UnoSpinButtonControl::getSupportedServiceNames()
{
- const css::uno::Sequence<OUString> vals {
"com.sun.star.awt.UnoControlSpinButton" };
+ const css::uno::Sequence<OUString> vals {
u"com.sun.star.awt.UnoControlSpinButton"_ustr };
return comphelper::concatSequences(
UnoControlBase::getSupportedServiceNames(), vals );
}
diff --git a/toolkit/source/controls/tree/treecontrol.cxx
b/toolkit/source/controls/tree/treecontrol.cxx
index c696220001f7..815292098f29 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -76,7 +76,7 @@ rtl::Reference<UnoControlModel> UnoTreeModel::Clone() const
OUString UnoTreeModel::getServiceName()
{
- return "com.sun.star.awt.tree.TreeControlModel";
+ return u"com.sun.star.awt.tree.TreeControlModel"_ustr;
}
Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -97,7 +97,7 @@ Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId )
const
case BASEPROPERTY_TREE_SHOWSHANDLES:
return Any( true );
case BASEPROPERTY_DEFAULTCONTROL:
- return uno::Any( OUString( "com.sun.star.awt.tree.TreeControl" ) );
+ return uno::Any( u"com.sun.star.awt.tree.TreeControl"_ustr );
default:
return UnoControlModel::ImplGetDefaultValue( nPropId );
}
@@ -189,7 +189,7 @@ UnoTreeControl::UnoTreeControl()
OUString UnoTreeControl::GetComponentServiceName() const
{
- return "Tree";
+ return u"Tree"_ustr;
}
diff --git a/toolkit/source/controls/tree/treecontrol.hxx
b/toolkit/source/controls/tree/treecontrol.hxx
index 357afddb0f20..4ea9ef81f113 100644
--- a/toolkit/source/controls/tree/treecontrol.hxx
+++ b/toolkit/source/controls/tree/treecontrol.hxx
@@ -50,7 +50,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
{
- return "stardiv.Toolkit.TreeControlModel";
+ return u"stardiv.Toolkit.TreeControlModel"_ustr;
}
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
diff --git a/toolkit/source/controls/tree/treecontrolpeer.cxx
b/toolkit/source/controls/tree/treecontrolpeer.cxx
index a26b0b6567da..78b93b9bb9fc 100644
--- a/toolkit/source/controls/tree/treecontrolpeer.cxx
+++ b/toolkit/source/controls/tree/treecontrolpeer.cxx
@@ -1388,7 +1388,7 @@ bool TreeControlPeer::loadImage( const OUString& rURL,
Image& rImage )
try
{
- css::beans::PropertyValues aProps{
comphelper::makePropertyValue("URL", rURL) };
+ css::beans::PropertyValues aProps{
comphelper::makePropertyValue(u"URL"_ustr, rURL) };
Reference< XGraphic > xGraphic( mxGraphicProvider->queryGraphic(
aProps ) );
Graphic aGraphic( xGraphic );
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx
b/toolkit/source/controls/tree/treedatamodel.cxx
index 4471697fb687..70156f44c23c 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -245,7 +245,7 @@ void SAL_CALL MutableTreeDataModel::removeEventListener(
const Reference< XEvent
OUString SAL_CALL MutableTreeDataModel::getImplementationName( )
{
- return "toolkit.MutableTreeDataModel";
+ return u"toolkit.MutableTreeDataModel"_ustr;
}
sal_Bool SAL_CALL MutableTreeDataModel::supportsService( const OUString&
ServiceName )
@@ -255,7 +255,7 @@ sal_Bool SAL_CALL MutableTreeDataModel::supportsService(
const OUString& Service
Sequence< OUString > SAL_CALL MutableTreeDataModel::getSupportedServiceNames(
)
{
- Sequence<OUString> aSeq { "com.sun.star.awt.tree.MutableTreeDataModel" };
+ Sequence<OUString> aSeq {
u"com.sun.star.awt.tree.MutableTreeDataModel"_ustr };
return aSeq;
}
@@ -508,7 +508,7 @@ OUString SAL_CALL MutableTreeNode::getCollapsedGraphicURL(
)
OUString SAL_CALL MutableTreeNode::getImplementationName( )
{
- return "toolkit.MutableTreeNode";
+ return u"toolkit.MutableTreeNode"_ustr;
}
sal_Bool SAL_CALL MutableTreeNode::supportsService( const OUString&
ServiceName )
@@ -518,7 +518,7 @@ sal_Bool SAL_CALL MutableTreeNode::supportsService( const
OUString& ServiceName
Sequence< OUString > SAL_CALL MutableTreeNode::getSupportedServiceNames( )
{
- Sequence<OUString> aSeq { "com.sun.star.awt.tree.MutableTreeNode" };
+ Sequence<OUString> aSeq { u"com.sun.star.awt.tree.MutableTreeNode"_ustr };
return aSeq;
}
diff --git a/toolkit/source/controls/unocontrol.cxx
b/toolkit/source/controls/unocontrol.cxx
index 101e5f75a706..b13ffa02d20f 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -218,7 +218,7 @@ bool UnoControl::ImplCheckLocalize( OUString&
_rPossiblyLocalizable )
{
Reference< XPropertySet > xPropSet( mxModel, UNO_QUERY_THROW );
Reference< resource::XStringResourceResolver > xStringResourceResolver(
- xPropSet->getPropertyValue("ResourceResolver"),
+ xPropSet->getPropertyValue(u"ResourceResolver"_ustr),
UNO_QUERY
);
if ( xStringResourceResolver.is() )
@@ -1059,7 +1059,7 @@ void UnoControl::createPeer( const Reference< XToolkit >&
rxToolkit, const Refer
::osl::ClearableMutexGuard aGuard( GetMutex() );
if ( !mxModel.is() )
{
- throw RuntimeException("createPeer: no model!", getXWeak());
+ throw RuntimeException(u"createPeer: no model!"_ustr, getXWeak());
}
if( getPeer().is() )
@@ -1284,9 +1284,9 @@ void UnoControl::createPeer( const Reference< XToolkit >&
rxToolkit, const Refer
// tdf#150886 if false use the same settings for widgets regardless of
theme
// for consistency of document across platforms and in pdf/print output
// note: tdf#155029 do this before updateFromModel
- if (xInfo->hasPropertyByName("StandardTheme"))
+ if (xInfo->hasPropertyByName(u"StandardTheme"_ustr))
{
- aVal = xPSet->getPropertyValue("StandardTheme");
+ aVal = xPSet->getPropertyValue(u"StandardTheme"_ustr);
bool bUseStandardTheme = false;
aVal >>= bUseStandardTheme;
if (bUseStandardTheme)
@@ -1363,7 +1363,7 @@ sal_Bool UnoControl::setModel( const Reference<
XControlModel >& rxModel )
Sequence< OUString> aNames = lcl_ImplGetPropertyNames( xPropSet );
xPropSet->addPropertiesChangeListener( aNames, xListener );
- mpData->bLocalizationSupport =
xPSI->hasPropertyByName("ResourceResolver");
+ mpData->bLocalizationSupport =
xPSI->hasPropertyByName(u"ResourceResolver"_ustr);
}
catch( const Exception& )
{
@@ -1444,7 +1444,7 @@ sal_Bool UnoControl::supportsService( const OUString&
rServiceName )
Sequence< OUString > UnoControl::getSupportedServiceNames( )
{
- return { "com.sun.star.awt.UnoControl" };
+ return { u"com.sun.star.awt.UnoControl"_ustr };
}
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx
b/toolkit/source/controls/unocontrolcontainer.cxx
index 1610f36629e1..053bfb6c62c4 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -268,7 +268,7 @@ UnoControlHolderList::ControlIdentifier
UnoControlHolderList::impl_getFreeIdenti
if ( existent == maControls.end() )
return candidateId;
}
- throw uno::RuntimeException("out of identifiers" );
+ throw uno::RuntimeException(u"out of identifiers"_ustr );
}
@@ -281,7 +281,7 @@ OUString UnoControlHolderList::impl_getFreeName_throw()
[&candidateName](const ControlMap::value_type& rEntry) {
return rEntry.second->getName() == candidateName; }) )
return candidateName;
}
- throw uno::RuntimeException("out of identifiers" );
+ throw uno::RuntimeException(u"out of identifiers"_ustr );
}
// Function to set the controls' visibility according
@@ -306,7 +306,7 @@ static void implUpdateVisibility
( xModel, uno::UNO_QUERY );
uno::Reference< beans::XPropertySetInfo >
xInfo = xPSet->getPropertySetInfo();
- OUString aPropName( "Step" );
+ OUString aPropName( u"Step"_ustr );
sal_Int32 nControlStep = 0;
if ( xInfo->hasPropertyByName( aPropName ) )
{
@@ -455,7 +455,7 @@ void UnoControlContainer::removeContainerListener( const
uno::Reference< contain
uno::Reference< awt::XControl > xControl;
if ( !( _rElement >>= xControl ) || !xControl.is() )
throw lang::IllegalArgumentException(
- "Elements must support the XControl interface.",
+ u"Elements must support the XControl interface."_ustr,
*this,
1
);
@@ -470,7 +470,7 @@ void SAL_CALL UnoControlContainer::removeByIdentifier(
::sal_Int32 _nIdentifier
uno::Reference< awt::XControl > xControl;
if ( !mpControls->getControlForIdentifier( _nIdentifier, xControl ) )
throw container::NoSuchElementException(
- "There is no element with the given identifier.",
+ u"There is no element with the given identifier."_ustr,
*this
);
@@ -484,14 +484,14 @@ void SAL_CALL UnoControlContainer::replaceByIdentifer(
::sal_Int32 _nIdentifier,
uno::Reference< awt::XControl > xExistentControl;
if ( !mpControls->getControlForIdentifier( _nIdentifier, xExistentControl
) )
throw container::NoSuchElementException(
- "There is no element with the given identifier.",
+ u"There is no element with the given identifier."_ustr,
*this
);
uno::Reference< awt::XControl > xNewControl;
if ( !( _rElement >>= xNewControl ) )
throw lang::IllegalArgumentException(
- "Elements must support the XControl interface.",
+ u"Elements must support the XControl interface."_ustr,
*this,
1
);
@@ -735,7 +735,7 @@ void UnoControlContainer::createPeer( const uno::Reference<
awt::XToolkit >& rxT
( xModel, uno::UNO_QUERY );
uno::Reference< beans::XPropertySetInfo >
xInfo = xPSet->getPropertySetInfo();
- OUString aPropName( "Step" );
+ OUString aPropName( u"Step"_ustr );
if ( xInfo->hasPropertyByName( aPropName ) )
{
css::uno::Any aVal = xPSet->getPropertyValue( aPropName );
@@ -778,7 +778,7 @@ void UnoControlContainer::setVisible( sal_Bool bVisible )
OUString UnoControlContainer::getImplementationName()
{
- return "stardiv.Toolkit.UnoControlContainer";
+ return u"stardiv.Toolkit.UnoControlContainer"_ustr;
}
css::uno::Sequence<OUString> UnoControlContainer::getSupportedServiceNames()
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx
b/toolkit/source/controls/unocontrolcontainermodel.cxx
index 6bfaf4448cd1..ee5512bb0c99 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -40,12 +40,12 @@ UnoControlContainerModel::UnoControlContainerModel( const
css::uno::Reference< c
OUString UnoControlContainerModel::getServiceName()
{
- return "stardiv.vcl.controlmodel.ControlContainer";
+ return u"stardiv.vcl.controlmodel.ControlContainer"_ustr;
}
OUString UnoControlContainerModel::getImplementationName()
{
- return "stardiv.Toolkit.UnoControlContainerModel";
+ return u"stardiv.Toolkit.UnoControlContainerModel"_ustr;
}
css::uno::Sequence<OUString>
diff --git a/toolkit/source/controls/unocontrolmodel.cxx
b/toolkit/source/controls/unocontrolmodel.cxx
index 6b24829a6310..e7fb947eebbb 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -1025,7 +1025,7 @@ sal_Bool UnoControlModel::supportsService( const
OUString& rServiceName )
css::uno::Sequence< OUString > UnoControlModel::getSupportedServiceNames( )
{
- return { "com.sun.star.awt.UnoControlModel" };
+ return { u"com.sun.star.awt.UnoControlModel"_ustr };
}
bool UnoControlModel::convertFastPropertyValue( std::unique_lock<std::mutex>&
rGuard, Any & rConvertedValue, Any & rOldValue, sal_Int32 nPropId, const Any&
rValue )
@@ -1263,7 +1263,7 @@ void UnoControlModel::setPropertyValuesImpl(
std::unique_lock<std::mutex>& rGuar
{
sal_Int32 nProps = rPropertyNames.getLength();
if (nProps != Values.getLength())
- throw css::lang::IllegalArgumentException("lengths do not match",
+ throw css::lang::IllegalArgumentException(u"lengths do not match"_ustr,
getXWeak(), -1);
// sal_Int32* pHandles = new sal_Int32[nProps];
diff --git a/toolkit/source/controls/unocontrols.cxx
b/toolkit/source/controls/unocontrols.cxx
index 2b0ac450293c..02642652d222 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -75,7 +75,7 @@ ImageHelper::getGraphicFromURL_nothrow( const OUString& _rURL
)
{
uno::Reference< uno::XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
uno::Reference< graphic::XGraphicProvider > xProvider(
graphic::GraphicProvider::create(xContext) );
- xGraphic = xProvider->queryGraphic({
comphelper::makePropertyValue("URL", _rURL) });
+ xGraphic = xProvider->queryGraphic({
comphelper::makePropertyValue(u"URL"_ustr, _rURL) });
}
catch (const Exception&)
{
@@ -94,7 +94,7 @@ UnoControlEditModel::UnoControlEditModel( const Reference<
XComponentContext >&
OUString UnoControlEditModel::getServiceName( )
{
- return "stardiv.vcl.controlmodel.Edit";
+ return u"stardiv.vcl.controlmodel.Edit"_ustr;
}
uno::Any UnoControlEditModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -107,7 +107,7 @@ uno::Any UnoControlEditModel::ImplGetDefaultValue(
sal_uInt16 nPropId ) const
aReturn <<= sal_Int16(awt::LineEndFormat::LINE_FEED); // LF
break;
case BASEPROPERTY_DEFAULTCONTROL:
- aReturn <<= OUString( "stardiv.vcl.control.Edit" );
+ aReturn <<= u"stardiv.vcl.control.Edit"_ustr;
break;
default:
aReturn = UnoControlModel::ImplGetDefaultValue( nPropId );
@@ -131,12 +131,12 @@ uno::Reference< beans::XPropertySetInfo >
UnoControlEditModel::getPropertySetInf
OUString UnoControlEditModel::getImplementationName()
{
- return "stardiv.Toolkit.UnoControlEditModel";
+ return u"stardiv.Toolkit.UnoControlEditModel"_ustr;
}
css::uno::Sequence<OUString> UnoControlEditModel::getSupportedServiceNames()
{
- const css::uno::Sequence<OUString> vals {
"com.sun.star.awt.UnoControlEditModel", "stardiv.vcl.controlmodel.Edit" };
+ const css::uno::Sequence<OUString> vals {
u"com.sun.star.awt.UnoControlEditModel"_ustr,
u"stardiv.vcl.controlmodel.Edit"_ustr };
return
comphelper::concatSequences(UnoControlModel::getSupportedServiceNames(), vals);
}
@@ -189,7 +189,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoEditControl,
UnoControlBase, UnoEditControl
OUString UnoEditControl::GetComponentServiceName() const
{
// by default, we want a simple edit field
- OUString sName( "Edit" );
+ OUString sName( u"Edit"_ustr );
// but maybe we are to display multi-line text?
uno::Any aVal = ImplGetPropertyValue( GetPropertyName(
BASEPROPERTY_MULTILINE ) );
@@ -460,12 +460,12 @@ void UnoEditControl::getColumnsAndLines( sal_Int16&
nCols, sal_Int16& nLines )
OUString UnoEditControl::getImplementationName( )
{
- return "stardiv.Toolkit.UnoEditControl";
+ return u"stardiv.Toolkit.UnoEditControl"_ustr;
}
uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames()
{
- css::uno::Sequence<OUString> vals { "com.sun.star.awt.UnoControlEdit",
"stardiv.vcl.control.Edit" };
+ css::uno::Sequence<OUString> vals {
u"com.sun.star.awt.UnoControlEdit"_ustr, u"stardiv.vcl.control.Edit"_ustr };
return comphelper::concatSequences(
UnoControlBase::getSupportedServiceNames( ), vals);
}
@@ -504,14 +504,14 @@ UnoControlFileControlModel::UnoControlFileControlModel(
const Reference< XCompon
OUString UnoControlFileControlModel::getServiceName()
{
- return "stardiv.vcl.controlmodel.FileControl";
+ return u"stardiv.vcl.controlmodel.FileControl"_ustr;
}
uno::Any UnoControlFileControlModel::ImplGetDefaultValue( sal_uInt16 nPropId )
const
{
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
- return uno::Any( OUString( "stardiv.vcl.control.FileControl" ) );
+ return uno::Any( u"stardiv.vcl.control.FileControl"_ustr );
}
return UnoControlModel::ImplGetDefaultValue( nPropId );
}
@@ -531,13 +531,13 @@ uno::Reference< beans::XPropertySetInfo >
UnoControlFileControlModel::getPropert
OUString UnoControlFileControlModel::getImplementationName()
{
- return "stardiv.Toolkit.UnoControlFileControlModel";
+ return u"stardiv.Toolkit.UnoControlFileControlModel"_ustr;
}
css::uno::Sequence<OUString>
UnoControlFileControlModel::getSupportedServiceNames()
{
- const css::uno::Sequence<OUString> vals {
"com.sun.star.awt.UnoControlFileControlModel",
"stardiv.vcl.controlmodel.FileControl" };
+ const css::uno::Sequence<OUString> vals {
u"com.sun.star.awt.UnoControlFileControlModel"_ustr,
u"stardiv.vcl.controlmodel.FileControl"_ustr };
return comphelper::concatSequences(
UnoControlModel::getSupportedServiceNames(), vals);
}
@@ -557,17 +557,17 @@ UnoFileControl::UnoFileControl()
OUString UnoFileControl::GetComponentServiceName() const
{
- return "filecontrol";
+ return u"filecontrol"_ustr;
}
OUString UnoFileControl::getImplementationName()
{
- return "stardiv.Toolkit.UnoFileControl";
+ return u"stardiv.Toolkit.UnoFileControl"_ustr;
}
css::uno::Sequence<OUString> UnoFileControl::getSupportedServiceNames()
{
- const css::uno::Sequence<OUString> vals {
"com.sun.star.awt.UnoControlFileControl", "stardiv.vcl.control.FileControl" };
+ const css::uno::Sequence<OUString> vals {
u"com.sun.star.awt.UnoControlFileControl"_ustr,
u"stardiv.vcl.control.FileControl"_ustr };
return comphelper::concatSequences(
UnoEditControl::getSupportedServiceNames(), vals );
}
@@ -668,7 +668,7 @@ UnoControlButtonModel::UnoControlButtonModel( const
Reference< XComponentContext
OUString UnoControlButtonModel::getServiceName()
{
- return "stardiv.vcl.controlmodel.Button";
+ return u"stardiv.vcl.controlmodel.Button"_ustr;
}
uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -676,7 +676,7 @@ uno::Any UnoControlButtonModel::ImplGetDefaultValue(
sal_uInt16 nPropId ) const
switch ( nPropId )
{
case BASEPROPERTY_DEFAULTCONTROL:
- return uno::Any( OUString( "stardiv.vcl.control.Button" ) );
+ return uno::Any( u"stardiv.vcl.control.Button"_ustr );
case BASEPROPERTY_TOGGLE:
return uno::Any( false );
case BASEPROPERTY_ALIGN:
@@ -703,12 +703,12 @@ uno::Reference< beans::XPropertySetInfo >
UnoControlButtonModel::getPropertySetI
OUString UnoControlButtonModel::getImplementationName()
{
- return "stardiv.Toolkit.UnoControlButtonModel";
+ return u"stardiv.Toolkit.UnoControlButtonModel"_ustr;
}
css::uno::Sequence<OUString> UnoControlButtonModel::getSupportedServiceNames()
{
- const css::uno::Sequence<OUString> vals {
"com.sun.star.awt.UnoControlButtonModel", "stardiv.vcl.controlmodel.Button" };
+ const css::uno::Sequence<OUString> vals {
u"com.sun.star.awt.UnoControlButtonModel"_ustr,
u"stardiv.vcl.controlmodel.Button"_ustr };
return comphelper::concatSequences(
GraphicControlModel::getSupportedServiceNames(), vals );
}
@@ -732,7 +732,7 @@ UnoButtonControl::UnoButtonControl()
OUString UnoButtonControl::GetComponentServiceName() const
{
- OUString aName( "pushbutton" );
+ OUString aName( u"pushbutton"_ustr );
uno::Any aVal = ImplGetPropertyValue( GetPropertyName(
BASEPROPERTY_PUSHBUTTONTYPE ) );
sal_Int16 n = sal_Int16();
if ( ( aVal >>= n ) && n )
@@ -870,12 +870,12 @@ awt::Size UnoButtonControl::calcAdjustedSize( const
awt::Size& rNewSize )
OUString UnoButtonControl::getImplementationName()
{
- return "stardiv.Toolkit.UnoButtonControl";
+ return u"stardiv.Toolkit.UnoButtonControl"_ustr;
}
css::uno::Sequence<OUString> UnoButtonControl::getSupportedServiceNames()
{
- const css::uno::Sequence<OUString> vals {
"com.sun.star.awt.UnoControlButton", "stardiv.vcl.control.Button" };
+ const css::uno::Sequence<OUString> vals {
u"com.sun.star.awt.UnoControlButton"_ustr, u"stardiv.vcl.control.Button"_ustr };
return comphelper::concatSequences(
UnoControlBase::getSupportedServiceNames(), vals);
}
@@ -898,22 +898,22 @@ UnoControlImageControlModel::UnoControlImageControlModel(
const Reference< XComp
OUString UnoControlImageControlModel::getServiceName()
{
- return "stardiv.vcl.controlmodel.ImageControl";
+ return u"stardiv.vcl.controlmodel.ImageControl"_ustr;
}
OUString UnoControlImageControlModel::getImplementationName()
{
- return "stardiv.Toolkit.UnoControlImageControlModel";
+ return u"stardiv.Toolkit.UnoControlImageControlModel"_ustr;
}
css::uno::Sequence<OUString>
UnoControlImageControlModel::getSupportedServiceNames()
{
const css::uno::Sequence<OUString> vals {
- "com.sun.star.awt.UnoControlImageButtonModel",
- "com.sun.star.awt.UnoControlImageControlModel",
- "stardiv.vcl.controlmodel.ImageButton",
- "stardiv.vcl.controlmodel.ImageControl"
+ u"com.sun.star.awt.UnoControlImageButtonModel"_ustr,
+ u"com.sun.star.awt.UnoControlImageControlModel"_ustr,
+ u"stardiv.vcl.controlmodel.ImageButton"_ustr,
+ u"stardiv.vcl.controlmodel.ImageControl"_ustr
};
return comphelper::concatSequences(
GraphicControlModel::getSupportedServiceNames(), vals);
}
@@ -921,7 +921,7 @@ UnoControlImageControlModel::getSupportedServiceNames()
uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId
) const
{
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
- return uno::Any( OUString( "stardiv.vcl.control.ImageControl" ) );
+ return uno::Any( u"stardiv.vcl.control.ImageControl"_ustr );
if ( nPropId == BASEPROPERTY_IMAGE_SCALE_MODE )
return Any( awt::ImageScaleMode::ANISOTROPIC );
@@ -1000,7 +1000,7 @@ UnoImageControlControl::UnoImageControlControl()
OUString UnoImageControlControl::GetComponentServiceName() const
{
- return "fixedimage";
+ return u"fixedimage"_ustr;
}
void UnoImageControlControl::dispose()
@@ -1033,16 +1033,16 @@ awt::Size UnoImageControlControl::calcAdjustedSize(
const awt::Size& rNewSize )
OUString UnoImageControlControl::getImplementationName()
{
- return "stardiv.Toolkit.UnoImageControlControl";
+ return u"stardiv.Toolkit.UnoImageControlControl"_ustr;
}
css::uno::Sequence<OUString> UnoImageControlControl::getSupportedServiceNames()
{
const css::uno::Sequence<OUString> vals {
- "com.sun.star.awt.UnoControlImageButton",
- "com.sun.star.awt.UnoControlImageControl",
- "stardiv.vcl.control.ImageButton",
- "stardiv.vcl.control.ImageControl"
+ u"com.sun.star.awt.UnoControlImageButton"_ustr,
+ u"com.sun.star.awt.UnoControlImageControl"_ustr,
+ u"stardiv.vcl.control.ImageButton"_ustr,
+ u"stardiv.vcl.control.ImageControl"_ustr
};
return comphelper::concatSequences(
UnoControlBase::getSupportedServiceNames(), vals);
}
@@ -1065,7 +1065,7 @@ UnoControlRadioButtonModel::UnoControlRadioButtonModel(
const Reference< XCompon
OUString UnoControlRadioButtonModel::getServiceName()
{
- return "stardiv.vcl.controlmodel.RadioButton";
+ return u"stardiv.vcl.controlmodel.RadioButton"_ustr;
}
uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId )
const
@@ -1073,7 +1073,7 @@ uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue(
sal_uInt16 nPropId ) c
switch ( nPropId )
{
case BASEPROPERTY_DEFAULTCONTROL:
- return uno::Any( OUString( "stardiv.vcl.control.RadioButton" ) );
+ return uno::Any( u"stardiv.vcl.control.RadioButton"_ustr );
case BASEPROPERTY_VISUALEFFECT:
return uno::Any( sal_Int16(awt::VisualEffect::LOOK3D) );
@@ -1097,13 +1097,13 @@ uno::Reference< beans::XPropertySetInfo >
UnoControlRadioButtonModel::getPropert
OUString UnoControlRadioButtonModel::getImplementationName()
{
- return "stardiv.Toolkit.UnoControlRadioButtonModel";
+ return u"stardiv.Toolkit.UnoControlRadioButtonModel"_ustr;
}
css::uno::Sequence<OUString>
UnoControlRadioButtonModel::getSupportedServiceNames()
{
- const css::uno::Sequence<OUString> vals {
"com.sun.star.awt.UnoControlRadioButtonModel",
"stardiv.vcl.controlmodel.RadioButton" };
+ const css::uno::Sequence<OUString> vals {
u"com.sun.star.awt.UnoControlRadioButtonModel"_ustr,
u"stardiv.vcl.controlmodel.RadioButton"_ustr };
return comphelper::concatSequences(
GraphicControlModel::getSupportedServiceNames(), vals);
}
@@ -1127,7 +1127,7 @@ UnoRadioButtonControl::UnoRadioButtonControl()
OUString UnoRadioButtonControl::GetComponentServiceName() const
{
- return "radiobutton";
+ return u"radiobutton"_ustr;
}
void UnoRadioButtonControl::dispose()
@@ -1271,12 +1271,12 @@ awt::Size UnoRadioButtonControl::calcAdjustedSize(
const awt::Size& rNewSize )
OUString UnoRadioButtonControl::getImplementationName()
{
- return "stardiv.Toolkit.UnoRadioButtonControl";
+ return u"stardiv.Toolkit.UnoRadioButtonControl"_ustr;
}
css::uno::Sequence<OUString> UnoRadioButtonControl::getSupportedServiceNames()
{
- const css::uno::Sequence<OUString> vals {
"com.sun.star.awt.UnoControlRadioButton", "stardiv.vcl.control.RadioButton" };
+ const css::uno::Sequence<OUString> vals {
u"com.sun.star.awt.UnoControlRadioButton"_ustr,
u"stardiv.vcl.control.RadioButton"_ustr };
return comphelper::concatSequences(
UnoControlBase::getSupportedServiceNames(), vals );
}
@@ -1298,7 +1298,7 @@ UnoControlCheckBoxModel::UnoControlCheckBoxModel( const
Reference< XComponentCon
OUString UnoControlCheckBoxModel::getServiceName()
{
- return "stardiv.vcl.controlmodel.CheckBox";
+ return u"stardiv.vcl.controlmodel.CheckBox"_ustr;
}
uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId )
const
@@ -1306,7 +1306,7 @@ uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue(
sal_uInt16 nPropId ) cons
switch ( nPropId )
{
case BASEPROPERTY_DEFAULTCONTROL:
- return uno::Any( OUString( "stardiv.vcl.control.CheckBox" ) );
+ return uno::Any( u"stardiv.vcl.control.CheckBox"_ustr );
case BASEPROPERTY_VISUALEFFECT:
return uno::Any( sal_Int16(awt::VisualEffect::LOOK3D) );
@@ -1330,12 +1330,12 @@ uno::Reference< beans::XPropertySetInfo >
UnoControlCheckBoxModel::getPropertySe
OUString UnoControlCheckBoxModel::getImplementationName()
{
- return "stardiv.Toolkit.UnoControlCheckBoxModel";
+ return u"stardiv.Toolkit.UnoControlCheckBoxModel"_ustr;
}
css::uno::Sequence<OUString>
UnoControlCheckBoxModel::getSupportedServiceNames()
{
- const css::uno::Sequence<OUString> vals {
"com.sun.star.awt.UnoControlCheckBoxModel", "stardiv.vcl.controlmodel.CheckBox"
};
+ const css::uno::Sequence<OUString> vals {
u"com.sun.star.awt.UnoControlCheckBoxModel"_ustr,
u"stardiv.vcl.controlmodel.CheckBox"_ustr };
return comphelper::concatSequences(
GraphicControlModel::getSupportedServiceNames(), vals );
}
@@ -1358,7 +1358,7 @@ UnoCheckBoxControl::UnoCheckBoxControl()
OUString UnoCheckBoxControl::GetComponentServiceName() const
{
- return "checkbox";
+ return u"checkbox"_ustr;
}
void UnoCheckBoxControl::dispose()
@@ -1476,12 +1476,12 @@ awt::Size UnoCheckBoxControl::calcAdjustedSize( const
awt::Size& rNewSize )
OUString UnoCheckBoxControl::getImplementationName()
{
- return "stardiv.Toolkit.UnoCheckBoxControl";
+ return u"stardiv.Toolkit.UnoCheckBoxControl"_ustr;
}
css::uno::Sequence<OUString> UnoCheckBoxControl::getSupportedServiceNames()
{
- const css::uno::Sequence<OUString> vals {
"com.sun.star.awt.UnoControlCheckBox", "stardiv.vcl.control.CheckBox" };
+ const css::uno::Sequence<OUString> vals {
u"com.sun.star.awt.UnoControlCheckBox"_ustr,
u"stardiv.vcl.control.CheckBox"_ustr };
return comphelper::concatSequences(
UnoControlBase::getSupportedServiceNames(), vals );
}
@@ -1503,14 +1503,14 @@
UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< X
OUString UnoControlFixedHyperlinkModel::getServiceName()
{
- return "com.sun.star.awt.UnoControlFixedHyperlinkModel";
+ return u"com.sun.star.awt.UnoControlFixedHyperlinkModel"_ustr;
}
uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16
nPropId ) const
{
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
- return uno::Any( OUString( "com.sun.star.awt.UnoControlFixedHyperlink"
) );
+ return uno::Any( u"com.sun.star.awt.UnoControlFixedHyperlink"_ustr );
}
else if ( nPropId == BASEPROPERTY_BORDER )
{
@@ -1556,7 +1556,7 @@ UnoFixedHyperlinkControl::UnoFixedHyperlinkControl()
OUString UnoFixedHyperlinkControl::GetComponentServiceName() const
{
- return "fixedhyperlink";
+ return u"fixedhyperlink"_ustr;
}
// uno::XInterface
@@ -1693,14 +1693,14 @@ UnoControlFixedTextModel::UnoControlFixedTextModel(
const Reference< XComponentC
OUString UnoControlFixedTextModel::getServiceName()
{
- return "stardiv.vcl.controlmodel.FixedText";
+ return u"stardiv.vcl.controlmodel.FixedText"_ustr;
}
uno::Any UnoControlFixedTextModel::ImplGetDefaultValue( sal_uInt16 nPropId )
const
{
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
- return uno::Any( OUString( "stardiv.vcl.control.FixedText" ) );
-e
... etc. - the rest is truncated
