summaryrefslogtreecommitdiff
path: root/unotools/source/ucbhelper
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-17 15:53:18 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-11-18 06:50:40 +0000
commit7f5c879310ce5add04a7f5d84c9a55e9ffbb5855 (patch)
treee5bf1857d14cc1e1a02c62e36e1468f399a81000 /unotools/source/ucbhelper
parent21c5ff1287c05e24d5cc2b6100866e6992ff8381 (diff)
com::sun::star->css in unotools/
Change-Id: Ie36efe4abe7f5c505f564147eb52e0222c1ce955 Reviewed-on: https://gerrit.libreoffice.org/20019 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'unotools/source/ucbhelper')
-rw-r--r--unotools/source/ucbhelper/XTempFile.hxx70
-rw-r--r--unotools/source/ucbhelper/localfilehelper.cxx10
-rw-r--r--unotools/source/ucbhelper/progresshandlerwrap.cxx2
-rw-r--r--unotools/source/ucbhelper/tempfile.cxx6
-rw-r--r--unotools/source/ucbhelper/ucbhelper.cxx7
-rw-r--r--unotools/source/ucbhelper/ucblockbytes.cxx2
-rw-r--r--unotools/source/ucbhelper/ucblockbytes.hxx28
-rw-r--r--unotools/source/ucbhelper/xtempfile.cxx2
8 files changed, 61 insertions, 66 deletions
diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx
index f655217778ec..5d54883bfeb8 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.hxx
@@ -35,13 +35,13 @@ class SvStream;
namespace utl { class TempFile; }
-typedef ::cppu::WeakImplHelper< ::com::sun::star::io::XTempFile
- , ::com::sun::star::io::XInputStream
- , ::com::sun::star::io::XOutputStream
- , ::com::sun::star::io::XTruncate > OTempFileBase;
+typedef ::cppu::WeakImplHelper< css::io::XTempFile
+ , css::io::XInputStream
+ , css::io::XOutputStream
+ , css::io::XTruncate > OTempFileBase;
class OTempFileService : public OTempFileBase
- , public ::cppu::PropertySetMixin< ::com::sun::star::io::XTempFile >
+ , public ::cppu::PropertySetMixin< css::io::XTempFile >
{
protected:
::utl::TempFile* mpTempFile;
@@ -58,65 +58,65 @@ protected:
void checkConnected ();
public:
- explicit OTempFileService (::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context);
+ explicit OTempFileService (css::uno::Reference< css::uno::XComponentContext > const & context);
//Methods
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire( )
throw () override;
virtual void SAL_CALL release( )
throw () override;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( )
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( )
+ throw (css::uno::RuntimeException, std::exception) override;
// XTempFile
virtual sal_Bool SAL_CALL getRemoveFile()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setRemoveFile( sal_Bool _removefile )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getUri()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getResourceName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XInputStream
- virtual ::sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL readBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead )
+ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead )
+ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL available( )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL closeInput( )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
// XOutputStream
- virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData )
+ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL flush( )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL closeOutput( )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
// XSeekable
virtual void SAL_CALL seek( sal_Int64 location )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual sal_Int64 SAL_CALL getPosition( )
- throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual sal_Int64 SAL_CALL getLength( )
- throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
// XStream
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( )
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( )
+ throw (css::uno::RuntimeException, std::exception) override;
// XTruncate
virtual void SAL_CALL truncate()
- throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual ~OTempFileService ();
};
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index 266f20f6e6ce..45668518c19e 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -38,7 +38,7 @@ namespace utl
typedef ::std::vector< OUString* > StringList_Impl;
-::com::sun::star::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUString& rFolder, bool bFolder )
+css::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUString& rFolder, bool bFolder )
{
StringList_Impl* pFiles = nullptr;
try
@@ -46,15 +46,15 @@ typedef ::std::vector< OUString* > StringList_Impl;
::ucbhelper::Content aCnt(
rFolder, Reference< XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- Reference< ::com::sun::star::sdbc::XResultSet > xResultSet;
- ::com::sun::star::uno::Sequence< OUString > aProps { "Url" };
+ Reference< css::sdbc::XResultSet > xResultSet;
+ css::uno::Sequence< OUString > aProps { "Url" };
try
{
::ucbhelper::ResultSetInclude eInclude = bFolder ? ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS : ::ucbhelper::INCLUDE_DOCUMENTS_ONLY;
xResultSet = aCnt.createCursor( aProps, eInclude );
}
- catch( ::com::sun::star::ucb::CommandAbortedException& )
+ catch( css::ucb::CommandAbortedException& )
{
}
catch( Exception& )
@@ -74,7 +74,7 @@ typedef ::std::vector< OUString* > StringList_Impl;
pFiles->push_back( pFile );
}
}
- catch( ::com::sun::star::ucb::CommandAbortedException& )
+ catch( css::ucb::CommandAbortedException& )
{
}
catch( Exception& )
diff --git a/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx
index 60f2c784453b..b84882fdffe4 100644
--- a/unotools/source/ucbhelper/progresshandlerwrap.cxx
+++ b/unotools/source/ucbhelper/progresshandlerwrap.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::ucb;
-ProgressHandlerWrap::ProgressHandlerWrap( ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > xSI )
+ProgressHandlerWrap::ProgressHandlerWrap( css::uno::Reference< css::task::XStatusIndicator > xSI )
: m_xStatusIndicator( xSI )
{
}
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index fa093d73ab70..53be9620b97f 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -114,10 +114,8 @@ OUString ConstructTempDir_Impl( const OUString* pParent )
OUString aName;
if ( pParent && !pParent->isEmpty() )
{
- com::sun::star::uno::Reference<
- com::sun::star::ucb::XUniversalContentBroker > pBroker(
- com::sun::star::ucb::UniversalContentBroker::create(
- comphelper::getProcessComponentContext() ) );
+ css::uno::Reference< css::ucb::XUniversalContentBroker > pBroker(
+ css::ucb::UniversalContentBroker::create( comphelper::getProcessComponentContext() ) );
// test for valid filename
OUString aRet;
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 11b7867478b6..5519419f90a9 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -85,11 +85,8 @@ std::vector<OUString> getContents(OUString const & url) {
std::vector<OUString> cs;
ucbhelper::Content c(content(url));
css::uno::Sequence<OUString> args { "Title" };
- css::uno::Reference<css::sdbc::XResultSet> res(
- c.createCursor(args),
- css::uno::UNO_SET_THROW);
- css::uno::Reference<com::sun::star::ucb::XContentAccess> acc(
- res, css::uno::UNO_QUERY_THROW);
+ css::uno::Reference<css::sdbc::XResultSet> res( c.createCursor(args), css::uno::UNO_SET_THROW);
+ css::uno::Reference<css::ucb::XContentAccess> acc( res, css::uno::UNO_QUERY_THROW);
while (res->next()) {
cs.push_back(acc->queryContentIdentifierString());
}
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 6c825bd1f86c..107aa83fa336 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -1209,7 +1209,7 @@ ErrCode UcbLockBytes::ReadAt(sal_uInt64 const nPos,
{
return ERRCODE_IO_CANTSEEK;
}
- catch (const com::sun::star::lang::IllegalArgumentException&)
+ catch (const css::lang::IllegalArgumentException&)
{
return ERRCODE_IO_CANTSEEK;
}
diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx
index 00805d1c7a46..cf1636eb093b 100644
--- a/unotools/source/ucbhelper/ucblockbytes.hxx
+++ b/unotools/source/ucbhelper/ucblockbytes.hxx
@@ -86,9 +86,9 @@ class UcbLockBytes : public virtual SvLockBytes
OUString m_aRealURL;
DateTime m_aExpireDate;
- ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > m_xInputStream;
- ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > m_xOutputStream;
- ::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable > m_xSeekable;
+ css::uno::Reference < css::io::XInputStream > m_xInputStream;
+ css::uno::Reference < css::io::XOutputStream > m_xOutputStream;
+ css::uno::Reference < css::io::XSeekable > m_xSeekable;
UcbLockBytesHandlerRef m_xHandler;
ErrCode m_nError;
@@ -103,14 +103,14 @@ protected:
public:
// properties: Referer, PostMimeType
- static UcbLockBytesRef CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XContent >& xContent,
- const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rProps,
+ static UcbLockBytesRef CreateLockBytes( const css::uno::Reference < css::ucb::XContent >& xContent,
+ const css::uno::Sequence < css::beans::PropertyValue >& rProps,
StreamMode eMode,
- const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& xInter,
+ const css::uno::Reference < css::task::XInteractionHandler >& xInter,
UcbLockBytesHandler* pHandler=nullptr );
- static UcbLockBytesRef CreateInputLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xContent );
- static UcbLockBytesRef CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream >& xContent );
+ static UcbLockBytesRef CreateInputLockBytes( const css::uno::Reference < css::io::XInputStream >& xContent );
+ static UcbLockBytesRef CreateLockBytes( const css::uno::Reference < css::io::XStream >& xContent );
// SvLockBytes
virtual void SetSynchronMode (bool bSynchron) override;
@@ -127,26 +127,26 @@ public:
{ return m_nError; }
// calling this method delegates the responsibility to call closeinput to the caller!
- ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > getInputStream();
+ css::uno::Reference < css::io::XInputStream > getInputStream();
- bool setInputStream_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > &rxInputStream,
+ bool setInputStream_Impl( const css::uno::Reference < css::io::XInputStream > &rxInputStream,
bool bSetXSeekable = true );
- bool setStream_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > &rxStream );
+ bool setStream_Impl( const css::uno::Reference < css::io::XStream > &rxStream );
void terminate_Impl();
- ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > getInputStream_Impl() const
+ css::uno::Reference < css::io::XInputStream > getInputStream_Impl() const
{
osl::MutexGuard aGuard( (const_cast< UcbLockBytes* >(this))->m_aMutex );
return m_xInputStream;
}
- ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > getOutputStream_Impl() const
+ css::uno::Reference < css::io::XOutputStream > getOutputStream_Impl() const
{
osl::MutexGuard aGuard( (const_cast< UcbLockBytes* >(this))->m_aMutex );
return m_xOutputStream;
}
- ::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable > getSeekable_Impl() const
+ css::uno::Reference < css::io::XSeekable > getSeekable_Impl() const
{
osl::MutexGuard aGuard( (const_cast< UcbLockBytes* >(this))->m_aMutex );
return m_xSeekable;
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index 8a9f952b2785..888ee864c850 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.cxx
@@ -30,7 +30,7 @@ OTempFileService::OTempFileService(css::uno::Reference< css::uno::XComponentCont
: ::cppu::PropertySetMixin< css::io::XTempFile >(
context
, static_cast< Implements >( IMPLEMENTS_PROPERTY_SET | IMPLEMENTS_FAST_PROPERTY_SET | IMPLEMENTS_PROPERTY_ACCESS )
- , com::sun::star::uno::Sequence< OUString >() )
+ , css::uno::Sequence< OUString >() )
, mpStream( nullptr )
, mbRemoveFile( true )
, mbInClosed( false )