comphelper: staruno -> css::uno

Change-Id: I21991280c5b7e4c6d0c200f4489c89a9f4fbc385

6 files changed, 81 insertions, 81 deletions

diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx
index 343b27655a95..83f53623337c 100644
--- a/comphelper/source/container/enumhelper.cxx
+++ b/comphelper/source/container/enumhelper.cxx
@@ -29,7 +29,7 @@ namespace comphelper
 //= OEnumerationByName
 
 
-OEnumerationByName::OEnumerationByName(const staruno::Reference<starcontainer::XNameAccess>& _rxAccess)
+OEnumerationByName::OEnumerationByName(const css::uno::Reference<starcontainer::XNameAccess>& _rxAccess)
     :m_aNames(_rxAccess->getElementNames())
     ,m_nPos(0)
     ,m_xAccess(_rxAccess)
@@ -39,8 +39,8 @@ OEnumerationByName::OEnumerationByName(const staruno::Reference<starcontainer::X
 }
 
 
-OEnumerationByName::OEnumerationByName(const staruno::Reference<starcontainer::XNameAccess>& _rxAccess,
-                                       const staruno::Sequence< OUString >&           _aNames  )
+OEnumerationByName::OEnumerationByName(const css::uno::Reference<starcontainer::XNameAccess>& _rxAccess,
+                                       const css::uno::Sequence< OUString >&           _aNames  )
     :m_aNames(_aNames)
     ,m_nPos(0)
     ,m_xAccess(_rxAccess)
@@ -56,7 +56,7 @@ OEnumerationByName::~OEnumerationByName()
 }
 
 
-sal_Bool SAL_CALL OEnumerationByName::hasMoreElements(  ) throw(staruno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OEnumerationByName::hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -73,12 +73,12 @@ sal_Bool SAL_CALL OEnumerationByName::hasMoreElements(  ) throw(staruno::Runtime
 }
 
 
-staruno::Any SAL_CALL OEnumerationByName::nextElement(  )
-        throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL OEnumerationByName::nextElement(  )
+        throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
-    staruno::Any aRes;
+    css::uno::Any aRes;
     if (m_xAccess.is() && m_nPos < m_aNames.getLength())
         aRes = m_xAccess->getByName(m_aNames.getConstArray()[m_nPos++]);
 
@@ -96,7 +96,7 @@ staruno::Any SAL_CALL OEnumerationByName::nextElement(  )
 
 
 void SAL_CALL OEnumerationByName::disposing(const starlang::EventObject& aEvent)
-        throw(staruno::RuntimeException, std::exception)
+        throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -113,7 +113,7 @@ void OEnumerationByName::impl_startDisposeListening()
         return;
 
     ++m_refCount;
-    staruno::Reference< starlang::XComponent > xDisposable(m_xAccess, staruno::UNO_QUERY);
+    css::uno::Reference< starlang::XComponent > xDisposable(m_xAccess, css::uno::UNO_QUERY);
     if (xDisposable.is())
     {
         xDisposable->addEventListener(this);
@@ -131,7 +131,7 @@ void OEnumerationByName::impl_stopDisposeListening()
         return;
 
     ++m_refCount;
-    staruno::Reference< starlang::XComponent > xDisposable(m_xAccess, staruno::UNO_QUERY);
+    css::uno::Reference< starlang::XComponent > xDisposable(m_xAccess, css::uno::UNO_QUERY);
     if (xDisposable.is())
     {
         xDisposable->removeEventListener(this);
@@ -144,7 +144,7 @@ void OEnumerationByName::impl_stopDisposeListening()
 //= OEnumerationByIndex
 
 
-OEnumerationByIndex::OEnumerationByIndex(const staruno::Reference< starcontainer::XIndexAccess >& _rxAccess)
+OEnumerationByIndex::OEnumerationByIndex(const css::uno::Reference< starcontainer::XIndexAccess >& _rxAccess)
     :m_nPos(0)
     ,m_xAccess(_rxAccess)
     ,m_bListening(false)
@@ -159,7 +159,7 @@ OEnumerationByIndex::~OEnumerationByIndex()
 }
 
 
-sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements(  ) throw(staruno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -176,12 +176,12 @@ sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements(  ) throw(staruno::Runtim
 }
 
 
-staruno::Any SAL_CALL OEnumerationByIndex::nextElement(  )
-        throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL OEnumerationByIndex::nextElement(  )
+        throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
-    staruno::Any aRes;
+    css::uno::Any aRes;
     if (m_xAccess.is())
     {
         aRes = m_xAccess->getByIndex(m_nPos++);
@@ -199,7 +199,7 @@ staruno::Any SAL_CALL OEnumerationByIndex::nextElement(  )
 
 
 void SAL_CALL OEnumerationByIndex::disposing(const starlang::EventObject& aEvent)
-        throw(staruno::RuntimeException, std::exception)
+        throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -216,7 +216,7 @@ void OEnumerationByIndex::impl_startDisposeListening()
         return;
 
     ++m_refCount;
-    staruno::Reference< starlang::XComponent > xDisposable(m_xAccess, staruno::UNO_QUERY);
+    css::uno::Reference< starlang::XComponent > xDisposable(m_xAccess, css::uno::UNO_QUERY);
     if (xDisposable.is())
     {
         xDisposable->addEventListener(this);
@@ -234,7 +234,7 @@ void OEnumerationByIndex::impl_stopDisposeListening()
         return;
 
     ++m_refCount;
-    staruno::Reference< starlang::XComponent > xDisposable(m_xAccess, staruno::UNO_QUERY);
+    css::uno::Reference< starlang::XComponent > xDisposable(m_xAccess, css::uno::UNO_QUERY);
     if (xDisposable.is())
     {
         xDisposable->removeEventListener(this);
@@ -248,7 +248,7 @@ void OEnumerationByIndex::impl_stopDisposeListening()
 
 
 
-OAnyEnumeration::OAnyEnumeration(const staruno::Sequence< staruno::Any >& lItems)
+OAnyEnumeration::OAnyEnumeration(const css::uno::Sequence< css::uno::Any >& lItems)
     :m_nPos(0)
     ,m_lItems(lItems)
 {
@@ -260,7 +260,7 @@ OAnyEnumeration::~OAnyEnumeration()
 }
 
 
-sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements(  ) throw(staruno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -268,8 +268,8 @@ sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements(  ) throw(staruno::RuntimeExc
 }
 
 
-staruno::Any SAL_CALL OAnyEnumeration::nextElement(  )
-        throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL OAnyEnumeration::nextElement(  )
+        throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     if ( ! hasMoreElements())
         throw starcontainer::NoSuchElementException();
diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx
index 3f853812620f..9610873cb0ae 100644
--- a/comphelper/source/misc/numbers.cxx
+++ b/comphelper/source/misc/numbers.cxx
@@ -33,14 +33,14 @@ namespace starbeans = ::com::sun::star::beans;
 namespace starlang  = ::com::sun::star::lang;
 
 
-sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormats>& xFormats, sal_Int32 nKey)
+sal_Int16 getNumberFormatType(const css::uno::Reference<starutil::XNumberFormats>& xFormats, sal_Int32 nKey)
 {
     sal_Int16 nReturn(starutil::NumberFormat::UNDEFINED);
     if (xFormats.is())
     {
         try
         {
-            staruno::Reference<starbeans::XPropertySet> xFormat(xFormats->getByKey(nKey));
+            css::uno::Reference<starbeans::XPropertySet> xFormat(xFormats->getByKey(nKey));
             if (xFormat.is())
                 xFormat->getPropertyValue("Type") >>= nReturn;
         }
@@ -53,23 +53,23 @@ sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormats>
 }
 
 
-sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormatter>& xFormatter, sal_Int32 nKey)
+sal_Int16 getNumberFormatType(const css::uno::Reference<starutil::XNumberFormatter>& xFormatter, sal_Int32 nKey)
 {
     OSL_ENSURE(xFormatter.is(), "getNumberFormatType : the formatter isn't valid !");
-    staruno::Reference<starutil::XNumberFormatsSupplier> xSupplier( xFormatter->getNumberFormatsSupplier());
+    css::uno::Reference<starutil::XNumberFormatsSupplier> xSupplier( xFormatter->getNumberFormatsSupplier());
     OSL_ENSURE(xSupplier.is(), "getNumberFormatType : the formatter doesn't implement a supplier !");
-    staruno::Reference<starutil::XNumberFormats> xFormats( xSupplier->getNumberFormats());
+    css::uno::Reference<starutil::XNumberFormats> xFormats( xSupplier->getNumberFormats());
     return getNumberFormatType(xFormats, nKey);
 }
 
 
-staruno::Any getNumberFormatDecimals(const staruno::Reference<starutil::XNumberFormats>& xFormats, sal_Int32 nKey)
+css::uno::Any getNumberFormatDecimals(const css::uno::Reference<starutil::XNumberFormats>& xFormats, sal_Int32 nKey)
 {
     if (xFormats.is())
     {
         try
         {
-            staruno::Reference<starbeans::XPropertySet> xFormat( xFormats->getByKey(nKey));
+            css::uno::Reference<starbeans::XPropertySet> xFormat( xFormats->getByKey(nKey));
             if (xFormat.is())
             {
                 static OUString PROPERTY_DECIMALS( "Decimals" );
@@ -81,19 +81,19 @@ staruno::Any getNumberFormatDecimals(const staruno::Reference<starutil::XNumberF
             OSL_TRACE("getNumberFormatDecimals : invalid key! (may be created with another formatter ?)");
         }
     }
-    return staruno::makeAny((sal_Int16)0);
+    return css::uno::makeAny((sal_Int16)0);
 }
 
 
 
 sal_Int32 getStandardFormat(
-        const staruno::Reference<starutil::XNumberFormatter>& xFormatter,
+        const css::uno::Reference<starutil::XNumberFormatter>& xFormatter,
         sal_Int16 nType,
         const starlang::Locale& _rLocale)
 {
-    staruno::Reference<starutil::XNumberFormatsSupplier> xSupplier( xFormatter.is() ? xFormatter->getNumberFormatsSupplier() : staruno::Reference<starutil::XNumberFormatsSupplier>(NULL));
-    staruno::Reference<starutil::XNumberFormats> xFormats( xSupplier.is() ? xSupplier->getNumberFormats() : staruno::Reference<starutil::XNumberFormats>(NULL));
-    staruno::Reference<starutil::XNumberFormatTypes> xTypes(xFormats, staruno::UNO_QUERY);
+    css::uno::Reference<starutil::XNumberFormatsSupplier> xSupplier( xFormatter.is() ? xFormatter->getNumberFormatsSupplier() : css::uno::Reference<starutil::XNumberFormatsSupplier>(NULL));
+    css::uno::Reference<starutil::XNumberFormats> xFormats( xSupplier.is() ? xSupplier->getNumberFormats() : css::uno::Reference<starutil::XNumberFormats>(NULL));
+    css::uno::Reference<starutil::XNumberFormatTypes> xTypes(xFormats, css::uno::UNO_QUERY);
     OSL_ENSURE(xTypes.is(), "getStandardFormat : no format types !");
 
     return xTypes.is() ? xTypes->getStandardFormat(nType, _rLocale) : 0;
diff --git a/comphelper/source/misc/sequence.cxx b/comphelper/source/misc/sequence.cxx
index 440993abd075..43e7c89a85b5 100644
--- a/comphelper/source/misc/sequence.cxx
+++ b/comphelper/source/misc/sequence.cxx
@@ -21,7 +21,7 @@
 
 namespace comphelper
 {
-staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rList, const OUString& _rValue, bool _bOnlyFirst)
+css::uno::Sequence<sal_Int16> findValue(const css::uno::Sequence< OUString >& _rList, const OUString& _rValue, bool _bOnlyFirst)
 {
     sal_Int32 nLength = _rList.getLength();
 
@@ -42,18 +42,18 @@ staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rLi
         // fill sequence
         if( nPos>-1 )
         {
-            staruno::Sequence<sal_Int16> aRetSeq( 1 );
+            css::uno::Sequence<sal_Int16> aRetSeq( 1 );
             aRetSeq.getArray()[0] = (sal_Int16)nPos;
 
             return aRetSeq;
         }
 
-        return staruno::Sequence<sal_Int16>();
+        return css::uno::Sequence<sal_Int16>();
 
     }
     else
     {
-        staruno::Sequence<sal_Int16> aRetSeq( nLength );
+        css::uno::Sequence<sal_Int16> aRetSeq( nLength );
         sal_Int16* pReturn = aRetSeq.getArray();
 
         // how often does the value occur?
diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx
index 30e3fa704598..d81ec90c79a9 100644
--- a/comphelper/source/streaming/basicio.cxx
+++ b/comphelper/source/streaming/basicio.cxx
@@ -25,8 +25,8 @@ namespace comphelper
 
 
 
-const staruno::Reference<stario::XObjectOutputStream>& operator << (
-        const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream,
+const css::uno::Reference<stario::XObjectOutputStream>& operator << (
+        const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream,
         const starawt::FontDescriptor& _rFont)
 {
     _rxOutStream->writeUTF( _rFont.Name );
@@ -50,8 +50,8 @@ const staruno::Reference<stario::XObjectOutputStream>& operator << (
 
 // FontDescriptor
 
-const staruno::Reference<stario::XObjectInputStream>& operator >> (
-        const staruno::Reference<stario::XObjectInputStream>& _rxInStream,
+const css::uno::Reference<stario::XObjectInputStream>& operator >> (
+        const css::uno::Reference<stario::XObjectInputStream>& _rxInStream,
         starawt::FontDescriptor& _rFont)
 {
     // schreiben des Fontdescriptors
@@ -75,84 +75,84 @@ const staruno::Reference<stario::XObjectInputStream>& operator >> (
 }
 
 
-const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, bool& _rVal)
+const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, bool& _rVal)
 {
     _rVal = _rxInStream->readBoolean();
     return _rxInStream;
 }
 
 
-const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, bool _bVal)
+const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, bool _bVal)
 {
     _rxOutStream->writeBoolean(_bVal);
     return _rxOutStream;
 }
 
 
-const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, OUString& rStr)
+const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, OUString& rStr)
 {
     rStr = _rxInStream->readUTF();
     return _rxInStream;
 }
 
 
-const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, const OUString& rStr)
+const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, const OUString& rStr)
 {
     _rxOutStream->writeUTF(rStr);
     return _rxOutStream;
 }
 
 
-const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int16& _rValue)
+const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int16& _rValue)
 {
     _rValue = _rxInStream->readShort();
     return _rxInStream;
 }
 
 
-const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int16 _nValue)
+const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int16 _nValue)
 {
     _rxOutStream->writeShort(_nValue);
     return _rxOutStream;
 }
 
 
-const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_uInt16& _rValue)
+const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_uInt16& _rValue)
 {
     _rValue = _rxInStream->readShort();
     return _rxInStream;
 }
 
 
-const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_uInt16 _nValue)
+const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_uInt16 _nValue)
 {
     _rxOutStream->writeShort(_nValue);
     return _rxOutStream;
 }
 
 
-const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_uInt32& _rValue)
+const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_uInt32& _rValue)
 {
     _rValue = _rxInStream->readLong();
     return _rxInStream;
 }
 
 
-const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_uInt32 _nValue)
+const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_uInt32 _nValue)
 {
     _rxOutStream->writeLong(_nValue);
     return _rxOutStream;
 }
 
 
-const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int32& _rValue)
+const css::uno::Reference<stario::XObjectInputStream>& operator >> (const css::uno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int32& _rValue)
 {
     _rValue = _rxInStream->readLong();
     return _rxInStream;
 }
 
 
-const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int32 _nValue)
+const css::uno::Reference<stario::XObjectOutputStream>& operator << (const css::uno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Int32 _nValue)
 {
     _rxOutStream->writeLong(_nValue);
     return _rxOutStream;
diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx
index 03f169dd9b0c..1c8584ef79ab 100644
--- a/comphelper/source/streaming/oslfile2streamwrap.cxx
+++ b/comphelper/source/streaming/oslfile2streamwrap.cxx
@@ -37,14 +37,14 @@ OSLInputStreamWrapper::~OSLInputStreamWrapper()
 }
 
 
-sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-                throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception )
+sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
+                throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
 {
     if (!m_pFile)
-        throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
+        throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
 
     if (nBytesToRead < 0)
-        throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this));
+        throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
 
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -53,9 +53,9 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8
     sal_uInt64 nRead = 0;
     FileBase::RC eError = m_pFile->read((void*)aData.getArray(), nBytesToRead, nRead);
     if (eError != FileBase::E_None)
-        throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this));
+        throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
 
-    // Wenn gelesene Zeichen < MaxLength, staruno::Sequence anpassen
+    // Wenn gelesene Zeichen < MaxLength, css::uno::Sequence anpassen
     if (nRead < (sal_uInt32)nBytesToRead)
         aData.realloc( sal::static_int_cast< sal_Int32 >(nRead) );
 
@@ -63,23 +63,23 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8
 }
 
 
-sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception )
+sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
 {
     if (!m_pFile)
-        throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
+        throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
 
     if (nMaxBytesToRead < 0)
-        throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this));
+        throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
 
     return readBytes(aData, nMaxBytesToRead);
 }
 
 
-void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception )
+void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!m_pFile)
-        throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
+        throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
 
     sal_uInt64 nCurrentPos;
     m_pFile->getPos(nCurrentPos);
@@ -88,45 +88,45 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( st
     FileBase::RC eError = m_pFile->setPos(osl_Pos_Absolut, nNewPos);
     if (eError != FileBase::E_None)
     {
-        throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
+        throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
     }
 }
 
 
-sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnectedException, staruno::RuntimeException, std::exception )
+sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnectedException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!m_pFile)
-        throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
+        throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
 
     sal_uInt64 nPos;
     FileBase::RC eError = m_pFile->getPos(nPos);
     if (eError != FileBase::E_None)
-        throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
+        throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
 
     sal_uInt64 nDummy = 0;
     eError = m_pFile->setPos(osl_Pos_End, nDummy);
     if (eError != FileBase::E_None)
-       throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this));
+       throw stario::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this));
 
     sal_uInt64 nAvailable;
     eError = m_pFile->getPos(nAvailable);
     if (eError != FileBase::E_None)
-       throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this));
+       throw stario::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this));
 
     nAvailable = nAvailable - nPos;
     eError = m_pFile->setPos(osl_Pos_Absolut, nPos);
     if (eError != FileBase::E_None)
-       throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this));
+       throw stario::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this));
     return sal::static_int_cast< sal_Int32 >(
         std::max(nAvailable, sal::static_int_cast< sal_uInt64 >(SAL_MAX_INT32)));
 }
 
 
-void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedException, staruno::RuntimeException, std::exception )
+void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedException, css::uno::RuntimeException, std::exception )
 {
     if (!m_pFile)
-        throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
+        throw stario::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
 
     m_pFile->close();
 
@@ -143,24 +143,24 @@ OSLOutputStreamWrapper::OSLOutputStreamWrapper(osl::File & _rFile):
 
 OSLOutputStreamWrapper::~OSLOutputStreamWrapper() {}
 
-void SAL_CALL OSLOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception )
+void SAL_CALL OSLOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
 {
     sal_uInt64 nWritten;
     FileBase::RC eError = rFile.write(aData.getConstArray(),aData.getLength(), nWritten);
     if (eError != FileBase::E_None
         || nWritten != sal::static_int_cast< sal_uInt32 >(aData.getLength()))
     {
-        throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this));
+        throw stario::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
     }
 }
 
 
-void SAL_CALL OSLOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception )
+void SAL_CALL OSLOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
 {
 }
 
 
-void SAL_CALL OSLOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception )
+void SAL_CALL OSLOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
 {
     rFile.close();
 }
diff --git a/comphelper/source/streaming/streamsection.cxx b/comphelper/source/streaming/streamsection.cxx
index 9cd2d01287c3..c1b2408ddca1 100644
--- a/comphelper/source/streaming/streamsection.cxx
+++ b/comphelper/source/streaming/streamsection.cxx
@@ -24,7 +24,7 @@ namespace comphelper
 {
 
 
-OStreamSection::OStreamSection(const staruno::Reference< stario::XDataInputStream >& _rxInput)
+OStreamSection::OStreamSection(const css::uno::Reference< stario::XDataInputStream >& _rxInput)
     :m_xMarkStream(_rxInput, ::com::sun::star::uno::UNO_QUERY)
     ,m_xInStream(_rxInput)
     ,m_nBlockStart(-1)
@@ -39,7 +39,7 @@ OStreamSection::OStreamSection(const staruno::Reference< stario::XDataInputStrea
 }
 
 
-OStreamSection::OStreamSection(const staruno::Reference< stario::XDataOutputStream >& _rxOutput, sal_Int32 _nPresumedLength)
+OStreamSection::OStreamSection(const css::uno::Reference< stario::XDataOutputStream >& _rxOutput, sal_Int32 _nPresumedLength)
     :m_xMarkStream(_rxOutput, ::com::sun::star::uno::UNO_QUERY)
     ,m_xOutStream(_rxOutput)
     ,m_nBlockStart(-1)
@@ -87,7 +87,7 @@ OStreamSection::~OStreamSection()
             }
         }
     }
-    catch(const staruno::Exception&)
+    catch(const css::uno::Exception&)
     {
     }
 }