summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vcl/qt5/Qt5DragAndDrop.cxx6
-rw-r--r--vcl/qt5/Qt5FilePicker.cxx7
-rw-r--r--vcl/source/components/dtranscomp.cxx4
-rw-r--r--vcl/source/uitest/uno/uiobject_uno.cxx4
-rw-r--r--vcl/source/uitest/uno/uitest_uno.cxx4
-rw-r--r--vcl/unx/generic/dtrans/X11_service.cxx9
-rw-r--r--vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx7
-rw-r--r--vcl/unx/kf5/KF5FilePicker.cxx8
8 files changed, 15 insertions, 34 deletions
diff --git a/vcl/qt5/Qt5DragAndDrop.cxx b/vcl/qt5/Qt5DragAndDrop.cxx
index 2b674e5a8e4f..ea26d5aaeb6f 100644
--- a/vcl/qt5/Qt5DragAndDrop.cxx
+++ b/vcl/qt5/Qt5DragAndDrop.cxx
@@ -120,8 +120,7 @@ sal_Bool SAL_CALL Qt5DragSource::supportsService(OUString const& ServiceName)
css::uno::Sequence<OUString> SAL_CALL Qt5DragSource::getSupportedServiceNames()
{
- uno::Sequence<OUString> aRet{ "com.sun.star.datatransfer.dnd.Qt5DragSource" };
- return aRet;
+ return { "com.sun.star.datatransfer.dnd.Qt5DragSource" };
}
Qt5DropTarget::Qt5DropTarget()
@@ -144,8 +143,7 @@ sal_Bool SAL_CALL Qt5DropTarget::supportsService(OUString const& ServiceName)
css::uno::Sequence<OUString> SAL_CALL Qt5DropTarget::getSupportedServiceNames()
{
- uno::Sequence<OUString> aRet{ "com.sun.star.datatransfer.dnd.Qt5DropTarget" };
- return aRet;
+ return { "com.sun.star.datatransfer.dnd.Qt5DropTarget" };
}
Qt5DropTarget::~Qt5DropTarget()
diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx
index 602ee21569ee..1573f95dd6b5 100644
--- a/vcl/qt5/Qt5FilePicker.cxx
+++ b/vcl/qt5/Qt5FilePicker.cxx
@@ -70,11 +70,8 @@ namespace
{
uno::Sequence<OUString> FilePicker_getSupportedServiceNames()
{
- uno::Sequence<OUString> aRet(3);
- aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
- aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker";
- aRet[2] = "com.sun.star.ui.dialogs.Qt5FilePicker";
- return aRet;
+ return { "com.sun.star.ui.dialogs.FilePicker", "com.sun.star.ui.dialogs.SystemFilePicker",
+ "com.sun.star.ui.dialogs.Qt5FilePicker" };
}
}
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index 2952eff97012..0b2245bbd2f0 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -405,9 +405,9 @@ void GenericDropTarget::setDefaultActions( sal_Int8)
Sequence< OUString > DropTarget_getSupportedServiceNames()
{
#if defined MACOSX
- return Sequence< OUString > { "com.sun.star.datatransfer.dnd.OleDropTarget" };
+ return { "com.sun.star.datatransfer.dnd.OleDropTarget" };
#elif defined UNX
- return Sequence< OUString > { "com.sun.star.datatransfer.dnd.X11DropTarget" };
+ return { "com.sun.star.datatransfer.dnd.X11DropTarget" };
#else
return GenericDropTarget::getSupportedServiceNames_static();
#endif
diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx
index 714f16a72dbc..5eaef4db584a 100644
--- a/vcl/source/uitest/uno/uiobject_uno.cxx
+++ b/vcl/source/uitest/uno/uiobject_uno.cxx
@@ -197,9 +197,7 @@ sal_Bool UIObjectUnoObj::supportsService(OUString const & ServiceName)
css::uno::Sequence<OUString> UIObjectUnoObj::getSupportedServiceNames()
{
- css::uno::Sequence<OUString> aServiceNames(1);
- aServiceNames[0] = "com.sun.star.ui.test.UIObject";
- return aServiceNames;
+ return { "com.sun.star.ui.test.UIObject" };
}
OUString SAL_CALL UIObjectUnoObj::getHierarchy()
diff --git a/vcl/source/uitest/uno/uitest_uno.cxx b/vcl/source/uitest/uno/uitest_uno.cxx
index 354b30585c69..8ae3b7e284a1 100644
--- a/vcl/source/uitest/uno/uitest_uno.cxx
+++ b/vcl/source/uitest/uno/uitest_uno.cxx
@@ -107,9 +107,7 @@ sal_Bool UITestUnoObj::supportsService(OUString const & ServiceName)
css::uno::Sequence<OUString> UITestUnoObj::getSupportedServiceNames()
{
- css::uno::Sequence<OUString> aServiceNames(1);
- aServiceNames[0] = "com.sun.star.ui.test.UITest";
- return aServiceNames;
+ return { "com.sun.star.ui.test.UITest" };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx
index 8020b677017f..dc08d85e6099 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -37,20 +37,17 @@ using namespace x11;
Sequence< OUString > x11::X11Clipboard_getSupportedServiceNames()
{
- Sequence< OUString > aRet { "com.sun.star.datatransfer.clipboard.SystemClipboard" };
- return aRet;
+ return { "com.sun.star.datatransfer.clipboard.SystemClipboard" };
}
Sequence< OUString > x11::Xdnd_getSupportedServiceNames()
{
- Sequence< OUString > aRet { "com.sun.star.datatransfer.dnd.X11DragSource" };
- return aRet;
+ return { "com.sun.star.datatransfer.dnd.X11DragSource" };
}
Sequence< OUString > x11::Xdnd_dropTarget_getSupportedServiceNames()
{
- Sequence< OUString > aRet { "com.sun.star.datatransfer.dnd.X11DropTarget" };
- return aRet;
+ return { "com.sun.star.datatransfer.dnd.X11DropTarget" };
}
css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& arguments )
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
index 8fbd2fc5385b..68c31d9561ad 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
@@ -60,11 +60,8 @@ namespace
{
uno::Sequence<OUString> FilePicker_getSupportedServiceNames()
{
- uno::Sequence<OUString> aRet(3);
- aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
- aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker";
- aRet[2] = "com.sun.star.ui.dialogs.Gtk3KDE5FilePicker";
- return aRet;
+ return { "com.sun.star.ui.dialogs.FilePicker", "com.sun.star.ui.dialogs.SystemFilePicker",
+ "com.sun.star.ui.dialogs.Gtk3KDE5FilePicker" };
}
}
diff --git a/vcl/unx/kf5/KF5FilePicker.cxx b/vcl/unx/kf5/KF5FilePicker.cxx
index 451824a12f13..b269c893c60f 100644
--- a/vcl/unx/kf5/KF5FilePicker.cxx
+++ b/vcl/unx/kf5/KF5FilePicker.cxx
@@ -38,12 +38,8 @@ namespace
{
uno::Sequence<OUString> FilePicker_getSupportedServiceNames()
{
- uno::Sequence<OUString> aRet(4);
- aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
- aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker";
- aRet[2] = "com.sun.star.ui.dialogs.KF5FilePicker";
- aRet[3] = "com.sun.star.ui.dialogs.KF5FolderPicker";
- return aRet;
+ return { "com.sun.star.ui.dialogs.FilePicker", "com.sun.star.ui.dialogs.SystemFilePicker",
+ "com.sun.star.ui.dialogs.KF5FilePicker", "com.sun.star.ui.dialogs.KF5FolderPicker" };
}
}