diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-13 14:56:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-13 21:14:26 +0200 |
| commit | b6491f09e9dc3e41d571abce3c4f16467cb60c9c (patch) | |
| tree | dfe1b5ad2273be6f5423a2b1994e1855811d3f78 /package | |
| parent | 5e1719ff1ed5b4350684c3ed67b5375bb49e0223 (diff) | |
loplugin:sequentialassign in oox..reportdesign
Change-Id: I59ef0a6da411b8af8bdf8d8efb1d733db7475d9c
Reviewed-on: https://gerrit.libreoffice.org/70707
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/xstor/ocompinstream.cxx | 4 | ||||
| -rw-r--r-- | package/source/xstor/ohierarchyholder.cxx | 8 | ||||
| -rw-r--r-- | package/source/xstor/owriteablestream.cxx | 8 | ||||
| -rw-r--r-- | package/source/xstor/xstorage.cxx | 4 |
4 files changed, 6 insertions, 18 deletions
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx index 98592e61c590..52565b7933cf 100644 --- a/package/source/xstor/ocompinstream.cxx +++ b/package/source/xstor/ocompinstream.cxx @@ -74,10 +74,8 @@ OInputCompStream::~OInputCompStream() uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType ) { - uno::Any aReturn; - // common interfaces - aReturn = ::cppu::queryInterface + uno::Any aReturn = ::cppu::queryInterface ( rType , static_cast<io::XInputStream*> ( this ) , static_cast<io::XStream*> ( this ) diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx index 20c613b8b8d2..76d8842fb497 100644 --- a/package/source/xstor/ohierarchyholder.cxx +++ b/package/source/xstor/ohierarchyholder.cxx @@ -92,9 +92,7 @@ uno::Reference< embed::XExtendedStorageStream > OHierarchyElement_Impl::GetStrea uno::Reference< embed::XExtendedStorageStream > xResult; - uno::Reference< embed::XStorage > xOwnStor; - - xOwnStor = m_xOwnStorage.is() ? m_xOwnStorage + uno::Reference< embed::XStorage > xOwnStor = m_xOwnStorage.is() ? m_xOwnStorage : uno::Reference< embed::XStorage >( m_xWeakOwnStorage.get(), uno::UNO_QUERY_THROW ); if ( aListPath.empty() ) @@ -171,9 +169,7 @@ void OHierarchyElement_Impl::RemoveStreamHierarchically( std::vector<OUString>& OUString aNextName = *(aListPath.begin()); aListPath.erase( aListPath.begin() ); - uno::Reference< embed::XStorage > xOwnStor; - - xOwnStor = m_xOwnStorage.is() ? m_xOwnStorage + uno::Reference< embed::XStorage > xOwnStor = m_xOwnStorage.is() ? m_xOwnStorage : uno::Reference< embed::XStorage >( m_xWeakOwnStorage.get(), uno::UNO_QUERY_THROW ); if ( aListPath.empty() ) diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index ee06fc0c398c..213c53efaf49 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -1267,9 +1267,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre throw io::IOException(); } - uno::Reference< io::XInputStream > xInStream; - - xInStream = GetTempFileAsInputStream(); //TODO: + uno::Reference< io::XInputStream > xInStream = GetTempFileAsInputStream(); //TODO: if ( !xInStream.is() ) throw io::IOException(); @@ -1800,10 +1798,8 @@ void OWriteStream::ModifyParentUnlockMutex_Impl(osl::ClearableMutexGuard& aGuard uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType ) { - uno::Any aReturn; - // common interfaces - aReturn = ::cppu::queryInterface + uno::Any aReturn = ::cppu::queryInterface ( rType , static_cast<lang::XTypeProvider*> ( this ) , static_cast<io::XInputStream*> ( this ) diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 28e20c43703a..c3033decefd6 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -2046,10 +2046,8 @@ void OStorage::MakeLinkToSubComponent_Impl( const uno::Reference< lang::XCompone uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType ) { - uno::Any aReturn; - // common interfaces - aReturn = ::cppu::queryInterface + uno::Any aReturn = ::cppu::queryInterface ( rType , static_cast<lang::XTypeProvider*> ( this ) , static_cast<embed::XStorage*> ( this ) |