From 88cc248d0d00bb00d7d686a858044663ad6c9c30 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 3 Dec 2012 14:36:14 +0200 Subject: WaE: BaseReference::_pInterface may be used uninitialized in this function Change-Id: Ia127816f994f7ce6fc7230a0a7dacaa7396ba825 --- package/source/xstor/ohierarchyholder.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx index ff2dc3fdf06f..da4d2310bf87 100644 --- a/package/source/xstor/ohierarchyholder.cxx +++ b/package/source/xstor/ohierarchyholder.cxx @@ -93,7 +93,9 @@ uno::Reference< embed::XExtendedStorageStream > OHierarchyElement_Impl::GetStrea uno::Reference< embed::XExtendedStorageStream > xResult; - uno::Reference< embed::XStorage > xOwnStor = m_xOwnStorage.is() ? m_xOwnStorage + uno::Reference< embed::XStorage > xOwnStor; + + xOwnStor = m_xOwnStorage.is() ? m_xOwnStorage : uno::Reference< embed::XStorage >( m_xWeakOwnStorage.get(), uno::UNO_QUERY ); if ( !xOwnStor.is() ) throw uno::RuntimeException(); @@ -175,7 +177,9 @@ void OHierarchyElement_Impl::RemoveStreamHierarchically( OStringList_Impl& aList uno::Reference< embed::XExtendedStorageStream > xResult; - uno::Reference< embed::XStorage > xOwnStor = m_xOwnStorage.is() ? m_xOwnStorage + uno::Reference< embed::XStorage > xOwnStor; + + xOwnStor = m_xOwnStorage.is() ? m_xOwnStorage : uno::Reference< embed::XStorage >( m_xWeakOwnStorage.get(), uno::UNO_QUERY ); if ( !xOwnStor.is() ) throw uno::RuntimeException(); -- cgit