package/inc/ByteChucker.hxx | 14
package/inc/ByteGrabber.hxx | 20
package/inc/CRC32.hxx | 16
package/inc/EncryptionData.hxx | 10
package/inc/HashMaps.hxx | 2
package/inc/ZipFile.hxx | 88 -
package/inc/ZipOutputEntry.hxx | 10
package/inc/ZipOutputStream.hxx | 18
package/inc/ZipPackage.hxx | 120 +-
package/inc/ZipPackageBuffer.hxx | 38
package/inc/ZipPackageEntry.hxx | 55
package/inc/ZipPackageFolder.hxx | 70 -
package/inc/ZipPackageStream.hxx | 99 -
package/inc/zipfileaccess.hxx | 54
package/source/manifest/ManifestExport.hxx | 2
package/source/manifest/ManifestImport.cxx | 4
package/source/manifest/ManifestImport.hxx | 40
package/source/manifest/ManifestReader.cxx | 2
package/source/manifest/ManifestReader.hxx | 24
package/source/manifest/ManifestWriter.hxx | 24
package/source/xstor/disposelistener.hxx | 4
package/source/xstor/ocompinstream.hxx | 88 -
package/source/xstor/ohierarchyholder.cxx | 16
package/source/xstor/ohierarchyholder.hxx | 42
package/source/xstor/oseekinstream.hxx | 22
package/source/xstor/owriteablestream.hxx | 228 ++--
package/source/xstor/selfterminatefilestream.hxx | 32
package/source/xstor/switchpersistencestream.cxx | 12
package/source/xstor/switchpersistencestream.hxx | 70 -
package/source/xstor/xfactory.hxx | 24
package/source/xstor/xstorage.hxx | 782 +++++++-------
package/source/zipapi/MemoryByteGrabber.hxx | 6
package/source/zipapi/XUnbufferedStream.hxx | 41
package/source/zipapi/blowfishcontext.hxx | 10
package/source/zipapi/sha1context.hxx | 9
package/source/zippackage/ContentInfo.hxx | 2
package/source/zippackage/ZipPackage.cxx | 16
package/source/zippackage/ZipPackageFolder.cxx | 2
package/source/zippackage/ZipPackageFolderEnumeration.hxx | 20
package/source/zippackage/ZipPackageSink.cxx | 10
package/source/zippackage/ZipPackageSink.hxx | 15
package/source/zippackage/ZipPackageStream.cxx | 4
package/source/zippackage/wrapstreamforshare.hxx | 30
package/source/zippackage/zipfileaccess.cxx | 2
pyuno/inc/pyuno/pyuno.hxx | 30
pyuno/source/loader/pyuno_loader.cxx | 6
pyuno/source/module/pyuno.cxx | 136 +-
pyuno/source/module/pyuno_adapter.cxx | 18
pyuno/source/module/pyuno_callable.cxx | 16
pyuno/source/module/pyuno_except.cxx | 10
pyuno/source/module/pyuno_gc.cxx | 2
pyuno/source/module/pyuno_impl.hxx | 144 +-
pyuno/source/module/pyuno_iterator.cxx | 38
pyuno/source/module/pyuno_module.cxx | 38
pyuno/source/module/pyuno_runtime.cxx | 32
pyuno/source/module/pyuno_struct.cxx | 26
pyuno/source/module/pyuno_type.cxx | 54
pyuno/source/module/pyuno_util.cxx | 2
58 files changed, 1362 insertions(+), 1387 deletions(-)
New commits:
commit 8d80b5be024bdbcfedd41b32cbb5c6b71724dd33
Author: Noel Grandin <n...@peralex.com>
Date: Fri Oct 23 14:59:15 2015 +0200
com::sun::star->css in package,pyuno
Change-Id: I7b7b0e7fea2d1a2b9f6f5501ad5e0b8c1b4a17b9
diff --git a/package/inc/ByteChucker.hxx b/package/inc/ByteChucker.hxx
index fc1167e..c18e76e 100644
--- a/package/inc/ByteChucker.hxx
+++ b/package/inc/ByteChucker.hxx
@@ -33,20 +33,20 @@ namespace com { namespace sun { namespace star {
class ByteChucker
{
protected:
- com::sun::star::uno::Reference < com::sun::star::io::XOutputStream >
xStream;
- com::sun::star::uno::Reference < com::sun::star::io::XSeekable > xSeek;
- com::sun::star::uno::Sequence < sal_Int8 > a1Sequence, a2Sequence,
a4Sequence;
+ css::uno::Reference < css::io::XOutputStream > xStream;
+ css::uno::Reference < css::io::XSeekable > xSeek;
+ css::uno::Sequence < sal_Int8 > a1Sequence, a2Sequence, a4Sequence;
sal_Int8 * const p1Sequence, * const p2Sequence, * const p4Sequence;
public:
- ByteChucker
(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> xOstream);
+ ByteChucker (css::uno::Reference<css::io::XOutputStream> xOstream);
~ByteChucker();
- void 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);
+ void WriteBytes( const css::uno::Sequence< sal_Int8 >& aData )
+ throw(css::io::NotConnectedException,
css::io::BufferSizeExceededException, css::io::IOException,
css::uno::RuntimeException);
sal_Int64 GetPosition()
- throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::uno::RuntimeException);
void WriteInt16(sal_Int16 nInt16)
{
diff --git a/package/inc/ByteGrabber.hxx b/package/inc/ByteGrabber.hxx
index 2791e0b..ffa112c 100644
--- a/package/inc/ByteGrabber.hxx
+++ b/package/inc/ByteGrabber.hxx
@@ -37,26 +37,26 @@ class ByteGrabber
protected:
::osl::Mutex m_aMutex;
- com::sun::star::uno::Reference < com::sun::star::io::XInputStream >
xStream;
- com::sun::star::uno::Reference < com::sun::star::io::XSeekable > xSeek;
- com::sun::star::uno::Sequence < sal_Int8 > aSequence;
+ css::uno::Reference < css::io::XInputStream > xStream;
+ css::uno::Reference < css::io::XSeekable > xSeek;
+ css::uno::Sequence < sal_Int8 > aSequence;
const sal_Int8 *pSequence;
public:
- ByteGrabber (com::sun::star::uno::Reference <
com::sun::star::io::XInputStream > xIstream);
+ ByteGrabber (css::uno::Reference < css::io::XInputStream > xIstream);
~ByteGrabber();
- void setInputStream (com::sun::star::uno::Reference <
com::sun::star::io::XInputStream > xNewStream);
+ void setInputStream (css::uno::Reference < css::io::XInputStream >
xNewStream);
// XInputStream
- 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);
+ 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);
// XSeekable
sal_Int64 SAL_CALL seek( sal_Int64 location )
- throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ throw(css::lang::IllegalArgumentException, css::io::IOException,
css::uno::RuntimeException);
sal_Int64 SAL_CALL getPosition( )
- throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::uno::RuntimeException);
sal_Int64 SAL_CALL getLength( )
- throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::uno::RuntimeException);
sal_uInt16 ReadUInt16();
sal_uInt32 ReadUInt32();
diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx
index cfc66c4..2f2af5a 100644
--- a/package/inc/CRC32.hxx
+++ b/package/inc/CRC32.hxx
@@ -33,16 +33,16 @@ public:
CRC32();
~CRC32();
- sal_Int64 SAL_CALL updateStream (::com::sun::star::uno::Reference <
::com::sun::star::io::XInputStream > & xStream)
- throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL updateSegment(const ::com::sun::star::uno::Sequence<
sal_Int8 > &b, sal_Int32 len)
- throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL update(const ::com::sun::star::uno::Sequence< sal_Int8 > &b)
- throw(::com::sun::star::uno::RuntimeException);
+ sal_Int64 SAL_CALL updateStream (css::uno::Reference <
css::io::XInputStream > & xStream)
+ throw(css::uno::RuntimeException);
+ void SAL_CALL updateSegment(const css::uno::Sequence< sal_Int8 > &b,
sal_Int32 len)
+ throw(css::uno::RuntimeException);
+ void SAL_CALL update(const css::uno::Sequence< sal_Int8 > &b)
+ throw(css::uno::RuntimeException);
sal_Int32 SAL_CALL getValue()
- throw(::com::sun::star::uno::RuntimeException);
+ throw(css::uno::RuntimeException);
void SAL_CALL reset()
- throw(::com::sun::star::uno::RuntimeException);
+ throw(css::uno::RuntimeException);
};
#endif
diff --git a/package/inc/EncryptionData.hxx b/package/inc/EncryptionData.hxx
index 664b8e2..0add43f 100644
--- a/package/inc/EncryptionData.hxx
+++ b/package/inc/EncryptionData.hxx
@@ -25,9 +25,9 @@
class BaseEncryptionData : public cppu::OWeakObject
{
public:
- ::com::sun::star::uno::Sequence< sal_Int8 > m_aSalt;
- ::com::sun::star::uno::Sequence< sal_Int8 > m_aInitVector;
- ::com::sun::star::uno::Sequence< sal_Int8 > m_aDigest;
+ css::uno::Sequence< sal_Int8 > m_aSalt;
+ css::uno::Sequence< sal_Int8 > m_aInitVector;
+ css::uno::Sequence< sal_Int8 > m_aDigest;
sal_Int32 m_nIterationCount;
BaseEncryptionData()
@@ -45,13 +45,13 @@ public:
class EncryptionData : public BaseEncryptionData
{
public:
- ::com::sun::star::uno::Sequence < sal_Int8 > m_aKey;
+ css::uno::Sequence < sal_Int8 > m_aKey;
sal_Int32 m_nEncAlg;
sal_Int32 m_nCheckAlg;
sal_Int32 m_nDerivedKeySize;
sal_Int32 m_nStartKeyGenID;
- EncryptionData( const BaseEncryptionData& aData, const
::com::sun::star::uno::Sequence< sal_Int8 >& aKey, sal_Int32 nEncAlg, sal_Int32
nCheckAlg, sal_Int32 nDerivedKeySize, sal_Int32 nStartKeyGenID )
+ EncryptionData( const BaseEncryptionData& aData, const css::uno::Sequence<
sal_Int8 >& aKey, sal_Int32 nEncAlg, sal_Int32 nCheckAlg, sal_Int32
nDerivedKeySize, sal_Int32 nStartKeyGenID )
: BaseEncryptionData( aData )
, m_aKey( aKey )
, m_nEncAlg( nEncAlg )
diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx
index a885509..f3d0c65 100644
--- a/package/inc/HashMaps.hxx
+++ b/package/inc/HashMaps.hxx
@@ -43,7 +43,7 @@ typedef std::unordered_map < OUString,
eqFunc > FolderHash;
typedef std::unordered_map < OUString,
- rtl::Reference < com::sun::star::packages::ContentInfo
>,
+ rtl::Reference < css::packages::ContentInfo >,
OUStringHash,
eqFunc > ContentHash;
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index 83ffd1c..68980c4 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -60,15 +60,15 @@ protected:
EntryHash aEntries;
ByteGrabber aGrabber;
ZipUtils::Inflater aInflater;
- com::sun::star::uno::Reference < com::sun::star::io::XInputStream >
xStream;
- com::sun::star::uno::Reference < com::sun::star::io::XSeekable > xSeek;
- const ::com::sun::star::uno::Reference <
com::sun::star::uno::XComponentContext > m_xContext;
- ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XProgressHandler
> xProgressHandler;
+ css::uno::Reference < css::io::XInputStream > xStream;
+ css::uno::Reference < css::io::XSeekable > xSeek;
+ const css::uno::Reference < css::uno::XComponentContext > m_xContext;
+ css::uno::Reference < css::ucb::XProgressHandler > xProgressHandler;
bool bRecoveryMode;
// aMediaType parameter is used only for raw stream header creation
- com::sun::star::uno::Reference < com::sun::star::io::XInputStream >
createUnbufferedStream(
+ css::uno::Reference < css::io::XInputStream > createUnbufferedStream(
const rtl::Reference<SotMutexHolder>& aMutexHolder,
ZipEntry & rEntry,
const ::rtl::Reference < EncryptionData > &rData,
@@ -86,38 +86,38 @@ protected:
public:
- ZipFile( com::sun::star::uno::Reference < com::sun::star::io::XInputStream
> &xInput,
- const com::sun::star::uno::Reference <
com::sun::star::uno::XComponentContext > &rxContext,
+ ZipFile( css::uno::Reference < css::io::XInputStream > &xInput,
+ const css::uno::Reference < css::uno::XComponentContext >
&rxContext,
bool bInitialise
)
- throw(::com::sun::star::io::IOException,
com::sun::star::packages::zip::ZipException,
com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::packages::zip::ZipException,
css::uno::RuntimeException);
- ZipFile( com::sun::star::uno::Reference < com::sun::star::io::XInputStream
> &xInput,
- const com::sun::star::uno::Reference <
com::sun::star::uno::XComponentContext > &rxContext,
+ ZipFile( css::uno::Reference < css::io::XInputStream > &xInput,
+ const css::uno::Reference < css::uno::XComponentContext >
&rxContext,
bool bInitialise,
bool bForceRecover,
- ::com::sun::star::uno::Reference <
::com::sun::star::ucb::XProgressHandler > xProgress
+ css::uno::Reference < css::ucb::XProgressHandler > xProgress
)
- throw(::com::sun::star::io::IOException,
com::sun::star::packages::zip::ZipException,
com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::packages::zip::ZipException,
css::uno::RuntimeException);
~ZipFile();
EntryHash& GetEntryHash() { return aEntries; }
- void setInputStream ( com::sun::star::uno::Reference <
com::sun::star::io::XInputStream > xNewStream );
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
SAL_CALL getRawData(
+ void setInputStream ( css::uno::Reference < css::io::XInputStream >
xNewStream );
+ css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData(
ZipEntry& rEntry,
const ::rtl::Reference < EncryptionData > &rData,
bool bDecrypt,
const rtl::Reference<SotMutexHolder>& aMutexHolder )
- throw(::com::sun::star::io::IOException,
::com::sun::star::packages::zip::ZipException,
::com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::packages::zip::ZipException,
css::uno::RuntimeException);
- static ::com::sun::star::uno::Reference<
::com::sun::star::xml::crypto::XDigestContext >
StaticGetDigestContextForChecksum(
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& xArgContext,
+ static css::uno::Reference< css::xml::crypto::XDigestContext >
StaticGetDigestContextForChecksum(
+ const css::uno::Reference< css::uno::XComponentContext >&
xArgContext,
const ::rtl::Reference< EncryptionData >& xEncryptionData );
- static ::com::sun::star::uno::Reference<
::com::sun::star::xml::crypto::XCipherContext > StaticGetCipher(
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& xArgContext,
+ static css::uno::Reference< css::xml::crypto::XCipherContext >
StaticGetCipher(
+ const css::uno::Reference< css::uno::XComponentContext >&
xArgContext,
const ::rtl::Reference< EncryptionData >& xEncryptionData,
bool bEncrypt );
@@ -133,58 +133,58 @@ public:
sal_Int32 &rStartKeyGenID,
sal_Int32 &rSize,
OUString& aMediaType,
- const ::com::sun::star::uno::Reference <
com::sun::star::io::XInputStream >& rStream );
+ const css::uno::Reference <
css::io::XInputStream >& rStream );
- static ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > StaticGetDataFromRawStream(
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext,
- const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream >& xStream,
+ static css::uno::Reference< css::io::XInputStream >
StaticGetDataFromRawStream(
+ const css::uno::Reference< css::uno::XComponentContext >&
rxContext,
+ const css::uno::Reference< css::io::XInputStream >& xStream,
const ::rtl::Reference < EncryptionData > &rData )
- throw ( ::com::sun::star::packages::WrongPasswordException,
- ::com::sun::star::packages::zip::ZipIOException,
- ::com::sun::star::uno::RuntimeException );
+ throw ( css::packages::WrongPasswordException,
+ css::packages::zip::ZipIOException,
+ css::uno::RuntimeException );
static bool StaticHasValidPassword (
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext,
- const ::com::sun::star::uno::Sequence< sal_Int8 > &aReadBuffer,
+ const css::uno::Reference< css::uno::XComponentContext >&
rxContext,
+ const css::uno::Sequence< sal_Int8 > &aReadBuffer,
const ::rtl::Reference < EncryptionData > &rData );
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
SAL_CALL getInputStream(
+ css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(
ZipEntry& rEntry,
const ::rtl::Reference < EncryptionData > &rData,
bool bDecrypt,
const rtl::Reference<SotMutexHolder>& aMutexHolder )
- throw(::com::sun::star::io::IOException,
::com::sun::star::packages::zip::ZipException,
::com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::packages::zip::ZipException,
css::uno::RuntimeException);
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
SAL_CALL getDataStream(
+ css::uno::Reference< css::io::XInputStream > SAL_CALL getDataStream(
ZipEntry& rEntry,
const ::rtl::Reference < EncryptionData > &rData,
bool bDecrypt,
const rtl::Reference<SotMutexHolder>& aMutexHolder )
- throw ( ::com::sun::star::packages::WrongPasswordException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::packages::zip::ZipException,
- ::com::sun::star::uno::RuntimeException );
+ throw ( css::packages::WrongPasswordException,
+ css::io::IOException,
+ css::packages::zip::ZipException,
+ css::uno::RuntimeException );
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
SAL_CALL getWrappedRawStream(
+ css::uno::Reference< css::io::XInputStream > SAL_CALL getWrappedRawStream(
ZipEntry& rEntry,
const ::rtl::Reference < EncryptionData > &rData,
const OUString& aMediaType,
const rtl::Reference<SotMutexHolder>& aMutexHolder )
- throw ( ::com::sun::star::packages::NoEncryptionException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::packages::zip::ZipException,
- ::com::sun::star::uno::RuntimeException );
+ throw ( css::packages::NoEncryptionException,
+ css::io::IOException,
+ css::packages::zip::ZipException,
+ css::uno::RuntimeException );
ZipEnumeration * SAL_CALL entries( );
protected:
bool readLOC ( ZipEntry &rEntry)
- throw(::com::sun::star::io::IOException,
com::sun::star::packages::zip::ZipException,
com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::packages::zip::ZipException,
css::uno::RuntimeException);
sal_Int32 readCEN()
- throw(::com::sun::star::io::IOException,
com::sun::star::packages::zip::ZipException,
com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::packages::zip::ZipException,
css::uno::RuntimeException);
sal_Int32 findEND()
- throw(::com::sun::star::io::IOException,
com::sun::star::packages::zip::ZipException,
com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::packages::zip::ZipException,
css::uno::RuntimeException);
sal_Int32 recover()
- throw(::com::sun::star::io::IOException,
com::sun::star::packages::zip::ZipException,
com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::packages::zip::ZipException,
css::uno::RuntimeException);
};
diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx
index 3a6447c..450cc39b 100644
--- a/package/inc/ZipOutputEntry.hxx
+++ b/package/inc/ZipOutputEntry.hxx
@@ -35,14 +35,14 @@ class ZipPackageStream;
class ZipOutputEntry
{
- ::com::sun::star::uno::Sequence< sal_Int8 > m_aDeflateBuffer;
+ css::uno::Sequence< sal_Int8 > m_aDeflateBuffer;
ZipUtils::Deflater m_aDeflater;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
OUString m_aTempURL;
css::uno::Reference< css::io::XOutputStream > m_xOutStream;
- ::com::sun::star::uno::Reference<
::com::sun::star::xml::crypto::XCipherContext > m_xCipherContext;
- ::com::sun::star::uno::Reference<
::com::sun::star::xml::crypto::XDigestContext > m_xDigestContext;
+ css::uno::Reference< css::xml::crypto::XCipherContext > m_xCipherContext;
+ css::uno::Reference< css::xml::crypto::XDigestContext > m_xDigestContext;
::css::uno::Any m_aParallelDeflateException;
CRC32 m_aCRC;
@@ -54,7 +54,7 @@ class ZipOutputEntry
public:
ZipOutputEntry(
const css::uno::Reference< css::io::XOutputStream >& rxOutStream,
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
ZipEntry& rEntry, ZipPackageStream* pStream, bool bEncrypt = false);
~ZipOutputEntry();
@@ -62,7 +62,7 @@ public:
/* This block of methods is for threaded zipping, where we compress to a
temp stream, whose
data is retrieved via getData */
ZipOutputEntry(
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
ZipEntry& rEntry, ZipPackageStream* pStream, bool bEncrypt = false);
void createBufferFile();
void setParallelDeflateException(const ::css::uno::Any &rAny) {
m_aParallelDeflateException = rAny; }
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index d6d7853..1674009 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -33,7 +33,7 @@ class ZipPackageStream;
class ZipOutputStream
{
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
m_xStream;
+ css::uno::Reference< css::io::XOutputStream > m_xStream;
::std::vector < ZipEntry * > m_aZipList;
ByteChucker m_aChucker;
@@ -43,20 +43,20 @@ class ZipOutputStream
public:
ZipOutputStream(
- const ::com::sun::star::uno::Reference<
::com::sun::star::io::XOutputStream > &xOStream );
+ const css::uno::Reference< css::io::XOutputStream > &xOStream );
~ZipOutputStream();
void addDeflatingThread( ZipOutputEntry *pEntry, comphelper::ThreadTask
*pThreadTask );
void writeLOC( ZipEntry *pEntry, bool bEncrypt = false )
- throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::uno::RuntimeException);
void rawWrite( const css::uno::Sequence< sal_Int8 >& rBuffer )
- throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::uno::RuntimeException);
void rawCloseEntry( bool bEncrypt = false )
- throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::uno::RuntimeException);
void finish()
- throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::uno::RuntimeException);
css::uno::Reference< css::io::XOutputStream > getStream();
static sal_uInt32 getCurrentDosTime();
@@ -64,11 +64,11 @@ public:
private:
void writeEND(sal_uInt32 nOffset, sal_uInt32 nLength)
- throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::uno::RuntimeException);
void writeCEN( const ZipEntry &rEntry )
- throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::uno::RuntimeException);
void writeEXT( const ZipEntry &rEntry )
- throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
+ throw(css::io::IOException, css::uno::RuntimeException);
};
#endif
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index f7251c3..f5b8ffd 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -65,20 +65,20 @@ enum InitialisationMode
class ZipPackage : public cppu::WeakImplHelper
<
- com::sun::star::lang::XInitialization,
- com::sun::star::lang::XSingleServiceFactory,
- com::sun::star::lang::XUnoTunnel,
- com::sun::star::lang::XServiceInfo,
- com::sun::star::container::XHierarchicalNameAccess,
- com::sun::star::util::XChangesBatch,
- com::sun::star::beans::XPropertySet
+ css::lang::XInitialization,
+ css::lang::XSingleServiceFactory,
+ css::lang::XUnoTunnel,
+ css::lang::XServiceInfo,
+ css::container::XHierarchicalNameAccess,
+ css::util::XChangesBatch,
+ css::beans::XPropertySet
>
{
protected:
rtl::Reference<SotMutexHolder> m_aMutexHolder;
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >
m_aStorageEncryptionKeys;
- ::com::sun::star::uno::Sequence< sal_Int8 > m_aEncryptionKey;
+ css::uno::Sequence< css::beans::NamedValue > m_aStorageEncryptionKeys;
+ css::uno::Sequence< sal_Int8 > m_aEncryptionKey;
FolderHash m_aRecent;
OUString m_aURL;
@@ -98,11 +98,11 @@ protected:
InitialisationMode m_eMode;
- ::com::sun::star::uno::Reference <
com::sun::star::container::XNameContainer > m_xRootFolder;
- ::com::sun::star::uno::Reference < com::sun::star::io::XStream > m_xStream;
- ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream >
m_xContentStream;
- ::com::sun::star::uno::Reference < com::sun::star::io::XSeekable >
m_xContentSeek;
- const ::com::sun::star::uno::Reference <
com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference < css::container::XNameContainer > m_xRootFolder;
+ css::uno::Reference < css::io::XStream > m_xStream;
+ css::uno::Reference < css::io::XInputStream > m_xContentStream;
+ css::uno::Reference < css::io::XSeekable > m_xContentSeek;
+ const css::uno::Reference < css::uno::XComponentContext > m_xContext;
ZipPackageFolder *m_pRootFolder;
ZipFile *m_pZipFile;
@@ -114,16 +114,16 @@ protected:
void getZipFileContents();
void WriteMimetypeMagicFile( ZipOutputStream& aZipOut );
- void WriteManifest( ZipOutputStream& aZipOut, const ::std::vector<
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >&
aManList );
- void WriteContentTypes( ZipOutputStream& aZipOut, const ::std::vector<
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >&
aManList );
+ void WriteManifest( ZipOutputStream& aZipOut, const ::std::vector<
css::uno::Sequence< css::beans::PropertyValue > >& aManList );
+ void WriteContentTypes( ZipOutputStream& aZipOut, const ::std::vector<
css::uno::Sequence< css::beans::PropertyValue > >& aManList );
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
writeTempFile();
- ::com::sun::star::uno::Reference <
::com::sun::star::io::XActiveDataStreamer > openOriginalForOutput();
+ css::uno::Reference< css::io::XInputStream > writeTempFile();
+ css::uno::Reference < css::io::XActiveDataStreamer >
openOriginalForOutput();
void DisconnectFromTargetAndThrowException_Impl(
- const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream >& xTempStream );
+ const css::uno::Reference< css::io::XInputStream >& xTempStream );
public:
- ZipPackage( const ::com::sun::star::uno::Reference <
com::sun::star::uno::XComponentContext > &xContext );
+ ZipPackage( const css::uno::Reference < css::uno::XComponentContext >
&xContext );
virtual ~ZipPackage();
ZipFile& getZipFile() { return *m_pZipFile;}
sal_Int32 getFormat() const { return m_nFormat; }
@@ -131,66 +131,66 @@ public:
sal_Int32 GetStartKeyGenID() const { return m_nStartKeyGenerationID; }
sal_Int32 GetEncAlgID() const { return m_nCommonEncryptionID; }
sal_Int32 GetChecksumAlgID() const { return m_nChecksumDigestID; }
- sal_Int32 GetDefaultDerivedKeySize() const { return m_nCommonEncryptionID
== ::com::sun::star::xml::crypto::CipherID::AES_CBC_W3C_PADDING ? 32 : 16; }
+ sal_Int32 GetDefaultDerivedKeySize() const { return m_nCommonEncryptionID
== css::xml::crypto::CipherID::AES_CBC_W3C_PADDING ? 32 : 16; }
rtl::Reference<SotMutexHolder>& GetSharedMutexRef() { return
m_aMutexHolder; }
- void ConnectTo( const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream >& xInStream );
- const ::com::sun::star::uno::Sequence< sal_Int8 > GetEncryptionKey();
+ void ConnectTo( const css::uno::Reference< css::io::XInputStream >&
xInStream );
+ const css::uno::Sequence< sal_Int8 > GetEncryptionKey();
// XInitialization
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any >& aArguments )
- throw(::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any
>& aArguments )
+ throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
override;
// XHierarchicalNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByHierarchicalName( const
OUString& aName )
- throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString&
aName )
+ throw(css::container::NoSuchElementException,
css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& aName )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw(css::uno::RuntimeException, std::exception) override;
// XSingleServiceFactory
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > SAL_CALL createInstance( )
- throw(::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
- throw(::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstance( )
+ throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >&
aArguments )
+ throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
override;
// XChangesBatch
virtual void SAL_CALL commitChanges( )
- throw(::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::lang::WrappedTargetException, css::uno::RuntimeException,
std::exception) override;
virtual sal_Bool SAL_CALL hasPendingChanges( )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::util::ElementChange > SAL_CALL getPendingChanges( )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::util::ElementChange > SAL_CALL
getPendingChanges( )
+ throw(css::uno::RuntimeException, std::exception) override;
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const
::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
- static com::sun::star::uno::Sequence < sal_Int8 >
getUnoTunnelImplementationId()
- throw(::com::sun::star::uno::RuntimeException);
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
sal_Int8 >& aIdentifier )
+ throw(css::uno::RuntimeException, std::exception) override;
+ static css::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId()
+ throw(css::uno::RuntimeException);
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const
OUString& PropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addPropertyChangeListener( const OUString&
aPropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertyChangeListener( const OUString&
aPropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& aListener )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addVetoableChangeListener( const OUString&
PropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& aListener )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeVetoableChangeListener( const OUString&
PropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& aListener )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo( )
+ throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const css::uno::Any& aValue )
+ throw(css::beans::UnknownPropertyException,
css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString&
PropertyName )
+ throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL addPropertyChangeListener( const OUString&
aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener
>& xListener )
+ throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL removePropertyChangeListener( const OUString&
aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener
>& aListener )
+ throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL addVetoableChangeListener( const OUString&
PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >&
aListener )
+ throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString&
PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >&
aListener )
+ throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(
)
+ throw (css::uno::RuntimeException, std::exception) override;
// Uno componentiseralation
static OUString static_getImplementationName();
- static ::com::sun::star::uno::Sequence < OUString >
static_getSupportedServiceNames();
- static ::com::sun::star::uno::Reference <
com::sun::star::lang::XSingleServiceFactory > createServiceFactory(
com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >
const & rServiceFactory );
+ static css::uno::Sequence < OUString > static_getSupportedServiceNames();
+ static css::uno::Reference < css::lang::XSingleServiceFactory >
createServiceFactory( css::uno::Reference < css::lang::XMultiServiceFactory >
const & rServiceFactory );
};
#endif
diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx
index ce0dfc8..aba3f29 100644
--- a/package/inc/ZipPackageBuffer.hxx
+++ b/package/inc/ZipPackageBuffer.hxx
@@ -26,13 +26,13 @@
class ZipPackageBuffer : public ::cppu::WeakImplHelper
<
- com::sun::star::io::XInputStream,
- com::sun::star::io::XOutputStream,
- com::sun::star::io::XSeekable
+ css::io::XInputStream,
+ css::io::XOutputStream,
+ css::io::XSeekable
>
{
protected:
- com::sun::star::uno::Sequence < sal_Int8 > m_aBuffer;
+ css::uno::Sequence < sal_Int8 > m_aBuffer;
sal_Int64 m_nBufferSize, m_nEnd, m_nCurrent;
bool m_bMustInitBuffer;
public:
@@ -40,33 +40,33 @@ public:
virtual ~ZipPackageBuffer();
inline void realloc ( sal_Int32 nSize ) { m_aBuffer.realloc ( nSize ); }
- inline const com::sun::star::uno::Sequence < sal_Int8> getSequence ()
const { return m_aBuffer; }
+ inline const css::uno::Sequence < sal_Int8> getSequence () const { return
m_aBuffer; }
// 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;
};
#endif
diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx
index 54956e1..0850f10 100644
--- a/package/inc/ZipPackageEntry.hxx
+++ b/package/inc/ZipPackageEntry.hxx
@@ -38,11 +38,11 @@ class ZipPackageFolder;
class ZipPackageEntry : public cppu::WeakImplHelper
<
- com::sun::star::container::XNamed,
- com::sun::star::container::XChild,
- com::sun::star::lang::XUnoTunnel,
- com::sun::star::beans::XPropertySet,
- com::sun::star::lang::XServiceInfo
+ css::container::XNamed,
+ css::container::XChild,
+ css::lang::XUnoTunnel,
+ css::beans::XPropertySet,
+ css::lang::XServiceInfo
>
{
protected:
@@ -50,7 +50,6 @@ protected:
OUString msName;
bool mbIsFolder:1;
bool mbAllowRemoveOnInsert:1;
- // com::sun::star::uno::Reference <
com::sun::star::container::XNameContainer > xParent;
OUString msMediaType;
ZipPackageFolder* mpParent;
sal_Int32 m_nFormat;
@@ -79,32 +78,32 @@ public:
}
// XNamed
virtual OUString SAL_CALL getName( )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw(css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setName( const OUString& aName )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw(css::uno::RuntimeException, std::exception) override;
// XChild
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > SAL_CALL getParent( )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& Parent )
- throw(::com::sun::star::lang::NoSupportException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( )
+ throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setParent( const css::uno::Reference<
css::uno::XInterface >& Parent )
+ throw(css::lang::NoSupportException, css::uno::RuntimeException,
std::exception) override;
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const
::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override = 0;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
sal_Int8 >& aIdentifier )
+ throw(css::uno::RuntimeException, std::exception) override = 0;
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override = 0;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const
OUString& PropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override = 0;
- virtual void SAL_CALL addPropertyChangeListener( const OUString&
aPropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertyChangeListener( const OUString&
aPropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& aListener )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addVetoableChangeListener( const OUString&
PropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& aListener )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeVetoableChangeListener( const OUString&
PropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& aListener )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo( )
+ throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const css::uno::Any& aValue )
+ throw(css::beans::UnknownPropertyException,
css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override = 0;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString&
PropertyName )
+ throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override = 0;
+ virtual void SAL_CALL addPropertyChangeListener( const OUString&
aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener
>& xListener )
+ throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL removePropertyChangeListener( const OUString&
aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener
>& aListener )
+ throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL addVetoableChangeListener( const OUString&
PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >&
aListener )
+ throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString&
PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >&
aListener )
+ throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
};
#endif
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index 75717fb..b024d2c 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -34,8 +34,8 @@ struct ZipEntry;
class ZipPackageFolder : public cppu::ImplInheritanceHelper
<
ZipPackageEntry,
- ::com::sun::star::container::XNameContainer,
- ::com::sun::star::container::XEnumerationAccess
+ css::container::XNameContainer,
+ css::container::XEnumerationAccess
>
{
private:
@@ -54,16 +54,16 @@ public:
bool LookForUnexpectedODF12Streams( const OUString& aPath );
- void setChildStreamsTypeByExtension( const
::com::sun::star::beans::StringPair& aPair );
+ void setChildStreamsTypeByExtension( const css::beans::StringPair& aPair );
void doInsertByName ( ZipPackageEntry *pEntry, bool bSetParent )
- throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::ElementExistException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+ throw(css::lang::IllegalArgumentException,
css::container::ElementExistException, css::lang::WrappedTargetException,
css::uno::RuntimeException);
- com::sun::star::packages::ContentInfo & doGetByName( const OUString& aName
)
- throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+ css::packages::ContentInfo & doGetByName( const OUString& aName )
+ throw(css::container::NoSuchElementException,
css::lang::WrappedTargetException, css::uno::RuntimeException);
static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource);
- static ::com::sun::star::uno::Sequence < sal_Int8 >
static_getImplementationId();
+ static css::uno::Sequence < sal_Int8 > static_getImplementationId();
void setPackageFormat_Impl( sal_Int32 nFormat ) { m_nFormat = nFormat; }
void setRemoveOnInsertMode_Impl( bool bRemove ) { mbAllowRemoveOnInsert =
bRemove; }
@@ -77,57 +77,57 @@ public:
// Recursive functions
void saveContents(
const OUString &rPath,
- std::vector < com::sun::star::uno::Sequence <
com::sun::star::beans::PropertyValue > > &rManList,
+ std::vector < css::uno::Sequence < css::beans::PropertyValue > >
&rManList,
ZipOutputStream & rZipOut,
- const com::sun::star::uno::Sequence< sal_Int8 > &rEncryptionKey,
+ const css::uno::Sequence< sal_Int8 > &rEncryptionKey,
const rtlRandomPool & rRandomPool) const
- throw(::com::sun::star::uno::RuntimeException);
+ throw(css::uno::RuntimeException);
// XNameContainer
- virtual void SAL_CALL insertByName( const OUString& aName, const
::com::sun::star::uno::Any& aElement )
- throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::ElementExistException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL insertByName( const OUString& aName, const
css::uno::Any& aElement )
+ throw(css::lang::IllegalArgumentException,
css::container::ElementExistException, css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeByName( const OUString& Name )
- throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::container::NoSuchElementException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
// XEnumerationAccess
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
createEnumeration( )
+ throw(css::uno::RuntimeException, std::exception) override;
// XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual css::uno::Type SAL_CALL getElementType( )
+ throw(css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasElements( )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw(css::uno::RuntimeException, std::exception) override;
// XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString&
aName )
- throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getElementNames( )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
+ throw(css::container::NoSuchElementException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( )
+ throw(css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw(css::uno::RuntimeException, std::exception) override;
// XNameReplace
- virtual void SAL_CALL replaceByName( const OUString& aName, const
::com::sun::star::uno::Any& aElement )
- throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL replaceByName( const OUString& aName, const
css::uno::Any& aElement )
+ throw(css::lang::IllegalArgumentException,
css::container::NoSuchElementException, css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const
OUString& PropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const css::uno::Any& aValue )
+ throw(css::beans::UnknownPropertyException,
css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString&
PropertyName )
+ throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const
::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
sal_Int8 >& aIdentifier )
+ throw(css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(
)
+ throw (css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index e823811..aa6b45f 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -42,18 +42,18 @@ struct ZipEntry;
class ZipPackageStream : public cppu::ImplInheritanceHelper
<
ZipPackageEntry,
- ::com::sun::star::io::XActiveDataSink,
- ::com::sun::star::packages::XDataSinkEncrSupport
+ css::io::XActiveDataSink,
+ css::packages::XDataSinkEncrSupport
>
{
private:
- com::sun::star::uno::Reference < com::sun::star::io::XInputStream >
m_xStream;
+ css::uno::Reference < css::io::XInputStream > m_xStream;
ZipPackage &m_rZipPackage;
- bool m_bToBeCompressed, m_bToBeEncrypted, m_bHaveOwnKey,
m_bIsEncrypted;
+ bool m_bToBeCompressed, m_bToBeEncrypted, m_bHaveOwnKey,
m_bIsEncrypted;
::rtl::Reference< BaseEncryptionData > m_xBaseEncryptionData;
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >
m_aStorageEncryptionKeys;
- ::com::sun::star::uno::Sequence< sal_Int8 > m_aEncryptionKey;
+ css::uno::Sequence< css::beans::NamedValue > m_aStorageEncryptionKeys;
+ css::uno::Sequence< sal_Int8 > m_aEncryptionKey;
sal_Int32 m_nImportedStartKeyAlgorithm;
sal_Int32 m_nImportedEncryptionAlgorithm;
@@ -72,9 +72,9 @@ private:
bool m_bRawStream;
/// Check that m_xStream implements io::XSeekable and return it
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
GetOwnSeekStream();
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
SAL_CALL getRawData()
- throw(::com::sun::star::uno::RuntimeException);
+ css::uno::Reference< css::io::XInputStream > GetOwnSeekStream();
+ css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData()
+ throw(css::uno::RuntimeException);
public:
bool IsEncrypted () const { return m_bIsEncrypted;}
@@ -85,7 +85,7 @@ public:
::rtl::Reference< EncryptionData > GetEncryptionData( bool bWinEncoding =
false );
- ::com::sun::star::uno::Sequence< sal_Int8 > GetEncryptionKey( bool
bWinEncoding = false );
+ css::uno::Sequence< sal_Int8 > GetEncryptionKey( bool bWinEncoding = false
);
sal_Int32 GetStartKeyGenID();
@@ -108,11 +108,11 @@ public:
}
void SetPackageMember (bool bNewValue);
- void setInitialisationVector (const com::sun::star::uno::Sequence <
sal_Int8 >& rNewVector )
+ void setInitialisationVector (const css::uno::Sequence < sal_Int8 >&
rNewVector )
{ m_xBaseEncryptionData->m_aInitVector = rNewVector;}
- void setSalt (const com::sun::star::uno::Sequence < sal_Int8 >& rNewSalt )
+ void setSalt (const css::uno::Sequence < sal_Int8 >& rNewSalt )
{ m_xBaseEncryptionData->m_aSalt = rNewSalt;}
- void setDigest (const com::sun::star::uno::Sequence < sal_Int8 >&
rNewDigest )
+ void setDigest (const css::uno::Sequence < sal_Int8 >& rNewDigest )
{ m_xBaseEncryptionData->m_aDigest = rNewDigest;}
void setIterationCount (const sal_Int32 nNewCount)
{ m_xBaseEncryptionData->m_nIterationCount = nNewCount;}
@@ -126,9 +126,8 @@ public:
bool bAllowRemoveOnInsert );
virtual ~ZipPackageStream();
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
GetRawEncrStreamNoHeaderCopy();
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
TryToGetRawFromDataStream(
-
bool bAddHeaderForEncr );
+ css::uno::Reference< css::io::XInputStream >
GetRawEncrStreamNoHeaderCopy();
+ css::uno::Reference< css::io::XInputStream >
TryToGetRawFromDataStream(bool bAddHeaderForEncr );
bool ParsePackageRawStream();
virtual bool saveChild( const OUString &rPath,
@@ -140,54 +139,54 @@ public:
void setZipEntryOnLoading( const ZipEntry &rInEntry);
void successfullyWritten( ZipEntry *pEntry );
- static ::com::sun::star::uno::Sequence < sal_Int8 >
static_getImplementationId();
+ static css::uno::Sequence < sal_Int8 > static_getImplementationId();
// XActiveDataSink
- virtual void SAL_CALL setInputStream( const
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aStream
)
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > SAL_CALL getInputStream( )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL setInputStream( const css::uno::Reference<
css::io::XInputStream >& aStream )
+ throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
getInputStream( )
+ throw(css::uno::RuntimeException, std::exception) override;
// XDataSinkEncrSupport
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > SAL_CALL getDataStream()
- throw ( ::com::sun::star::packages::WrongPasswordException,
::com::sun::star::packages::zip::ZipException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::uno::RuntimeException, std::exception )
override;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > SAL_CALL getRawStream()
- throw ( ::com::sun::star::packages::NoEncryptionException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
getDataStream()
+ throw ( css::packages::WrongPasswordException,
css::packages::zip::ZipException,
+ css::io::IOException,
+ css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
getRawStream()
+ throw ( css::packages::NoEncryptionException,
+ css::io::IOException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL setDataStream(
- const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream >& aStream )
- throw ( ::com::sun::star::io::IOException,
- ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ const css::uno::Reference< css::io::XInputStream >&
aStream )
+ throw ( css::io::IOException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL setRawStream(
- const ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream >& aStream )
- throw ( ::com::sun::star::packages::EncryptionNotAllowedException,
- ::com::sun::star::packages::NoRawFormatException,
- ::com::sun::star::io::IOException,
- ::com::sun::star::uno::RuntimeException, std::exception )
override;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > SAL_CALL getPlainRawStream()
- throw ( ::com::sun::star::io::IOException,
::com::sun::star::packages::NoEncryptionException,
- ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ const css::uno::Reference< css::io::XInputStream >&
aStream )
+ throw ( css::packages::EncryptionNotAllowedException,
+ css::packages::NoRawFormatException,
+ css::io::IOException,
+ css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
getPlainRawStream()
+ throw ( css::io::IOException, css::packages::NoEncryptionException,
+ css::uno::RuntimeException, std::exception ) override;
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const
::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
sal_Int8 >& aIdentifier )
+ throw(css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const
OUString& PropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const css::uno::Any& aValue )
+ throw(css::beans::UnknownPropertyException,
css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString&
PropertyName )
+ throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(
)
+ throw (css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx
index ff6d4cd..1fab519 100644
--- a/package/inc/zipfileaccess.hxx
+++ b/package/inc/zipfileaccess.hxx
@@ -37,62 +37,58 @@
#include <HashMaps.hxx>
class OZipFileAccess : public ::cppu::WeakImplHelper<
- ::com::sun::star::packages::zip::XZipFileAccess2,
- ::com::sun::star::lang::XInitialization,
- ::com::sun::star::lang::XComponent,
- ::com::sun::star::lang::XServiceInfo >
+ css::packages::zip::XZipFileAccess2,
+ css::lang::XInitialization,
+ css::lang::XComponent,
+ css::lang::XServiceInfo >
{
rtl::Reference<SotMutexHolder> m_aMutexHolder;
-
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
> m_xContext;
-
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
m_xContentStream;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::io::XInputStream > m_xContentStream;
ZipFile* m_pZipFile;
-
::cppu::OInterfaceContainerHelper* m_pListenersContainer;
-
bool m_bDisposed;
bool m_bOwnContent;
public:
- OZipFileAccess( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext );
+ OZipFileAccess( const css::uno::Reference< css::uno::XComponentContext >&
rxContext );
virtual ~OZipFileAccess();
- static ::com::sun::star::uno::Sequence< OUString >
GetPatternsFromString_Impl( const OUString& aString );
+ static css::uno::Sequence< OUString > GetPatternsFromString_Impl( const
OUString& aString );
static bool StringGoodForPattern_Impl( const OUString& aString,
- const ::com::sun::star::uno::Sequence<
OUString >& aPattern );
+ const css::uno::Sequence< OUString >&
aPattern );
- static ::com::sun::star::uno::Sequence< OUString > SAL_CALL
impl_staticGetSupportedServiceNames();
+ static css::uno::Sequence< OUString > SAL_CALL
impl_staticGetSupportedServiceNames();
static OUString SAL_CALL impl_staticGetImplementationName();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface
> SAL_CALL impl_staticCreateSelfInstance(
- const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& rxMSF );
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL
impl_staticCreateSelfInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory >&
rxMSF );
// XInitialization
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any >& aArguments ) throw
(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException,
std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any
>& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException,
std::exception) override;
// XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString&
aName ) throw (::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getElementNames( ) throw (::com::sun::star::uno::RuntimeException,
std::exception) override;
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw
(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw
(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasElements( ) throw
(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw
(css::container::NoSuchElementException, css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw
(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw
(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType( ) throw
(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw
(css::uno::RuntimeException, std::exception) override;
// XZipFileAccess
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > SAL_CALL getStreamByPattern( const
OUString& aPattern ) throw
(::com::sun::star::container::NoSuchElementException,
::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException,
css::packages::WrongPasswordException, css::packages::zip::ZipException,
std::exception) override;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
getStreamByPattern( const OUString& aPattern ) throw
(css::container::NoSuchElementException, css::io::IOException,
css::uno::RuntimeException, css::packages::WrongPasswordException,
css::packages::zip::ZipException, std::exception) override;
// XComponent
- virtual void SAL_CALL dispose( ) throw
(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const
::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >&
xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual void SAL_CALL removeEventListener( const
::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >&
aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException,
std::exception) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference<
css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException,
std::exception) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference<
css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException,
std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw
(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException,
std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() throw
(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(
) throw (css::uno::RuntimeException, std::exception) override;
};
diff --git a/package/source/manifest/ManifestExport.hxx
b/package/source/manifest/ManifestExport.hxx
index 1fc62c8..cb862f1 100644
--- a/package/source/manifest/ManifestExport.hxx
+++ b/package/source/manifest/ManifestExport.hxx
@@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star {
class ManifestExport
{
public:
- ManifestExport(com::sun::star::uno::Reference <
com::sun::star::xml::sax::XDocumentHandler > xHandler, const
com::sun::star::uno::Sequence < com::sun::star::uno::Sequence <
com::sun::star::beans::PropertyValue > > &rManList );
+ ManifestExport(css::uno::Reference < css::xml::sax::XDocumentHandler >
xHandler, const css::uno::Sequence < css::uno::Sequence <
css::beans::PropertyValue > > &rManList );
};
#endif
diff --git a/package/source/manifest/ManifestImport.cxx
b/package/source/manifest/ManifestImport.cxx
index 7c0bbde..eb8ed2b 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -333,7 +333,7 @@ void SAL_CALL ManifestImport::startElement( const OUString&
aName, const uno::Re
namespace
{
- bool isEmpty(const com::sun::star::beans::PropertyValue &rProp)
+ bool isEmpty(const css::beans::PropertyValue &rProp)
{
return rProp.Name.isEmpty();
}
@@ -347,7 +347,7 @@ void SAL_CALL ManifestImport::endElement( const OUString&
aName )
{
if ( aConvertedName.equals( sFileEntryElement ) &&
aStack.back().m_bValid )
{
- com::sun::star::beans::PropertyValue aEmpty;
+ css::beans::PropertyValue aEmpty;
aSequence.erase(std::remove_if(aSequence.begin(), aSequence.end(),
isEmpty), aSequence.end());
diff --git a/package/source/manifest/ManifestImport.hxx
b/package/source/manifest/ManifestImport.hxx
index a4eed2a..e62c401 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -51,14 +51,14 @@ struct ManifestScopeEntry
typedef ::std::vector< ManifestScopeEntry > ManifestStack;
-class ManifestImport : public cppu::WeakImplHelper <
com::sun::star::xml::sax::XDocumentHandler >
+class ManifestImport : public cppu::WeakImplHelper <
css::xml::sax::XDocumentHandler >
{
protected:
- std::vector< com::sun::star::beans::PropertyValue > aSequence;
+ std::vector< css::beans::PropertyValue > aSequence;
ManifestStack aStack;
bool bIgnoreEncryptData;
sal_Int32 nDerivedKeySize;
- ::std::vector < ::com::sun::star::uno::Sequence <
::com::sun::star::beans::PropertyValue > > & rManVector;
+ ::std::vector < css::uno::Sequence < css::beans::PropertyValue > > &
rManVector;
const OUString sFileEntryElement;
const OUString sManifestElement;
@@ -115,36 +115,36 @@ protected:
const OUString sPBKDF2_URL;
OUString PushNameAndNamespaces( const OUString& aName,
- const
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >&
xAttribs,
+ const css::uno::Reference<
css::xml::sax::XAttributeList >& xAttribs,
StringHashMap& o_aConvertedAttribs
);
static OUString ConvertNameWithNamespace( const OUString& aName, const
StringHashMap& aNamespaces );
OUString ConvertName( const OUString& aName );
public:
- ManifestImport( std::vector < ::com::sun::star::uno::Sequence <
::com::sun::star::beans::PropertyValue > > & rNewVector );
+ ManifestImport( std::vector < css::uno::Sequence <
css::beans::PropertyValue > > & rNewVector );
virtual ~ManifestImport();
virtual void SAL_CALL startDocument( )
- throw(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL endDocument( )
- throw(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL startElement( const OUString& aName, const
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >&
xAttribs )
- throw(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException,
std::exception) override;
+ virtual void SAL_CALL startElement( const OUString& aName, const
css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL endElement( const OUString& aName )
- throw(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL characters( const OUString& aChars )
- throw(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
- throw(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL processingInstruction( const OUString& aTarget,
const OUString& aData )
- throw(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDocumentLocator( const
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >&
xLocator )
- throw(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException,
std::exception) override;
+ virtual void SAL_CALL setDocumentLocator( const css::uno::Reference<
css::xml::sax::XLocator >& xLocator )
+ throw(css::xml::sax::SAXException, css::uno::RuntimeException,
std::exception) override;
private:
- void doFileEntry(StringHashMap &rConvertedAttribs)
throw(::com::sun::star::uno::RuntimeException);
- void doEncryptionData(StringHashMap &rConvertedAttribs)
throw(::com::sun::star::uno::RuntimeException);
- void doAlgorithm(StringHashMap &rConvertedAttribs)
throw(::com::sun::star::uno::RuntimeException);
- void doKeyDerivation(StringHashMap &rConvertedAttribs)
throw(::com::sun::star::uno::RuntimeException);
- void doStartKeyAlg(StringHashMap &rConvertedAttribs)
throw(::com::sun::star::uno::RuntimeException);
+ void doFileEntry(StringHashMap &rConvertedAttribs)
throw(css::uno::RuntimeException);
+ void doEncryptionData(StringHashMap &rConvertedAttribs)
throw(css::uno::RuntimeException);
+ void doAlgorithm(StringHashMap &rConvertedAttribs)
throw(css::uno::RuntimeException);
+ void doKeyDerivation(StringHashMap &rConvertedAttribs)
throw(css::uno::RuntimeException);
+ void doStartKeyAlg(StringHashMap &rConvertedAttribs)
throw(css::uno::RuntimeException);
};
#endif
diff --git a/package/source/manifest/ManifestReader.cxx
b/package/source/manifest/ManifestReader.cxx
index 9ed6c2b..7bd5916 100644
--- a/package/source/manifest/ManifestReader.cxx
+++ b/package/source/manifest/ManifestReader.cxx
@@ -46,7 +46,7 @@ ManifestReader::~ManifestReader()
{
}
Sequence< Sequence< PropertyValue > > SAL_CALL
ManifestReader::readManifestSequence( const Reference< XInputStream >& rStream )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
Sequence < Sequence < PropertyValue > > aManifestSequence;
Reference < XParser > xParser = Parser::create(m_xContext);
diff --git a/package/source/manifest/ManifestReader.hxx
b/package/source/manifest/ManifestReader.hxx
index 8a8cd6d..0e0b4b0 100644
--- a/package/source/manifest/ManifestReader.hxx
+++ b/package/source/manifest/ManifestReader.hxx
@@ -32,32 +32,32 @@ namespace com { namespace sun { namespace star {
class ManifestReader: public ::cppu::WeakImplHelper
<
- ::com::sun::star::packages::manifest::XManifestReader,
- ::com::sun::star::lang::XServiceInfo
+ css::packages::manifest::XManifestReader,
+ css::lang::XServiceInfo
>
{
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
> m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
public:
- ManifestReader( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > & xContext );
+ ManifestReader( const css::uno::Reference< css::uno::XComponentContext > &
xContext );
virtual ~ManifestReader();
// XManifestReader
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > > SAL_CALL readManifestSequence( const
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rStream
)
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue
> > SAL_CALL readManifestSequence( const css::uno::Reference<
css::io::XInputStream >& rStream )
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(
)
+ throw (css::uno::RuntimeException, std::exception) override;
// Component constructor
static OUString static_getImplementationName();
- static ::com::sun::star::uno::Sequence < OUString >
static_getSupportedServiceNames();
- static ::com::sun::star::uno::Reference <
com::sun::star::lang::XSingleServiceFactory > createServiceFactory(
com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >
const & rServiceFactory );
+ static css::uno::Sequence < OUString > static_getSupportedServiceNames();
+ static css::uno::Reference < css::lang::XSingleServiceFactory >
createServiceFactory( css::uno::Reference < css::lang::XMultiServiceFactory >
const & rServiceFactory );
};
#endif
diff --git a/package/source/manifest/ManifestWriter.hxx
b/package/source/manifest/ManifestWriter.hxx
index 1ab20b3..fd20e33 100644
--- a/package/source/manifest/ManifestWriter.hxx
+++ b/package/source/manifest/ManifestWriter.hxx
@@ -32,32 +32,32 @@ namespace com { namespace sun { namespace star {
class ManifestWriter: public ::cppu::WeakImplHelper
<
- ::com::sun::star::packages::manifest::XManifestWriter,
- ::com::sun::star::lang::XServiceInfo
+ css::packages::manifest::XManifestWriter,
+ css::lang::XServiceInfo
>
{
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
> m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
public:
- ManifestWriter( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > & xContext );
+ ManifestWriter( const css::uno::Reference< css::uno::XComponentContext > &
xContext );
virtual ~ManifestWriter();
// XManifestWriter
- virtual void SAL_CALL writeManifestSequence( const
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >&
rStream, const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >&
rSequence )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL writeManifestSequence( const css::uno::Reference<
css::io::XOutputStream >& rStream, const css::uno::Sequence<
css::uno::Sequence< css::beans::PropertyValue > >& rSequence )
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(
)
+ throw (css::uno::RuntimeException, std::exception) override;
// Component constructor
static OUString static_getImplementationName();
- static ::com::sun::star::uno::Sequence < OUString >
static_getSupportedServiceNames();
- static ::com::sun::star::uno::Reference <
com::sun::star::lang::XSingleServiceFactory > createServiceFactory(
com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >
const & rServiceFactory );
+ static css::uno::Sequence < OUString > static_getSupportedServiceNames();
+ static css::uno::Reference < css::lang::XSingleServiceFactory >
createServiceFactory( css::uno::Reference < css::lang::XMultiServiceFactory >
const & rServiceFactory );
};
#endif
diff --git a/package/source/xstor/disposelistener.hxx
b/package/source/xstor/disposelistener.hxx
index 3155679..21b9b31 100644
--- a/package/source/xstor/disposelistener.hxx
+++ b/package/source/xstor/disposelistener.hxx
@@ -25,7 +25,7 @@
#include <osl/mutex.hxx>
class OStorage;
-class OChildDispListener_Impl : public ::cppu::WeakImplHelper <
::com::sun::star::lang::XEventListener >
+class OChildDispListener_Impl : public ::cppu::WeakImplHelper <
css::lang::XEventListener >
{
::osl::Mutex m_aMutex;
OStorage* m_pStorage;
@@ -36,7 +36,7 @@ public:
void OwnerIsDisposed();
- virtual void SAL_CALL disposing( const
::com::sun::star::lang::EventObject& Source ) throw
(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
throw (css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/package/source/xstor/ocompinstream.hxx
b/package/source/xstor/ocompinstream.hxx
index d59e6d4..404a980 100644
--- a/package/source/xstor/ocompinstream.hxx
+++ b/package/source/xstor/ocompinstream.hxx
@@ -34,34 +34,28 @@
struct OWriteStream_Impl;
-class OInputCompStream : public cppu::WeakImplHelper <
::com::sun::star::io::XInputStream
-
,::com::sun::star::embed::XExtendedStorageStream
-
,::com::sun::star::embed::XRelationshipAccess
-
,::com::sun::star::beans::XPropertySet >
+class OInputCompStream : public cppu::WeakImplHelper < css::io::XInputStream
+
,css::embed::XExtendedStorageStream
+
,css::embed::XRelationshipAccess
+
,css::beans::XPropertySet >
{
protected:
OWriteStream_Impl* m_pImpl;
-
rtl::Reference<SotMutexHolder> m_rMutexRef;
-
- ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >
m_xStream;
-
+ css::uno::Reference < css::io::XInputStream > m_xStream;
::cppu::OInterfaceContainerHelper* m_pInterfaceContainer;
-
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >
m_aProperties;
-
+ css::uno::Sequence < css::beans::PropertyValue > m_aProperties;
bool m_bDisposed;
-
sal_Int32 m_nStorageType;
public:
OInputCompStream( OWriteStream_Impl& pImpl,
- ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > xStream,
- const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& aProps,
+ css::uno::Reference< css::io::XInputStream > xStream,
+ const css::uno::Sequence< css::beans::PropertyValue >&
aProps,
sal_Int32 nStorageType );
- OInputCompStream( ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > xStream,
- const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& aProps,
+ OInputCompStream( css::uno::Reference< css::io::XInputStream > xStream,
+ const css::uno::Sequence< css::beans::PropertyValue >&
aProps,
sal_Int32 nStorageType );
virtual ~OInputCompStream();
@@ -69,50 +63,50 @@ public:
void InternalDispose();
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type& rType )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType
)
+ 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;
//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;
//XComponent
- virtual void SAL_CALL dispose( ) throw
(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const
::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >&
xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual void SAL_CALL removeEventListener( const
::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >&
aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException,
std::exception) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference<
css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException,
std::exception) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference<
css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException,
std::exception) override;
//XRelationshipAccess
- virtual sal_Bool SAL_CALL hasByID( const OUString& sID ) throw
(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException,
std::exception) override;
- virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw
(::com::sun::star::container::NoSuchElementException,
::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException,
std::exception) override;
- virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw
(::com::sun::star::container::NoSuchElementException,
::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException,
std::exception) override;
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const
OUString& sID ) throw (::com::sun::star::container::NoSuchElementException,
::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException,
std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence<
::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const
OUString& sType ) throw (::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence<
::com::sun::star::beans::StringPair > > SAL_CALL getAllRelationships( ) throw
(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException,
std::exception) override;
- virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const
::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry,
sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException,
::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException,
std::exception) override;
- virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw
(::com::sun::star::container::NoSuchElementException,
::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException,
std::exception) override;
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
