summaryrefslogtreecommitdiff
path: root/vcl/aqua/source/dtrans
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/aqua/source/dtrans')
-rw-r--r--vcl/aqua/source/dtrans/DropTarget.cxx9
-rw-r--r--vcl/aqua/source/dtrans/PictToBmpFlt.cxx16
2 files changed, 21 insertions, 4 deletions
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx
index bb46e21d6a83..c799d9298a3b 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/aqua/source/dtrans/DropTarget.cxx
@@ -296,6 +296,7 @@ NSDragOperation DropTarget::draggingUpdated(id sender)
//NSLog(@"Drag update: Source actions: %x proposed action %x selected action %x", mDragSourceSupportedActions, currentAction, mSelectedDropAction);
}
+#ifndef __LP64__
// Weird but it appears as if there is no method in Cocoa
// to create a kThemeCopyArrowCursor hence we have to use
// Carbon to do it
@@ -305,7 +306,9 @@ NSDragOperation DropTarget::draggingUpdated(id sender)
SetThemeCursor(kThemeCopyArrowCursor);
else
SetThemeCursor(kThemeArrowCursor);
-
+#else
+ // FIXME: SetThemeCursor replacement?
+#endif
return dragOp;
}
@@ -316,7 +319,9 @@ void DropTarget::draggingExited(id /*sender*/)
fire_dragExit(dte);
mDragSourceSupportedActions = DNDConstants::ACTION_NONE;
mSelectedDropAction = DNDConstants::ACTION_NONE;
+#ifndef __LP64__
SetThemeCursor(kThemeArrowCursor);
+#endif
}
@@ -370,7 +375,9 @@ void DropTarget::concludeDragOperation(id /*sender*/)
mDragSourceSupportedActions = DNDConstants::ACTION_NONE;
mSelectedDropAction = DNDConstants::ACTION_NONE;
mXCurrentDragClipboard = uno::Reference<XClipboard>();
+#ifndef __LP64__
SetThemeCursor(kThemeArrowCursor);
+#endif
}
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
index 8a545daa4731..0bbb33ba51a3 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
@@ -39,6 +39,11 @@ bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict,
bool result = false;
+#ifdef __LP64__
+ // FIXME
+ (void) aPict;
+ (void) aBmp;
+#else
ComponentInstance bmpExporter;
if (OpenADefaultComponent(GraphicsExporterComponentType,
kQTFileTypeBMP,
@@ -78,7 +83,7 @@ bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict,
DisposeHandle(hPict);
DisposeHandle(hBmp);
CloseComponent(bmpExporter);
-
+#endif
return result;
}
@@ -103,12 +108,17 @@ bool BMPtoPICT(com::sun::star::uno::Sequence<sal_Int8>& aBmp,
bool result = false;
Handle hBmp;
- ComponentInstance pictExporter;
if ((PtrToHand(aBmp.getArray(), &hBmp, aBmp.getLength()) != noErr))
{
return result;
}
+#ifdef __LP64__
+ // FIXME
+ (void) aPict;
+#else
+ ComponentInstance pictExporter;
+
if (OpenADefaultComponent(GraphicsImporterComponentType,
kQTFileTypeBMP,
&pictExporter) != noErr)
@@ -145,7 +155,7 @@ bool BMPtoPICT(com::sun::star::uno::Sequence<sal_Int8>& aBmp,
DisposeHandle(hBmp);
CloseComponent(pictExporter);
-
+#endif
return result;
}