4 files changed, 17 insertions, 17 deletions

diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 435d83a79725..931e00a4834f 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -716,7 +716,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments )
             {
                 // the stream must be seekable, if it is not it will be wrapped
                 m_xContentStream = ::comphelper::OSeekableInputWrapper::CheckSeekableCanWrap( m_xContentStream, m_xContext );
-                m_xContentSeek = uno::Reference < XSeekable > ( m_xContentStream, UNO_QUERY );
+                m_xContentSeek.set( m_xContentStream, UNO_QUERY );
                 if ( ! m_xContentSeek.is() )
                     throw css::uno::Exception (THROW_WHERE "The package component _requires_ an XSeekable interface!",
                             static_cast < ::cppu::OWeakObject * > ( this ) );
@@ -1473,7 +1473,7 @@ void SAL_CALL ZipPackage::commitChanges()
                     try
                     {
                         aOrigFileStream = xSimpleAccess->openFileWrite( m_aURL );
-                        xOrigTruncate = uno::Reference< io::XTruncate >( aOrigFileStream, uno::UNO_QUERY_THROW );
+                        xOrigTruncate.set( aOrigFileStream, uno::UNO_QUERY_THROW );
                         // after successful truncation the file is already corrupted
                         xOrigTruncate->truncate();
                     }
@@ -1494,7 +1494,7 @@ void SAL_CALL ZipPackage::commitChanges()
                             aOrigFileStream->closeOutput();
                         } catch ( uno::Exception& ) {}
 
-                        aOrigFileStream = uno::Reference< XOutputStream >();
+                        aOrigFileStream.clear();
                         // the original file can already be corrupted
                         bCanBeCorrupted = true;
                     }
@@ -1551,7 +1551,7 @@ void SAL_CALL ZipPackage::commitChanges()
 
 void ZipPackage::DisconnectFromTargetAndThrowException_Impl( const uno::Reference< io::XInputStream >& xTempStream )
 {
-    m_xStream = uno::Reference< io::XStream >( xTempStream, uno::UNO_QUERY );
+    m_xStream.set( xTempStream, uno::UNO_QUERY );
     if ( m_xStream.is() )
         m_eMode = e_IMode_XStream;
     else
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index e5ec367be724..f99fbda5bbc3 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -141,7 +141,7 @@ void ZipPackageStream::CloseOwnStreamIfAny()
     if ( m_xStream.is() )
     {
         m_xStream->closeInput();
-        m_xStream = uno::Reference< io::XInputStream >();
+        m_xStream.clear();
         m_bHasSeekable = false;
     }
 }
@@ -349,12 +349,12 @@ uno::Reference< io::XInputStream > ZipPackageStream::TryToGetRawFromDataStream(
         xTempSeek->seek( 0 );
 
         // close raw stream, package stream and folder
-        xInRaw = uno::Reference< io::XInputStream >();
-        xNewPSProps = uno::Reference< XPropertySet >();
-        xNPSTunnel = uno::Reference< XUnoTunnel >();
-        xNewPackStream = uno::Reference< XDataSinkEncrSupport >();
-        xTunnel = uno::Reference< XUnoTunnel >();
-        xRootNameContainer = uno::Reference< container::XNameContainer >();
+        xInRaw.clear();
+        xNewPSProps.clear();
+        xNPSTunnel.clear();
+        xNewPackStream.clear();
+        xTunnel.clear();
+        xRootNameContainer.clear();
 
         // return the stream representing the first temporary file
         return xTempIn;
diff --git a/package/source/zippackage/wrapstreamforshare.cxx b/package/source/zippackage/wrapstreamforshare.cxx
index 50f160132e5e..f97c213b4709 100644
--- a/package/source/zippackage/wrapstreamforshare.cxx
+++ b/package/source/zippackage/wrapstreamforshare.cxx
@@ -35,7 +35,7 @@ WrapStreamForShare::WrapStreamForShare( const uno::Reference< io::XInputStream >
 , m_xInStream( xInStream )
 , m_nCurPos( 0 )
 {
-    m_xSeekable = uno::Reference< io::XSeekable >( m_xInStream, uno::UNO_QUERY );
+    m_xSeekable.set( m_xInStream, uno::UNO_QUERY );
     if ( !m_rMutexRef.is() || !m_xInStream.is() || !m_xSeekable.is() )
     {
         OSL_FAIL( "Wrong initialization of wrapping stream!\n" );
@@ -124,8 +124,8 @@ void SAL_CALL WrapStreamForShare::closeInput()
 
     // the package is the owner so it will close the stream
     // m_xInStream->closeInput();
-    m_xInStream = uno::Reference< io::XInputStream >();
-    m_xSeekable = uno::Reference< io::XSeekable >();
+    m_xInStream.clear();
+    m_xSeekable.clear();
 }
 
 // XSeekable
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index 6e865470c60f..f05bdce6d321 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -194,18 +194,18 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu
         {
             m_xContentStream = xSink->getInputStream();
             m_bOwnContent = true;
-            xSeekable = uno::Reference< io::XSeekable >( m_xContentStream, uno::UNO_QUERY );
+            xSeekable.set( m_xContentStream, uno::UNO_QUERY );
         }
     }
     else if ( (aArguments[0] >>= xStream ) )
     {
         // a writable stream can implement both XStream & XInputStream
         m_xContentStream = xStream->getInputStream();
-        xSeekable = uno::Reference< io::XSeekable >( xStream, uno::UNO_QUERY );
+        xSeekable.set( xStream, uno::UNO_QUERY );
     }
     else if ( aArguments[0] >>= m_xContentStream )
     {
-        xSeekable = uno::Reference< io::XSeekable >( m_xContentStream, uno::UNO_QUERY );
+        xSeekable.set( m_xContentStream, uno::UNO_QUERY );
     }
     else
         throw lang::IllegalArgumentException(THROW_WHERE, uno::Reference< uno::XInterface >(), 1 );