diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-23 18:51:57 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-23 18:51:57 +0100 |
commit | 096a1315ef00a0f3feb32a469c01254f4b9e8341 (patch) | |
tree | 02d642c4fa948691e3980481dff119a35e05e681 /vcl/aqua | |
parent | 3bcb29437f1d91476e759f0a6d3b72d7da3ce37f (diff) |
vcl119: solve a merge problem
Diffstat (limited to 'vcl/aqua')
-rw-r--r-- | vcl/aqua/source/dtrans/DropTarget.cxx | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx index edd66a28aead..103b6dc47d44 100644 --- a/vcl/aqua/source/dtrans/DropTarget.cxx +++ b/vcl/aqua/source/dtrans/DropTarget.cxx @@ -62,6 +62,7 @@ using namespace com::sun::star::datatransfer::dnd::DNDConstants; using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::lang; using namespace com::sun::star::uno; +using namespace com::sun::star; using namespace comphelper; OUString dropTarget_getImplementationName() @@ -248,7 +249,7 @@ NSDragOperation DropTarget::draggingEntered(id sender) NSPasteboard* dragPboard = [sender draggingPasteboard]; mXCurrentDragClipboard = new AquaClipboard(dragPboard, false); - Reference<XTransferable> xTransferable = DragSource::g_XTransferable.is() ? + uno::Reference<XTransferable> xTransferable = DragSource::g_XTransferable.is() ? DragSource::g_XTransferable : mXCurrentDragClipboard->getContents(); DropTargetDragEnterEvent dtdee(static_cast<OWeakObject*>(this), @@ -338,7 +339,7 @@ BOOL DropTarget::performDragOperation(id sender) if (mSelectedDropAction != DNDConstants::ACTION_NONE) { - Reference<XTransferable> xTransferable = DragSource::g_XTransferable; + uno::Reference<XTransferable> xTransferable = DragSource::g_XTransferable; if (!DragSource::g_XTransferable.is()) { @@ -375,7 +376,7 @@ BOOL DropTarget::performDragOperation(id sender) { mDragSourceSupportedActions = DNDConstants::ACTION_NONE; mSelectedDropAction = DNDConstants::ACTION_NONE; - mXCurrentDragClipboard = Reference<XClipboard>(); + mXCurrentDragClipboard = uno::Reference<XClipboard>(); SetThemeCursor(kThemeArrowCursor); } @@ -421,14 +422,14 @@ BOOL DropTarget::performDragOperation(id sender) } - void SAL_CALL DropTarget::addDropTargetListener(const Reference<XDropTargetListener>& dtl) + void SAL_CALL DropTarget::addDropTargetListener(const uno::Reference<XDropTargetListener>& dtl) throw(RuntimeException) { rBHelper.addListener(::getCppuType(&dtl), dtl); } - void SAL_CALL DropTarget::removeDropTargetListener(const Reference<XDropTargetListener>& dtl) + void SAL_CALL DropTarget::removeDropTargetListener(const uno::Reference<XDropTargetListener>& dtl) throw(RuntimeException) { rBHelper.removeListener(::getCppuType(&dtl), dtl); @@ -492,7 +493,7 @@ BOOL DropTarget::performDragOperation(id sender) { // Reset the internal transferable used as shortcut in case this is // an internal D&D operation - DragSource::g_XTransferable = Reference<XTransferable>(); + DragSource::g_XTransferable = uno::Reference<XTransferable>(); DragSource::g_DropSuccessSet = true; DragSource::g_DropSuccess = success; } @@ -500,13 +501,13 @@ BOOL DropTarget::performDragOperation(id sender) void DropTarget::fire_drop( const DropTargetDropEvent& dte) { - OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (Reference<XDropTargetListener>* )0 ) ); + OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (uno::Reference<XDropTargetListener>* )0 ) ); if( pContainer) { OInterfaceIteratorHelper iter( *pContainer); while( iter.hasMoreElements()) { - Reference<XDropTargetListener> listener( static_cast<XDropTargetListener*>( iter.next())); + uno::Reference<XDropTargetListener> listener( static_cast<XDropTargetListener*>( iter.next())); try { listener->drop( dte); } catch(RuntimeException&) {} @@ -517,13 +518,13 @@ BOOL DropTarget::performDragOperation(id sender) void DropTarget::fire_dragEnter(const DropTargetDragEnterEvent& e) { - OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (Reference<XDropTargetListener>* )0 ) ); + OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (uno::Reference<XDropTargetListener>* )0 ) ); if( pContainer) { OInterfaceIteratorHelper iter( *pContainer); while( iter.hasMoreElements()) { - Reference<XDropTargetListener> listener( static_cast<XDropTargetListener*>( iter.next())); + uno::Reference<XDropTargetListener> listener( static_cast<XDropTargetListener*>( iter.next())); try { listener->dragEnter( e); } catch (RuntimeException&) {} @@ -534,14 +535,14 @@ BOOL DropTarget::performDragOperation(id sender) void DropTarget::fire_dragExit(const DropTargetEvent& dte) { - OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (Reference<XDropTargetListener>* )0 ) ); + OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (uno::Reference<XDropTargetListener>* )0 ) ); if( pContainer) { OInterfaceIteratorHelper iter( *pContainer); while( iter.hasMoreElements()) { - Reference<XDropTargetListener> listener( static_cast<XDropTargetListener*>( iter.next())); + uno::Reference<XDropTargetListener> listener( static_cast<XDropTargetListener*>( iter.next())); try { listener->dragExit( dte); } catch (RuntimeException&) {} @@ -552,13 +553,13 @@ BOOL DropTarget::performDragOperation(id sender) void DropTarget::fire_dragOver(const DropTargetDragEvent& dtde) { - OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (Reference<XDropTargetListener>* )0 ) ); + OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (uno::Reference<XDropTargetListener>* )0 ) ); if( pContainer) { OInterfaceIteratorHelper iter( *pContainer ); while( iter.hasMoreElements()) { - Reference<XDropTargetListener> listener( static_cast<XDropTargetListener*>( iter.next())); + uno::Reference<XDropTargetListener> listener( static_cast<XDropTargetListener*>( iter.next())); try { listener->dragOver( dtde); } catch (RuntimeException&) {} @@ -569,13 +570,13 @@ BOOL DropTarget::performDragOperation(id sender) void DropTarget::fire_dropActionChanged(const DropTargetDragEvent& dtde) { - OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (Reference<XDropTargetListener>* )0 ) ); + OInterfaceContainerHelper* pContainer= rBHelper.getContainer( getCppuType( (uno::Reference<XDropTargetListener>* )0 ) ); if( pContainer) { OInterfaceIteratorHelper iter( *pContainer); while( iter.hasMoreElements()) { - Reference<XDropTargetListener> listener( static_cast<XDropTargetListener*>( iter.next())); + uno::Reference<XDropTargetListener> listener( static_cast<XDropTargetListener*>( iter.next())); try { listener->dropActionChanged( dtde); } catch (RuntimeException&) {} |