diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-05 12:55:32 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-11-05 13:32:16 +0200 |
commit | 281296330735158d6265e0b146b5d5301f6e610e (patch) | |
tree | ee8235f54b59dbec8d13f12b0bafa62e61ab9ad1 /vcl/osx | |
parent | 75da22e3ce80f8dcdeef0488b22c4dc522c2ec29 (diff) |
use uno::Reference::set method instead of assignment
Change-Id: I31a69a997098eb1807361b8049c3312a4f287d75
Diffstat (limited to 'vcl/osx')
-rw-r--r-- | vcl/osx/DragSource.cxx | 4 | ||||
-rw-r--r-- | vcl/osx/DropTarget.cxx | 4 | ||||
-rw-r--r-- | vcl/osx/a11ycomponentwrapper.mm | 2 | ||||
-rw-r--r-- | vcl/osx/a11ywrapper.mm | 24 | ||||
-rw-r--r-- | vcl/osx/service_entry.cxx | 2 |
5 files changed, 18 insertions, 18 deletions
diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx index d2ce6d103975..bc3ee9700284 100644 --- a/vcl/osx/DragSource.cxx +++ b/vcl/osx/DragSource.cxx @@ -123,7 +123,7 @@ Sequence<OUString> dragSource_getSupportedServiceNames() bDropSuccess ); mDragSource->mXDragSrcListener->dragDropEnd(dsde); - mDragSource->mXDragSrcListener = uno::Reference<XDragSourceListener>(); + mDragSource->mXDragSrcListener.clear(); } -(void)draggedImage:(NSImage *)draggedImage movedTo:(NSPoint)screenPoint @@ -276,7 +276,7 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger, [dragImage release]; - g_XTransferable = uno::Reference<XTransferable>(); + g_XTransferable.clear(); g_DragSourceView = nil; // reset drop success flags diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx index 3c836eea31d5..bd7467db64cf 100644 --- a/vcl/osx/DropTarget.cxx +++ b/vcl/osx/DropTarget.cxx @@ -338,7 +338,7 @@ void DropTarget::concludeDragOperation(id /*sender*/) { mDragSourceSupportedActions = DNDConstants::ACTION_NONE; mSelectedDropAction = DNDConstants::ACTION_NONE; - mXCurrentDragClipboard = uno::Reference<XClipboard>(); + mXCurrentDragClipboard.clear(); [[NSCursor arrowCursor] set]; } @@ -438,7 +438,7 @@ void SAL_CALL DropTarget::dropComplete(sal_Bool success) throw (RuntimeException { // Reset the internal transferable used as shortcut in case this is // an internal D&D operation - DragSource::g_XTransferable = uno::Reference<XTransferable>(); + DragSource::g_XTransferable.clear(); DragSource::g_DropSuccessSet = true; DragSource::g_DropSuccess = success; } diff --git a/vcl/osx/a11ycomponentwrapper.mm b/vcl/osx/a11ycomponentwrapper.mm index 5b61c1257ca7..d7d0327b7b8a 100644 --- a/vcl/osx/a11ycomponentwrapper.mm +++ b/vcl/osx/a11ycomponentwrapper.mm @@ -85,7 +85,7 @@ using namespace ::com::sun::star::uno; if ( rxParent.is() ) { Reference < XAccessibleContext > rxContext = rxParent->getAccessibleContext(); if ( rxContext.is() && rxContext -> getAccessibleRole() == AccessibleRole::PANEL ) { - Reference < XAccessibleComponent > rxComponent = Reference < XAccessibleComponent > ( rxParent -> getAccessibleContext(), UNO_QUERY ); + Reference < XAccessibleComponent > rxComponent( rxParent -> getAccessibleContext(), UNO_QUERY ); if ( rxComponent.is() ) { rxComponent -> grabFocus(); } diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm index a90f917f3813..cd6a28b3d041 100644 --- a/vcl/osx/a11ywrapper.mm +++ b/vcl/osx/a11ywrapper.mm @@ -83,27 +83,27 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) { // Querying all supported interfaces try { // XAccessibleComponent - mpReferenceWrapper -> rAccessibleComponent = Reference < XAccessibleComponent > ( rxAccessibleContext, UNO_QUERY ); + mpReferenceWrapper->rAccessibleComponent.set( rxAccessibleContext, UNO_QUERY ); // XAccessibleExtendedComponent - mpReferenceWrapper -> rAccessibleExtendedComponent = Reference < XAccessibleExtendedComponent > ( rxAccessibleContext, UNO_QUERY ); + mpReferenceWrapper->rAccessibleExtendedComponent.set( rxAccessibleContext, UNO_QUERY ); // XAccessibleSelection - mpReferenceWrapper -> rAccessibleSelection = Reference< XAccessibleSelection > ( rxAccessibleContext, UNO_QUERY ); + mpReferenceWrapper->rAccessibleSelection.set( rxAccessibleContext, UNO_QUERY ); // XAccessibleTable - mpReferenceWrapper -> rAccessibleTable = Reference < XAccessibleTable > ( rxAccessibleContext, UNO_QUERY ); + mpReferenceWrapper->rAccessibleTable.set( rxAccessibleContext, UNO_QUERY ); // XAccessibleText - mpReferenceWrapper -> rAccessibleText = Reference < XAccessibleText > ( rxAccessibleContext, UNO_QUERY ); + mpReferenceWrapper->rAccessibleText.set( rxAccessibleContext, UNO_QUERY ); // XAccessibleEditableText - mpReferenceWrapper -> rAccessibleEditableText = Reference < XAccessibleEditableText > ( rxAccessibleContext, UNO_QUERY ); + mpReferenceWrapper->rAccessibleEditableText.set( rxAccessibleContext, UNO_QUERY ); // XAccessibleValue - mpReferenceWrapper -> rAccessibleValue = Reference < XAccessibleValue > ( rxAccessibleContext, UNO_QUERY ); + mpReferenceWrapper->rAccessibleValue.set( rxAccessibleContext, UNO_QUERY ); // XAccessibleAction - mpReferenceWrapper -> rAccessibleAction = Reference < XAccessibleAction > ( rxAccessibleContext, UNO_QUERY ); + mpReferenceWrapper->rAccessibleAction.set( rxAccessibleContext, UNO_QUERY ); // XAccessibleTextAttributes - mpReferenceWrapper -> rAccessibleTextAttributes = Reference < XAccessibleTextAttributes > ( rxAccessibleContext, UNO_QUERY ); + mpReferenceWrapper->rAccessibleTextAttributes.set( rxAccessibleContext, UNO_QUERY ); // XAccessibleMultiLineText - mpReferenceWrapper -> rAccessibleMultiLineText = Reference < XAccessibleMultiLineText > ( rxAccessibleContext, UNO_QUERY ); + mpReferenceWrapper->rAccessibleMultiLineText.set( rxAccessibleContext, UNO_QUERY ); // XAccessibleTextMarkup - mpReferenceWrapper -> rAccessibleTextMarkup = Reference < XAccessibleTextMarkup > ( rxAccessibleContext, UNO_QUERY ); + mpReferenceWrapper->rAccessibleTextMarkup.set( rxAccessibleContext, UNO_QUERY ); // XAccessibleEventBroadcaster #if 0 /* #i102033# NSAccessibility does not seemt to know an equivalent for transient children. @@ -313,7 +313,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) { AccessibleRelation relationMemberOf = rxAccessibleRelationSet -> getRelationByType ( AccessibleRelationType::MEMBER_OF ); if ( relationMemberOf.RelationType == AccessibleRelationType::MEMBER_OF && relationMemberOf.TargetSet.hasElements() ) { for ( int index = 0; index < relationMemberOf.TargetSet.getLength(); index++ ) { - Reference < XAccessible > rMateAccessible = Reference < XAccessible > ( relationMemberOf.TargetSet[index], UNO_QUERY ); + Reference < XAccessible > rMateAccessible( relationMemberOf.TargetSet[index], UNO_QUERY ); if ( rMateAccessible.is() ) { Reference< XAccessibleContext > rMateAccessibleContext( rMateAccessible -> getAccessibleContext() ); if ( rMateAccessibleContext.is() ) { diff --git a/vcl/osx/service_entry.cxx b/vcl/osx/service_entry.cxx index a8ac53c58e8e..3679d9726459 100644 --- a/vcl/osx/service_entry.cxx +++ b/vcl/osx/service_entry.cxx @@ -42,7 +42,7 @@ uno::Reference< XInterface > AquaSalInstance::CreateClipboard( const Sequence< A SalData* pSalData = GetSalData(); if( ! pSalData->mxClipboard.is() ) - pSalData->mxClipboard = uno::Reference<XInterface>(static_cast< XClipboard* >(new AquaClipboard()), UNO_QUERY); + pSalData->mxClipboard.set(static_cast< XClipboard* >(new AquaClipboard()), UNO_QUERY); return pSalData->mxClipboard; } |