summaryrefslogtreecommitdiff
path: root/vcl/source/components
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/components')
-rw-r--r--vcl/source/components/dtranscomp.cxx34
-rw-r--r--vcl/source/components/fontident.cxx4
2 files changed, 13 insertions, 25 deletions
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index bbe623aee352..6dc83ff295d0 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -346,18 +346,13 @@ void GenericDragSource::initialize( const Sequence< Any >& ) throw( Exception, s
Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames()
{
- #if defined UNX
- OUString aServiceName(
- #if ! defined MACOSX
- "com.sun.star.datatransfer.dnd.X11DragSource"
- #else
- "com.sun.star.datatransfer.dnd.OleDragSource"
- #endif
- );
- return Sequence< OUString >(&aServiceName, 1);
- #else
+#if defined MACOSX
+ return Sequence< OUString > { "com.sun.star.datatransfer.dnd.OleDragSource" };
+#elif defined UNX
+ return Sequence< OUString > { "com.sun.star.datatransfer.dnd.X11DragSource" };
+#else
return GenericDragSource::getSupportedServiceNames_static();
- #endif
+#endif
}
OUString SAL_CALL DragSource_getImplementationName()
@@ -470,18 +465,13 @@ void GenericDropTarget::setDefaultActions( sal_Int8) throw(std::exception)
Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames()
{
- #if defined UNX
- OUString aServiceName(
- #if ! defined MACOSX
- "com.sun.star.datatransfer.dnd.X11DropTarget"
- #else
- "com.sun.star.datatransfer.dnd.OleDropTarget"
- #endif
- );
- return Sequence< OUString >(&aServiceName, 1);
- #else
+#if defined MACOSX
+ return Sequence< OUString > { "com.sun.star.datatransfer.dnd.OleDropTarget" };
+#elif defined UNX
+ return Sequence< OUString > { "com.sun.star.datatransfer.dnd.X11DropTarget" };
+#else
return GenericDropTarget::getSupportedServiceNames_static();
- #endif
+#endif
}
OUString SAL_CALL DropTarget_getImplementationName()
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index d80dd74f59fa..11066c63ae9e 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -154,9 +154,7 @@ Any SAL_CALL FontIdentificator::getMaterial() throw(RuntimeException, std::excep
Sequence< OUString > FontIdentificator_getSupportedServiceNames()
{
- OUString aServiceName( "com.sun.star.awt.FontIdentificator" );
- Sequence< OUString > aServiceNames( &aServiceName, 1 );
- return aServiceNames;
+ return Sequence< OUString >{ "com.sun.star.awt.FontIdentificator" };
}
OUString FontIdentificator_getImplementationName()