From 1b41208608f472df8dd5879c27dca45cc2ea7740 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 2 Nov 2015 07:38:44 +0200 Subject: use uno::Reference::set method instead of assignment Change-Id: I3d94c94a9829161663a7ed18421ace38ce95a659 Reviewed-on: https://gerrit.libreoffice.org/19733 Tested-by: Jenkins Reviewed-by: Noel Grandin --- fpicker/source/office/fpinteraction.cxx | 8 ++++---- fpicker/source/win32/filepicker/FilePicker.cxx | 6 +++--- fpicker/source/win32/folderpicker/workbench/Test_fops.cxx | 5 +---- 3 files changed, 8 insertions(+), 11 deletions(-) (limited to 'fpicker') diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx index d82612c13a76..a991e3044529 100644 --- a/fpicker/source/office/fpinteraction.cxx +++ b/fpicker/source/office/fpinteraction.cxx @@ -66,13 +66,13 @@ namespace svt for (sal_Int32 i=0; i(pConts[i], UNO_QUERY); + xAbort.set(pConts[i], UNO_QUERY); if (!xApprove.is()) - xApprove = Reference< XInteractionApprove >(pConts[i], UNO_QUERY); + xApprove.set(pConts[i], UNO_QUERY); if (!xDisapprove.is()) - xDisapprove = Reference< XInteractionDisapprove >(pConts[i], UNO_QUERY); + xDisapprove.set(pConts[i], UNO_QUERY); if (!xRetry.is()) - xRetry = Reference< XInteractionRetry >(pConts[i], UNO_QUERY); + xRetry.set(pConts[i], UNO_QUERY); } // safe the original request for later analyzing! diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index b08e53b68ccf..9a3c4552db27 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -135,7 +135,7 @@ void SAL_CALL CFilePicker::disposing(const lang::EventObject& aEvent) throw(uno: void SAL_CALL CFilePicker::fileSelectionChanged(FilePickerEvent aEvent) { - aEvent.Source = uno::Reference(static_cast(this)); + aEvent.Source.set(static_cast(this)); m_aAsyncEventNotifier.notifyEvent( new CFilePickerParamEventNotification(&XFilePickerListener::fileSelectionChanged,aEvent)); } @@ -146,7 +146,7 @@ void SAL_CALL CFilePicker::fileSelectionChanged(FilePickerEvent aEvent) void SAL_CALL CFilePicker::directoryChanged(FilePickerEvent aEvent) { - aEvent.Source = uno::Reference(static_cast(this)); + aEvent.Source.set(static_cast(this)); m_aAsyncEventNotifier.notifyEvent( new CFilePickerParamEventNotification(&XFilePickerListener::directoryChanged,aEvent)); } @@ -157,7 +157,7 @@ void SAL_CALL CFilePicker::directoryChanged(FilePickerEvent aEvent) void SAL_CALL CFilePicker::controlStateChanged(FilePickerEvent aEvent) { - aEvent.Source = uno::Reference(static_cast(this)); + aEvent.Source.set(static_cast(this)); m_aAsyncEventNotifier.notifyEvent( new CFilePickerParamEventNotification(&XFilePickerListener::controlStateChanged,aEvent)); } diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx index 7c4a54e6386c..ae561b4487d4 100644 --- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx +++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx @@ -91,10 +91,7 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/ ) // try to get an Interface to a XFilePicker Service - Reference< XFolderPicker2 > xFolderPicker; - - xFolderPicker = Reference< XFolderPicker2 >( - g_xFactory->createInstance( FOLDER_PICKER_SERVICE_NAME), UNO_QUERY ); + Reference< XFolderPicker2 > xFolderPicker( g_xFactory->createInstance( FOLDER_PICKER_SERVICE_NAME ), UNO_QUERY ); if ( xFolderPicker.is() == sal_False ) { -- cgit v1.2.3