comphelper/source/property/genericpropertyset.cxx    |    2 +-
 embeddedobj/source/commonembedding/miscobj.cxx       |    2 +-
 embeddedobj/source/commonembedding/specialobject.cxx |    2 +-
 package/source/xstor/ocompinstream.cxx               |    4 ++--
 package/source/xstor/owriteablestream.cxx            |    8 ++++----
 package/source/xstor/xstorage.cxx                    |   10 +++++-----
 svl/source/fsstor/fsstorage.cxx                      |    2 +-
 svl/source/fsstor/ostreamcontainer.cxx               |   12 ++++++------
 svtools/source/graphic/descriptor.cxx                |    2 +-
 svtools/source/graphic/graphic.cxx                   |    2 +-
 svtools/source/graphic/renderer.cxx                  |    2 +-
 svtools/source/uno/unoimap.cxx                       |    2 +-
 svx/source/unodraw/unopool.cxx                       |    2 +-
 svx/source/unogallery/unogalitem.cxx                 |    2 +-
 14 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 930f0242a11538ddda0e80712be98ff6b9431fd2
Author: Jochen Nitschke <j.nitschke+loger...@ok.de>
Date:   Sun Oct 16 07:52:45 2016 +0200

    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 <c...@libreoffice.org>
    Reviewed-by: Jochen Nitschke <j.nitschke+loger...@ok.de>

diff --git a/comphelper/source/property/genericpropertyset.cxx 
b/comphelper/source/property/genericpropertyset.cxx
index e8b08ec..f30a7b2 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 00464a7..fa020e9 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 b9ec0ab..e1c73f8 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 24318b1..c94d16c 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 7e60023..8506f7e 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 f11843e..29155de 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 cbcc682..7aa50cd 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 997dd2c..9e5d0c5 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 4f73e4f..e25d870 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 5c56025..2d18804 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 161707f..d7134e7 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 a3bcc1f..5859455 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 15752f7..74bc8e2 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 1c4fcf4..037991f 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;
 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to