vcl/source/window/window.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 271ce90753d7004cfb2f1d1aeddd2ee4f36e16c4
Author: Tor Lillqvist <t...@collabora.com>
Date: Sat Oct 12 21:54:27 2013 +0300
It's whether X11 is used that is meant here
Change-Id: Ie03696eccde6b1a02a839321f84c6a23b73419ca
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 9aa6289..27df84f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8418,7 +8418,7 @@ uno::Reference< XDragSource > Window::GetDragSource()
aDropTargetSN =
OUString("com.sun.star.datatransfer.dnd.OleDropTarget");
aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>(
reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) );
aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>(
reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) );
-#elif defined UNX
+#elif HAVE_FEATURE_X11
aDragSourceSN =
OUString("com.sun.star.datatransfer.dnd.X11DragSource");
aDropTargetSN =
OUString("com.sun.star.datatransfer.dnd.X11DropTarget");
@@ -8504,7 +8504,7 @@ uno::Reference< XClipboard > Window::GetPrimarySelection()
{
uno::Reference< XComponentContext > xContext(
comphelper::getProcessComponentContext() );
-#if defined(UNX) && !defined(MACOSX) && !defined(IOS) && !defined(ANDROID)
+#if HAVE_FEATURE_X11
// A hack, making the primary selection available as an
instance
// of the SystemClipboard service on X11:
css::uno::Sequence<css::uno::Any> args(1);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
