summaryrefslogtreecommitdiff
path: root/vcl/source/components/dtranscomp.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-06 09:23:33 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-11-09 08:34:40 +0000
commit6c80a8fe89fadf9a2c7260a09c037a09462f53d1 (patch)
treed36da9ee2a5fdc579d2a57ff6ba02deaddfa785a /vcl/source/components/dtranscomp.cxx
parente1fc599eb764186e5d511ace9785463eebbc7028 (diff)
new loplugin: oncevar
Change-Id: If57390510dde4d166be3141b9f658a7453755d3f Reviewed-on: https://gerrit.libreoffice.org/19815 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/components/dtranscomp.cxx')
-rw-r--r--vcl/source/components/dtranscomp.cxx34
1 files changed, 12 insertions, 22 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()