summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/gio
diff options
context:
space:
mode:
Diffstat (limited to 'ucb/source/ucp/gio')
-rw-r--r--ucb/source/ucp/gio/gio_content.hxx134
-rw-r--r--ucb/source/ucp/gio/gio_datasupplier.hxx22
-rw-r--r--ucb/source/ucp/gio/gio_inputstream.hxx40
-rw-r--r--ucb/source/ucp/gio/gio_mount.cxx2
-rw-r--r--ucb/source/ucp/gio/gio_mount.hxx4
-rw-r--r--ucb/source/ucp/gio/gio_outputstream.cxx2
-rw-r--r--ucb/source/ucp/gio/gio_outputstream.hxx30
-rw-r--r--ucb/source/ucp/gio/gio_provider.cxx15
-rw-r--r--ucb/source/ucp/gio/gio_provider.hxx13
-rw-r--r--ucb/source/ucp/gio/gio_resultset.hxx19
-rw-r--r--ucb/source/ucp/gio/gio_seekable.hxx26
11 files changed, 151 insertions, 156 deletions
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index 180ba638d649..eb2094984806 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -53,14 +53,14 @@ namespace gio
#define GIO_FILE_TYPE "application/vnd.sun.staroffice.gio-file"
#define GIO_FOLDER_TYPE "application/vnd.sun.staroffice.gio-folder"
-com::sun::star::uno::Any convertToException(GError *pError,
- const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rContext, bool bThrow=true);
+css::uno::Any convertToException(GError *pError,
+ const css::uno::Reference< css::uno::XInterface >& rContext, bool bThrow=true);
void convertToIOException(GError *pError,
- const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rContext)
+ const css::uno::Reference< css::uno::XInterface >& rContext)
throw (css::io::IOException, css::uno::RuntimeException, std::exception);
class ContentProvider;
-class Content : public ::ucbhelper::ContentImplHelper, public com::sun::star::ucb::XContentCreator
+class Content : public ::ucbhelper::ContentImplHelper, public css::ucb::XContentCreator
{
private:
ContentProvider *m_pProvider;
@@ -68,17 +68,17 @@ private:
GFileInfo *mpInfo;
bool mbTransient;
- GFileInfo *getGFileInfo(const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv,
+ GFileInfo *getGFileInfo(const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv,
GError **ppError=NULL);
- bool isFolder(const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv);
+ bool isFolder(const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv);
- com::sun::star::uno::Any mapGIOError( GError *error );
- com::sun::star::uno::Any getBadArgExcept();
+ css::uno::Any mapGIOError( GError *error );
+ css::uno::Any getBadArgExcept();
- com::sun::star::uno::Reference< com::sun::star::sdbc::XRow >
+ css::uno::Reference< css::sdbc::XRow >
getPropertyValues(
- const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProperties,
- const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv );
+ const css::uno::Sequence< css::beans::Property >& rProperties,
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
private:
typedef rtl::Reference< Content > ContentRef;
typedef std::list< ContentRef > ContentRefList;
@@ -87,60 +87,60 @@ private:
bool doSetFileInfo ( GFileInfo *pNewInfo );
- com::sun::star::uno::Any open(const com::sun::star::ucb::OpenCommandArgument2 & rArg,
- const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
- throw( com::sun::star::uno::Exception );
+ css::uno::Any open(const css::ucb::OpenCommandArgument2 & rArg,
+ const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
+ throw( css::uno::Exception );
- void transfer( const com::sun::star::ucb::TransferInfo& rTransferInfo,
- const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
- throw( com::sun::star::uno::Exception, std::exception );
+ void transfer( const css::ucb::TransferInfo& rTransferInfo,
+ const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
+ throw( css::uno::Exception, std::exception );
- void insert( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & xInputStream,
- bool bReplaceExisting, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv )
- throw( com::sun::star::uno::Exception );
+ void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream,
+ bool bReplaceExisting, const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
+ throw( css::uno::Exception );
- void destroy( bool bDeletePhysical ) throw( com::sun::star::uno::Exception, std::exception );
+ void destroy( bool bDeletePhysical ) throw( css::uno::Exception, std::exception );
- static void copyData( com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xIn,
- com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOut );
+ static void copyData( css::uno::Reference< css::io::XInputStream > xIn,
+ css::uno::Reference< css::io::XOutputStream > xOut );
- com::sun::star::uno::Sequence< com::sun::star::uno::Any >
- setPropertyValues( const com::sun::star::uno::Sequence<
- com::sun::star::beans::PropertyValue >& rValues,
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment >& xEnv );
+ css::uno::Sequence< css::uno::Any >
+ setPropertyValues( const css::uno::Sequence<
+ css::beans::PropertyValue >& rValues,
+ const css::uno::Reference<
+ css::ucb::XCommandEnvironment >& xEnv );
- bool feedSink( com::sun::star::uno::Reference< com::sun::star::uno::XInterface> aSink,
- const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv );
+ bool feedSink( css::uno::Reference< css::uno::XInterface> aSink,
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
- bool exchangeIdentity(const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xNewId);
+ bool exchangeIdentity(const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId);
public:
- Content( const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
- const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier)
- throw ( com::sun::star::ucb::ContentCreationException );
-
- Content( const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
- const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier,
+ Content( const css::uno::Reference<
+ css::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
+ const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier)
+ throw ( css::ucb::ContentCreationException );
+
+ Content( const css::uno::Reference<
+ css::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
+ const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
bool bIsFolder)
- throw ( com::sun::star::ucb::ContentCreationException );
+ throw ( css::ucb::ContentCreationException );
virtual ~Content();
- com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > getPropertyValuesFromGFileInfo(
- GFileInfo *pInfo, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
- const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv,
- const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProperties);
+ css::uno::Reference< css::sdbc::XRow > getPropertyValuesFromGFileInfo(
+ GFileInfo *pInfo, const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv,
+ const css::uno::Sequence< css::beans::Property >& rProperties);
- virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
- getProperties( const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment > & xEnv ) override;
+ virtual css::uno::Sequence< css::beans::Property >
+ getProperties( const css::uno::Reference<
+ css::ucb::XCommandEnvironment > & xEnv ) override;
- virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >
- getCommands( const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment > & xEnv ) override;
+ virtual css::uno::Sequence< css::ucb::CommandInfo >
+ getCommands( const css::uno::Reference<
+ css::ucb::XCommandEnvironment > & xEnv ) override;
virtual OUString getParentURL() override;
@@ -159,36 +159,36 @@ public:
virtual OUString SAL_CALL
getImplementationName()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual OUString SAL_CALL
getContentType()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Any SAL_CALL
- execute( const com::sun::star::ucb::Command& aCommand,
+ virtual css::uno::Any SAL_CALL
+ execute( const css::ucb::Command& aCommand,
sal_Int32 CommandId,
- const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment )
- throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
+ throw( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL abort( sal_Int32 CommandId )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo >
+ virtual css::uno::Sequence< css::ucb::ContentInfo >
SAL_CALL queryCreatableContentsInfo()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent >
- SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::ucb::XContent >
+ SAL_CALL createNewContent( const css::ucb::ContentInfo& Info )
+ throw( css::uno::RuntimeException, std::exception ) override;
- com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo >
+ css::uno::Sequence< css::ucb::ContentInfo >
queryCreatableContentsInfo(
- const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv)
- throw( com::sun::star::uno::RuntimeException );
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv)
+ throw( css::uno::RuntimeException );
GFile* getGFile();
};
diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx
index 824b1174f320..d359cc4ca12d 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.hxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.hxx
@@ -32,9 +32,9 @@ class Content;
struct ResultListEntry
{
OUString aId;
- com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > xId;
- com::sun::star::uno::Reference< com::sun::star::ucb::XContent > xContent;
- com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > xRow;
+ css::uno::Reference< css::ucb::XContentIdentifier > xId;
+ css::uno::Reference< css::ucb::XContent > xContent;
+ css::uno::Reference< css::sdbc::XRow > xRow;
GFileInfo *pInfo;
explicit ResultListEntry( GFileInfo *pInInfo ) : pInfo(pInInfo)
@@ -53,21 +53,21 @@ typedef std::vector< ResultListEntry* > ResultList;
class DataSupplier : public ucbhelper::ResultSetDataSupplier
{
private:
- com::sun::star::uno::Reference< ::gio::Content > mxContent;
- com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xSMgr;
+ css::uno::Reference< ::gio::Content > mxContent;
+ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMgr;
sal_Int32 mnOpenMode;
bool mbCountFinal;
bool getData();
ResultList maResults;
public:
- DataSupplier( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
- const com::sun::star::uno::Reference< Content >& rContent, sal_Int32 nOpenMode );
+ DataSupplier( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSMgr,
+ const css::uno::Reference< Content >& rContent, sal_Int32 nOpenMode );
virtual ~DataSupplier();
virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override;
- virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >
+ virtual css::uno::Reference< css::ucb::XContentIdentifier >
queryContentIdentifier( sal_uInt32 nIndex ) override;
- virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent >
+ virtual css::uno::Reference< css::ucb::XContent >
queryContent( sal_uInt32 nIndex ) override;
virtual bool getResult( sal_uInt32 nIndex ) override;
@@ -76,14 +76,14 @@ public:
virtual sal_uInt32 currentCount() override;
virtual bool isCountFinal() override;
- virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow >
+ virtual css::uno::Reference< css::sdbc::XRow >
queryPropertyValues( sal_uInt32 nIndex ) override;
virtual void releasePropertyValues( sal_uInt32 nIndex ) override;
virtual void close() override;
virtual void validate()
- throw( com::sun::star::ucb::ResultSetException ) override;
+ throw( css::ucb::ResultSetException ) override;
};
}
diff --git a/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx
index ca2bac2018d2..ea096d5cf607 100644
--- a/ucb/source/ucp/gio/gio_inputstream.hxx
+++ b/ucb/source/ucp/gio/gio_inputstream.hxx
@@ -41,35 +41,35 @@ public:
virtual ~InputStream();
// XInputStream
- virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 > & aData,
+ virtual sal_Int32 SAL_CALL readBytes( css::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;
+ throw( css::io::NotConnectedException,
+ css::io::BufferSizeExceededException,
+ css::io::IOException,
+ css::uno::RuntimeException, std::exception ) override;
- virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 > & aData,
+ virtual sal_Int32 SAL_CALL readSomeBytes( css::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;
+ 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;
};
} // namespace gio
diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx
index 4ac8b2987e60..ff3c75fe910b 100644
--- a/ucb/source/ucp/gio/gio_mount.cxx
+++ b/ucb/source/ucp/gio/gio_mount.cxx
@@ -70,7 +70,7 @@ static void ooo_mount_operation_ask_password (GMountOperation *op,
OOoMountOperation *pThis = reinterpret_cast<OOoMountOperation*>(op);
- const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > &xEnv = *(pThis->pEnv);
+ const css::uno::Reference< css::ucb::XCommandEnvironment > &xEnv = *(pThis->pEnv);
if (xEnv.is())
xIH = xEnv->getInteractionHandler();
diff --git a/ucb/source/ucp/gio/gio_mount.hxx b/ucb/source/ucp/gio/gio_mount.hxx
index 0f3c14559447..3b6c057499d6 100644
--- a/ucb/source/ucp/gio/gio_mount.hxx
+++ b/ucb/source/ucp/gio/gio_mount.hxx
@@ -36,7 +36,7 @@ struct OOoMountOperation
{
GMountOperation parent_instance;
- const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > *pEnv;
+ const css::uno::Reference< css::ucb::XCommandEnvironment > *pEnv;
char *m_pPrevUsername;
char *m_pPrevPassword;
};
@@ -54,7 +54,7 @@ struct OOoMountOperationClass
GType ooo_mount_operation_get_type();
-GMountOperation *ooo_mount_operation_new(const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& rEnv);
+GMountOperation *ooo_mount_operation_new(const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv);
G_END_DECLS
#endif
diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx
index 1161bc299781..743d04b8a23b 100644
--- a/ucb/source/ucp/gio/gio_outputstream.cxx
+++ b/ucb/source/ucp/gio/gio_outputstream.cxx
@@ -40,7 +40,7 @@ OutputStream::~OutputStream()
closeOutput();
}
-void SAL_CALL OutputStream::writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& rData )
+void SAL_CALL OutputStream::writeBytes( const css::uno::Sequence< sal_Int8 >& rData )
throw( io::NotConnectedException, io::BufferSizeExceededException,
io::IOException, uno::RuntimeException, std::exception)
{
diff --git a/ucb/source/ucp/gio/gio_outputstream.hxx b/ucb/source/ucp/gio/gio_outputstream.hxx
index e11beab088a8..73158eba8b4e 100644
--- a/ucb/source/ucp/gio/gio_outputstream.hxx
+++ b/ucb/source/ucp/gio/gio_outputstream.hxx
@@ -34,7 +34,7 @@ namespace gio
{
class OutputStream :
- public ::com::sun::star::io::XOutputStream,
+ public css::io::XOutputStream,
public Seekable
{
private:
@@ -45,29 +45,29 @@ public:
virtual ~OutputStream();
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & type )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire() throw () override { OWeakObject::acquire(); }
virtual void SAL_CALL release() throw() override { OWeakObject::release(); }
// 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::IOException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::io::NotConnectedException,
+ css::io::IOException,
+ css::uno::RuntimeException, std::exception ) override;
};
} // namespace gio
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index 527f1ef0b627..32745dec1c98 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -27,11 +27,10 @@ using namespace com::sun::star;
namespace gio
{
-uno::Reference< com::sun::star::ucb::XContent > SAL_CALL
+uno::Reference< css::ucb::XContent > SAL_CALL
ContentProvider::queryContent(
- const uno::Reference<
- com::sun::star::ucb::XContentIdentifier >& Identifier )
- throw( com::sun::star::ucb::IllegalIdentifierException,
+ const uno::Reference< css::ucb::XContentIdentifier >& Identifier )
+ throw( css::ucb::IllegalIdentifierException,
uno::RuntimeException, std::exception )
{
SAL_INFO("ucb.ucp.gio", "QueryContent: " << Identifier->getContentIdentifier());
@@ -46,13 +45,13 @@ ContentProvider::queryContent(
{
xContent = new ::gio::Content(m_xContext, this, Identifier);
}
- catch ( com::sun::star::ucb::ContentCreationException const & )
+ catch ( css::ucb::ContentCreationException const & )
{
- throw com::sun::star::ucb::IllegalIdentifierException();
+ throw css::ucb::IllegalIdentifierException();
}
if ( !xContent->getIdentifier().is() )
- throw com::sun::star::ucb::IllegalIdentifierException();
+ throw css::ucb::IllegalIdentifierException();
return xContent;
}
@@ -94,7 +93,7 @@ css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & r
XTYPEPROVIDER_IMPL_3( ContentProvider,
lang::XTypeProvider,
lang::XServiceInfo,
- com::sun::star::ucb::XContentProvider );
+ css::ucb::XContentProvider );
XSERVICEINFO_IMPL_1_CTX( ContentProvider,
OUString( "com.sun.star.comp.GIOContentProvider" ),
diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx
index 863e0e46a895..dbb3f8542ef4 100644
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_provider.hxx
@@ -30,8 +30,7 @@ namespace gio
class ContentProvider : public ::ucbhelper::ContentProviderImplHelper
{
public:
- explicit ContentProvider( const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext >& rxContext );
+ explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~ContentProvider();
// XInterface
@@ -64,12 +63,10 @@ public:
css::lang::XMultiServiceFactory >& rxServiceMgr );
// XContentProvider
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::ucb::XContent > SAL_CALL
- queryContent( const ::com::sun::star::uno::Reference<
- ::com::sun::star::ucb::XContentIdentifier >& Identifier )
- throw( ::com::sun::star::ucb::IllegalIdentifierException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
+ queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
+ throw( css::ucb::IllegalIdentifierException,
+ css::uno::RuntimeException, std::exception ) override;
};
}
diff --git a/ucb/source/ucp/gio/gio_resultset.hxx b/ucb/source/ucp/gio/gio_resultset.hxx
index 236a7e18c889..543b38455b54 100644
--- a/ucb/source/ucp/gio/gio_resultset.hxx
+++ b/ucb/source/ucp/gio/gio_resultset.hxx
@@ -28,20 +28,19 @@ namespace gio
class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
{
- com::sun::star::uno::Reference< Content > m_xContent;
- com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv;
+ css::uno::Reference< Content > m_xContent;
+ css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv;
private:
- virtual void initStatic() override;
- virtual void initDynamic() override;
+ virtual void initStatic() override;
+ virtual void initDynamic() override;
public:
- DynamicResultSet(
- const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
- const com::sun::star::uno::Reference< Content >& rxContent,
- const com::sun::star::ucb::OpenCommandArgument2& rCommand,
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment >& rxEnv );
+ DynamicResultSet(
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ const css::uno::Reference< Content >& rxContent,
+ const css::ucb::OpenCommandArgument2& rCommand,
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv );
};
}
diff --git a/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx
index 339b8281da6a..b4e5e078e174 100644
--- a/ucb/source/ucp/gio/gio_seekable.hxx
+++ b/ucb/source/ucp/gio/gio_seekable.hxx
@@ -32,8 +32,8 @@
namespace gio
{
-class Seekable : public ::com::sun::star::io::XTruncate,
- public ::com::sun::star::io::XSeekable,
+class Seekable : public css::io::XTruncate,
+ public css::io::XSeekable,
public ::cppu::OWeakObject
{
private:
@@ -43,29 +43,29 @@ public:
virtual ~Seekable();
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & type )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire() throw () override { OWeakObject::acquire(); }
virtual void SAL_CALL release() throw() override { OWeakObject::release(); }
// 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;
// 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;
};
} // namespace gio
generated by cgit (git 2.34.1) at 2024-07-10 18:19:40 +0000