summaryrefslogtreecommitdiff
path: root/svtools/source/uno
diff options
context:
space:
mode:
Diffstat (limited to 'svtools/source/uno')
-rw-r--r--svtools/source/uno/addrtempuno.cxx4
-rw-r--r--svtools/source/uno/fpicker.cxx20
-rw-r--r--svtools/source/uno/genericunodialog.cxx2
-rw-r--r--svtools/source/uno/popupmenucontrollerbase.cxx2
-rw-r--r--svtools/source/uno/statusbarcontroller.cxx2
-rw-r--r--svtools/source/uno/toolboxcontroller.cxx4
-rw-r--r--svtools/source/uno/unoevent.cxx12
-rw-r--r--svtools/source/uno/unoimap.cxx54
-rw-r--r--svtools/source/uno/wizard/unowizard.cxx6
-rw-r--r--svtools/source/uno/wizard/wizardshell.cxx2
10 files changed, 54 insertions, 54 deletions
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index a0c530f8f1f0..0c8694e76b76 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -94,13 +94,13 @@ constexpr OUStringLiteral UNODIALOG_PROPERTY_ALIASES = u"FieldMapping";
OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName()
{
- return "com.sun.star.comp.svtools.OAddressBookSourceDialogUno";
+ return u"com.sun.star.comp.svtools.OAddressBookSourceDialogUno"_ustr;
}
css::uno::Sequence<OUString> SAL_CALL OAddressBookSourceDialogUno::getSupportedServiceNames()
{
- return { "com.sun.star.ui.AddressBookSourceDialog" };
+ return { u"com.sun.star.ui.AddressBookSourceDialog"_ustr };
}
diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx
index e02d8abebb80..9800f40fea32 100644
--- a/svtools/source/uno/fpicker.cxx
+++ b/svtools/source/uno/fpicker.cxx
@@ -39,9 +39,9 @@ static OUString FilePicker_getSystemPickerServiceName()
#ifdef UNX
OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
if (aDesktopEnvironment.equalsIgnoreAsciiCase("macosx"))
- return "com.sun.star.ui.dialogs.AquaFilePicker";
+ return u"com.sun.star.ui.dialogs.AquaFilePicker"_ustr;
else
- return "com.sun.star.ui.dialogs.SystemFilePicker";
+ return u"com.sun.star.ui.dialogs.SystemFilePicker"_ustr;
#endif
#ifdef _WIN32
return "com.sun.star.ui.dialogs.Win32FilePicker";
@@ -88,7 +88,7 @@ Reference< css::uno::XInterface > FilePicker_CreateInstance (
{
// Always fall back to OfficeFilePicker.
xResult = xFactory->createInstanceWithContext (
- "com.sun.star.ui.dialogs.OfficeFilePicker",
+ u"com.sun.star.ui.dialogs.OfficeFilePicker"_ustr,
context);
}
if (xResult.is())
@@ -101,12 +101,12 @@ Reference< css::uno::XInterface > FilePicker_CreateInstance (
OUString FilePicker_getImplementationName()
{
- return "com.sun.star.comp.svt.FilePicker";
+ return u"com.sun.star.comp.svt.FilePicker"_ustr;
}
Sequence< OUString > FilePicker_getSupportedServiceNames()
{
- Sequence< OUString > aServiceNames { "com.sun.star.ui.dialogs.FilePicker" };
+ Sequence< OUString > aServiceNames { u"com.sun.star.ui.dialogs.FilePicker"_ustr };
return aServiceNames;
}
@@ -118,9 +118,9 @@ static OUString FolderPicker_getSystemPickerServiceName()
#ifdef UNX
OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
if (aDesktopEnvironment.equalsIgnoreAsciiCase("macosx"))
- return "com.sun.star.ui.dialogs.AquaFolderPicker";
+ return u"com.sun.star.ui.dialogs.AquaFolderPicker"_ustr;
#endif
- return "com.sun.star.ui.dialogs.SystemFolderPicker";
+ return u"com.sun.star.ui.dialogs.SystemFolderPicker"_ustr;
}
Reference< css::uno::XInterface > FolderPicker_CreateInstance (
@@ -153,7 +153,7 @@ Reference< css::uno::XInterface > FolderPicker_CreateInstance (
{
// Always fall back to OfficeFolderPicker.
xResult = xFactory->createInstanceWithContext (
- "com.sun.star.ui.dialogs.OfficeFolderPicker",
+ u"com.sun.star.ui.dialogs.OfficeFolderPicker"_ustr,
context);
}
if (xResult.is())
@@ -166,12 +166,12 @@ Reference< css::uno::XInterface > FolderPicker_CreateInstance (
OUString FolderPicker_getImplementationName()
{
- return "com.sun.star.comp.svt.FolderPicker";
+ return u"com.sun.star.comp.svt.FolderPicker"_ustr;
}
Sequence< OUString > FolderPicker_getSupportedServiceNames()
{
- Sequence< OUString > aServiceNames { "com.sun.star.ui.dialogs.FolderPicker" };
+ Sequence< OUString > aServiceNames { u"com.sun.star.ui.dialogs.FolderPicker"_ustr };
return aServiceNames;
}
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index 349d9a73a4d4..6a7f0a3be741 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -190,7 +190,7 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute()
if (m_bExecuting)
throw RuntimeException(
- "already executing the dialog (recursive call)",
+ u"already executing the dialog (recursive call)"_ustr,
*this
);
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index 61df2a4645af..85065724f9f3 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -275,7 +275,7 @@ void SAL_CALL PopupMenuControllerBase::removeStatusListener(
OUString PopupMenuControllerBase::determineBaseURL( std::u16string_view aURL )
{
// Just use the main part of the URL for popup menu controllers
- OUString aMainURL( "vnd.sun.star.popup:" );
+ OUString aMainURL( u"vnd.sun.star.popup:"_ustr );
size_t nSchemePart = aURL.find( ':' );
if (( nSchemePart != std::u16string_view::npos && nSchemePart > 0 ) &&
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index 59607875ffc6..fb56a0b47fa2 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -276,7 +276,7 @@ void SAL_CALL StatusbarController::statusChanged( const FeatureStateEvent& Event
if ( Event.State >>= aStrValue )
pStatusBar->SetItemText( m_nID, aStrValue );
else if ( !Event.State.hasValue() )
- pStatusBar->SetItemText( m_nID, "" );
+ pStatusBar->SetItemText( m_nID, u""_ustr );
}
}
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index f1f97fd88c52..b397ae65649c 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -128,7 +128,7 @@ Reference< XLayoutManager > ToolboxController::getLayoutManager() const
{
try
{
- xLayoutManager.set(xPropSet->getPropertyValue("LayoutManager"),UNO_QUERY);
+ xLayoutManager.set(xPropSet->getPropertyValue(u"LayoutManager"_ustr),UNO_QUERY);
}
catch ( Exception& )
{
@@ -344,7 +344,7 @@ void SAL_CALL ToolboxController::execute( sal_Int16 KeyModifier )
css::util::URL aTargetURL;
// Provide key modifier information to dispatch function
- Sequence<PropertyValue> aArgs{ comphelper::makePropertyValue("KeyModifier", KeyModifier) };
+ Sequence<PropertyValue> aArgs{ comphelper::makePropertyValue(u"KeyModifier"_ustr, KeyModifier) };
aTargetURL.Complete = aCommandURL;
if ( m_xUrlTransformer.is() )
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index 853815e7d161..cfb33a0296a0 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -166,7 +166,7 @@ void getMacroFromAny(
if (bNone)
{
// return empty macro
- rMacro = SvxMacro( "", "" );
+ rMacro = SvxMacro( u""_ustr, u""_ustr );
}
else
{
@@ -221,7 +221,7 @@ void SvBaseEventDescriptor::replaceByName(
rElement >>= aSequence;
// perform replace (in subclass)
- SvxMacro aMacro("","");
+ SvxMacro aMacro(u""_ustr,u""_ustr);
getMacroFromAny(aMacro, rElement);
replaceByName(nMacroID, aMacro);
}
@@ -237,7 +237,7 @@ Any SvBaseEventDescriptor::getByName(
// perform get (in subclass)
Any aAny;
- SvxMacro aMacro( "", "" );
+ SvxMacro aMacro( u""_ustr, u""_ustr );
getByName(aMacro, nMacroID);
getAnyFromMacro(aAny, aMacro);
return aAny;
@@ -335,7 +335,7 @@ void SvEventDescriptor::getByName(
if (rItem.HasMacro(nEvent))
rMacro = rItem.GetMacro(nEvent);
else
- rMacro = SvxMacro("", "");
+ rMacro = SvxMacro(u""_ustr, u""_ustr);
}
SvDetachedEventDescriptor::SvDetachedEventDescriptor(
@@ -363,7 +363,7 @@ sal_Int16 SvDetachedEventDescriptor::getIndex(const SvMacroItemId nID) const
OUString SvDetachedEventDescriptor::getImplementationName()
{
- return "SvDetachedEventDescriptor";
+ return u"SvDetachedEventDescriptor"_ustr;
}
@@ -435,7 +435,7 @@ void SvMacroTableEventDescriptor::copyMacrosIntoTable(
const SvMacroItemId nEvent = mpSupportedMacroItems[i].mnEvent;
if (hasById(nEvent))
{
- SvxMacro& rMacro = rMacroTable.Insert(nEvent, SvxMacro("", ""));
+ SvxMacro& rMacro = rMacroTable.Insert(nEvent, SvxMacro(u""_ustr, u""_ustr));
getByName(rMacro, nEvent);
}
}
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 1776f2ce7305..637f13b98a47 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -126,13 +126,13 @@ rtl::Reference<PropertySetInfo> SvUnoImageMapObject::createPropertySetInfo( IMap
{
static PropertyMapEntry const aPolygonObj_Impl[] =
{
- { OUString("URL"), HANDLE_URL, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("Title"), HANDLE_TITLE, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("Description"), HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("Target"), HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("Name"), HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("IsActive"), HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 },
- { OUString("Polygon"), HANDLE_POLYGON, cppu::UnoType<PointSequence>::get(), 0, 0 },
+ { u"URL"_ustr, HANDLE_URL, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"Title"_ustr, HANDLE_TITLE, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"Description"_ustr, HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"Target"_ustr, HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"Name"_ustr, HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"IsActive"_ustr, HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 },
+ { u"Polygon"_ustr, HANDLE_POLYGON, cppu::UnoType<PointSequence>::get(), 0, 0 },
};
return rtl::Reference<PropertySetInfo>(new PropertySetInfo( aPolygonObj_Impl ));
@@ -141,14 +141,14 @@ rtl::Reference<PropertySetInfo> SvUnoImageMapObject::createPropertySetInfo( IMap
{
static PropertyMapEntry const aCircleObj_Impl[] =
{
- { OUString("URL"), HANDLE_URL, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("Title"), HANDLE_TITLE, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("Description"), HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("Target"), HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("Name"), HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("IsActive"), HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 },
- { OUString("Center"), HANDLE_CENTER, cppu::UnoType<awt::Point>::get(), 0, 0 },
- { OUString("Radius"), HANDLE_RADIUS, cppu::UnoType<sal_Int32>::get(), 0, 0 },
+ { u"URL"_ustr, HANDLE_URL, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"Title"_ustr, HANDLE_TITLE, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"Description"_ustr, HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"Target"_ustr, HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"Name"_ustr, HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"IsActive"_ustr, HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 },
+ { u"Center"_ustr, HANDLE_CENTER, cppu::UnoType<awt::Point>::get(), 0, 0 },
+ { u"Radius"_ustr, HANDLE_RADIUS, cppu::UnoType<sal_Int32>::get(), 0, 0 },
};
return rtl::Reference<PropertySetInfo>(new PropertySetInfo( aCircleObj_Impl ));
@@ -158,13 +158,13 @@ rtl::Reference<PropertySetInfo> SvUnoImageMapObject::createPropertySetInfo( IMap
{
static PropertyMapEntry const aRectangleObj_Impl[] =
{
- { OUString("URL"), HANDLE_URL, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("Title"), HANDLE_TITLE, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("Description"), HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("Target"), HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("Name"), HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 },
- { OUString("IsActive"), HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 },
- { OUString("Boundary"), HANDLE_BOUNDARY, cppu::UnoType<awt::Rectangle>::get(), 0, 0 },
+ { u"URL"_ustr, HANDLE_URL, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"Title"_ustr, HANDLE_TITLE, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"Description"_ustr, HANDLE_DESCRIPTION, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"Target"_ustr, HANDLE_TARGET, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"Name"_ustr, HANDLE_NAME, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"IsActive"_ustr, HANDLE_ISACTIVE, cppu::UnoType<bool>::get(), 0, 0 },
+ { u"Boundary"_ustr, HANDLE_BOUNDARY, cppu::UnoType<awt::Rectangle>::get(), 0, 0 },
};
return rtl::Reference<PropertySetInfo>(new PropertySetInfo( aRectangleObj_Impl ));
@@ -368,11 +368,11 @@ OUString SAL_CALL SvUnoImageMapObject::getImplementationName()
{
case IMapObjectType::Polygon:
default:
- return "org.openoffice.comp.svt.ImageMapPolygonObject";
+ return u"org.openoffice.comp.svt.ImageMapPolygonObject"_ustr;
case IMapObjectType::Circle:
- return "org.openoffice.comp.svt.ImageMapCircleObject";
+ return u"org.openoffice.comp.svt.ImageMapCircleObject"_ustr;
case IMapObjectType::Rectangle:
- return "org.openoffice.comp.svt.ImageMapRectangleObject";
+ return u"org.openoffice.comp.svt.ImageMapRectangleObject"_ustr;
}
}
@@ -631,7 +631,7 @@ sal_Bool SAL_CALL SvUnoImageMap::hasElements( )
// XServiceInfo
OUString SAL_CALL SvUnoImageMap::getImplementationName( )
{
- return "org.openoffice.comp.svt.SvUnoImageMap";
+ return u"org.openoffice.comp.svt.SvUnoImageMap"_ustr;
}
sal_Bool SAL_CALL SvUnoImageMap::supportsService( const OUString& ServiceName )
@@ -641,7 +641,7 @@ sal_Bool SAL_CALL SvUnoImageMap::supportsService( const OUString& ServiceName )
Sequence< OUString > SAL_CALL SvUnoImageMap::getSupportedServiceNames( )
{
- return { "com.sun.star.image.ImageMap" };
+ return { u"com.sun.star.image.ImageMap"_ustr };
}
void SvUnoImageMap::fillImageMap( ImageMap& rMap ) const
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 4ec742a24add..69c34b00ae42 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -198,7 +198,7 @@ namespace {
if (std::any_of(i_rPaths.begin(), i_rPaths.end(),
[nFirstPageId](const Sequence< sal_Int16 >& rPath) { return rPath[0] != nFirstPageId; }))
throw IllegalArgumentException(
- "All paths must start with the same page id.",
+ u"All paths must start with the same page id."_ustr,
i_rContext, 2 );
}
@@ -252,12 +252,12 @@ namespace {
OUString SAL_CALL Wizard::getImplementationName()
{
- return "com.sun.star.comp.svtools.uno.Wizard";
+ return u"com.sun.star.comp.svtools.uno.Wizard"_ustr;
}
Sequence< OUString > SAL_CALL Wizard::getSupportedServiceNames()
{
- return { "com.sun.star.ui.dialogs.Wizard" };
+ return { u"com.sun.star.ui.dialogs.Wizard"_ustr };
}
Reference< XPropertySetInfo > SAL_CALL Wizard::getPropertySetInfo()
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index 9a6870b2cdfe..39487d13b55a 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -182,7 +182,7 @@ namespace svt::uno
{
public:
EmptyPage(weld::Widget* pParent, weld::DialogController* pController)
- : BuilderPage(pParent, pController, "svt/ui/emptypage.ui", "EmptyPage")
+ : BuilderPage(pParent, pController, u"svt/ui/emptypage.ui"_ustr, u"EmptyPage"_ustr)
{
m_xContainer->set_size_request(m_xContainer->get_approximate_digit_width() * 70,
m_xContainer->get_text_height() * 10);
generated by cgit (git 2.34.1) at 2024-12-23 23:40:35 +0000