diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-10-16 07:52:45 +0200 |
---|---|---|
committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-10-19 05:28:29 +0000 |
commit | 930f0242a11538ddda0e80712be98ff6b9431fd2 (patch) | |
tree | 77e6490ba9e211d3a8f08b214bec9ba41a77c681 | |
parent | tdf#93894: Write a new test case for column and row labels combined. (diff) | |
download | core-930f0242a11538ddda0e80712be98ff6b9431fd2.tar.gz core-930f0242a11538ddda0e80712be98ff6b9431fd2.zip |
replace <<= with assign for <<= with rhs Any
queryAggregation and queryInterface return Any
Change-Id: Ib8e3e742bd66f7419cad583988b247bb628f7b4a
Reviewed-on: https://gerrit.libreoffice.org/29912
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
-rw-r--r-- | comphelper/source/property/genericpropertyset.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/commonembedding/miscobj.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/commonembedding/specialobject.cxx | 2 | ||||
-rw-r--r-- | package/source/xstor/ocompinstream.cxx | 4 | ||||
-rw-r--r-- | package/source/xstor/owriteablestream.cxx | 8 | ||||
-rw-r--r-- | package/source/xstor/xstorage.cxx | 10 | ||||
-rw-r--r-- | svl/source/fsstor/fsstorage.cxx | 2 | ||||
-rw-r--r-- | svl/source/fsstor/ostreamcontainer.cxx | 12 | ||||
-rw-r--r-- | svtools/source/graphic/descriptor.cxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/graphic.cxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/renderer.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/unoimap.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unopool.cxx | 2 | ||||
-rw-r--r-- | svx/source/unogallery/unogalitem.cxx | 2 |
14 files changed, 27 insertions, 27 deletions
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index e8b08eca2497..f30a7b27d72f 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -205,7 +205,7 @@ Any SAL_CALL GenericPropertySet::queryAggregation( const Type & rType ) else if( rType == cppu::UnoType<XMultiPropertySet>::get()) aAny <<= Reference< XMultiPropertySet >(this); else - aAny <<= OWeakAggObject::queryAggregation( rType ); + aAny = OWeakAggObject::queryAggregation( rType ); return aAny; } diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index 00464a7a6cae..fa020e92f7b2 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -369,7 +369,7 @@ uno::Any SAL_CALL OCommonEmbeddedObject::queryInterface( const uno::Type& rType return uno::Any(&p, rType); } else - aReturn <<= ::cppu::queryInterface( + aReturn = ::cppu::queryInterface( rType, static_cast< embed::XInplaceObject* >( this ), static_cast< embed::XVisualObject* >( this ), diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index b9ec0abf9d78..e1c73f896f8e 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -57,7 +57,7 @@ uno::Any SAL_CALL OSpecialEmbeddedObject::queryInterface( const uno::Type& rType { uno::Any aReturn; - aReturn <<= ::cppu::queryInterface( rType, + aReturn = ::cppu::queryInterface( rType, static_cast< embed::XEmbeddedObject* >( this ), static_cast< embed::XInplaceObject* >( this ), static_cast< embed::XVisualObject* >( this ), diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx index 24318b1b0c3e..c94d16c277b9 100644 --- a/package/source/xstor/ocompinstream.cxx +++ b/package/source/xstor/ocompinstream.cxx @@ -80,7 +80,7 @@ uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType ) uno::Any aReturn; // common interfaces - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<io::XInputStream*> ( this ) , static_cast<io::XStream*> ( this ) @@ -93,7 +93,7 @@ uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType ) if ( m_nStorageType == embed::StorageFormats::OFOPXML ) { - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<embed::XRelationshipAccess*> ( this ) ); diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index 7e600238c3bd..8506f7e352a7 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -1866,7 +1866,7 @@ uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType ) uno::Any aReturn; // common interfaces - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<lang::XTypeProvider*> ( this ) , static_cast<io::XInputStream*> ( this ) @@ -1883,14 +1883,14 @@ uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType ) if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE ) { - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<embed::XEncryptionProtectedSource2*> ( this ) , static_cast<embed::XEncryptionProtectedSource*> ( this ) ); } else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML ) { - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<embed::XRelationshipAccess*> ( this ) ); } @@ -1900,7 +1900,7 @@ uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType ) if ( m_bTransacted ) { - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<embed::XTransactedObject*> ( this ) , static_cast<embed::XTransactionBroadcaster*> ( this ) ); diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index f11843ed8b7a..29155de03ebb 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -2161,7 +2161,7 @@ uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType ) uno::Any aReturn; // common interfaces - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<lang::XTypeProvider*> ( this ) , static_cast<embed::XStorage*> ( this ) @@ -2178,7 +2178,7 @@ uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType ) if ( aReturn.hasValue() ) return aReturn ; - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<embed::XHierarchicalStorageAccess*> ( this ) , static_cast<embed::XHierarchicalStorageAccess2*> ( this ) ); @@ -2190,7 +2190,7 @@ uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType ) { if ( m_pData->m_bIsRoot ) { - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<embed::XStorageRawAccess*> ( this ) , static_cast<embed::XEncryptionProtectedSource*> ( this ) @@ -2199,14 +2199,14 @@ uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType ) } else { - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<embed::XStorageRawAccess*> ( this ) ); } } else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML ) { - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<embed::XRelationshipAccess*> ( this ) ); } diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index cbcc682599fc..7aa50cd5ba9c 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -255,7 +255,7 @@ uno::Any SAL_CALL FSStorage::queryInterface( const uno::Type& rType ) throw( uno::RuntimeException, std::exception ) { uno::Any aReturn; - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<lang::XTypeProvider*> ( this ) , static_cast<embed::XStorage*> ( this ) diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx index 997dd2c33420..9e5d0c501c1d 100644 --- a/svl/source/fsstor/ostreamcontainer.cxx +++ b/svl/source/fsstor/ostreamcontainer.cxx @@ -69,7 +69,7 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) { uno::Any aReturn; - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<lang::XTypeProvider*> ( this ) , static_cast<io::XStream*> ( this ) @@ -81,7 +81,7 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) if ( m_xSeekable.is() ) { - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<io::XSeekable*> ( this ) ); @@ -91,7 +91,7 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) if ( m_xInputStream.is() ) { - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<io::XInputStream*> ( this ) ); @@ -100,7 +100,7 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) } if ( m_xOutputStream.is() ) { - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<io::XOutputStream*> ( this ) ); @@ -109,7 +109,7 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) } if ( m_xTruncate.is() ) { - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<io::XTruncate*> ( this ) ); @@ -118,7 +118,7 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) } if ( m_xAsyncOutputMonitor.is() ) { - aReturn <<= ::cppu::queryInterface + aReturn = ::cppu::queryInterface ( rType , static_cast<io::XAsyncOutputMonitor*> ( this ) ); diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index 4f73e4fab05c..e25d870f0f3b 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -184,7 +184,7 @@ uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) else if( rType == cppu::UnoType<beans::XMultiPropertySet>::get()) aAny <<= uno::Reference< beans::XMultiPropertySet >(this); else - aAny <<= OWeakAggObject::queryAggregation( rType ); + aAny = OWeakAggObject::queryAggregation( rType ); return aAny; } diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx index 5c56025388e6..2d188043472b 100644 --- a/svtools/source/graphic/graphic.cxx +++ b/svtools/source/graphic/graphic.cxx @@ -60,7 +60,7 @@ uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType ) else if( rType == cppu::UnoType<lang::XUnoTunnel>::get()) aAny <<= uno::Reference< lang::XUnoTunnel >(this); else - aAny <<= ::unographic::GraphicDescriptor::queryAggregation( rType ); + aAny = ::unographic::GraphicDescriptor::queryAggregation( rType ); return aAny; } diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 161707f22264..d7134e7665e6 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -73,7 +73,7 @@ uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType else if( rType == cppu::UnoType<graphic::XGraphicRenderer>::get()) aAny <<= uno::Reference< graphic::XGraphicRenderer >(this); else - aAny <<= OWeakAggObject::queryAggregation( rType ); + aAny = OWeakAggObject::queryAggregation( rType ); return aAny; } diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index a3bcc1f51180..5859455b5dec 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -326,7 +326,7 @@ Any SAL_CALL SvUnoImageMapObject::queryAggregation( const Type & rType ) else if( rType == cppu::UnoType<XUnoTunnel>::get()) aAny <<= Reference< XUnoTunnel >(this); else - aAny <<= OWeakAggObject::queryAggregation( rType ); + aAny = OWeakAggObject::queryAggregation( rType ); return aAny; } diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index 15752f7bd7c4..74bc8e260143 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -353,7 +353,7 @@ uno::Any SAL_CALL SvxUnoDrawPool::queryAggregation( const uno::Type & rType ) else if( rType == cppu::UnoType<beans::XMultiPropertySet>::get()) aAny <<= uno::Reference< beans::XMultiPropertySet >(this); else - aAny <<= OWeakAggObject::queryAggregation( rType ); + aAny = OWeakAggObject::queryAggregation( rType ); return aAny; } diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 1c4fcf4b91f1..037991f39d12 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -90,7 +90,7 @@ uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType ) else if( rType == cppu::UnoType<beans::XMultiPropertySet>::get()) aAny <<= uno::Reference< beans::XMultiPropertySet >(this); else - aAny <<= OWeakAggObject::queryAggregation( rType ); + aAny = OWeakAggObject::queryAggregation( rType ); return aAny; } |