diff options
58 files changed, 1362 insertions, 1387 deletions
diff --git a/package/inc/ByteChucker.hxx b/package/inc/ByteChucker.hxx index fc1167ef978f..c18e76e99ad6 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 2791e0bfd6c7..ffa112c871ab 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 cfc66c457804..2f2af5a9cbf7 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 664b8e201fd1..0add43f143de 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 a8855090fc47..f3d0c65a6bb7 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 83ffd1cd236a..68980c48aec4 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 3a6447cc9007..450cc39b9bc8 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 d6d7853f96cc..16740095bd92 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 f7251c30a0df..f5b8ffd5d313 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 ce0dfc8f3479..aba3f29bd519 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 54956e13c26d..0850f10af87d 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 75717fb80b9d..b024d2ccea04 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 e82381116d86..aa6b45f17048 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 ff6d4cd9b5df..1fab519ee35b 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 1fc62c8476e3..cb862f110f14 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 7c0bbde0501c..eb8ed2b3ad36 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 a4eed2abd6c0..e62c401f9f4e 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 9ed6c2bb1ff7..7bd59161940d 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 8a8cd6d5d9b6..0e0b4b0fa0aa 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 1ab20b3a50df..fd20e33252ce 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 315567998760..21b9b31d05d1 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 d59e6d4bd60f..404a98013991 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; - virtual void SAL_CALL insertRelationships( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > >& aEntries, 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 clearRelationships( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByID( const OUString& sID ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace ) throw (css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace ) throw (css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearRelationships( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; //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; }; diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx index cb827a137aa9..32e09ed719d7 100644 --- a/package/source/xstor/ohierarchyholder.cxx +++ b/package/source/xstor/ohierarchyholder.cxx @@ -302,13 +302,13 @@ void OHierarchyElement_Impl::RemoveElement( const ::rtl::Reference< OHierarchyEl } // XTransactionListener -void SAL_CALL OHierarchyElement_Impl::preCommit( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OHierarchyElement_Impl::preCommit( const css::lang::EventObject& /*aEvent*/ ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { } -void SAL_CALL OHierarchyElement_Impl::commited( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) - throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OHierarchyElement_Impl::commited( const css::lang::EventObject& /*aEvent*/ ) + throw (css::uno::RuntimeException, std::exception) { try { @@ -323,13 +323,13 @@ void SAL_CALL OHierarchyElement_Impl::commited( const ::com::sun::star::lang::Ev } } -void SAL_CALL OHierarchyElement_Impl::preRevert( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OHierarchyElement_Impl::preRevert( const css::lang::EventObject& /*aEvent*/ ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { } -void SAL_CALL OHierarchyElement_Impl::reverted( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) - throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OHierarchyElement_Impl::reverted( const css::lang::EventObject& /*aEvent*/ ) + throw (css::uno::RuntimeException, std::exception) { } diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx index f9490ef64a6c..6813fa1e13cb 100644 --- a/package/source/xstor/ohierarchyholder.hxx +++ b/package/source/xstor/ohierarchyholder.hxx @@ -49,28 +49,28 @@ typedef std::unordered_map< OUString, eqFunc > OHierarchyElementList_Impl; typedef ::std::vector< OUString > OStringList_Impl; -typedef ::std::list< ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XExtendedStorageStream > > +typedef ::std::list< css::uno::WeakReference< css::embed::XExtendedStorageStream > > OWeakStorRefList_Impl; -struct OHierarchyElement_Impl : public cppu::WeakImplHelper< ::com::sun::star::embed::XTransactionListener > +struct OHierarchyElement_Impl : public cppu::WeakImplHelper< css::embed::XTransactionListener > { ::osl::Mutex m_aMutex; ::rtl::Reference< OHierarchyElement_Impl > m_rParent; - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xOwnStorage; - ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XStorage > m_xWeakOwnStorage; + css::uno::Reference< css::embed::XStorage > m_xOwnStorage; + css::uno::WeakReference< css::embed::XStorage > m_xWeakOwnStorage; OHierarchyElementList_Impl m_aChildren; OWeakStorRefList_Impl m_aOpenStreams; public: - OHierarchyElement_Impl( OHierarchyElement_Impl* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) + OHierarchyElement_Impl( OHierarchyElement_Impl* pParent, const css::uno::Reference< css::embed::XStorage >& xStorage ) : m_rParent( pParent ) , m_xOwnStorage( xStorage ) {} - explicit OHierarchyElement_Impl( const ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XStorage >& xWeakStorage ) + explicit OHierarchyElement_Impl( const css::uno::WeakReference< css::embed::XStorage >& xWeakStorage ) : m_rParent( NULL ) , m_xWeakOwnStorage( xWeakStorage ) {} @@ -83,7 +83,7 @@ public: void RemoveElement( const ::rtl::Reference< OHierarchyElement_Impl >& aRef ); - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > + css::uno::Reference< css::embed::XExtendedStorageStream > GetStreamHierarchically( sal_Int32 nStorageMode, OStringList_Impl& aPath, sal_Int32 nStreamMode, @@ -92,34 +92,34 @@ public: void RemoveStreamHierarchically( OStringList_Impl& aListPath ); // XEventListener - 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; // XTransactionListener - virtual void SAL_CALL preCommit( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commited( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL preRevert( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reverted( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL preCommit( const css::lang::EventObject& aEvent ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL commited( const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL preRevert( const css::lang::EventObject& aEvent ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reverted( const css::lang::EventObject& aEvent ) + throw (css::uno::RuntimeException, std::exception) override; }; class OHierarchyHolder_Impl : public ::cppu::OWeakObject { - ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XStorage > m_xWeakOwnStorage; + css::uno::WeakReference< css::embed::XStorage > m_xWeakOwnStorage; ::rtl::Reference< OHierarchyElement_Impl > m_xChild; public: - explicit OHierarchyHolder_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xOwnStorage ) + explicit OHierarchyHolder_Impl( const css::uno::Reference< css::embed::XStorage >& xOwnStorage ) : m_xWeakOwnStorage( xOwnStorage ) - , m_xChild( new OHierarchyElement_Impl( ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XStorage >( xOwnStorage ) ) ) + , m_xChild( new OHierarchyElement_Impl( css::uno::WeakReference< css::embed::XStorage >( xOwnStorage ) ) ) {} static OStringList_Impl GetListPathFromString( const OUString& aPath ); - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > + css::uno::Reference< css::embed::XExtendedStorageStream > GetStreamHierarchically( sal_Int32 nStorageMode, OStringList_Impl& aListPath, sal_Int32 nStreamMode, diff --git a/package/source/xstor/oseekinstream.hxx b/package/source/xstor/oseekinstream.hxx index 291bdcdef452..02e1baa8f294 100644 --- a/package/source/xstor/oseekinstream.hxx +++ b/package/source/xstor/oseekinstream.hxx @@ -25,34 +25,34 @@ #include "ocompinstream.hxx" class OInputSeekStream : public OInputCompStream - , public ::com::sun::star::io::XSeekable + , public css::io::XSeekable { protected: - ::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable > m_xSeekable; + css::uno::Reference < css::io::XSeekable > m_xSeekable; public: OInputSeekStream( 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 ); - OInputSeekStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xStream, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps, + OInputSeekStream( css::uno::Reference < css::io::XInputStream > xStream, + const css::uno::Sequence< css::beans::PropertyValue >& aProps, sal_Int32 nStorageType ); virtual ~OInputSeekStream(); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; // 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; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() 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; - virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::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; + virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; }; diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx index f28ab0aa6239..98e305742836 100644 --- a/package/source/xstor/owriteablestream.hxx +++ b/package/source/xstor/owriteablestream.hxx @@ -82,22 +82,22 @@ struct OWriteStream_Impl : public MutexHolder OWriteStream* m_pAntiImpl; OUString m_aTempURL; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xCacheStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xCacheSeek; + css::uno::Reference< css::io::XStream > m_xCacheStream; + css::uno::Reference< css::io::XSeekable > m_xCacheSeek; InputStreamsList_Impl m_aInputStreamsList; bool m_bHasDataToFlush; // only modified elements will be sent to the original content bool m_bFlushed; // sending the streams is coordinated by the root storage of the package - ::com::sun::star::uno::Reference< ::com::sun::star::packages::XDataSinkEncrSupport > m_xPackageStream; - ::com::sun::star::uno::Reference< ::com::sun::star::logging::XSimpleLogRing > m_xLogRing; + css::uno::Reference< css::packages::XDataSinkEncrSupport > m_xPackageStream; + css::uno::Reference< css::logging::XSimpleLogRing > m_xLogRing; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; OStorage_Impl* m_pParent; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aProps; + css::uno::Sequence< css::beans::PropertyValue > m_aProps; bool m_bForceEncrypted; @@ -107,49 +107,49 @@ struct OWriteStream_Impl : public MutexHolder bool m_bCompressedSetExplicit; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > m_xPackage; + css::uno::Reference< css::lang::XSingleServiceFactory > m_xPackage; bool m_bHasInsertedStreamOptimization; sal_Int32 m_nStorageType; // Relations info related data, stored in *.rels file in OFOPXML format - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xOrigRelInfoStream; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > m_aOrigRelInfo; + css::uno::Reference< css::io::XInputStream > m_xOrigRelInfoStream; + css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > m_aOrigRelInfo; bool m_bOrigRelInfoBroken; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > m_aNewRelInfo; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xNewRelInfoStream; + css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > m_aNewRelInfo; + css::uno::Reference< css::io::XInputStream > m_xNewRelInfoStream; sal_Int16 m_nRelInfoStatus; sal_Int32 m_nRelId; private: - OUString GetFilledTempFileIfNo( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xStream ); + OUString GetFilledTempFileIfNo( const css::uno::Reference< css::io::XInputStream >& xStream ); OUString FillTempGetFileName(); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetTempFileAsStream(); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetTempFileAsInputStream(); + css::uno::Reference< css::io::XStream > GetTempFileAsStream(); + css::uno::Reference< css::io::XInputStream > GetTempFileAsInputStream(); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStream_Impl( sal_Int32 nStreamMode, + css::uno::Reference< css::io::XStream > GetStream_Impl( sal_Int32 nStreamMode, bool bHierarchyAccess ); - ::comphelper::SequenceAsHashMap GetCommonRootEncryptionData() throw ( ::com::sun::star::packages::NoEncryptionException ); + ::comphelper::SequenceAsHashMap GetCommonRootEncryptionData() throw ( css::packages::NoEncryptionException ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > ReadPackageStreamProperties(); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > InsertOwnProps( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps, + css::uno::Sequence< css::beans::PropertyValue > ReadPackageStreamProperties(); + css::uno::Sequence< css::beans::PropertyValue > InsertOwnProps( + const css::uno::Sequence< css::beans::PropertyValue >& aProps, bool bUseCommonEncryption ); public: OWriteStream_Impl( OStorage_Impl* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::packages::XDataSinkEncrSupport >& xPackageStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory >& xPackage, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::packages::XDataSinkEncrSupport >& xPackageStream, + const css::uno::Reference< css::lang::XSingleServiceFactory >& xPackage, + const css::uno::Reference< css::uno::XComponentContext >& xContext, bool bForceEncrypted, sal_Int32 nStorageType, bool bDefaultCompress, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xRelInfoStream = - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >() ); + const css::uno::Reference< css::io::XInputStream >& xRelInfoStream = + css::uno::Reference< css::io::XInputStream >() ); ~OWriteStream_Impl(); @@ -165,7 +165,7 @@ public: void InsertIntoPackageFolder( const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xParentPackageFolder ); + const css::uno::Reference< css::container::XNameContainer >& xParentPackageFolder ); void SetToBeCommited() { m_bFlushed = true; } @@ -181,47 +181,47 @@ public: void DisposeWrappers(); void InsertStreamDirectly( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ); + const css::uno::Reference< css::io::XInputStream >& xInStream, + const css::uno::Sequence< css::beans::PropertyValue >& aProps ); void Commit(); void Revert(); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetStreamProperties(); + css::uno::Sequence< css::beans::PropertyValue > GetStreamProperties(); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > GetAllRelationshipsIfAny(); + css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > GetAllRelationshipsIfAny(); - void CopyInternallyTo_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xDestStream, + void CopyInternallyTo_Impl( const css::uno::Reference< css::io::XStream >& xDestStream, const ::comphelper::SequenceAsHashMap& aEncryptionData ); - void CopyInternallyTo_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xDestStream ); + void CopyInternallyTo_Impl( const css::uno::Reference< css::io::XStream >& xDestStream ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStream( + css::uno::Reference< css::io::XStream > GetStream( sal_Int32 nStreamMode, const ::comphelper::SequenceAsHashMap& aEncryptionData, bool bHierarchyAccess ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStream( + css::uno::Reference< css::io::XStream > GetStream( sal_Int32 nStreamMode, bool bHierarchyAccess ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetRawInStream(); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetPlainRawInStream(); + css::uno::Reference< css::io::XInputStream > GetRawInStream(); + css::uno::Reference< css::io::XInputStream > GetPlainRawInStream(); void InputStreamDisposed( OInputCompStream* pStream ); void CreateReadonlyCopyBasedOnData( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xDataToCopy, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps, + const css::uno::Reference< css::io::XInputStream >& xDataToCopy, + const css::uno::Sequence< css::beans::PropertyValue >& aProps, bool bUseCommonEncryption, - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream ); + css::uno::Reference< css::io::XStream >& xTargetStream ); - void GetCopyOfLastCommit( ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream ); + void GetCopyOfLastCommit( css::uno::Reference< css::io::XStream >& xTargetStream ); void GetCopyOfLastCommit( - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream, + css::uno::Reference< css::io::XStream >& xTargetStream, const ::comphelper::SequenceAsHashMap& aEncryptionData ); void CommitStreamRelInfo( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xRelStorage, + const css::uno::Reference< css::embed::XStorage >& xRelStorage, const OUString& aOrigStreamName, const OUString& aNewStreamName ); @@ -230,25 +230,25 @@ public: sal_Int32 GetNewRelId() { return m_nRelId ++; } }; -class OWriteStream : ::com::sun::star::lang::XTypeProvider - , public ::com::sun::star::io::XInputStream - , public ::com::sun::star::io::XOutputStream - , public ::com::sun::star::embed::XExtendedStorageStream - , public ::com::sun::star::io::XSeekable - , public ::com::sun::star::io::XTruncate - , public ::com::sun::star::embed::XEncryptionProtectedSource2 - , public ::com::sun::star::embed::XRelationshipAccess - , public ::com::sun::star::embed::XTransactedObject - , public ::com::sun::star::embed::XTransactionBroadcaster - , public ::com::sun::star::beans::XPropertySet +class OWriteStream : css::lang::XTypeProvider + , public css::io::XInputStream + , public css::io::XOutputStream + , public css::embed::XExtendedStorageStream + , public css::io::XSeekable + , public css::io::XTruncate + , public css::embed::XEncryptionProtectedSource2 + , public css::embed::XRelationshipAccess + , public css::embed::XTransactedObject + , public css::embed::XTransactionBroadcaster + , public css::beans::XPropertySet , public ::cppu::OWeakObject { friend struct OWriteStream_Impl; protected: - ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > m_xInStream; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > m_xOutStream; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable > m_xSeekable; + css::uno::Reference < css::io::XInputStream > m_xInStream; + css::uno::Reference < css::io::XOutputStream > m_xOutStream; + css::uno::Reference < css::io::XSeekable > m_xSeekable; OWriteStream_Impl* m_pImpl; std::unique_ptr<WSInternalData_Impl> m_pData; @@ -260,11 +260,11 @@ protected: bool m_bTransacted; OWriteStream( OWriteStream_Impl* pImpl, bool bTransacted ); - OWriteStream( OWriteStream_Impl* pImpl, ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xStream, bool bTransacted ); + OWriteStream( OWriteStream_Impl* pImpl, css::uno::Reference< css::io::XStream > xStream, bool bTransacted ); void CloseOutput_Impl(); - void CopyToStreamInternally_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream ); + void CopyToStreamInternally_Impl( const css::uno::Reference< css::io::XStream >& xStream ); void ModifyParentUnlockMutex_Impl( ::osl::ResettableMutexGuard& aGuard ); @@ -278,100 +278,100 @@ public: void DeInit(); // 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; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; // 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 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; - 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; + 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 (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL closeOutput( ) 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; - virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::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; + virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; //XStream - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) throw (css::uno::RuntimeException, std::exception) override; // XTruncate - virtual void SAL_CALL truncate() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL truncate() throw (css::io::IOException, 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; //XEncryptionProtectedSource virtual void SAL_CALL setEncryptionPassword( const OUString& aPass ) - throw ( ::com::sun::star::uno::RuntimeException, - ::com::sun::star::io::IOException, std::exception ) override; + throw ( css::uno::RuntimeException, + css::io::IOException, std::exception ) override; virtual void SAL_CALL removeEncryption() - throw ( ::com::sun::star::uno::RuntimeException, - ::com::sun::star::io::IOException, std::exception ) override; + throw ( css::uno::RuntimeException, + css::io::IOException, std::exception ) override; //XEncryptionProtectedSource2 - virtual void SAL_CALL setEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasEncryptionData() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasEncryptionData() 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; - virtual void SAL_CALL insertRelationships( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > >& aEntries, 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 clearRelationships( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByID( const OUString& sID ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace ) throw (css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace ) throw (css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearRelationships( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; //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; // XTransactedObject virtual void SAL_CALL commit() - throw ( ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL revert() - throw ( ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; // XTransactionBroadcaster virtual void SAL_CALL addTransactionListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XTransactionListener >& aListener ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::embed::XTransactionListener >& aListener ) + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeTransactionListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XTransactionListener >& aListener ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::embed::XTransactionListener >& aListener ) + throw ( css::uno::RuntimeException, std::exception ) override; }; diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx index f7303d552879..73ce1fa79e66 100644 --- a/package/source/xstor/selfterminatefilestream.hxx +++ b/package/source/xstor/selfterminatefilestream.hxx @@ -27,40 +27,40 @@ struct OWriteStream_Impl; -class OSelfTerminateFileStream : public cppu::WeakImplHelper< ::com::sun::star::io::XInputStream, - ::com::sun::star::io::XSeekable > +class OSelfTerminateFileStream : public cppu::WeakImplHelper< css::io::XInputStream, + css::io::XSeekable > { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > m_xFileAccess; + css::uno::Reference< css::ucb::XSimpleFileAccess3 > m_xFileAccess; OUString m_aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeekable; + css::uno::Reference< css::io::XInputStream > m_xInputStream; + css::uno::Reference< css::io::XSeekable > m_xSeekable; public: - OSelfTerminateFileStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const OUString& aURL ); + OSelfTerminateFileStream( const css::uno::Reference< css::uno::XComponentContext > xContext, const OUString& aURL ); virtual ~OSelfTerminateFileStream(); void CloseStreamDeleteFile(); // 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; //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; - virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::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; + virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; }; diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx index c187b4bafadc..9e241f2694a0 100644 --- a/package/source/xstor/switchpersistencestream.cxx +++ b/package/source/xstor/switchpersistencestream.cxx @@ -210,7 +210,7 @@ void SwitchablePersistenceStream::CloseAll_Impl() } } -// com::sun::star::io::XStream +// css::io::XStream uno::Reference< io::XInputStream > SAL_CALL SwitchablePersistenceStream::getInputStream( ) throw (uno::RuntimeException, std::exception) { @@ -231,7 +231,7 @@ uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOut return static_cast< io::XOutputStream* >( this ); } -// com::sun::star::io::XInputStream +// css::io::XInputStream ::sal_Int32 SAL_CALL SwitchablePersistenceStream::readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { @@ -305,7 +305,7 @@ void SAL_CALL SwitchablePersistenceStream::closeInput() CloseAll_Impl(); } -// com::sun::star::io::XOutputStream +// css::io::XOutputStream void SAL_CALL SwitchablePersistenceStream::writeBytes( const uno::Sequence< ::sal_Int8 >& aData ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { @@ -358,7 +358,7 @@ void SAL_CALL SwitchablePersistenceStream::closeOutput( ) CloseAll_Impl(); } -// com::sun::star::io::XTruncate +// css::io::XTruncate void SAL_CALL SwitchablePersistenceStream::truncate( ) throw (io::IOException, uno::RuntimeException, std::exception) { @@ -377,7 +377,7 @@ void SAL_CALL SwitchablePersistenceStream::truncate( ) m_pStreamData->m_xOrigTruncate->truncate(); } -// com::sun::star::io::XSeekable +// css::io::XSeekable void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location ) throw (lang::IllegalArgumentException, io::IOException, uno::RuntimeException, std::exception) { @@ -424,7 +424,7 @@ void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location ) } void SAL_CALL SwitchablePersistenceStream::waitForCompletion() - throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::io::IOException, css::uno::RuntimeException, std::exception) { if ( !m_pStreamData ) throw io::NotConnectedException(); diff --git a/package/source/xstor/switchpersistencestream.hxx b/package/source/xstor/switchpersistencestream.hxx index 96396010f782..713a7cfdbd01 100644 --- a/package/source/xstor/switchpersistencestream.hxx +++ b/package/source/xstor/switchpersistencestream.hxx @@ -43,16 +43,16 @@ struct SPStreamData_Impl; class SwitchablePersistenceStream : public ::cppu::WeakImplHelper < - ::com::sun::star::io::XStream, - ::com::sun::star::io::XInputStream, - ::com::sun::star::io::XOutputStream, - ::com::sun::star::io::XTruncate, - ::com::sun::star::io::XSeekable, - ::com::sun::star::io::XAsyncOutputMonitor > + css::io::XStream, + css::io::XInputStream, + css::io::XOutputStream, + css::io::XTruncate, + css::io::XSeekable, + css::io::XAsyncOutputMonitor > { ::osl::Mutex m_aMutex; - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + const css::uno::Reference< css::uno::XComponentContext > m_xContext; SPStreamData_Impl* m_pStreamData; @@ -61,47 +61,47 @@ class SwitchablePersistenceStream public: SwitchablePersistenceStream( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream ); + const css::uno::Reference< css::uno::XComponentContext >& xContext, + const css::uno::Reference< css::io::XStream >& xStream ); SwitchablePersistenceStream( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream ); + const css::uno::Reference< css::uno::XComponentContext >& xContext, + const css::uno::Reference< css::io::XInputStream >& xInStream ); virtual ~SwitchablePersistenceStream(); - void SwitchPersistenceTo( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream ); + void SwitchPersistenceTo( const css::uno::Reference< css::io::XStream >& xStream ); - void SwitchPersistenceTo( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream ); + void SwitchPersistenceTo( const css::uno::Reference< css::io::XInputStream >& xInputStream ); - void CopyAndSwitchPersistenceTo( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream ); + void CopyAndSwitchPersistenceTo( const css::uno::Reference< css::io::XStream >& xStream ); -// com::sun::star::io::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; +// css::io::XStream + 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; -// com::sun::star::io::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 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; - 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; - virtual void SAL_CALL closeInput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; +// css::io::XInputStream + 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 (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL available( ) throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL closeInput( ) throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; -// com::sun::star::io::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 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; - 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; +// css::io::XOutputStream + 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 (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL closeOutput( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; -// com::sun::star::io::XTruncate - virtual void SAL_CALL truncate( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; +// css::io::XTruncate + virtual void SAL_CALL truncate( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; -// com::sun::star::io::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; - virtual ::sal_Int64 SAL_CALL getPosition( ) throw (::com::sun::star::io::IOException, ::com::sun::star::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; +// css::io::XSeekable + virtual void SAL_CALL seek( ::sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getPosition( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getLength( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::io::XAsyncOutputMonitor - virtual void SAL_CALL waitForCompletion( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; +// css::io::XAsyncOutputMonitor + virtual void SAL_CALL waitForCompletion( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; }; diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx index 01fe85b395d8..13c55e85003d 100644 --- a/package/source/xstor/xfactory.hxx +++ b/package/source/xstor/xfactory.hxx @@ -25,35 +25,35 @@ #include <cppuhelper/implbase.hxx> -class OStorageFactory : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XSingleServiceFactory, - ::com::sun::star::lang::XServiceInfo > +class OStorageFactory : public ::cppu::WeakImplHelper< css::lang::XSingleServiceFactory, + css::lang::XServiceInfo > { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; public: - explicit OStorageFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) + explicit OStorageFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : m_xContext( xContext ) { OSL_ENSURE( xContext.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL + 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 + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); + const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); // 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; // 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/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx index 60b6808461db..24ea11832ac5 100644 --- a/package/source/xstor/xstorage.hxx +++ b/package/source/xstor/xstorage.hxx @@ -102,7 +102,7 @@ class OStorage; struct StorageHolder_Impl { OStorage* m_pPointer; - ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XStorage > m_xWeakRef; + css::uno::WeakReference< css::embed::XStorage > m_xWeakRef; explicit inline StorageHolder_Impl( OStorage* pStorage ); @@ -142,16 +142,16 @@ struct OStorage_Impl SotElementList_Impl m_aChildrenList; SotElementList_Impl m_aDeletedList; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xPackageFolder; - ::com::sun::star::uno::Reference< ::com::sun::star::logging::XSimpleLogRing > m_xLogRing; + css::uno::Reference< css::container::XNameContainer > m_xPackageFolder; + css::uno::Reference< css::logging::XSimpleLogRing > m_xLogRing; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > m_xPackage; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::lang::XSingleServiceFactory > m_xPackage; + css::uno::Reference< css::uno::XComponentContext > m_xContext; // valid only for root storage - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream; // ??? may be stored in properties - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream; // ??? may be stored in properties - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_xProperties; + css::uno::Reference< css::io::XInputStream > m_xInputStream; // ??? may be stored in properties + css::uno::Reference< css::io::XStream > m_xStream; // ??? may be stored in properties + css::uno::Sequence< css::beans::PropertyValue > m_xProperties; bool m_bHasCommonEncryptionData; ::comphelper::SequenceAsHashMap m_aCommonEncryptionData; @@ -171,30 +171,30 @@ struct OStorage_Impl // the _rels substorage that is handled in a special way in embed::StorageFormats::OFOPXML SotElement_Impl* m_pRelStorElement; - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xRelStorage; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > m_aRelInfo; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xNewRelInfoStream; + css::uno::Reference< css::embed::XStorage > m_xRelStorage; + css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > m_aRelInfo; + css::uno::Reference< css::io::XInputStream > m_xNewRelInfoStream; sal_Int16 m_nRelInfoStatus; // Constructors - OStorage_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream, + OStorage_Impl( css::uno::Reference< css::io::XInputStream > xInputStream, sal_Int32 nMode, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xProperties, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, + const css::uno::Sequence< css::beans::PropertyValue >& xProperties, + css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nStorageType ); - OStorage_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xStream, + OStorage_Impl( css::uno::Reference< css::io::XStream > xStream, sal_Int32 nMode, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xProperties, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, + const css::uno::Sequence< css::beans::PropertyValue >& xProperties, + css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nStorageType ); // constructor for a substorage OStorage_Impl( OStorage_Impl* pParent, sal_Int32 nMode, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xPackageFolder, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > xPackage, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, + css::uno::Reference< css::container::XNameContainer > xPackageFolder, + css::uno::Reference< css::lang::XSingleServiceFactory > xPackage, + css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nStorageType ); ~OStorage_Impl(); @@ -208,33 +208,33 @@ struct OStorage_Impl void ReadContents(); void ReadRelInfoIfNecessary(); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > GetComponentContext(); + css::uno::Reference< css::uno::XComponentContext > GetComponentContext(); SotElementList_Impl& GetChildrenList(); void GetStorageProperties(); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > GetAllRelationshipsIfAny(); - void CopyLastCommitTo( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewStor ); + css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > GetAllRelationshipsIfAny(); + void CopyLastCommitTo( const css::uno::Reference< css::embed::XStorage >& xNewStor ); void InsertIntoPackageFolder( const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xParentPackageFolder ); + const css::uno::Reference< css::container::XNameContainer >& xParentPackageFolder ); void Commit(); void Revert(); - ::comphelper::SequenceAsHashMap GetCommonRootEncryptionData() throw ( ::com::sun::star::packages::NoEncryptionException ); + ::comphelper::SequenceAsHashMap GetCommonRootEncryptionData() throw ( css::packages::NoEncryptionException ); - void CopyToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, + void CopyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest, bool bDirect ); void CopyStorageElement( SotElement_Impl* pElement, - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > xDest, + css::uno::Reference< css::embed::XStorage > xDest, const OUString& aName, bool bDirect ); SotElement_Impl* FindElement( const OUString& rName ); SotElement_Impl* InsertStream( const OUString& aName, bool bEncr ); - SotElement_Impl* InsertRawStream( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream ); + SotElement_Impl* InsertRawStream( const OUString& aName, const css::uno::Reference< css::io::XInputStream >& xInStream ); OStorage_Impl* CreateNewStorageImpl( sal_Int32 nStorageMode ); SotElement_Impl* InsertStorage( const OUString& aName, sal_Int32 nStorageMode ); @@ -243,7 +243,7 @@ struct OStorage_Impl void OpenSubStorage( SotElement_Impl* pElement, sal_Int32 nStorageMode ); void OpenSubStream( SotElement_Impl* pElement ); - ::com::sun::star::uno::Sequence< OUString > GetElementNames(); + css::uno::Sequence< OUString > GetElementNames(); void RemoveElement( SotElement_Impl* pElement ); static void ClearElement( SotElement_Impl* pElement ); @@ -252,41 +252,41 @@ struct OStorage_Impl const OUString& aStreamName, bool bPassProvided, const ::comphelper::SequenceAsHashMap& aEncryptionData, - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::packages::NoEncryptionException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + css::uno::Reference< css::io::XStream >& xTargetStream ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::WrongPasswordException, + css::packages::NoEncryptionException, + css::container::NoSuchElementException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException ); void RemoveStreamRelInfo( const OUString& aOriginalName ); void CreateRelStorage(); void CommitStreamRelInfo( SotElement_Impl* pStreamElement ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetRelInfoStreamForName( const OUString& aName ); - void CommitRelInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xNewPackageFolder ); + css::uno::Reference< css::io::XInputStream > GetRelInfoStreamForName( const OUString& aName ); + void CommitRelInfo( const css::uno::Reference< css::container::XNameContainer >& xNewPackageFolder ); static void completeStorageStreamCopy_Impl( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSource, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xDest, + const css::uno::Reference< css::io::XStream >& xSource, + const css::uno::Reference< css::io::XStream >& xDest, sal_Int32 nStorageType, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > >& aRelInfo ); + const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aRelInfo ); }; -class OStorage : public ::com::sun::star::lang::XTypeProvider - , public ::com::sun::star::embed::XStorage2 - , public ::com::sun::star::embed::XStorageRawAccess - , public ::com::sun::star::embed::XTransactedObject - , public ::com::sun::star::embed::XTransactionBroadcaster - , public ::com::sun::star::util::XModifiable - , public ::com::sun::star::embed::XEncryptionProtectedStorage - , public ::com::sun::star::beans::XPropertySet - , public ::com::sun::star::embed::XOptimizedStorage - , public ::com::sun::star::embed::XRelationshipAccess - , public ::com::sun::star::embed::XHierarchicalStorageAccess2 +class OStorage : public css::lang::XTypeProvider + , public css::embed::XStorage2 + , public css::embed::XStorageRawAccess + , public css::embed::XTransactedObject + , public css::embed::XTransactionBroadcaster + , public css::util::XModifiable + , public css::embed::XEncryptionProtectedStorage + , public css::beans::XPropertySet + , public css::embed::XOptimizedStorage + , public css::embed::XRelationshipAccess + , public css::embed::XHierarchicalStorageAccess2 , public ::cppu::OWeakObject { OStorage_Impl* m_pImpl; @@ -301,20 +301,20 @@ protected: void BroadcastTransaction( sal_Int8 nMessage ); void MakeLinkToSubComponent_Impl( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xComponent ); + const css::uno::Reference< css::lang::XComponent >& xComponent ); public: - OStorage( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream, + OStorage( css::uno::Reference< css::io::XInputStream > xInputStream, sal_Int32 nMode, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xProperties, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, + const css::uno::Sequence< css::beans::PropertyValue >& xProperties, + css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nStorageType ); - OStorage( ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xStream, + OStorage( css::uno::Reference< css::io::XStream > xStream, sal_Int32 nMode, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xProperties, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, + const css::uno::Sequence< css::beans::PropertyValue >& xProperties, + css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nStorageType ); OStorage( OStorage_Impl* pImpl, bool bReadOnlyWrap ); @@ -323,14 +323,14 @@ public: void SAL_CALL InternalDispose( bool bNotifyImpl ); - void ChildIsDisposed( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xChild ); + void ChildIsDisposed( const css::uno::Reference< css::uno::XInterface >& xChild ); sal_Int32 GetRefCount_Impl() { return m_refCount; } // 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; virtual void SAL_CALL acquire() throw() override; @@ -338,471 +338,471 @@ public: // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; // XStorage - virtual void SAL_CALL copyToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openStreamElement( + virtual css::uno::Reference< css::io::XStream > SAL_CALL openStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement( + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + + virtual css::uno::Reference< css::io::XStream > SAL_CALL openEncryptedStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::NoEncryptionException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL openStorageElement( + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::NoEncryptionException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL openStorageElement( const OUString& aStorName, sal_Int32 nStorageMode ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneStreamElement( + virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneStreamElement( const OUString& aStreamName ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement( + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + + virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneEncryptedStreamElement( const OUString& aStreamName, const OUString& aPass ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::NoEncryptionException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::NoEncryptionException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL copyLastCommitTo( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xTargetStorage ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::embed::XStorage >& xTargetStorage ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL copyStorageElementLastCommitTo( const OUString& aStorName, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xTargetStorage ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::embed::XStorage >& xTargetStorage ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName ) - throw ( ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::container::NoSuchElementException, + css::lang::IllegalArgumentException, + css::embed::InvalidStorageException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName ) - throw ( ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::container::NoSuchElementException, + css::lang::IllegalArgumentException, + css::embed::InvalidStorageException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeElement( const OUString& aElementName ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL renameElement( const OUString& rEleName, const OUString& rNewName ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::container::ElementExistException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::container::ElementExistException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL copyElementTo( const OUString& aElementName, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, + const css::uno::Reference< css::embed::XStorage >& xDest, const OUString& aNewName ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::container::ElementExistException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::container::ElementExistException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL moveElementTo( const OUString& aElementName, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, + const css::uno::Reference< css::embed::XStorage >& xDest, const OUString& rNewName ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::container::ElementExistException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::container::ElementExistException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; // XStorage2 - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStream( const OUString& sStreamName, ::sal_Int32 nOpenMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::NoEncryptionException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStream( const OUString& sStreamName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::NoEncryptionException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XStream > SAL_CALL openEncryptedStream( const OUString& sStreamName, ::sal_Int32 nOpenMode, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::NoEncryptionException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception) override; + + virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneEncryptedStream( const OUString& sStreamName, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::NoEncryptionException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XStorageRawAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getPlainRawStreamElement( + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getPlainRawStreamElement( const OUString& sStreamName ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawEncrStreamElement( + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getRawEncrStreamElement( const OUString& sStreamName ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::NoEncryptionException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::NoEncryptionException, + css::container::NoSuchElementException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL insertRawEncrStreamElement( const OUString& aStreamName, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::NoRawFormatException, - ::com::sun::star::container::ElementExistException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::io::XInputStream >& xInStream ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::NoRawFormatException, + css::container::ElementExistException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XTransactedObject virtual void SAL_CALL commit() - throw ( ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL revert() - throw ( ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; // XTransactionBroadcaster virtual void SAL_CALL addTransactionListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XTransactionListener >& aListener ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::embed::XTransactionListener >& aListener ) + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeTransactionListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XTransactionListener >& aListener ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::embed::XTransactionListener >& aListener ) + throw ( css::uno::RuntimeException, std::exception ) override; // XModifiable virtual sal_Bool SAL_CALL isModified() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setModified( sal_Bool bModified ) - throw ( ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::beans::PropertyVetoException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) + 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 css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw ( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::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::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; - 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; // XComponent virtual void SAL_CALL dispose() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::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; + const css::uno::Reference< css::lang::XEventListener >& xListener ) + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::lang::XEventListener >& xListener ) + throw ( css::uno::RuntimeException, std::exception ) override; // XEncryptionProtectedSource virtual void SAL_CALL setEncryptionPassword( const OUString& aPass ) - throw ( ::com::sun::star::uno::RuntimeException, - ::com::sun::star::io::IOException, std::exception ) override; + throw ( css::uno::RuntimeException, + css::io::IOException, std::exception ) override; virtual void SAL_CALL removeEncryption() - throw ( ::com::sun::star::uno::RuntimeException, - ::com::sun::star::io::IOException, std::exception ) override; + throw ( css::uno::RuntimeException, + css::io::IOException, std::exception ) override; // XEncryptionProtectedSource2 virtual void SAL_CALL setEncryptionData( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ) - throw ( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) + throw ( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasEncryptionData() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; // XEncryptionProtectedStorage - virtual void SAL_CALL setEncryptionAlgorithms( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aAlgorithms ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setEncryptionAlgorithms( const css::uno::Sequence< css::beans::NamedValue >& aAlgorithms ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > SAL_CALL getEncryptionAlgorithms() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getEncryptionAlgorithms() throw (css::uno::RuntimeException, std::exception) override; // 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 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 ::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 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 ::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 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 ::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; + 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 ::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; + 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 ::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; + 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 ::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 css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw ( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; // XOptimizedStorage - virtual void SAL_CALL insertRawNonEncrStreamElementDirect( const OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::NoRawFormatException, - ::com::sun::star::container::ElementExistException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL insertStreamElementDirect( const OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::ElementExistException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL copyElementDirectlyTo( const OUString& sSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XOptimizedStorage >& xTargetStorage, const OUString& sTargetName ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::container::ElementExistException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL writeAndAttachToStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL insertRawNonEncrStreamElementDirect( const OUString& sStreamName, const css::uno::Reference< css::io::XInputStream >& xInStream ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::NoRawFormatException, + css::container::ElementExistException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + + virtual void SAL_CALL insertStreamElementDirect( const OUString& sStreamName, const css::uno::Reference< css::io::XInputStream >& xInStream, const css::uno::Sequence< css::beans::PropertyValue >& aProps ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::ElementExistException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + + virtual void SAL_CALL copyElementDirectlyTo( const OUString& sSourceName, const css::uno::Reference< css::embed::XOptimizedStorage >& xTargetStorage, const OUString& sTargetName ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::container::ElementExistException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + + virtual void SAL_CALL writeAndAttachToStream( const css::uno::Reference< css::io::XStream >& xStream ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL attachToURL( const OUString& sURL, sal_Bool bReadOnly ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - - virtual ::com::sun::star::uno::Any SAL_CALL getElementPropertyValue( const OUString& sElementName, const OUString& sPropertyName ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::io::IOException, - ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL copyStreamElementData( const OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + + virtual css::uno::Any SAL_CALL getElementPropertyValue( const OUString& sElementName, const OUString& sPropertyName ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::io::IOException, + css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception) override; + + virtual void SAL_CALL copyStreamElementData( const OUString& sStreamName, const css::uno::Reference< css::io::XStream >& xTargetStream ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + 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; + throw ( css::io::IOException, + css::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; + throw ( css::container::NoSuchElementException, + css::io::IOException, + css::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; + throw ( css::container::NoSuchElementException, + css::io::IOException, + css::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 css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) + throw ( css::container::NoSuchElementException, + css::io::IOException, + css::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 css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) + throw ( css::io::IOException, + css::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 css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships( ) + throw ( css::io::IOException, + css::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 insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace ) + throw ( css::container::ElementExistException, + css::io::IOException, + css::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; + throw ( css::container::NoSuchElementException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertRelationships( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > >& aEntries, 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 insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace ) + throw ( css::container::ElementExistException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clearRelationships( ) - throw ( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw ( css::io::IOException, + css::uno::RuntimeException, std::exception) override; // XHierarchicalStorageAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::NoEncryptionException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception) override; + + virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::NoEncryptionException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XHierarchicalStorageAccess2 - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::NoEncryptionException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::NoEncryptionException, + css::packages::WrongPasswordException, + css::container::NoSuchElementException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; }; StorageHolder_Impl::StorageHolder_Impl( OStorage* pStorage ) : m_pPointer( pStorage ) -, m_xWeakRef( ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >( pStorage ) ) +, m_xWeakRef( css::uno::Reference< css::embed::XStorage >( pStorage ) ) { } diff --git a/package/source/zipapi/MemoryByteGrabber.hxx b/package/source/zipapi/MemoryByteGrabber.hxx index ff173e3a17af..18112625fd46 100644 --- a/package/source/zipapi/MemoryByteGrabber.hxx +++ b/package/source/zipapi/MemoryByteGrabber.hxx @@ -26,11 +26,11 @@ class MemoryByteGrabber { protected: - const com::sun::star::uno::Sequence < sal_Int8 > maBuffer; + const css::uno::Sequence < sal_Int8 > maBuffer; const sal_Int8 *mpBuffer; sal_Int32 mnCurrent, mnEnd; public: - MemoryByteGrabber ( const com::sun::star::uno::Sequence < sal_Int8 > & rBuffer ) + MemoryByteGrabber ( const css::uno::Sequence < sal_Int8 > & rBuffer ) : maBuffer ( rBuffer ) , mpBuffer ( rBuffer.getConstArray() ) , mnCurrent ( 0 ) @@ -45,7 +45,7 @@ public: // XInputStream chained 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) + throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException) { mnCurrent += nBytesToSkip; } diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx index 638de647e7b4..98674ebc3d0e 100644 --- a/package/source/zipapi/XUnbufferedStream.hxx +++ b/package/source/zipapi/XUnbufferedStream.hxx @@ -43,19 +43,19 @@ namespace com { namespace sun { namespace star { namespace uno { class EncryptionData; class XUnbufferedStream : public cppu::WeakImplHelper < - com::sun::star::io::XInputStream + css::io::XInputStream > { protected: rtl::Reference<SotMutexHolder> maMutexHolder; - com::sun::star::uno::Reference < com::sun::star::io::XInputStream > mxZipStream; - com::sun::star::uno::Reference < com::sun::star::io::XSeekable > mxZipSeek; - com::sun::star::uno::Sequence < sal_Int8 > maCompBuffer, maHeader; + css::uno::Reference < css::io::XInputStream > mxZipStream; + css::uno::Reference < css::io::XSeekable > mxZipSeek; + css::uno::Sequence < sal_Int8 > maCompBuffer, maHeader; ZipEntry maEntry; ::rtl::Reference< EncryptionData > mxData; sal_Int32 mnBlockSize; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > m_xCipherContext; + css::uno::Reference< css::xml::crypto::XCipherContext > m_xCipherContext; ZipUtils::Inflater maInflater; bool mbRawStream, mbWrappedRaw, mbFinished; sal_Int16 mnHeaderToRead; @@ -65,10 +65,10 @@ protected: public: XUnbufferedStream( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::Reference<SotMutexHolder>& aMutexHolder, ZipEntry & rEntry, - com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xNewZipStream, + css::uno::Reference < css::io::XInputStream > xNewZipStream, const ::rtl::Reference< EncryptionData >& rData, sal_Int8 nStreamMode, bool bIsEncrypted, @@ -77,32 +77,23 @@ public: // allows to read package raw stream XUnbufferedStream( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, - const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& xRawStream, + const css::uno::Reference< css::uno::XComponentContext >& xContext, + const css::uno::Reference < css::io::XInputStream >& xRawStream, const ::rtl::Reference< EncryptionData >& rData ); virtual ~XUnbufferedStream(); // 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; - // 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); - virtual sal_Int64 SAL_CALL getPosition( ) - throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getLength( ) - throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - */ + throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/package/source/zipapi/blowfishcontext.hxx b/package/source/zipapi/blowfishcontext.hxx index 418877494fb3..d369ec74466f 100644 --- a/package/source/zipapi/blowfishcontext.hxx +++ b/package/source/zipapi/blowfishcontext.hxx @@ -24,7 +24,7 @@ #include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> -class BlowfishCFB8CipherContext : public cppu::WeakImplHelper< ::com::sun::star::xml::crypto::XCipherContext > +class BlowfishCFB8CipherContext : public cppu::WeakImplHelper< css::xml::crypto::XCipherContext > { ::osl::Mutex m_aMutex; void* m_pCipher; @@ -39,11 +39,11 @@ public: virtual ~BlowfishCFB8CipherContext(); - static ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > - Create( const ::com::sun::star::uno::Sequence< sal_Int8 >& aDerivedKey, const ::com::sun::star::uno::Sequence< sal_Int8 >& aInitVector, bool bEncrypt ); + static css::uno::Reference< css::xml::crypto::XCipherContext > + Create( const css::uno::Sequence< sal_Int8 >& aDerivedKey, const css::uno::Sequence< sal_Int8 >& aInitVector, bool bEncrypt ); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::lang::IllegalArgumentException, css::lang::DisposedException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose( ) throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_PACKAGE_SOURCE_ZIPAPI_BLOWFISHCONTEXT_HXX diff --git a/package/source/zipapi/sha1context.hxx b/package/source/zipapi/sha1context.hxx index b47011e58698..d57a6390993e 100644 --- a/package/source/zipapi/sha1context.hxx +++ b/package/source/zipapi/sha1context.hxx @@ -24,7 +24,7 @@ #include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> -class SHA1DigestContext : public cppu::WeakImplHelper< ::com::sun::star::xml::crypto::XDigestContext > +class SHA1DigestContext : public cppu::WeakImplHelper< css::xml::crypto::XDigestContext > { ::osl::Mutex m_aMutex; void* m_pDigest; @@ -37,11 +37,10 @@ public: virtual ~SHA1DigestContext(); - static ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XDigestContext > - Create(); + static css::uno::Reference< css::xml::crypto::XDigestContext > Create(); - virtual void SAL_CALL updateDigest( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateDigest( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override; }; diff --git a/package/source/zippackage/ContentInfo.hxx b/package/source/zippackage/ContentInfo.hxx index 4b66395377ef..1fd3a95159a0 100644 --- a/package/source/zippackage/ContentInfo.hxx +++ b/package/source/zippackage/ContentInfo.hxx @@ -28,7 +28,7 @@ namespace com { namespace sun { namespace star { namespace packages { class ContentInfo : public cppu::OWeakObject { public: - com::sun::star::uno::Reference < com::sun::star::lang::XUnoTunnel > xTunnel; + css::uno::Reference < css::lang::XUnoTunnel > xTunnel; bool bFolder; union { diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 730dc145949e..435d83a79725 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -630,7 +630,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) else bHaveZipFile = false; } - catch ( com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { // Exception derived from uno::Exception thrown. This probably // means the file doesn't exist...we'll create it at @@ -705,7 +705,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) else { // The URL is not acceptable - throw com::sun::star::uno::Exception (THROW_WHERE "Bad arguments.", + throw css::uno::Exception (THROW_WHERE "Bad arguments.", static_cast < ::cppu::OWeakObject * > ( this ) ); } } @@ -718,7 +718,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) m_xContentStream = ::comphelper::OSeekableInputWrapper::CheckSeekableCanWrap( m_xContentStream, m_xContext ); m_xContentSeek = uno::Reference < XSeekable > ( m_xContentStream, UNO_QUERY ); if ( ! m_xContentSeek.is() ) - throw com::sun::star::uno::Exception (THROW_WHERE "The package component _requires_ an XSeekable interface!", + throw css::uno::Exception (THROW_WHERE "The package component _requires_ an XSeekable interface!", static_cast < ::cppu::OWeakObject * > ( this ) ); if ( !m_xContentSeek->getLength() ) @@ -727,7 +727,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) else bHaveZipFile = false; } - catch ( com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { // Exception derived from uno::Exception thrown. This probably // means the file doesn't exist...we'll create it at @@ -764,7 +764,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) // clean up the memory, and tell the UCB about the error if( m_pZipFile ) { delete m_pZipFile; m_pZipFile = NULL; } - throw com::sun::star::packages::zip::ZipIOException ( + throw css::packages::zip::ZipIOException ( THROW_WHERE "Bad Zip File, " + message, static_cast < ::cppu::OWeakObject * > ( this ) ); } @@ -994,7 +994,7 @@ void ZipPackage::WriteMimetypeMagicFile( ZipOutputStream& aZipOut ) aZipOut.rawWrite(aType); aZipOut.rawCloseEntry(); } - catch ( const ::com::sun::star::io::IOException & r ) + catch ( const css::io::IOException & r ) { throw WrappedTargetException( THROW_WHERE "Error adding mimetype to the ZipOutputStream!", @@ -1464,7 +1464,7 @@ void SAL_CALL ZipPackage::commitChanges() if( isLocalFile() ) { // write directly in case of local file - uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > xSimpleAccess( + uno::Reference< css::ucb::XSimpleFileAccess3 > xSimpleAccess( SimpleFileAccess::create( m_xContext ) ); OSL_ENSURE( xSimpleAccess.is(), "Can't instantiate SimpleFileAccess service!\n" ); uno::Reference< io::XTruncate > xOrigTruncate; @@ -1531,7 +1531,7 @@ void SAL_CALL ZipPackage::commitChanges() // if the file is still not corrupted, it can become after the next step aContent.executeCommand ("transfer", aAny ); } - catch ( const ::com::sun::star::uno::Exception& r ) + catch ( const css::uno::Exception& r ) { if ( bCanBeCorrupted ) DisconnectFromTargetAndThrowException_Impl( xTempInStream ); diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index c76d6520590f..2734ded1fd8b 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -172,7 +172,7 @@ void ZipPackageFolder::copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource) rDest.nExtraLen = rSource.nExtraLen; } -::com::sun::star::uno::Sequence < sal_Int8 > ZipPackageFolder::static_getImplementationId() +css::uno::Sequence < sal_Int8 > ZipPackageFolder::static_getImplementationId() { return lcl_CachedImplId::get().getImplementationId(); } diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx index 714b6cfd7340..eee73c5db362 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx @@ -26,31 +26,31 @@ class ZipPackageFolderEnumeration : public cppu::WeakImplHelper < - com::sun::star::container::XEnumeration, - com::sun::star::lang::XServiceInfo + css::container::XEnumeration, + css::lang::XServiceInfo > { protected: ContentHash& rContents; ContentHash::const_iterator aIterator; public: - //ZipPackageFolderEnumeration (unordered_map < OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput); + //ZipPackageFolderEnumeration (unordered_map < OUString, css::uno::Reference < css::container::XNamed >, hashFunc, eqFunc > &rInput); ZipPackageFolderEnumeration (ContentHash &rInput); virtual ~ZipPackageFolderEnumeration(); // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL nextElement( ) - throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL nextElement( ) + throw(css::container::NoSuchElementException, 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/source/zippackage/ZipPackageSink.cxx b/package/source/zippackage/ZipPackageSink.cxx index 738ccb4f9d14..d7dd47b37ae1 100644 --- a/package/source/zippackage/ZipPackageSink.cxx +++ b/package/source/zippackage/ZipPackageSink.cxx @@ -20,19 +20,19 @@ #include <ZipPackageSink.hxx> ZipPackageSink::ZipPackageSink() -: xStream ( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > (NULL)) +: xStream ( css::uno::Reference < css::io::XInputStream > (NULL)) { } ZipPackageSink::~ZipPackageSink() { } -void SAL_CALL ZipPackageSink::setInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aStream ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ZipPackageSink::setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream ) + throw(css::uno::RuntimeException, std::exception) { xStream = aStream; } -::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL ZipPackageSink::getInputStream( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::io::XInputStream > SAL_CALL ZipPackageSink::getInputStream( ) + throw(css::uno::RuntimeException, std::exception) { return xStream; } diff --git a/package/source/zippackage/ZipPackageSink.hxx b/package/source/zippackage/ZipPackageSink.hxx index 331e02a46213..1f141d2eb989 100644 --- a/package/source/zippackage/ZipPackageSink.hxx +++ b/package/source/zippackage/ZipPackageSink.hxx @@ -22,20 +22,17 @@ #include <com/sun/star/io/XActiveDataSink.hpp> #include <cppuhelper/implbase.hxx> -class ZipPackageSink : public ::cppu::WeakImplHelper -< - com::sun::star::io::XActiveDataSink -> +class ZipPackageSink : public ::cppu::WeakImplHelper< css::io::XActiveDataSink > { protected: - com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xStream; + css::uno::Reference < css::io::XInputStream > xStream; public: ZipPackageSink(); virtual ~ZipPackageSink(); - 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; }; #endif diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 77df0039248b..e5ec367be724 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -70,7 +70,7 @@ using namespace cppu; namespace { struct lcl_CachedImplId : public rtl::Static< cppu::OImplementationId, lcl_CachedImplId > {}; } -::com::sun::star::uno::Sequence < sal_Int8 > ZipPackageStream::static_getImplementationId() +css::uno::Sequence < sal_Int8 > ZipPackageStream::static_getImplementationId() { return lcl_CachedImplId::get().getImplementationId(); } @@ -202,7 +202,7 @@ sal_Int32 ZipPackageStream::GetEncryptionAlgorithm() const sal_Int32 ZipPackageStream::GetBlockSize() const { - return GetEncryptionAlgorithm() == ::com::sun::star::xml::crypto::CipherID::AES_CBC_W3C_PADDING ? 16 : 8; + return GetEncryptionAlgorithm() == css::xml::crypto::CipherID::AES_CBC_W3C_PADDING ? 16 : 8; } ::rtl::Reference< EncryptionData > ZipPackageStream::GetEncryptionData( bool bUseWinEncoding ) diff --git a/package/source/zippackage/wrapstreamforshare.hxx b/package/source/zippackage/wrapstreamforshare.hxx index dd6cd387fc88..7e5950a39467 100644 --- a/package/source/zippackage/wrapstreamforshare.hxx +++ b/package/source/zippackage/wrapstreamforshare.hxx @@ -26,37 +26,37 @@ #include <mutexholder.hxx> -class WrapStreamForShare : public cppu::WeakImplHelper < ::com::sun::star::io::XInputStream - , ::com::sun::star::io::XSeekable > +class WrapStreamForShare : public cppu::WeakImplHelper < css::io::XInputStream + , css::io::XSeekable > { protected: rtl::Reference<SotMutexHolder> m_rMutexRef; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > m_xInStream; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable > m_xSeekable; + css::uno::Reference < css::io::XInputStream > m_xInStream; + css::uno::Reference < css::io::XSeekable > m_xSeekable; sal_Int64 m_nCurPos; public: - WrapStreamForShare( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, + WrapStreamForShare( const css::uno::Reference< css::io::XInputStream >& xInStream, const rtl::Reference<SotMutexHolder>& rMutexRef ); virtual ~WrapStreamForShare(); // 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; //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; - virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::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; + virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; }; diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index 163f1e2350a2..6e865470c60f 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -187,7 +187,7 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu { ::ucbhelper::Content aContent( aParamURL, - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + uno::Reference< css::ucb::XCommandEnvironment >(), m_xContext ); uno::Reference < io::XActiveDataSink > xSink = new ZipPackageSink; if ( aContent.openStream ( xSink ) ) diff --git a/pyuno/inc/pyuno/pyuno.hxx b/pyuno/inc/pyuno/pyuno.hxx index cc7b2bb4a1b5..b79d01dd10f3 100644 --- a/pyuno/inc/pyuno/pyuno.hxx +++ b/pyuno/inc/pyuno/pyuno.hxx @@ -168,7 +168,7 @@ class LO_DLLPUBLIC_PYUNO Runtime Safely unpacks a Python iterator into a sequence, then stores it in an Any. Used internally by pyObject2Any */ - bool pyIterUnpack( PyObject *const, com::sun::star::uno::Any & ) const; + bool pyIterUnpack( PyObject *const, css::uno::Any & ) const; public: ~Runtime( ); @@ -183,7 +183,7 @@ public: @throw RuntimeException in case the runtime has not been initialized before */ - Runtime() throw( com::sun::star::uno::RuntimeException ); + Runtime() throw( css::uno::RuntimeException ); Runtime( const Runtime & ); Runtime & operator = ( const Runtime & ); @@ -201,12 +201,12 @@ public: has not been initialized. */ static void SAL_CALL initialize( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & ctx ) - throw ( com::sun::star::uno::RuntimeException, std::exception ); + const css::uno::Reference< css::uno::XComponentContext > & ctx ) + throw ( css::uno::RuntimeException, std::exception ); /** Checks, whether the uno runtime is already initialized in the current python interpreter. */ - static bool SAL_CALL isInitialized() throw (com::sun::star::uno::RuntimeException); + static bool SAL_CALL isInitialized() throw (css::uno::RuntimeException); /** converts something contained in an UNO Any to a Python object @@ -214,10 +214,10 @@ public: the global interpreter lock is held and pyuno::Runtime has been initialized. */ - PyRef any2PyObject (const com::sun::star::uno::Any &source ) const - throw ( com::sun::star::script::CannotConvertException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException ); + PyRef any2PyObject (const css::uno::Any &source ) const + throw ( css::script::CannotConvertException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException ); /** converts a Python object to a UNO any @@ -225,13 +225,13 @@ public: the global interpreter lock is held and pyuno has been initialized */ - com::sun::star::uno::Any pyObject2Any ( + css::uno::Any pyObject2Any ( const PyRef & source , enum ConversionMode mode = REJECT_UNO_ANY ) const - throw ( com::sun::star::uno::RuntimeException); + throw ( css::uno::RuntimeException); /** extracts a proper uno exception from a given python exception */ - com::sun::star::uno::Any extractUnoException( + css::uno::Any extractUnoException( const PyRef & excType, const PyRef & excValue, const PyRef & excTraceback) const; /** Returns the internal handle. Should only be used by the module implementation @@ -276,10 +276,10 @@ public: precondition: The current thread MUST NOT hold the global interpreter lock. postcondition: The global interpreter lock is acquired - @raises com::sun::star::uno::RuntimeException + @raises css::uno::RuntimeException in case no pythread state could be created */ - PyThreadAttach( PyInterpreterState *interp) throw ( com::sun::star::uno::RuntimeException ); + PyThreadAttach( PyInterpreterState *interp) throw ( css::uno::RuntimeException ); /** Releases the global interpreter lock and destroys the thread state. @@ -304,7 +304,7 @@ public: precondition: The current thread MUST hold the global interpreter lock. postcondition: The current thread does not hold the global interpreter lock anymore. */ - PyThreadDetach() throw ( com::sun::star::uno::RuntimeException ); + PyThreadDetach() throw ( css::uno::RuntimeException ); /** Acquires the global interpreter lock again */ ~PyThreadDetach(); diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index e5daae177e52..822465dd731b 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -69,11 +69,11 @@ static void raiseRuntimeExceptionWhenNeeded() throw ( RuntimeException ) PyRef excType, excValue, excTraceback; PyErr_Fetch(reinterpret_cast<PyObject **>(&excType), reinterpret_cast<PyObject**>(&excValue), reinterpret_cast<PyObject**>(&excTraceback)); Runtime runtime; - com::sun::star::uno::Any a = runtime.extractUnoException( excType, excValue, excTraceback ); + css::uno::Any a = runtime.extractUnoException( excType, excValue, excTraceback ); OUStringBuffer buf; buf.append( "python-loader:" ); if( a.hasValue() ) - buf.append( static_cast<com::sun::star::uno::Exception const *>(a.getValue())->Message ); + buf.append( static_cast<css::uno::Exception const *>(a.getValue())->Message ); throw RuntimeException( buf.makeStringAndClear() ); } } @@ -245,7 +245,7 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c Runtime runtime; PyRef pyCtx = runtime.any2PyObject( - com::sun::star::uno::makeAny( ctx ) ); + css::uno::makeAny( ctx ) ); PyRef clazz = getObjectFromLoaderModule( "Loader" ); PyRef args ( PyTuple_New( 1 ), SAL_NO_ACQUIRE, NOT_NULL ); diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index 8bd95f5e0253..feca36d57669 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -444,21 +444,21 @@ PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args ) } ret = PyRef( PyObject_CallObject( callable.get(), paras.get() ), SAL_NO_ACQUIRE ); } - catch (const ::com::sun::star::lang::IllegalArgumentException &e) + catch (const css::lang::IllegalArgumentException &e) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch (const ::com::sun::star::script::CannotConvertException &e) + catch (const css::script::CannotConvertException &e) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch (const ::com::sun::star::uno::RuntimeException &e) + catch (const css::uno::RuntimeException &e) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch (const ::com::sun::star::uno::Exception &e) + catch (const css::uno::Exception &e) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } return ret.getAcquired(); @@ -546,9 +546,9 @@ int PyUNO_bool( PyObject* self ) // Anything which doesn't have members is a scalar object and therefore true return 1; } - catch( const ::com::sun::star::uno::RuntimeException &e ) + catch( const css::uno::RuntimeException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } return -1; @@ -566,9 +566,9 @@ Py_ssize_t PyUNO_len( PyObject* self ) PyErr_SetString( PyExc_TypeError, "object has no len()" ); } - catch( const ::com::sun::star::uno::RuntimeException &e ) + catch( const css::uno::RuntimeException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } return -1; @@ -877,29 +877,29 @@ PyObject* PyUNO_getitem( PyObject *self, PyObject *pKey ) PyErr_SetString( PyExc_TypeError, "object is not subscriptable" ); } - catch( const ::com::sun::star::lang::IndexOutOfBoundsException ) + catch( const css::lang::IndexOutOfBoundsException ) { PyErr_SetString( PyExc_IndexError, "index out of range" ); } - catch( const ::com::sun::star::container::NoSuchElementException ) + catch( const css::container::NoSuchElementException ) { PyErr_SetString( PyExc_KeyError, "key not found" ); } - catch( const com::sun::star::script::CannotConvertException &e ) + catch( const css::script::CannotConvertException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const com::sun::star::lang::IllegalArgumentException &e ) + catch( const css::lang::IllegalArgumentException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const ::com::sun::star::lang::WrappedTargetException &e ) + catch( const css::lang::WrappedTargetException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const ::com::sun::star::uno::RuntimeException &e ) + catch( const css::uno::RuntimeException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } return NULL; @@ -926,12 +926,12 @@ int lcl_setitem_index( PyUNO *me, PyObject *pKey, PyObject *pValue ) { aValue <<= runtime.pyObject2Any( pValue ); } - catch ( const ::com::sun::star::uno::RuntimeException ) + catch ( const css::uno::RuntimeException ) { // TODO pyObject2Any can't convert e.g. dicts but only throws // RuntimeException on failure. Fixing this will require an audit of // all the rest of PyUNO - throw ::com::sun::star::script::CannotConvertException(); + throw css::script::CannotConvertException(); } } @@ -1047,12 +1047,12 @@ int lcl_setitem_slice( PyUNO *me, PyObject *pKey, PyObject *pValue ) { aItem <<= runtime.pyObject2Any( rItem.get() ); } - catch ( const ::com::sun::star::uno::RuntimeException ) + catch ( const css::uno::RuntimeException ) { // TODO pyObject2Any can't convert e.g. dicts but only throws // RuntimeException on failure. Fixing this will require an audit of // all the rest of PyUNO - throw ::com::sun::star::script::CannotConvertException(); + throw css::script::CannotConvertException(); } { @@ -1106,12 +1106,12 @@ int lcl_setitem_string( PyUNO *me, PyObject *pKey, PyObject *pValue ) { aValue <<= runtime.pyObject2Any( pValue ); } - catch( const ::com::sun::star::uno::RuntimeException ) + catch( const css::uno::RuntimeException ) { // TODO pyObject2Any can't convert e.g. dicts but only throws // RuntimeException on failure. Fixing this will require an audit of // all the rest of PyUNO - throw ::com::sun::star::script::CannotConvertException(); + throw css::script::CannotConvertException(); } } @@ -1142,7 +1142,7 @@ int lcl_setitem_string( PyUNO *me, PyObject *pKey, PyObject *pValue ) xNameContainer->insertByName( sKey, aValue ); return 0; } - catch( com::sun::star::container::ElementExistException ) + catch( css::container::ElementExistException ) { // Fall through, try replace instead } @@ -1184,33 +1184,33 @@ int PyUNO_setitem( PyObject *self, PyObject *pKey, PyObject *pValue ) PyErr_SetString( PyExc_TypeError, "list index has invalid type" ); } - catch( const ::com::sun::star::lang::IndexOutOfBoundsException ) + catch( const css::lang::IndexOutOfBoundsException ) { PyErr_SetString( PyExc_IndexError, "list index out of range" ); } - catch( const ::com::sun::star::container::NoSuchElementException ) + catch( const css::container::NoSuchElementException ) { PyErr_SetString( PyExc_KeyError, "key not found" ); } - catch( const ::com::sun::star::lang::IllegalArgumentException ) + catch( const css::lang::IllegalArgumentException ) { PyErr_SetString( PyExc_TypeError, "value has invalid type" ); } - catch( com::sun::star::script::CannotConvertException ) + catch( css::script::CannotConvertException ) { PyErr_SetString( PyExc_TypeError, "value has invalid type" ); } - catch( const ::com::sun::star::container::ElementExistException &e ) + catch( const css::container::ElementExistException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const::com::sun::star::lang::WrappedTargetException &e ) + catch( const css::lang::WrappedTargetException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const ::com::sun::star::uno::RuntimeException &e ) + catch( const css::uno::RuntimeException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } return 1; @@ -1276,17 +1276,17 @@ PyObject* PyUNO_iter( PyObject *self ) PyErr_SetString ( PyExc_TypeError, "object is not iterable" ); } - catch( com::sun::star::script::CannotConvertException &e ) + catch( css::script::CannotConvertException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( com::sun::star::lang::IllegalArgumentException &e ) + catch( css::lang::IllegalArgumentException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const ::com::sun::star::uno::RuntimeException &e ) + catch( const css::uno::RuntimeException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } return NULL; @@ -1305,12 +1305,12 @@ int PyUNO_contains( PyObject *self, PyObject *pKey ) { aValue <<= runtime.pyObject2Any( pKey ); } - catch( const ::com::sun::star::uno::RuntimeException ) + catch( const css::uno::RuntimeException ) { // TODO pyObject2Any can't convert e.g. dicts but only throws // RuntimeException on failure. Fixing this will require an audit of // all the rest of PyUNO - throw ::com::sun::star::script::CannotConvertException(); + throw css::script::CannotConvertException(); } // XNameAccess is tried first, because checking key presence is much more @@ -1354,29 +1354,29 @@ int PyUNO_contains( PyObject *self, PyObject *pKey ) PyErr_SetString( PyExc_TypeError, "argument is not iterable" ); } - catch( const com::sun::star::script::CannotConvertException ) + catch( const css::script::CannotConvertException ) { PyErr_SetString( PyExc_TypeError, "invalid type passed as left argument to 'in'" ); } - catch( const ::com::sun::star::container::NoSuchElementException &e ) + catch( const css::container::NoSuchElementException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const ::com::sun::star::lang::IndexOutOfBoundsException &e ) + catch( const css::lang::IndexOutOfBoundsException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const com::sun::star::lang::IllegalArgumentException &e ) + catch( const css::lang::IllegalArgumentException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const ::com::sun::star::lang::WrappedTargetException &e ) + catch( const css::lang::WrappedTargetException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const ::com::sun::star::uno::RuntimeException &e ) + catch( const css::uno::RuntimeException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } return -1; @@ -1438,19 +1438,19 @@ PyObject* PyUNO_getattr (PyObject* self, char* name) //or else... PyErr_SetString (PyExc_AttributeError, name); } - catch( const com::sun::star::reflection::InvocationTargetException & e ) + catch( const css::reflection::InvocationTargetException & e ) { raisePyExceptionWithAny( e.TargetException ); } - catch( const com::sun::star::beans::UnknownPropertyException & e ) + catch( const css::beans::UnknownPropertyException & e ) { raisePyExceptionWithAny( makeAny(e) ); } - catch( const com::sun::star::lang::IllegalArgumentException &e ) + catch( const css::lang::IllegalArgumentException &e ) { raisePyExceptionWithAny( makeAny(e) ); } - catch( const com::sun::star::script::CannotConvertException &e ) + catch( const css::script::CannotConvertException &e ) { raisePyExceptionWithAny( makeAny(e) ); } @@ -1482,17 +1482,17 @@ int PyUNO_setattr (PyObject* self, char* name, PyObject* value) } } } - catch( const com::sun::star::reflection::InvocationTargetException & e ) + catch( const css::reflection::InvocationTargetException & e ) { raisePyExceptionWithAny( e.TargetException ); return 1; } - catch( const com::sun::star::beans::UnknownPropertyException & e ) + catch( const css::beans::UnknownPropertyException & e ) { raisePyExceptionWithAny( makeAny(e) ); return 1; } - catch( const com::sun::star::script::CannotConvertException &e ) + catch( const css::script::CannotConvertException &e ) { raisePyExceptionWithAny( makeAny(e) ); return 1; @@ -1529,8 +1529,8 @@ static PyObject* PyUNO_cmp( PyObject *self, PyObject *that, int op ) PyUNO *me = reinterpret_cast< PyUNO*> ( self ); PyUNO *other = reinterpret_cast< PyUNO *> (that ); - com::sun::star::uno::TypeClass tcMe = me->members->wrappedObject.getValueTypeClass(); - com::sun::star::uno::TypeClass tcOther = other->members->wrappedObject.getValueTypeClass(); + css::uno::TypeClass tcMe = me->members->wrappedObject.getValueTypeClass(); + css::uno::TypeClass tcOther = other->members->wrappedObject.getValueTypeClass(); if( tcMe == tcOther ) { @@ -1543,7 +1543,7 @@ static PyObject* PyUNO_cmp( PyObject *self, PyObject *that, int op ) } } } - catch( const com::sun::star::uno::RuntimeException & e) + catch( const css::uno::RuntimeException & e) { raisePyExceptionWithAny( makeAny( e ) ); } diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx index d1ab7201ef2d..cd5e5e4b8e31 100644 --- a/pyuno/source/module/pyuno_adapter.cxx +++ b/pyuno/source/module/pyuno_adapter.cxx @@ -89,7 +89,7 @@ void raiseInvocationTargetExceptionWhenNeeded( const Runtime &runtime ) PyErr_Fetch(reinterpret_cast<PyObject **>(&excType), reinterpret_cast<PyObject**>(&excValue), reinterpret_cast<PyObject**>(&excTraceback)); Any unoExc( runtime.extractUnoException( excType, excValue, excTraceback ) ); throw InvocationTargetException( - static_cast<com::sun::star::uno::Exception const *>(unoExc.getValue())->Message, + static_cast<css::uno::Exception const *>(unoExc.getValue())->Message, Reference<XInterface>(), unoExc ); } } @@ -130,7 +130,7 @@ Sequence< sal_Int16 > Adapter::getOutIndexes( const OUString & functionName ) } Reference< XIdlMethod > method = introspection->getMethod( - functionName, com::sun::star::beans::MethodConcept::ALL ); + functionName, css::beans::MethodConcept::ALL ); if( ! method.is( ) ) { throw RuntimeException( @@ -142,8 +142,8 @@ Sequence< sal_Int16 > Adapter::getOutIndexes( const OUString & functionName ) int nOuts = 0; for( i = 0 ; i < seqInfo.getLength() ; i ++ ) { - if( seqInfo[i].aMode == com::sun::star::reflection::ParamMode_OUT || - seqInfo[i].aMode == com::sun::star::reflection::ParamMode_INOUT ) + if( seqInfo[i].aMode == css::reflection::ParamMode_OUT || + seqInfo[i].aMode == css::reflection::ParamMode_INOUT ) { // sequence must be interpreted as return value/outparameter tuple ! nOuts ++; @@ -156,8 +156,8 @@ Sequence< sal_Int16 > Adapter::getOutIndexes( const OUString & functionName ) sal_Int32 nOutsAssigned = 0; for( i = 0 ; i < seqInfo.getLength() ; i ++ ) { - if( seqInfo[i].aMode == com::sun::star::reflection::ParamMode_OUT || - seqInfo[i].aMode == com::sun::star::reflection::ParamMode_INOUT ) + if( seqInfo[i].aMode == css::reflection::ParamMode_OUT || + seqInfo[i].aMode == css::reflection::ParamMode_INOUT ) { ret[nOutsAssigned] = (sal_Int16) i; nOutsAssigned ++; @@ -189,7 +189,7 @@ Any Adapter::invoke( const OUString &aFunctionName, { Sequence< sal_Int8 > id; if( aParams[0] >>= id ) - return com::sun::star::uno::makeAny( getSomething( id ) ); + return css::uno::makeAny( getSomething( id ) ); } @@ -255,7 +255,7 @@ Any Adapter::invoke( const OUString &aFunctionName, ret = runtime.pyObject2Any( pyRet ); if( ret.hasValue() && - ret.getValueTypeClass() == com::sun::star::uno::TypeClass_SEQUENCE && + ret.getValueTypeClass() == css::uno::TypeClass_SEQUENCE && aFunctionName != "getTypes" && // needed by introspection itself ! aFunctionName != "getImplementationId" ) // needed by introspection itself ! { @@ -384,7 +384,7 @@ void Adapter::setValue( const OUString & aPropertyName, const Any & value ) } catch( const IllegalArgumentException & exc ) { - throw InvocationTargetException( exc.Message, *this, com::sun::star::uno::makeAny( exc ) ); + throw InvocationTargetException( exc.Message, *this, css::uno::makeAny( exc ) ); } } diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx index 3e47361a927c..ef6a707bf4aa 100644 --- a/pyuno/source/module/pyuno_callable.cxx +++ b/pyuno/source/module/pyuno_callable.cxx @@ -80,7 +80,7 @@ PyObject* PyUNO_callable_call( cargo = runtime.getImpl()->cargo; any_params = runtime.pyObject2Any (args, me->members->mode); - if (any_params.getValueTypeClass () == com::sun::star::uno::TypeClass_SEQUENCE) + if (any_params.getValueTypeClass () == css::uno::TypeClass_SEQUENCE) { any_params >>= aParams; } @@ -139,7 +139,7 @@ PyObject* PyUNO_callable_call( ret = temp; } } - catch( const com::sun::star::reflection::InvocationTargetException & e ) + catch( const css::reflection::InvocationTargetException & e ) { if( isLog( cargo, LogLevel::CALL ) ) @@ -149,32 +149,32 @@ PyObject* PyUNO_callable_call( } raisePyExceptionWithAny( e.TargetException ); } - catch( const com::sun::star::script::CannotConvertException &e ) + catch( const css::script::CannotConvertException &e ) { if( isLog( cargo, LogLevel::CALL ) ) { logException( cargo, "error py->uno[0x", me->members->xInvocation.get() , me->members->methodName, &e, cppu::UnoType<decltype(e)>::get().getTypeLibType()); } - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const com::sun::star::lang::IllegalArgumentException &e ) + catch( const css::lang::IllegalArgumentException &e ) { if( isLog( cargo, LogLevel::CALL ) ) { logException( cargo, "error py->uno[0x", me->members->xInvocation.get() , me->members->methodName, &e, cppu::UnoType<decltype(e)>::get().getTypeLibType()); } - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch (const ::com::sun::star::uno::RuntimeException &e) + catch (const css::uno::RuntimeException &e) { if( cargo && isLog( cargo, LogLevel::CALL ) ) { logException( cargo, "error py->uno[0x", me->members->xInvocation.get() , me->members->methodName, &e, cppu::UnoType<decltype(e)>::get().getTypeLibType()); } - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } return ret.getAcquired(); diff --git a/pyuno/source/module/pyuno_except.cxx b/pyuno/source/module/pyuno_except.cxx index 2c14af9be646..6ae91ad65a16 100644 --- a/pyuno/source/module/pyuno_except.cxx +++ b/pyuno/source/module/pyuno_except.cxx @@ -33,7 +33,7 @@ using com::sun::star::uno::TypeDescription; namespace pyuno { -void raisePyExceptionWithAny( const com::sun::star::uno::Any &anyExc ) +void raisePyExceptionWithAny( const css::uno::Any &anyExc ) { try { @@ -46,7 +46,7 @@ void raisePyExceptionWithAny( const com::sun::star::uno::Any &anyExc ) } else { - com::sun::star::uno::Exception e; + css::uno::Exception e; anyExc >>= e; OUStringBuffer buf; @@ -60,12 +60,12 @@ void raisePyExceptionWithAny( const com::sun::star::uno::Any &anyExc ) OUStringToOString(buf.makeStringAndClear(),RTL_TEXTENCODING_ASCII_US).getStr() ); } } - catch(const com::sun::star::lang::IllegalArgumentException & e) + catch(const css::lang::IllegalArgumentException & e) { PyErr_SetString( PyExc_SystemError, OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr() ); } - catch(const com::sun::star::script::CannotConvertException & e) + catch(const css::script::CannotConvertException & e) { PyErr_SetString( PyExc_SystemError, OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr() ); @@ -100,7 +100,7 @@ static PyRef createClass( const OUString & name, const Runtime &runtime ) OUStringBuffer buf; buf.append( "pyuno.getClass: " ).append(name).append( "is a " ); buf.appendAscii( - typeClassToString( (com::sun::star::uno::TypeClass) desc.get()->eTypeClass)); + typeClassToString( (css::uno::TypeClass) desc.get()->eTypeClass)); buf.append( ", expected EXCEPTION, STRUCT or INTERFACE" ); throw RuntimeException( buf.makeStringAndClear() ); } diff --git a/pyuno/source/module/pyuno_gc.cxx b/pyuno/source/module/pyuno_gc.cxx index 0a17c9db36a4..d65be77402fa 100644 --- a/pyuno/source/module/pyuno_gc.cxx +++ b/pyuno/source/module/pyuno_gc.cxx @@ -84,7 +84,7 @@ void GCThread::execute() Py_XDECREF( mPyObject ); } } - catch( const com::sun::star::uno::RuntimeException & e ) + catch( const css::uno::RuntimeException & e ) { OString msg; msg = OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ); diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index 2fb3a1b8e8e8..249a319a8b47 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -163,14 +163,14 @@ void log( RuntimeCargo *cargo, sal_Int32 level, const OUString &logString ); void log( RuntimeCargo *cargo, sal_Int32 level, const char *str ); void logCall( RuntimeCargo *cargo, const char *intro, void * ptr, const OUString & aFunctionName, - const com::sun::star::uno::Sequence< com::sun::star::uno::Any > & args ); + const css::uno::Sequence< css::uno::Any > & args ); void logReply( RuntimeCargo *cargo, const char *intro, void * ptr, const OUString & aFunctionName, - const com::sun::star::uno::Any &returnValue, - const com::sun::star::uno::Sequence< com::sun::star::uno::Any > & args ); + const css::uno::Any &returnValue, + const css::uno::Sequence< css::uno::Any > & args ); void logException( RuntimeCargo *cargo, const char *intro, void * ptr, const OUString &aFunctionName, - const void * data, const com::sun::star::uno::Type & type ); + const void * data, const css::uno::Type & type ); static const sal_Int32 VAL2STR_MODE_DEEP = 0; static const sal_Int32 VAL2STR_MODE_SHALLOW = 1; OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef, sal_Int32 mode = VAL2STR_MODE_DEEP ); @@ -179,7 +179,7 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef typedef std::unordered_map < PyRef, - com::sun::star::uno::WeakReference< com::sun::star::script::XInvocation >, + css::uno::WeakReference< css::script::XInvocation >, PyRef::Hash, std::equal_to< PyRef > > PyRef2Adapter; @@ -196,7 +196,7 @@ std::equal_to<OUString> typedef std::unordered_map < OUString, - com::sun::star::uno::Sequence< sal_Int16 >, + css::uno::Sequence< sal_Int16 >, OUStringHash, std::equal_to< OUString > > MethodOutIndexMap; @@ -207,17 +207,17 @@ int PyUNO_initType(); int PyUNOStruct_initType(); PyRef PyUNO_new ( - const com::sun::star::uno::Any & targetInterface, - const com::sun::star::uno::Reference<com::sun::star::lang::XSingleServiceFactory> & ssf ); + const css::uno::Any & targetInterface, + const css::uno::Reference<css::lang::XSingleServiceFactory> & ssf ); PyRef PyUNOStruct_new ( - const com::sun::star::uno::Any &targetInterface, - const com::sun::star::uno::Reference<com::sun::star::lang::XSingleServiceFactory> &ssf ); + const css::uno::Any &targetInterface, + const css::uno::Reference<css::lang::XSingleServiceFactory> &ssf ); typedef struct { - com::sun::star::uno::Reference <com::sun::star::script::XInvocation2> xInvocation; - com::sun::star::uno::Any wrappedObject; + css::uno::Reference <css::script::XInvocation2> xInvocation; + css::uno::Any wrappedObject; } PyUNOInternals; typedef struct @@ -227,11 +227,11 @@ typedef struct } PyUNO; PyObject* PyUNO_iterator_new ( - const com::sun::star::uno::Reference<com::sun::star::container::XEnumeration> xEnumeration); + const css::uno::Reference<css::container::XEnumeration> xEnumeration); typedef struct { - com::sun::star::uno::Reference <com::sun::star::container::XEnumeration> xEnumeration; + css::uno::Reference <css::container::XEnumeration> xEnumeration; } PyUNO_iterator_Internals; typedef struct @@ -241,11 +241,11 @@ typedef struct } PyUNO_iterator; PyObject* PyUNO_list_iterator_new ( - const com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> &xIndexAccess); + const css::uno::Reference<css::container::XIndexAccess> &xIndexAccess); typedef struct { - com::sun::star::uno::Reference <com::sun::star::container::XIndexAccess> xIndexAccess; + css::uno::Reference <css::container::XIndexAccess> xIndexAccess; int index; } PyUNO_list_iterator_Internals; @@ -260,26 +260,26 @@ PyRef ustring2PyString( const OUString & source ); OUString pyString2ustring( PyObject *str ); -PyRef AnyToPyObject (const com::sun::star::uno::Any & a, const Runtime &r ) - throw ( com::sun::star::uno::RuntimeException ); +PyRef AnyToPyObject (const css::uno::Any & a, const Runtime &r ) + throw ( css::uno::RuntimeException ); -com::sun::star::uno::Any PyObjectToAny (PyObject* o) - throw ( com::sun::star::uno::RuntimeException ); +css::uno::Any PyObjectToAny (PyObject* o) + throw ( css::uno::RuntimeException ); void raiseInvocationTargetExceptionWhenNeeded( const Runtime &runtime ) - throw ( com::sun::star::reflection::InvocationTargetException ); + throw ( css::reflection::InvocationTargetException ); -com::sun::star::uno::TypeClass StringToTypeClass (char* string); +css::uno::TypeClass StringToTypeClass (char* string); PyRef PyUNO_callable_new ( - const com::sun::star::uno::Reference<com::sun::star::script::XInvocation2> &xInv, + const css::uno::Reference<css::script::XInvocation2> &xInv, const OUString &methodName, ConversionMode mode = REJECT_UNO_ANY ); -PyObject* PyUNO_Type_new (const char *typeName , com::sun::star::uno::TypeClass t , const Runtime &r ); +PyObject* PyUNO_Type_new (const char *typeName , css::uno::TypeClass t , const Runtime &r ); PyObject* PyUNO_Enum_new( const char *enumBase, const char *enumValue, const Runtime &r ); PyObject* PyUNO_char_new (sal_Unicode c , const Runtime &r); -PyObject *PyUNO_ByteSequence_new( const com::sun::star::uno::Sequence< sal_Int8 > &, const Runtime &r ); +PyObject *PyUNO_ByteSequence_new( const css::uno::Sequence< sal_Int8 > &, const Runtime &r ); PyRef getTypeClass( const Runtime &); PyRef getEnumClass( const Runtime &); @@ -292,33 +292,33 @@ PyRef getClass( const OUString & name , const Runtime & runtime ); PyRef getAnyClass( const Runtime &); PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args ); -com::sun::star::uno::Any PyEnum2Enum( PyObject *obj ) - throw ( com::sun::star::uno::RuntimeException ); +css::uno::Any PyEnum2Enum( PyObject *obj ) + throw ( css::uno::RuntimeException ); sal_Unicode PyChar2Unicode( PyObject *o ) - throw ( com::sun::star::uno::RuntimeException ); -com::sun::star::uno::Type PyType2Type( PyObject * o ) - throw( com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); +css::uno::Type PyType2Type( PyObject * o ) + throw( css::uno::RuntimeException ); -void raisePyExceptionWithAny( const com::sun::star::uno::Any &a ); -const char *typeClassToString( com::sun::star::uno::TypeClass t ); +void raisePyExceptionWithAny( const css::uno::Any &a ); +const char *typeClassToString( css::uno::TypeClass t ); PyRef getObjectFromUnoModule( const Runtime &runtime, const char * object ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); bool isInterfaceClass( const Runtime &, PyObject *obj ); bool isInstanceOfStructOrException( PyObject *obj); -com::sun::star::uno::Sequence<com::sun::star::uno::Type> implementsInterfaces( +css::uno::Sequence<css::uno::Type> implementsInterfaces( const Runtime & runtime, PyObject *obj ); struct RuntimeCargo { - com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xInvocation; - com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter> xTypeConverter; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext; - com::sun::star::uno::Reference< com::sun::star::reflection::XIdlReflection > xCoreReflection; - com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xTdMgr; - com::sun::star::uno::Reference< com::sun::star::script::XInvocationAdapterFactory2 > xAdapterFactory; - com::sun::star::uno::Reference< com::sun::star::beans::XIntrospection > xIntrospection; + css::uno::Reference< css::lang::XSingleServiceFactory > xInvocation; + css::uno::Reference< css::script::XTypeConverter> xTypeConverter; + css::uno::Reference< css::uno::XComponentContext > xContext; + css::uno::Reference< css::reflection::XIdlReflection > xCoreReflection; + css::uno::Reference< css::container::XHierarchicalNameAccess > xTdMgr; + css::uno::Reference< css::script::XInvocationAdapterFactory2 > xAdapterFactory; + css::uno::Reference< css::beans::XIntrospection > xIntrospection; PyRef dictUnoModule; osl::Module testModule; bool valid; @@ -339,65 +339,65 @@ public: static void del( PyObject *self ); static PyRef create( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext ) - throw ( com::sun::star::uno::RuntimeException, std::exception ); + const css::uno::Reference< css::uno::XComponentContext > & xContext ) + throw ( css::uno::RuntimeException, std::exception ); }; class Adapter : public cppu::WeakImplHelper< - com::sun::star::script::XInvocation, com::sun::star::lang::XUnoTunnel > + css::script::XInvocation, css::lang::XUnoTunnel > { PyRef mWrappedObject; PyInterpreterState *mInterpreter; // interpreters don't seem to be refcounted ! - com::sun::star::uno::Sequence< com::sun::star::uno::Type > mTypes; + css::uno::Sequence< css::uno::Type > mTypes; MethodOutIndexMap m_methodOutIndexMap; private: - com::sun::star::uno::Sequence< sal_Int16 > getOutIndexes( const OUString & functionName ); + css::uno::Sequence< sal_Int16 > getOutIndexes( const OUString & functionName ); public: public: Adapter( const PyRef &obj, - const com::sun::star::uno::Sequence< com::sun::star::uno::Type > & types ); + const css::uno::Sequence< css::uno::Type > & types ); - static com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); PyRef getWrappedObject() { return mWrappedObject; } - com::sun::star::uno::Sequence< com::sun::star::uno::Type > getWrappedTypes() { return mTypes; } + css::uno::Sequence< css::uno::Type > getWrappedTypes() { return mTypes; } virtual ~Adapter(); // XInvocation - virtual com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > - SAL_CALL getIntrospection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL invoke( + virtual css::uno::Reference< css::beans::XIntrospectionAccess > + SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, - ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::script::CannotConvertException, - ::com::sun::star::reflection::InvocationTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aParams, + css::uno::Sequence< sal_Int16 >& aOutParamIndex, + css::uno::Sequence< css::uno::Any >& aOutParam ) + throw (css::lang::IllegalArgumentException, + css::script::CannotConvertException, + css::reflection::InvocationTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::script::CannotConvertException, - ::com::sun::star::reflection::InvocationTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - - virtual ::com::sun::star::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Any& aValue ) + throw (css::beans::UnknownPropertyException, + css::script::CannotConvertException, + css::reflection::InvocationTargetException, + css::uno::RuntimeException, std::exception) override; + + virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/pyuno/source/module/pyuno_iterator.cxx b/pyuno/source/module/pyuno_iterator.cxx index 58c6f504d6b5..0b245d33e661 100644 --- a/pyuno/source/module/pyuno_iterator.cxx +++ b/pyuno/source/module/pyuno_iterator.cxx @@ -88,25 +88,25 @@ PyObject* PyUNO_iterator_next( PyObject *self ) PyErr_SetString( PyExc_StopIteration, "" ); return NULL; } - catch( com::sun::star::container::NoSuchElementException &e ) + catch( css::container::NoSuchElementException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( com::sun::star::script::CannotConvertException &e ) + catch( css::script::CannotConvertException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( com::sun::star::lang::IllegalArgumentException &e ) + catch( css::lang::IllegalArgumentException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const ::com::sun::star::lang::WrappedTargetException &e ) + catch( const css::lang::WrappedTargetException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const ::com::sun::star::uno::RuntimeException &e ) + catch( const css::uno::RuntimeException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } return NULL; @@ -206,7 +206,7 @@ PyObject* PyUNO_list_iterator_next( PyObject *self ) try { aRet = me->members->xIndexAccess->getByIndex( me->members->index ); } - catch( com::sun::star::lang::IndexOutOfBoundsException ) + catch( css::lang::IndexOutOfBoundsException ) { noMoreElements = true; } @@ -222,21 +222,21 @@ PyObject* PyUNO_list_iterator_next( PyObject *self ) me->members->index++; return rRet.getAcquired(); } - catch( com::sun::star::script::CannotConvertException &e ) + catch( css::script::CannotConvertException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( com::sun::star::lang::IllegalArgumentException &e ) + catch( css::lang::IllegalArgumentException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const ::com::sun::star::lang::WrappedTargetException &e ) + catch( const css::lang::WrappedTargetException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } - catch( const ::com::sun::star::uno::RuntimeException &e ) + catch( const css::uno::RuntimeException &e ) { - raisePyExceptionWithAny( com::sun::star::uno::makeAny( e ) ); + raisePyExceptionWithAny( css::uno::makeAny( e ) ); } return NULL; diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index 32b6440a7e96..687e7fc8c148 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -293,26 +293,26 @@ static PyObject* getComponentContext( Runtime runtime; ret = runtime.any2PyObject( makeAny( ctx ) ); } - catch (const com::sun::star::registry::InvalidRegistryException &e) + catch (const css::registry::InvalidRegistryException &e) { // can't use raisePyExceptionWithAny() here, because the function // does any conversions, which will not work with a // wrongly bootstrapped pyuno! raisePySystemException( "InvalidRegistryException", e.Message ); } - catch(const com::sun::star::lang::IllegalArgumentException & e) + catch(const css::lang::IllegalArgumentException & e) { raisePySystemException( "IllegalArgumentException", e.Message ); } - catch(const com::sun::star::script::CannotConvertException & e) + catch(const css::script::CannotConvertException & e) { raisePySystemException( "CannotConvertException", e.Message ); } - catch (const com::sun::star::uno::RuntimeException & e) + catch (const css::uno::RuntimeException & e) { raisePySystemException( "RuntimeException", e.Message ); } - catch (const com::sun::star::uno::Exception & e) + catch (const css::uno::Exception & e) { raisePySystemException( "uno::Exception", e.Message ); } @@ -334,10 +334,10 @@ static PyObject* initTestEnvironment( Reference<XComponentContext> xContext; a >>= xContext; if (!xContext.is()) { abort(); } - using com::sun::star::lang::XMultiServiceFactory; + using css::lang::XMultiServiceFactory; Reference<XMultiServiceFactory> const xMSF( xContext->getServiceManager(), - com::sun::star::uno::UNO_QUERY_THROW); + css::uno::UNO_QUERY_THROW); if (!xMSF.is()) { abort(); } char *const testlib = getenv("TEST_LIB"); if (!testlib) { abort(); } @@ -356,7 +356,7 @@ static PyObject* initTestEnvironment( if (!pFunc) { abort(); } reinterpret_cast<void (SAL_CALL *)(XMultiServiceFactory*)>(pFunc)(xMSF.get()); } - catch (const com::sun::star::uno::Exception &) + catch (const css::uno::Exception &) { abort(); } @@ -454,15 +454,15 @@ static PyObject *createUnoStructHelper( PyErr_SetString (PyExc_AttributeError, "pyuno._createUnoStructHelper: expects exactly two non-keyword arguments:\n\tStructure Name\n\tinitialiser tuple; may be the empty tuple"); } } - catch( const com::sun::star::uno::RuntimeException & e ) + catch( const css::uno::RuntimeException & e ) { raisePyExceptionWithAny( makeAny( e ) ); } - catch( const com::sun::star::script::CannotConvertException & e ) + catch( const css::script::CannotConvertException & e ) { raisePyExceptionWithAny( makeAny( e ) ); } - catch( const com::sun::star::uno::Exception & e ) + catch( const css::uno::Exception & e ) { raisePyExceptionWithAny( makeAny( e ) ); } @@ -486,7 +486,7 @@ static PyObject *getTypeByName( { Runtime runtime; ret = PyUNO_Type_new( - name, (com::sun::star::uno::TypeClass)typeDesc.get()->eTypeClass, runtime ); + name, (css::uno::TypeClass)typeDesc.get()->eTypeClass, runtime ); } else { @@ -536,11 +536,11 @@ static PyObject *getConstantByName( RuntimeException runExc( e.Message ); raisePyExceptionWithAny( makeAny( runExc ) ); } - catch(const com::sun::star::script::CannotConvertException & e) + catch(const css::script::CannotConvertException & e) { raisePyExceptionWithAny( makeAny( e ) ); } - catch(const com::sun::star::lang::IllegalArgumentException & e) + catch(const css::lang::IllegalArgumentException & e) { raisePyExceptionWithAny( makeAny( e ) ); } @@ -780,9 +780,9 @@ static PyObject *getCurrentContext( { Runtime runtime; ret = runtime.any2PyObject( - makeAny( com::sun::star::uno::getCurrentContext() ) ); + makeAny( css::uno::getCurrentContext() ) ); } - catch( const com::sun::star::uno::Exception & e ) + catch( const css::uno::Exception & e ) { raisePyExceptionWithAny( makeAny( e ) ); } @@ -801,11 +801,11 @@ static PyObject *setCurrentContext( Runtime runtime; Any a = runtime.pyObject2Any( PyTuple_GetItem( args, 0 ) ); - Reference< com::sun::star::uno::XCurrentContext > context; + Reference< css::uno::XCurrentContext > context; if( (a.hasValue() && (a >>= context)) || ! a.hasValue() ) { - ret = com::sun::star::uno::setCurrentContext( context ) ? Py_True : Py_False; + ret = css::uno::setCurrentContext( context ) ? Py_True : Py_False; } else { @@ -825,7 +825,7 @@ static PyObject *setCurrentContext( PyExc_RuntimeError, buf.makeStringAndClear().getStr() ); } } - catch( const com::sun::star::uno::Exception & e ) + catch( const css::uno::Exception & e ) { raisePyExceptionWithAny( makeAny( e ) ); } diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 1f431aeee5ac..580aad0df777 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -130,7 +130,7 @@ static PyTypeObject RuntimeImpl_Type = Runtime implementation -----------------------------------------------------------------------*/ static void getRuntimeImpl( PyRef & globalDict, PyRef &runtimeImpl ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( css::uno::RuntimeException ) { PyThreadState * state = PyThreadState_Get(); if( ! state ) @@ -250,7 +250,7 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile ) RuntimeImpl implementations *-------------------------------------------------------------------*/ PyRef stRuntimeImpl::create( const Reference< XComponentContext > &ctx ) - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { RuntimeImpl *me = PyObject_New (RuntimeImpl, &RuntimeImpl_Type); if( ! me ) @@ -362,8 +362,8 @@ Runtime & Runtime::operator = ( const Runtime & r ) } PyRef Runtime::any2PyObject (const Any &a ) const - throw ( com::sun::star::script::CannotConvertException, - com::sun::star::lang::IllegalArgumentException, + throw ( css::script::CannotConvertException, + css::lang::IllegalArgumentException, RuntimeException) { if( ! impl->cargo->valid ) @@ -443,7 +443,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const OString o = OUStringToOString( t.getTypeName(), RTL_TEXTENCODING_ASCII_US ); return PyRef( PyUNO_Type_new ( - o.getStr(), (com::sun::star::uno::TypeClass)t.getTypeClass(), *this), + o.getStr(), (css::uno::TypeClass)t.getTypeClass(), *this), SAL_NO_ACQUIRE); } case typelib_TypeClass_ANY: @@ -493,7 +493,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const throw RuntimeException( buf.makeStringAndClear() ); } - if( com::sun::star::uno::TypeClass_EXCEPTION == a.getValueTypeClass() ) + if( css::uno::TypeClass_EXCEPTION == a.getValueTypeClass() ) { // add the message in a standard python way ! PyRef args( PyTuple_New( 1 ), SAL_NO_ACQUIRE, NOT_NULL ); @@ -537,7 +537,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const PyTuple_SetItem( tuple.get(), i, element.getAcquired() ); } } - catch( com::sun::star::uno::Exception & ) + catch( css::uno::Exception & ) { for( ; i < s.getLength() ; i ++ ) { @@ -589,7 +589,7 @@ static Sequence< Type > invokeGetTypes( const Runtime & r , PyObject * o ) Any a = r.pyObject2Any(PyTuple_GetItem(types.get(),i)); a >>= ret[i]; } - ret[size] = cppu::UnoType<com::sun::star::lang::XUnoTunnel>::get(); + ret[size] = cppu::UnoType<css::lang::XUnoTunnel>::get(); } } return ret; @@ -645,7 +645,7 @@ bool Runtime::pyIterUnpack( PyObject *const pObj, Any &a ) const } Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) const - throw ( com::sun::star::uno::RuntimeException ) + throw ( css::uno::RuntimeException ) { if( ! impl->cargo->valid ) { @@ -835,7 +835,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con { a = getImpl()->cargo->xTypeConverter->convertTo( a, t ); } - catch( const com::sun::star::uno::Exception & e ) + catch( const css::uno::Exception & e ) { throw WrappedTargetRuntimeException( e.Message, e.Context, makeAny(e)); @@ -863,7 +863,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con if( adapterObject.is() ) { // object got already bridged ! - Reference< com::sun::star::lang::XUnoTunnel > tunnel( adapterObject, UNO_QUERY ); + Reference< css::lang::XUnoTunnel > tunnel( adapterObject, UNO_QUERY ); Adapter *pAdapter = reinterpret_cast<Adapter*>( tunnel->getSomething( @@ -885,7 +885,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con // keep a list of exported objects to ensure object identity ! impl->cargo->mappedObjects[ PyRef(o) ] = - com::sun::star::uno::WeakReference< XInvocation > ( pAdapter ); + css::uno::WeakReference< XInvocation > ( pAdapter ); } } catch (InvocationTargetException const& e) { OUString const msg(lcl_ExceptionMessage(o, &e.Message)); @@ -895,7 +895,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con } if( mappedObject.is() ) { - a = com::sun::star::uno::makeAny( mappedObject ); + a = css::uno::makeAny( mappedObject ); } else { @@ -1001,14 +1001,14 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue, fprintf( stderr, "Python exception: %s\n", OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); #endif - ret = com::sun::star::uno::makeAny( e ); + ret = css::uno::makeAny( e ); } return ret; } PyThreadAttach::PyThreadAttach( PyInterpreterState *interp) - throw ( com::sun::star::uno::RuntimeException ) + throw ( css::uno::RuntimeException ) { tstate = PyThreadState_New( interp ); if( !tstate ) @@ -1023,7 +1023,7 @@ PyThreadAttach::~PyThreadAttach() PyThreadState_Delete( tstate ); } -PyThreadDetach::PyThreadDetach() throw ( com::sun::star::uno::RuntimeException ) +PyThreadDetach::PyThreadDetach() throw ( css::uno::RuntimeException ) { tstate = PyThreadState_Get(); PyEval_ReleaseThread( tstate ); diff --git a/pyuno/source/module/pyuno_struct.cxx b/pyuno/source/module/pyuno_struct.cxx index b407426708d0..684ebed44ff0 100644 --- a/pyuno/source/module/pyuno_struct.cxx +++ b/pyuno/source/module/pyuno_struct.cxx @@ -83,7 +83,7 @@ PyObject *PyUNOStruct_repr( PyObject *self ) PyObject *ret = 0; if( me->members->wrappedObject.getValueType().getTypeClass() - == com::sun::star::uno::TypeClass_EXCEPTION ) + == css::uno::TypeClass_EXCEPTION ) { Reference< XMaterialHolder > rHolder(me->members->xInvocation,UNO_QUERY); if( rHolder.is() ) @@ -167,19 +167,19 @@ PyObject* PyUNOStruct_getattr( PyObject* self, char* name ) //or else... PyErr_SetString (PyExc_AttributeError, name); } - catch( const com::sun::star::reflection::InvocationTargetException & e ) + catch( const css::reflection::InvocationTargetException & e ) { raisePyExceptionWithAny( e.TargetException ); } - catch( const com::sun::star::beans::UnknownPropertyException & e ) + catch( const css::beans::UnknownPropertyException & e ) { raisePyExceptionWithAny( makeAny(e) ); } - catch( const com::sun::star::lang::IllegalArgumentException &e ) + catch( const css::lang::IllegalArgumentException &e ) { raisePyExceptionWithAny( makeAny(e) ); } - catch( const com::sun::star::script::CannotConvertException &e ) + catch( const css::script::CannotConvertException &e ) { raisePyExceptionWithAny( makeAny(e) ); } @@ -211,17 +211,17 @@ int PyUNOStruct_setattr (PyObject* self, char* name, PyObject* value) } } } - catch( const com::sun::star::reflection::InvocationTargetException & e ) + catch( const css::reflection::InvocationTargetException & e ) { raisePyExceptionWithAny( e.TargetException ); return 1; } - catch( const com::sun::star::beans::UnknownPropertyException & e ) + catch( const css::beans::UnknownPropertyException & e ) { raisePyExceptionWithAny( makeAny(e) ); return 1; } - catch( const com::sun::star::script::CannotConvertException &e ) + catch( const css::script::CannotConvertException &e ) { raisePyExceptionWithAny( makeAny(e) ); return 1; @@ -259,13 +259,13 @@ static PyObject* PyUNOStruct_cmp( PyObject *self, PyObject *that, int op ) PyUNO *me = reinterpret_cast< PyUNO * > ( self ); PyUNO *other = reinterpret_cast< PyUNO * > ( that ); - com::sun::star::uno::TypeClass tcMe = me->members->wrappedObject.getValueTypeClass(); - com::sun::star::uno::TypeClass tcOther = other->members->wrappedObject.getValueTypeClass(); + css::uno::TypeClass tcMe = me->members->wrappedObject.getValueTypeClass(); + css::uno::TypeClass tcOther = other->members->wrappedObject.getValueTypeClass(); if( tcMe == tcOther ) { - if( tcMe == com::sun::star::uno::TypeClass_STRUCT || - tcMe == com::sun::star::uno::TypeClass_EXCEPTION ) + if( tcMe == css::uno::TypeClass_STRUCT || + tcMe == css::uno::TypeClass_EXCEPTION ) { Reference< XMaterialHolder > xMe( me->members->xInvocation,UNO_QUERY ); Reference< XMaterialHolder > xOther( other->members->xInvocation,UNO_QUERY ); @@ -279,7 +279,7 @@ static PyObject* PyUNOStruct_cmp( PyObject *self, PyObject *that, int op ) } } } - catch( const com::sun::star::uno::RuntimeException & e) + catch( const css::uno::RuntimeException & e) { raisePyExceptionWithAny( makeAny( e ) ); } diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx index 71551a032035..dfaf0d3951b0 100644 --- a/pyuno/source/module/pyuno_type.cxx +++ b/pyuno/source/module/pyuno_type.cxx @@ -39,55 +39,55 @@ const char *typeClassToString( TypeClass t ) const char * ret = 0; switch (t) { - case com::sun::star::uno::TypeClass_VOID: + case css::uno::TypeClass_VOID: ret = "VOID"; break; - case com::sun::star::uno::TypeClass_CHAR: + case css::uno::TypeClass_CHAR: ret = "CHAR"; break; - case com::sun::star::uno::TypeClass_BOOLEAN: + case css::uno::TypeClass_BOOLEAN: ret = "BOOLEAN"; break; - case com::sun::star::uno::TypeClass_BYTE: + case css::uno::TypeClass_BYTE: ret = "BYTE"; break; - case com::sun::star::uno::TypeClass_SHORT: + case css::uno::TypeClass_SHORT: ret = "SHORT"; break; - case com::sun::star::uno::TypeClass_UNSIGNED_SHORT: + case css::uno::TypeClass_UNSIGNED_SHORT: ret = "UNSIGNED_SHORT"; break; - case com::sun::star::uno::TypeClass_LONG: + case css::uno::TypeClass_LONG: ret = "LONG"; break; - case com::sun::star::uno::TypeClass_UNSIGNED_LONG: + case css::uno::TypeClass_UNSIGNED_LONG: ret = "UNSIGNED_LONG"; break; - case com::sun::star::uno::TypeClass_HYPER: + case css::uno::TypeClass_HYPER: ret = "HYPER"; break; - case com::sun::star::uno::TypeClass_UNSIGNED_HYPER: + case css::uno::TypeClass_UNSIGNED_HYPER: ret = "UNSIGNED_HYPER"; break; - case com::sun::star::uno::TypeClass_FLOAT: + case css::uno::TypeClass_FLOAT: ret = "FLOAT"; break; - case com::sun::star::uno::TypeClass_DOUBLE: + case css::uno::TypeClass_DOUBLE: ret = "DOUBLE"; break; - case com::sun::star::uno::TypeClass_STRING: + case css::uno::TypeClass_STRING: ret = "STRING"; break; - case com::sun::star::uno::TypeClass_TYPE: + case css::uno::TypeClass_TYPE: ret = "TYPE"; break; - case com::sun::star::uno::TypeClass_ANY: + case css::uno::TypeClass_ANY: ret = "ANY";break; - case com::sun::star::uno::TypeClass_ENUM: + case css::uno::TypeClass_ENUM: ret = "ENUM";break; - case com::sun::star::uno::TypeClass_STRUCT: + case css::uno::TypeClass_STRUCT: ret = "STRUCT"; break; - case com::sun::star::uno::TypeClass_EXCEPTION: + case css::uno::TypeClass_EXCEPTION: ret = "EXCEPTION"; break; - case com::sun::star::uno::TypeClass_SEQUENCE: + case css::uno::TypeClass_SEQUENCE: ret = "SEQUENCE"; break; - case com::sun::star::uno::TypeClass_INTERFACE: + case css::uno::TypeClass_INTERFACE: ret = "INTERFACE"; break; - case com::sun::star::uno::TypeClass_TYPEDEF: + case css::uno::TypeClass_TYPEDEF: ret = "TYPEDEF"; break; - case com::sun::star::uno::TypeClass_SERVICE: + case css::uno::TypeClass_SERVICE: ret = "SERVICE"; break; - case com::sun::star::uno::TypeClass_MODULE: + case css::uno::TypeClass_MODULE: ret = "MODULE"; break; - case com::sun::star::uno::TypeClass_INTERFACE_METHOD: + case css::uno::TypeClass_INTERFACE_METHOD: ret = "INTERFACE_METHOD"; break; - case com::sun::star::uno::TypeClass_INTERFACE_ATTRIBUTE: + case css::uno::TypeClass_INTERFACE_ATTRIBUTE: ret = "INTERFACE_ATTRIBUTE"; break; default: ret = "UNKNOWN"; break; @@ -167,7 +167,7 @@ Any PyEnum2Enum( PyObject *obj ) throw ( RuntimeException ) OUStringBuffer buf; buf.append( "pyuno.checkEnum: " ).append(strTypeName).append( "is a " ); buf.appendAscii( - typeClassToString( (com::sun::star::uno::TypeClass) desc.get()->eTypeClass)); + typeClassToString( (css::uno::TypeClass) desc.get()->eTypeClass)); buf.append( ", expected ENUM" ); throw RuntimeException( buf.makeStringAndClear() ); } @@ -290,7 +290,7 @@ PyObject* PyUNO_char_new ( sal_Unicode val , const Runtime &r ) } PyObject *PyUNO_ByteSequence_new( - const com::sun::star::uno::Sequence< sal_Int8 > &byteSequence, const Runtime &r ) + const css::uno::Sequence< sal_Int8 > &byteSequence, const Runtime &r ) { PyRef str( PyStrBytes_FromStringAndSize( reinterpret_cast<char const *>(byteSequence.getConstArray()), byteSequence.getLength()), diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx index e6abadcf8ec8..77fe4557a5d0 100644 --- a/pyuno/source/module/pyuno_util.cxx +++ b/pyuno/source/module/pyuno_util.cxx @@ -172,7 +172,7 @@ void appendPointer(OUStringBuffer & buffer, void * pointer) { void logException( RuntimeCargo *cargo, const char *intro, void * ptr, const OUString &aFunctionName, - const void * data, const com::sun::star::uno::Type & type ) + const void * data, const css::uno::Type & type ) { if( isLog( cargo, LogLevel::CALL ) ) { |