diff --git a/odk/examples/java/NotesAccess/Stocks.nsf b/odk/examples/java/NotesAccess/Stocks.nsf
index 10ed138..1f00821 100644
Binary files a/odk/examples/java/NotesAccess/Stocks.nsf and b/odk/examples/java/NotesAccess/Stocks.nsf differ
diff --git a/qadevOOo/testdocs/SwXTextEmbeddedObject.sdw b/qadevOOo/testdocs/SwXTextEmbeddedObject.sdw
index 4f5c2e3..68d3726 100644
Binary files a/qadevOOo/testdocs/SwXTextEmbeddedObject.sdw and b/qadevOOo/testdocs/SwXTextEmbeddedObject.sdw differ
diff --git a/sw/qa/unoapi/testdocuments/SwXTextEmbeddedObject.sdw b/sw/qa/unoapi/testdocuments/SwXTextEmbeddedObject.sdw
index 4f5c2e3..68d3726 100644
Binary files a/sw/qa/unoapi/testdocuments/SwXTextEmbeddedObject.sdw and b/sw/qa/unoapi/testdocuments/SwXTextEmbeddedObject.sdw differ
diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx
index 7ee0f5b..fbd747c 100644
--- a/vcl/osx/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -104,7 +104,8 @@ namespace /* private */
 
 -(BOOL)performDragOperation:(id <NSDraggingInfo>)sender
 {
-    return mDropTarget->performDragOperation(sender);
+    (void) sender;
+    return mDropTarget->performDragOperation();
 }
 
 -(void)concludeDragOperation:(id <NSDraggingInfo>)sender
@@ -200,8 +201,10 @@ NSDragOperation DropTarget::draggingEntered(id sender)
         sal_Int8 currentAction = determineDropAction(mDragSourceSupportedActions, sender);
 
         NSRect bounds = [mView bounds];
-        NSPoint dragLocation = [sender draggedImageLocation];
+        NSPoint mouseLoc = [NSEvent mouseLocation];
 
+        id wnd = [mView window];
+        NSPoint dragLocation = [mView convertPoint:[wnd convertScreenToBase:mouseLoc] fromView:nil];
         CocoaToVCL(dragLocation, bounds);
 
         sal_Int32 posX = static_cast<sal_Int32>(dragLocation.x);
@@ -238,8 +241,10 @@ NSDragOperation DropTarget::draggingUpdated(id sender)
     {
         sal_Int8 currentAction = determineDropAction(currentDragSourceActions, sender);
         NSRect bounds = [mView bounds];
-        NSPoint dragLocation = [sender draggedImageLocation];
+        NSPoint mouseLoc = [NSEvent mouseLocation];
 
+        id wnd = [mView window];
+        NSPoint dragLocation = [mView convertPoint:[wnd convertScreenToBase:mouseLoc] fromView:nil];
         CocoaToVCL(dragLocation, bounds);
 
         sal_Int32 posX = static_cast<sal_Int32>(dragLocation.x);
@@ -287,7 +292,7 @@ BOOL DropTarget::prepareForDragOperation(id /*sender*/)
     return 1;
 }
 
-BOOL DropTarget::performDragOperation(id sender)
+BOOL DropTarget::performDragOperation()
 {
     bool bSuccess = false;
 
@@ -301,8 +306,10 @@ BOOL DropTarget::performDragOperation(id sender)
         }
 
         NSRect bounds = [mView bounds];
-        NSPoint dragLocation = [sender draggedImageLocation];
+        NSPoint mouseLoc = [NSEvent mouseLocation];
 
+        id wnd = [mView window];
+        NSPoint dragLocation = [mView convertPoint:[wnd convertScreenToBase:mouseLoc] fromView:nil];
         CocoaToVCL(dragLocation, bounds);
 
         sal_Int32 posX = static_cast<sal_Int32>(dragLocation.x);
diff --git a/vcl/osx/DropTarget.hxx b/vcl/osx/DropTarget.hxx
index d67b647..be0b3da 100644
--- a/vcl/osx/DropTarget.hxx
+++ b/vcl/osx/DropTarget.hxx
@@ -125,7 +125,7 @@ public:
   NSDragOperation draggingUpdated(id sender);
   void draggingExited(id sender);
   BOOL prepareForDragOperation(id sender);
-  BOOL performDragOperation(id sender);
+  BOOL performDragOperation();
   void concludeDragOperation(id sender);
 
   /* If multiple actions are supported by the drag source and