diff options
| author | Ashod Nakashian <ashodnakashian@yahoo.com> | 2015-11-10 19:20:12 -0500 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-12 10:47:26 +0000 |
| commit | d7801c39826f2f24f7340e1b25809d3bb65d6099 (patch) | |
| tree | 6acf82af5954e72930272fd62ac37c07664cf937 /unotools | |
| parent | b34eab5996c52269360d166815ef15a250627c48 (diff) | |
Namespace cleanup and disambiguation
Change-Id: Ib6d2f8b4e71436c3a7c26bdfc9847152ebaf0739
Reviewed-on: https://gerrit.libreoffice.org/19900
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/ucbhelper/ucblockbytes.cxx | 6 | ||||
| -rw-r--r-- | unotools/source/ucbhelper/ucbstreamhelper.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index c37f49086953..6c825bd1f86c 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -500,8 +500,8 @@ Moderator::Moderator( const Command& rArg ) throw( - ::com::sun::star::ucb::ContentCreationException, - ::com::sun::star::uno::RuntimeException + css::ucb::ContentCreationException, + css::uno::RuntimeException ) : m_aMutex(), @@ -1131,7 +1131,7 @@ bool UcbLockBytes::setInputStream_Impl( const Reference<XInputStream> &rxInputSt if( !m_xSeekable.is() && rxInputStream.is() ) { Reference < XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< XOutputStream > rxTempOut( TempFile::create(xContext), UNO_QUERY_THROW ); + Reference< XOutputStream > rxTempOut( css::io::TempFile::create(xContext), UNO_QUERY_THROW ); ::comphelper::OStorageHelper::CopyInputToOutput( rxInputStream, rxTempOut ); m_xInputStream.set( rxTempOut, UNO_QUERY ); diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index 11098986f9dc..4025b7738f16 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx @@ -60,7 +60,7 @@ static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMo ::ucbhelper::Content aCnt( rFileName, Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( "delete", makeAny( true ) ); + aCnt.executeCommand( "delete", css::uno::makeAny( true ) ); } catch ( const CommandAbortedException& ) |