diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-23 14:59:15 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-10-23 15:14:45 +0200 |
commit | 8d80b5be024bdbcfedd41b32cbb5c6b71724dd33 (patch) | |
tree | 4a4ec47464f3756d551ef97fb419ca073750ef24 /package/source/manifest | |
parent | 3569c58c0ed9ac69f809d6f47ac4fe2cb8732630 (diff) |
com::sun::star->css in package,pyuno
Change-Id: I7b7b0e7fea2d1a2b9f6f5501ad5e0b8c1b4a17b9
Diffstat (limited to 'package/source/manifest')
-rw-r--r-- | package/source/manifest/ManifestExport.hxx | 2 | ||||
-rw-r--r-- | package/source/manifest/ManifestImport.cxx | 4 | ||||
-rw-r--r-- | package/source/manifest/ManifestImport.hxx | 40 | ||||
-rw-r--r-- | package/source/manifest/ManifestReader.cxx | 2 | ||||
-rw-r--r-- | package/source/manifest/ManifestReader.hxx | 24 | ||||
-rw-r--r-- | package/source/manifest/ManifestWriter.hxx | 24 |
6 files changed, 48 insertions, 48 deletions
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 |