diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-09 11:05:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-09 11:14:44 +0000 |
| commit | a3db4959b07d2454fba7774f04c7658ae4fba783 (patch) | |
| tree | fb9853e4158d2b39fd80c302b54440cf56e654f8 /ucb | |
| parent | e31205f3ec1f941ab5a188bfde6329edf2acc55b (diff) | |
com::sun::star->css in tools/ and ucb/
Change-Id: I695ff721efd63b8ca0dd3c61ba5a4fef2c43cde6
Reviewed-on: https://gerrit.libreoffice.org/19854
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'ucb')
143 files changed, 3104 insertions, 3784 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 6e593b035bde..7a39ce2e3050 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -299,7 +299,7 @@ const Any& SAL_CALL CachedContentResultSet::CCRS_Cache const OUString& SAL_CALL CachedContentResultSet::CCRS_Cache ::getContentIdentifierString( sal_Int32 nRow ) - throw( com::sun::star::uno::RuntimeException ) + throw( css::uno::RuntimeException ) { try { @@ -322,7 +322,7 @@ const OUString& SAL_CALL CachedContentResultSet::CCRS_Cache const Reference< XContentIdentifier >& SAL_CALL CachedContentResultSet::CCRS_Cache ::getContentIdentifier( sal_Int32 nRow ) - throw( com::sun::star::uno::RuntimeException ) + throw( css::uno::RuntimeException ) { try { @@ -345,7 +345,7 @@ const Reference< XContentIdentifier >& SAL_CALL CachedContentResultSet::CCRS_Cac const Reference< XContent >& SAL_CALL CachedContentResultSet::CCRS_Cache ::getContent( sal_Int32 nRow ) - throw( com::sun::star::uno::RuntimeException ) + throw( css::uno::RuntimeException ) { try { @@ -374,13 +374,13 @@ const Reference< XContent >& SAL_CALL CachedContentResultSet::CCRS_Cache class CCRS_PropertySetInfo : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::beans::XPropertySetInfo + public css::lang::XTypeProvider, + public css::beans::XPropertySetInfo { friend class CachedContentResultSet; //my Properties - Sequence< com::sun::star::beans::Property >* + Sequence< css::beans::Property >* m_pProperties; //some helping variables ( names for my special properties ) @@ -399,7 +399,7 @@ private: bool SAL_CALL impl_queryProperty( const OUString& rName - , com::sun::star::beans::Property& rProp ) const; + , css::beans::Property& rProp ) const; sal_Int32 SAL_CALL impl_getPos( const OUString& rName ) const; @@ -423,17 +423,17 @@ public: // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override; // XPropertySetInfo - virtual Sequence< com::sun::star::beans::Property > SAL_CALL + virtual Sequence< css::beans::Property > SAL_CALL getProperties() throw( RuntimeException, std::exception ) override; - virtual com::sun::star::beans::Property SAL_CALL + virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( com::sun::star::beans::UnknownPropertyException, RuntimeException, std::exception ) override; + throw( css::beans::UnknownPropertyException, RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) @@ -852,7 +852,7 @@ if( bIsFinalCount && !bCurIsFinalCount ) \ void SAL_CALL CachedContentResultSet ::impl_fetchData( sal_Int32 nRow , sal_Int32 nFetchSize, sal_Int32 nFetchDirection ) - throw( com::sun::star::uno::RuntimeException ) + throw( css::uno::RuntimeException ) { FETCH_XXX( m_aCache, m_xFetchProvider, fetch ); } @@ -2072,7 +2072,7 @@ DateTime SAL_CALL CachedContentResultSet } //virtual -Reference< com::sun::star::io::XInputStream > +Reference< css::io::XInputStream > SAL_CALL CachedContentResultSet ::getBinaryStream( sal_Int32 columnIndex ) throw( SQLException, @@ -2083,7 +2083,7 @@ Reference< com::sun::star::io::XInputStream > } //virtual -Reference< com::sun::star::io::XInputStream > +Reference< css::io::XInputStream > SAL_CALL CachedContentResultSet ::getCharacterStream( sal_Int32 columnIndex ) throw( SQLException, @@ -2097,7 +2097,7 @@ Reference< com::sun::star::io::XInputStream > Any SAL_CALL CachedContentResultSet ::getObject( sal_Int32 columnIndex, const Reference< - com::sun::star::container::XNameAccess >& typeMap ) + css::container::XNameAccess >& typeMap ) throw( SQLException, RuntimeException, std::exception ) { @@ -2271,7 +2271,7 @@ Reference< XResultSet > SAL_CALL CachedContentResultSetFactory ::createCachedContentResultSet( const Reference< XResultSet > & xSource, const Reference< XContentIdentifierMapping > & xMapping ) - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { Reference< XResultSet > xRet; xRet = new CachedContentResultSet( m_xContext, xSource, xMapping ); diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx index 775a287ca5b9..ba5c80d5fdbb 100644 --- a/ucb/source/cacher/cachedcontentresultset.hxx +++ b/ucb/source/cacher/cachedcontentresultset.hxx @@ -41,8 +41,8 @@ namespace com { namespace sun { namespace star { namespace script { class CCRS_PropertySetInfo; class CachedContentResultSet : public ContentResultSetWrapper - , public com::sun::star::lang::XTypeProvider - , public com::sun::star::lang::XServiceInfo + , public css::lang::XTypeProvider + , public css::lang::XServiceInfo { // class CCRS_Cache @@ -50,17 +50,16 @@ class CachedContentResultSet class CCRS_Cache { private: - com::sun::star::ucb::FetchResult* m_pResult; - com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifierMapping > - m_xContentIdentifierMapping; - com::sun::star::uno::Sequence< sal_Bool >* m_pMappedReminder; + css::ucb::FetchResult* m_pResult; + css::uno::Reference< css::ucb::XContentIdentifierMapping > + m_xContentIdentifierMapping; + css::uno::Sequence< sal_Bool >* m_pMappedReminder; private: - com::sun::star::uno::Any& SAL_CALL + css::uno::Any& SAL_CALL getRowAny( sal_Int32 nRow ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + throw( css::sdbc::SQLException, + css::uno::RuntimeException ); void SAL_CALL clear(); @@ -68,15 +67,15 @@ class CachedContentResultSet void SAL_CALL remindMapped( sal_Int32 nRow ); bool SAL_CALL isRowMapped( sal_Int32 nRow ); void SAL_CALL clearMappedReminder(); - com::sun::star::uno::Sequence< sal_Bool >* SAL_CALL getMappedReminder(); + css::uno::Sequence< sal_Bool >* SAL_CALL getMappedReminder(); public: - CCRS_Cache( const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifierMapping > & xMapping ); + CCRS_Cache( const css::uno::Reference< + css::ucb::XContentIdentifierMapping > & xMapping ); ~CCRS_Cache(); void SAL_CALL loadData( - const com::sun::star::ucb::FetchResult& rResult ); + const css::ucb::FetchResult& rResult ); bool SAL_CALL hasRow( sal_Int32 nRow ); @@ -91,63 +90,61 @@ class CachedContentResultSet hasKnownLast(); - const com::sun::star::uno::Any& SAL_CALL + const css::uno::Any& SAL_CALL getAny( sal_Int32 nRow, sal_Int32 nColumnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + throw( css::sdbc::SQLException, + css::uno::RuntimeException ); const OUString& SAL_CALL getContentIdentifierString( sal_Int32 nRow ) - throw( com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& SAL_CALL + const css::uno::Reference< css::ucb::XContentIdentifier >& SAL_CALL getContentIdentifier( sal_Int32 nRow ) - throw( com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContent >& SAL_CALL + const css::uno::Reference< css::ucb::XContent >& SAL_CALL getContent( sal_Int32 nRow ) - throw( com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); }; //members - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; //different Interfaces from Origin: - com::sun::star::uno::Reference< com::sun::star::ucb::XFetchProvider > + css::uno::Reference< css::ucb::XFetchProvider > m_xFetchProvider; //XFetchProvider-interface from m_xOrigin - com::sun::star::uno::Reference< com::sun::star::ucb::XFetchProviderForContentAccess > + css::uno::Reference< css::ucb::XFetchProviderForContentAccess > m_xFetchProviderForContentAccess; //XFetchProviderForContentAccess-interface from m_xOrigin //my PropertySetInfo - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > + css::uno::Reference< css::beans::XPropertySetInfo > m_xMyPropertySetInfo;//holds m_pMyPropSetInfo alive CCRS_PropertySetInfo* m_pMyPropSetInfo; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifierMapping > + css::uno::Reference< css::ucb::XContentIdentifierMapping > m_xContentIdentifierMapping;// can be used for remote optimized ContentAccess //some Properties and helping variables sal_Int32 m_nRow; - bool m_bAfterLast; // TRUE, if m_nRow is after final count; can be TRUE without knowing the exact final count + bool m_bAfterLast; // TRUE, if m_nRow is after final count; can be TRUE without knowing the exact final count sal_Int32 m_nLastAppliedPos; - bool m_bAfterLastApplied; + bool m_bAfterLastApplied; sal_Int32 m_nKnownCount; // count we know from the Origin - bool m_bFinalCount; // TRUE if the Origin has reached final count and we got that count in m_nKnownCount + bool m_bFinalCount; // TRUE if the Origin has reached final count and we got that count in m_nKnownCount sal_Int32 m_nFetchSize; sal_Int32 m_nFetchDirection; - bool m_bLastReadWasFromCache; - bool m_bLastCachedReadWasNull; + bool m_bLastReadWasFromCache; + bool m_bLastCachedReadWasNull; //cache: CCRS_Cache m_aCache; @@ -165,13 +162,13 @@ private: bool SAL_CALL applyPositionToOrigin( sal_Int32 nRow ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + throw( css::sdbc::SQLException, + css::uno::RuntimeException ); void SAL_CALL impl_fetchData( sal_Int32 nRow, sal_Int32 nCount , sal_Int32 nFetchDirection ) - throw( com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); bool SAL_CALL impl_isKnownValidPosition( sal_Int32 nRow ); @@ -187,14 +184,9 @@ private: public: CachedContentResultSet( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & - rxContext, - const com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet > & xOrigin, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifierMapping > & - xContentIdentifierMapping ); + const css::uno::Reference< css::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::sdbc::XResultSet > & xOrigin, + const css::uno::Reference< css::ucb::XContentIdentifierMapping > & xContentIdentifierMapping ); virtual ~CachedContentResultSet(); @@ -230,239 +222,232 @@ public: 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 + 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( com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; // own inherited virtual void SAL_CALL - impl_disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException ) override; + impl_disposing( const css::lang::EventObject& Source ) + throw( css::uno::RuntimeException ) override; virtual void SAL_CALL - impl_propertyChange( const com::sun::star::beans::PropertyChangeEvent& evt ) - throw( com::sun::star::uno::RuntimeException ) override; + impl_propertyChange( const css::beans::PropertyChangeEvent& evt ) + throw( css::uno::RuntimeException ) override; virtual void SAL_CALL - impl_vetoableChange( const com::sun::star::beans::PropertyChangeEvent& aEvent ) - throw( com::sun::star::beans::PropertyVetoException, - com::sun::star::uno::RuntimeException ) override; + impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) + throw( css::beans::PropertyVetoException, + css::uno::RuntimeException ) override; // XContentAccess inherited virtual OUString SAL_CALL queryContentIdentifierString() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > SAL_CALL + virtual css::uno::Reference< + css::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL + virtual css::uno::Reference< + css::ucb::XContent > SAL_CALL queryContent() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XResultSet inherited virtual sal_Bool SAL_CALL next() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isBeforeFirst() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isAfterLast() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isFirst() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isLast() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL beforeFirst() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL afterLast() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL first() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL last() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getRow() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL previous() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL refreshRow() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowUpdated() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowInserted() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowDeleted() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::uno::XInterface > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< + css::uno::XInterface > SAL_CALL getStatement() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; // XRow inherited virtual sal_Bool SAL_CALL wasNull() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::util::Date SAL_CALL + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::util::Time SAL_CALL + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::util::DateTime SAL_CALL + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const com::sun::star::uno::Reference< - com::sun::star::container::XNameAccess >& typeMap ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XRef > SAL_CALL + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XBlob > SAL_CALL + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XClob > SAL_CALL + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XArray > SAL_CALL + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; // Type Converter support @@ -470,11 +455,10 @@ public: private: bool m_bTriedToGetTypeConverter; - com::sun::star::uno::Reference< - com::sun::star::script::XTypeConverter > m_xTypeConverter; + css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter; - const com::sun::star::uno::Reference< - com::sun::star::script::XTypeConverter >& getTypeConverter(); + const css::uno::Reference< + css::script::XTypeConverter >& getTypeConverter(); template<typename T> T rowOriginGet( T (SAL_CALL css::sdbc::XRow::* f)(sal_Int32), sal_Int32 columnIndex); @@ -484,19 +468,16 @@ private: class CachedContentResultSetFactory : public cppu::OWeakObject - , public com::sun::star::lang::XTypeProvider - , public com::sun::star::lang::XServiceInfo - , public com::sun::star::ucb::XCachedContentResultSetFactory + , public css::lang::XTypeProvider + , public css::lang::XServiceInfo + , public css::ucb::XCachedContentResultSetFactory { protected: - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; public: - CachedContentResultSetFactory( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext); + CachedContentResultSetFactory( const css::uno::Reference< css::uno::XComponentContext > & rxContext); virtual ~CachedContentResultSetFactory(); @@ -532,14 +513,11 @@ public: // XCachedContentResultSetFactory - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet > SAL_CALL + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL createCachedContentResultSet( - const com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet > & xSource, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifierMapping > & xMapping ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::sdbc::XResultSet > & xSource, + const css::uno::Reference< css::ucb::XContentIdentifierMapping > & xMapping ) + throw( css::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 0a3b4919a656..efa4d14447e7 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -412,7 +412,7 @@ void SAL_CALL CachedContentResultSetStub { setPropertyValue( m_aPropertyNameForFetchSize, aValue ); } - catch( com::sun::star::uno::Exception& ) {} + catch( css::uno::Exception& ) {} } if( bSetDirection ) { @@ -425,7 +425,7 @@ void SAL_CALL CachedContentResultSetStub { setPropertyValue( m_aPropertyNameForFetchDirection, aValue ); } - catch( com::sun::star::uno::Exception& ) {} + catch( css::uno::Exception& ) {} } } @@ -463,7 +463,7 @@ void SAL_CALL CachedContentResultSetStub FetchResult SAL_CALL CachedContentResultSetStub ::fetchContentIdentifierStrings( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { impl_init_xContentAccessOrigin(); FETCH_XXX( impl_getCurrentContentIdentifierString, m_xContentAccessOrigin ); @@ -473,7 +473,7 @@ FetchResult SAL_CALL CachedContentResultSetStub FetchResult SAL_CALL CachedContentResultSetStub ::fetchContentIdentifiers( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { impl_init_xContentAccessOrigin(); FETCH_XXX( impl_getCurrentContentIdentifier, m_xContentAccessOrigin ); @@ -483,7 +483,7 @@ FetchResult SAL_CALL CachedContentResultSetStub FetchResult SAL_CALL CachedContentResultSetStub ::fetchContents( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { impl_init_xContentAccessOrigin(); FETCH_XXX( impl_getCurrentContent, m_xContentAccessOrigin ); diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx index 66c3bc1b969f..72fa1702b318 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.hxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx @@ -34,10 +34,10 @@ class CachedContentResultSetStub : public ContentResultSetWrapper - , public com::sun::star::lang::XTypeProvider - , public com::sun::star::lang::XServiceInfo - , public com::sun::star::ucb::XFetchProvider - , public com::sun::star::ucb::XFetchProviderForContentAccess + , public css::lang::XTypeProvider + , public css::lang::XServiceInfo + , public css::ucb::XFetchProvider + , public css::ucb::XFetchProviderForContentAccess { private: sal_Int32 m_nColumnCount; @@ -54,43 +54,38 @@ private: void SAL_CALL impl_getCurrentRowContent( - com::sun::star::uno::Any& rRowContent, - com::sun::star::uno::Reference< - com::sun::star::sdbc::XRow > xRow ) - throw ( com::sun::star::sdbc::SQLException - , com::sun::star::uno::RuntimeException ); + css::uno::Any& rRowContent, + css::uno::Reference< css::sdbc::XRow > xRow ) + throw ( css::sdbc::SQLException + , css::uno::RuntimeException ); sal_Int32 SAL_CALL impl_getColumnCount(); static void SAL_CALL impl_getCurrentContentIdentifierString( - com::sun::star::uno::Any& rAny - , com::sun::star::uno::Reference< - com::sun::star::ucb::XContentAccess > xContentAccess ) - throw ( com::sun::star::uno::RuntimeException ); + css::uno::Any& rAny + , css::uno::Reference< css::ucb::XContentAccess > xContentAccess ) + throw ( css::uno::RuntimeException ); static void SAL_CALL impl_getCurrentContentIdentifier( - com::sun::star::uno::Any& rAny - , com::sun::star::uno::Reference< - com::sun::star::ucb::XContentAccess > xContentAccess ) - throw ( com::sun::star::uno::RuntimeException ); + css::uno::Any& rAny + , css::uno::Reference< css::ucb::XContentAccess > xContentAccess ) + throw ( css::uno::RuntimeException ); static void SAL_CALL impl_getCurrentContent( - com::sun::star::uno::Any& rAny - , com::sun::star::uno::Reference< - com::sun::star::ucb::XContentAccess > xContentAccess ) - throw ( com::sun::star::uno::RuntimeException ); + css::uno::Any& rAny + , css::uno::Reference< css::ucb::XContentAccess > xContentAccess ) + throw ( css::uno::RuntimeException ); void SAL_CALL impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, bool bFetchDirection ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); public: - CachedContentResultSetStub( com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet > xOrigin ); + CachedContentResultSetStub( css::uno::Reference< css::sdbc::XResultSet > xOrigin ); virtual ~CachedContentResultSetStub(); @@ -107,13 +102,13 @@ public: // own inherited virtual void SAL_CALL - impl_propertyChange( const com::sun::star::beans::PropertyChangeEvent& evt ) - throw( com::sun::star::uno::RuntimeException ) override; + impl_propertyChange( const css::beans::PropertyChangeEvent& evt ) + throw( css::uno::RuntimeException ) override; virtual void SAL_CALL - impl_vetoableChange( const com::sun::star::beans::PropertyChangeEvent& aEvent ) - throw( com::sun::star::beans::PropertyVetoException, - com::sun::star::uno::RuntimeException ) override; + impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) + throw( css::beans::PropertyVetoException, + css::uno::RuntimeException ) override; // XTypeProvider @@ -136,47 +131,45 @@ public: // XFetchProvider - virtual com::sun::star::ucb::FetchResult SAL_CALL + virtual css::ucb::FetchResult SAL_CALL fetch( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XFetchProviderForContentAccess - virtual com::sun::star::ucb::FetchResult SAL_CALL + virtual css::ucb::FetchResult SAL_CALL fetchContentIdentifierStrings( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::ucb::FetchResult SAL_CALL + virtual css::ucb::FetchResult SAL_CALL fetchContentIdentifiers( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::ucb::FetchResult SAL_CALL + virtual css::ucb::FetchResult SAL_CALL fetchContents( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; }; class CachedContentResultSetStubFactory : public cppu::OWeakObject - , public com::sun::star::lang::XTypeProvider - , public com::sun::star::lang::XServiceInfo - , public com::sun::star::ucb::XCachedContentResultSetStubFactory + , public css::lang::XTypeProvider + , public css::lang::XServiceInfo + , public css::ucb::XCachedContentResultSetStubFactory { protected: - com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > m_xSMgr; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMgr; public: CachedContentResultSetStubFactory( - const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > & rSMgr); + const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); virtual ~CachedContentResultSetStubFactory(); @@ -192,7 +185,7 @@ public: // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override; @@ -213,12 +206,10 @@ public: // XCachedContentResultSetStubFactory - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet > SAL_CALL + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL createCachedContentResultSetStub( - const com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet > & xSource ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::sdbc::XResultSet > & xSource ) + throw( css::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx index ee04a838fe5b..0a65f3bd367a 100644 --- a/ucb/source/cacher/cacheddynamicresultset.hxx +++ b/ucb/source/cacher/cacheddynamicresultset.hxx @@ -31,27 +31,22 @@ class CachedDynamicResultSet : public DynamicResultSetWrapper - , public com::sun::star::lang::XTypeProvider - , public com::sun::star::lang::XServiceInfo + , public css::lang::XTypeProvider + , public css::lang::XServiceInfo { - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifierMapping > + css::uno::Reference< css::ucb::XContentIdentifierMapping > m_xContentIdentifierMapping; protected: virtual void SAL_CALL - impl_InitResultSetOne( const com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet >& xResultSet ) override; + impl_InitResultSetOne( const css::uno::Reference< css::sdbc::XResultSet >& xResultSet ) override; virtual void SAL_CALL - impl_InitResultSetTwo( const com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet >& xResultSet ) override; + impl_InitResultSetTwo( const css::uno::Reference< css::sdbc::XResultSet >& xResultSet ) override; public: - CachedDynamicResultSet( com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSet > xOrigin - , const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifierMapping > & xContentMapping - , const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & xContext ); + CachedDynamicResultSet( css::uno::Reference< css::ucb::XDynamicResultSet > xOrigin + , const css::uno::Reference< css::ucb::XContentIdentifierMapping > & xContentMapping + , const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~CachedDynamicResultSet(); @@ -86,27 +81,25 @@ public: // own methods ( inherited ) virtual void SAL_CALL - impl_disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException ) override; + impl_disposing( const css::lang::EventObject& Source ) + throw( css::uno::RuntimeException ) override; }; class CachedDynamicResultSetFactory : public cppu::OWeakObject - , public com::sun::star::lang::XTypeProvider - , public com::sun::star::lang::XServiceInfo - , public com::sun::star::ucb::XCachedDynamicResultSetFactory + , public css::lang::XTypeProvider + , public css::lang::XServiceInfo + , public css::ucb::XCachedDynamicResultSetFactory { protected: - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; public: CachedDynamicResultSetFactory( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & xContext); + const css::uno::Reference< css::uno::XComponentContext > & xContext); virtual ~CachedDynamicResultSetFactory(); @@ -122,7 +115,7 @@ public: // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override; @@ -143,17 +136,12 @@ public: // XCachedDynamicResultSetFactory - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSet > SAL_CALL + virtual css::uno::Reference< css::ucb::XDynamicResultSet > SAL_CALL createCachedDynamicResultSet( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSet > & - SourceStub - , const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifierMapping > & - ContentIdentifierMapping + const css::uno::Reference< css::ucb::XDynamicResultSet > & SourceStub + , const css::uno::Reference< css::ucb::XContentIdentifierMapping > & ContentIdentifierMapping ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx index 60dfd9fbb595..bd619cb43f28 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx @@ -30,22 +30,18 @@ class CachedDynamicResultSetStub : public DynamicResultSetWrapper - , public com::sun::star::lang::XTypeProvider - , public com::sun::star::lang::XServiceInfo + , public css::lang::XTypeProvider + , public css::lang::XServiceInfo { protected: virtual void SAL_CALL - impl_InitResultSetOne( const com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet >& xResultSet ) override; + impl_InitResultSetOne( const css::uno::Reference< css::sdbc::XResultSet >& xResultSet ) override; virtual void SAL_CALL - impl_InitResultSetTwo( const com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet >& xResultSet ) override; + impl_InitResultSetTwo( const css::uno::Reference< css::sdbc::XResultSet >& xResultSet ) override; public: - CachedDynamicResultSetStub( com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSet > xOrigin - , const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext ); + CachedDynamicResultSetStub( css::uno::Reference< css::ucb::XDynamicResultSet > xOrigin + , const css::uno::Reference< css::uno::XComponentContext > & rxContext ); virtual ~CachedDynamicResultSetStub(); @@ -82,19 +78,17 @@ public: class CachedDynamicResultSetStubFactory : public cppu::OWeakObject - , public com::sun::star::lang::XTypeProvider - , public com::sun::star::lang::XServiceInfo - , public com::sun::star::ucb::XCachedDynamicResultSetStubFactory + , public css::lang::XTypeProvider + , public css::lang::XServiceInfo + , public css::ucb::XCachedDynamicResultSetStubFactory { protected: - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; public: CachedDynamicResultSetStubFactory( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext); + const css::uno::Reference< css::uno::XComponentContext > & rxContext); virtual ~CachedDynamicResultSetStubFactory(); @@ -109,7 +103,7 @@ public: // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo @@ -129,28 +123,22 @@ public: // XCachedDynamicResultSetStubFactory - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSet > SAL_CALL + virtual css::uno::Reference< css::ucb::XDynamicResultSet > SAL_CALL createCachedDynamicResultSetStub( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSet > & Source ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XDynamicResultSet > & Source ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL connectToCache( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSet > & Source - , const com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSet > & TargetCache - , const com::sun::star::uno::Sequence< - com::sun::star::ucb::NumberedSortingInfo > & SortingInfo - , const com::sun::star::uno::Reference< - com::sun::star::ucb::XAnyCompareFactory > & CompareFactory + const css::uno::Reference< css::ucb::XDynamicResultSet > & Source + , const css::uno::Reference< css::ucb::XDynamicResultSet > & TargetCache + , const css::uno::Sequence< css::ucb::NumberedSortingInfo > & SortingInfo + , const css::uno::Reference< css::ucb::XAnyCompareFactory > & CompareFactory ) throw ( - com::sun::star::ucb::ListenerAlreadySetException - , com::sun::star::ucb::AlreadyInitializedException - , com::sun::star::uno::RuntimeException, std::exception + css::ucb::ListenerAlreadySetException + , css::ucb::AlreadyInitializedException + , css::uno::RuntimeException, std::exception ) override; }; diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index f592ea50f324..e606b36bff65 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -1249,7 +1249,7 @@ DateTime SAL_CALL ContentResultSetWrapper::getTimestamp( sal_Int32 columnIndex ) } //virtual -Reference< com::sun::star::io::XInputStream > SAL_CALL ContentResultSetWrapper::getBinaryStream( sal_Int32 columnIndex ) +Reference< css::io::XInputStream > SAL_CALL ContentResultSetWrapper::getBinaryStream( sal_Int32 columnIndex ) throw( SQLException, RuntimeException, std::exception ) { @@ -1257,7 +1257,7 @@ Reference< com::sun::star::io::XInputStream > SAL_CALL ContentResultSetWrapper:: } //virtual -Reference< com::sun::star::io::XInputStream > SAL_CALL ContentResultSetWrapper::getCharacterStream( sal_Int32 columnIndex ) +Reference< css::io::XInputStream > SAL_CALL ContentResultSetWrapper::getCharacterStream( sal_Int32 columnIndex ) throw( SQLException, RuntimeException, std::exception ) { @@ -1265,7 +1265,7 @@ Reference< com::sun::star::io::XInputStream > SAL_CALL ContentResultSetWrapper:: } //virtual -Any SAL_CALL ContentResultSetWrapper::getObject( sal_Int32 columnIndex, const Reference< com::sun::star::container::XNameAccess >& typeMap ) +Any SAL_CALL ContentResultSetWrapper::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) throw( SQLException, RuntimeException, std::exception ) { @@ -1345,7 +1345,7 @@ void SAL_CALL ContentResultSetWrapperListener::release() } css::uno::Any SAL_CALL ContentResultSetWrapperListener::queryInterface( const css::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { //list all interfaces inclusive baseclasses of interfaces css::uno::Any aRet = cppu::queryInterface( rType, diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx index b62f62dc140c..2767b870d9ca 100644 --- a/ucb/source/cacher/contentresultsetwrapper.hxx +++ b/ucb/source/cacher/contentresultsetwrapper.hxx @@ -39,13 +39,13 @@ class ContentResultSetWrapperListener; class ContentResultSetWrapper : public cppu::OWeakObject - , public com::sun::star::lang::XComponent - , public com::sun::star::sdbc::XCloseable - , public com::sun::star::sdbc::XResultSetMetaDataSupplier - , public com::sun::star::beans::XPropertySet - , public com::sun::star::ucb::XContentAccess - , public com::sun::star::sdbc::XResultSet - , public com::sun::star::sdbc::XRow + , public css::lang::XComponent + , public css::sdbc::XCloseable + , public css::sdbc::XResultSetMetaDataSupplier + , public css::beans::XPropertySet + , public css::ucb::XContentAccess + , public css::sdbc::XResultSet + , public css::sdbc::XRow { protected: typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString> @@ -101,31 +101,31 @@ protected: osl::Mutex m_aMutex; //different Interfaces from Origin: - com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > + css::uno::Reference< css::sdbc::XResultSet > m_xResultSetOrigin; - com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + css::uno::Reference< css::sdbc::XRow > m_xRowOrigin; //XRow-interface from m_xOrigin //!! call impl_init_xRowOrigin() bevor you access this member - com::sun::star::uno::Reference< com::sun::star::ucb::XContentAccess > + css::uno::Reference< css::ucb::XContentAccess > m_xContentAccessOrigin; //XContentAccess-interface from m_xOrigin //!! call impl_init_xContentAccessOrigin() bevor you access this member - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xPropertySetOrigin; //XPropertySet-interface from m_xOrigin //!! call impl_init_xPropertySetOrigin() bevor you access this member - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > + css::uno::Reference< css::beans::XPropertySetInfo > m_xPropertySetInfo; //call impl_initPropertySetInfo() bevor you access this member sal_Int32 m_nForwardOnly; private: - com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > + css::uno::Reference< css::beans::XPropertyChangeListener > m_xMyListenerImpl; ContentResultSetWrapperListener* m_pMyListenerImpl; - com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > + css::uno::Reference< css::sdbc::XResultSetMetaData > m_xMetaDataFromOrigin; //XResultSetMetaData from m_xOrigin //management of listeners @@ -151,8 +151,7 @@ private: protected: - ContentResultSetWrapper( com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet > xOrigin ); + ContentResultSetWrapper( css::uno::Reference< css::sdbc::XResultSet > xOrigin ); virtual ~ContentResultSetWrapper(); @@ -171,18 +170,18 @@ protected: void SAL_CALL impl_EnsureNotDisposed() - throw( com::sun::star::lang::DisposedException, - com::sun::star::uno::RuntimeException ); + throw( css::lang::DisposedException, + css::uno::RuntimeException ); void SAL_CALL impl_notifyPropertyChangeListeners( - const com::sun::star::beans::PropertyChangeEvent& rEvt ); + const css::beans::PropertyChangeEvent& rEvt ); void SAL_CALL impl_notifyVetoableChangeListeners( - const com::sun::star::beans::PropertyChangeEvent& rEvt ) - throw( com::sun::star::beans::PropertyVetoException, - com::sun::star::uno::RuntimeException ); + const css::beans::PropertyChangeEvent& rEvt ) + throw( css::beans::PropertyVetoException, + css::uno::RuntimeException ); bool SAL_CALL impl_isForwardOnly(); @@ -191,326 +190,309 @@ public: // 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; // XComponent virtual void SAL_CALL - dispose() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + dispose() throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - addEventListener( const com::sun::star::uno::Reference< - com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - removeEventListener( const com::sun::star::uno::Reference< - com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; //XCloseable virtual void SAL_CALL close() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; //XResultSetMetaDataSupplier - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSetMetaData > SAL_CALL + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; // XPropertySet - virtual com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + 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 com::sun::star::uno::Any SAL_CALL + 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( com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + 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; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; // own methods virtual void SAL_CALL - impl_disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException ); + impl_disposing( const css::lang::EventObject& Source ) + throw( css::uno::RuntimeException ); virtual void SAL_CALL - impl_propertyChange( const com::sun::star::beans::PropertyChangeEvent& evt ) - throw( com::sun::star::uno::RuntimeException ); + impl_propertyChange( const css::beans::PropertyChangeEvent& evt ) + throw( css::uno::RuntimeException ); virtual void SAL_CALL - impl_vetoableChange( const com::sun::star::beans::PropertyChangeEvent& aEvent ) - throw( com::sun::star::beans::PropertyVetoException, - com::sun::star::uno::RuntimeException ); + impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) + throw( css::beans::PropertyVetoException, + css::uno::RuntimeException ); // XContentAccess virtual OUString SAL_CALL queryContentIdentifierString() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > SAL_CALL + virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XResultSet virtual sal_Bool SAL_CALL next() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isBeforeFirst() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isAfterLast() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isFirst() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isLast() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL beforeFirst() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL afterLast() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL first() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL last() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getRow() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL previous() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL refreshRow() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowUpdated() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowInserted() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowDeleted() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::uno::XInterface > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< + css::uno::XInterface > SAL_CALL getStatement() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; // XRow virtual sal_Bool SAL_CALL wasNull() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::util::Date SAL_CALL + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::util::Time SAL_CALL + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::util::DateTime SAL_CALL + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const com::sun::star::uno::Reference< - com::sun::star::container::XNameAccess >& typeMap ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XRef > SAL_CALL + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XBlob > SAL_CALL + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XClob > SAL_CALL + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XArray > SAL_CALL + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; }; class ContentResultSetWrapperListener : public cppu::OWeakObject - , public com::sun::star::beans::XPropertyChangeListener - , public com::sun::star::beans::XVetoableChangeListener + , public css::beans::XPropertyChangeListener + , public css::beans::XVetoableChangeListener { protected: ContentResultSetWrapper* m_pOwner; @@ -532,23 +514,23 @@ public: //XEventListener virtual void SAL_CALL - disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + disposing( const css::lang::EventObject& Source ) + throw( css::uno::RuntimeException, std::exception ) override; //XPropertyChangeListener virtual void SAL_CALL - propertyChange( const com::sun::star::beans::PropertyChangeEvent& evt ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + propertyChange( const css::beans::PropertyChangeEvent& evt ) + throw( css::uno::RuntimeException, std::exception ) override; //XVetoableChangeListener virtual void SAL_CALL - vetoableChange( const com::sun::star::beans::PropertyChangeEvent& aEvent ) - throw( com::sun::star::beans::PropertyVetoException, - com::sun::star::uno::RuntimeException, std::exception ) override; + vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) + throw( css::beans::PropertyVetoException, + css::uno::RuntimeException, std::exception ) override; // own methods: diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx index 9f0f505c8647..e04f75875a67 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.hxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx @@ -38,46 +38,43 @@ class DynamicResultSetWrapperListener; class DynamicResultSetWrapper : public cppu::OWeakObject - , public com::sun::star::ucb::XDynamicResultSet - , public com::sun::star::ucb::XSourceInitialization + , public css::ucb::XDynamicResultSet + , public css::ucb::XSourceInitialization { private: //management of listeners - bool m_bDisposed; ///Dispose call ready. - bool m_bInDispose;///In dispose call + bool m_bDisposed; ///Dispose call ready. + bool m_bInDispose;///In dispose call osl::Mutex m_aContainerMutex; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; protected: - com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSetListener > + css::uno::Reference< css::ucb::XDynamicResultSetListener > m_xMyListenerImpl; DynamicResultSetWrapperListener* m_pMyListenerImpl; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; osl::Mutex m_aMutex; - bool m_bStatic; - bool m_bGotWelcome; + bool m_bStatic; + bool m_bGotWelcome; //different Interfaces from Origin: - com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > + css::uno::Reference< css::ucb::XDynamicResultSet > m_xSource; - com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > + css::uno::Reference< css::sdbc::XResultSet > m_xSourceResultOne; - com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > + css::uno::Reference< css::sdbc::XResultSet > m_xSourceResultTwo; - //com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > - // m_xSourceResultCurrent; - //sal_Bool m_bUseOne; - com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > + css::uno::Reference< css::sdbc::XResultSet > m_xMyResultOne; - com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > + css::uno::Reference< css::sdbc::XResultSet > m_xMyResultTwo; - com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSetListener > + css::uno::Reference< css::ucb::XDynamicResultSetListener > m_xListener; osl::Condition m_aSourceSet; @@ -88,96 +85,89 @@ protected: void SAL_CALL impl_deinit(); void SAL_CALL impl_EnsureNotDisposed() - throw( com::sun::star::lang::DisposedException, - com::sun::star::uno::RuntimeException ); + throw( css::lang::DisposedException, + css::uno::RuntimeException ); virtual void SAL_CALL - impl_InitResultSetOne( const com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet >& xResultSet ); + impl_InitResultSetOne( const css::uno::Reference< + css::sdbc::XResultSet >& xResultSet ); virtual void SAL_CALL - impl_InitResultSetTwo( const com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet >& xResultSet ); + impl_InitResultSetTwo( const css::uno::Reference< + css::sdbc::XResultSet >& xResultSet ); public: DynamicResultSetWrapper( - com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSet > xOrigin - , const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext ); + css::uno::Reference< css::ucb::XDynamicResultSet > xOrigin + , const css::uno::Reference< css::uno::XComponentContext > & rxContext ); virtual ~DynamicResultSetWrapper(); // 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; // XDynamicResultSet - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > SAL_CALL + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getStaticResultSet() - throw( com::sun::star::ucb::ListenerAlreadySetException - , com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::ucb::ListenerAlreadySetException + , css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - setListener( const com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSetListener > & Listener ) - throw( com::sun::star::ucb::ListenerAlreadySetException - , com::sun::star::uno::RuntimeException, std::exception ) override; + setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener > & Listener ) + throw( css::ucb::ListenerAlreadySetException + , css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - connectToCache( const com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSet > & xCache ) - throw( com::sun::star::ucb::ListenerAlreadySetException - , com::sun::star::ucb::AlreadyInitializedException - , com::sun::star::ucb::ServiceNotFoundException - , com::sun::star::uno::RuntimeException, std::exception ) override; + connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) + throw( css::ucb::ListenerAlreadySetException + , css::ucb::AlreadyInitializedException + , css::ucb::ServiceNotFoundException + , css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL - getCapabilities() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + getCapabilities() throw( css::uno::RuntimeException, std::exception ) override; // XComponent ( base of XDynamicResultSet ) virtual void SAL_CALL - dispose() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + dispose() throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - addEventListener( const com::sun::star::uno::Reference< - com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - removeEventListener( const com::sun::star::uno::Reference< - com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XSourceInitialization virtual void SAL_CALL - setSource( const com::sun::star::uno::Reference< - com::sun::star::uno::XInterface > & Source ) - throw( com::sun::star::ucb::AlreadyInitializedException - , com::sun::star::uno::RuntimeException, std::exception ) override; + setSource( const css::uno::Reference< css::uno::XInterface > & Source ) + throw( css::ucb::AlreadyInitializedException + , css::uno::RuntimeException, std::exception ) override; // own methods: virtual void SAL_CALL - impl_disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException ); + impl_disposing( const css::lang::EventObject& Source ) + throw( css::uno::RuntimeException ); void SAL_CALL - impl_notify( const ::com::sun::star::ucb::ListEvent& Changes ) - throw( com::sun::star::uno::RuntimeException ); + impl_notify( const css::ucb::ListEvent& Changes ) + throw( css::uno::RuntimeException ); }; class DynamicResultSetWrapperListener : public cppu::OWeakObject - , public com::sun::star::ucb::XDynamicResultSetListener + , public css::ucb::XDynamicResultSetListener { protected: DynamicResultSetWrapper* m_pOwner; @@ -200,13 +190,13 @@ public: // XEventListener ( base of XDynamicResultSetListener ) virtual void SAL_CALL - disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + disposing( const css::lang::EventObject& Source ) + throw( css::uno::RuntimeException, std::exception ) override; // XDynamicResultSetListener virtual void SAL_CALL - notify( const ::com::sun::star::ucb::ListEvent& Changes ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + notify( const css::ucb::ListEvent& Changes ) + throw( css::uno::RuntimeException, std::exception ) override; // own methods: diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx index 1b6c9bb406ff..590f57bb5c3f 100644 --- a/ucb/source/core/FileAccess.cxx +++ b/ucb/source/core/FileAccess.cxx @@ -97,25 +97,25 @@ public: explicit OFileAccess( const Reference< XComponentContext > & xContext ) : m_xContext( xContext), mpEnvironment( NULL ) {} // Methods - virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL kill( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFolder( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL createFolder( const OUString& NewFolderURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSize( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getContentType( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::util::DateTime SAL_CALL getDateTimeModified( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL exists( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL openFileRead( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL openFileWrite( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openFileReadWrite( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL writeFile( const OUString& FileURL, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& data ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL kill( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isFolder( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL createFolder( const OUString& NewFolderURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSize( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getContentType( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::util::DateTime SAL_CALL getDateTimeModified( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL exists( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL openFileRead( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL openFileWrite( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XStream > SAL_CALL openFileReadWrite( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL writeFile( const OUString& FileURL, const css::uno::Reference< css::io::XInputStream >& data ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override @@ -281,9 +281,9 @@ void OFileAccess::transferImpl( const OUString& rSource, ? ucbhelper::InsertOperation_MOVE : ucbhelper::InsertOperation_COPY, aName, - ::com::sun::star::ucb::NameClash::OVERWRITE ); + css::ucb::NameClash::OVERWRITE ); } - catch ( ::com::sun::star::ucb::CommandFailedException const & ) + catch ( css::ucb::CommandFailedException const & ) { // Interaction Handler already handled the error that has occurred... } @@ -311,7 +311,7 @@ void OFileAccess::kill( const OUString& FileURL ) { aCnt.executeCommand( "delete", makeAny( true ) ); } - catch ( ::com::sun::star::ucb::CommandFailedException const & ) + catch ( css::ucb::CommandFailedException const & ) { // Interaction Handler already handled the error that has occurred... } @@ -411,7 +411,7 @@ void OFileAccess::createFolder( const OUString& NewFolderURL ) // Success. We're done. return; } - catch ( ::com::sun::star::ucb::CommandFailedException const & ) + catch ( css::ucb::CommandFailedException const & ) { // Interaction Handler already handled the error that has occurred... continue; @@ -444,11 +444,11 @@ OUString OFileAccess::getContentType( const OUString& FileURL ) return aTypeStr; } -::com::sun::star::util::DateTime OFileAccess::getDateTimeModified( const OUString& FileURL ) +css::util::DateTime OFileAccess::getDateTimeModified( const OUString& FileURL ) throw(CommandAbortedException, Exception, RuntimeException, std::exception) { INetURLObject aFileObj( FileURL, INetProtocol::File ); - ::com::sun::star::util::DateTime aDateTime; + css::util::DateTime aDateTime; Reference< XCommandEnvironment > aCmdEnv; ucbhelper::Content aYoung( aFileObj.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv, comphelper::getProcessComponentContext() ); @@ -476,7 +476,7 @@ Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL, { xResultSet = aCnt.createCursor( aProps, eInclude ); } - catch ( ::com::sun::star::ucb::CommandFailedException const & ) + catch ( css::ucb::CommandFailedException const & ) { // Interaction Handler already handled the error that has occurred... } @@ -484,7 +484,7 @@ Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL, if ( xResultSet.is() ) { pFiles = new StringList_Impl(); - Reference< com::sun::star::ucb::XContentAccess > xContentAccess( xResultSet, UNO_QUERY ); + Reference< css::ucb::XContentAccess > xContentAccess( xResultSet, UNO_QUERY ); while ( xResultSet->next() ) { @@ -548,7 +548,7 @@ Reference< XInputStream > OFileAccess::openFileRead( const OUString& FileURL ) if( bRet ) xRet = xSink->getInputStream(); } - catch ( ::com::sun::star::ucb::CommandFailedException const & ) + catch ( css::ucb::CommandFailedException const & ) { // Interaction Handler already handled the error that has occurred... } diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx index 60c636384f08..6fb133d87180 100644 --- a/ucb/source/core/cmdenv.hxx +++ b/ucb/source/core/cmdenv.hxx @@ -30,63 +30,49 @@ namespace ucb_cmdenv { class UcbCommandEnvironment : - public cppu::WeakImplHelper< com::sun::star::lang::XInitialization, - com::sun::star::lang::XServiceInfo, - com::sun::star::ucb::XCommandEnvironment > + public cppu::WeakImplHelper< css::lang::XInitialization, + css::lang::XServiceInfo, + css::ucb::XCommandEnvironment > { - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionHandler > m_xIH; - com::sun::star::uno::Reference< - com::sun::star::ucb::XProgressHandler > m_xPH; + css::uno::Reference< css::task::XInteractionHandler > m_xIH; + css::uno::Reference< css::ucb::XProgressHandler > m_xPH; public: - explicit UcbCommandEnvironment( - const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rXSMgr ); + explicit UcbCommandEnvironment( const css::uno::Reference< css::lang::XMultiServiceFactory >& rXSMgr ); virtual ~UcbCommandEnvironment(); // 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; + initialize( 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; + 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; + throw ( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; // XCommandEnvironment - virtual com::sun::star::uno::Reference< - com::sun::star::task::XInteractionHandler > SAL_CALL + virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XProgressHandler > SAL_CALL + throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL getProgressHandler() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; // Non-UNO interfaces - static OUString - getImplementationName_Static(); - static com::sun::star::uno::Sequence< OUString > - getSupportedServiceNames_Static(); - - static com::sun::star::uno::Reference< - com::sun::star::lang::XSingleServiceFactory > - createServiceFactory( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > & rxServiceMgr ); -private: - //com::sun::star::uno::Reference< - // com::sun::star::lang::XMultiServiceFactory > m_xSMgr; + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); + + static css::uno::Reference< css::lang::XSingleServiceFactory > + createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxServiceMgr ); }; } // namespace ucb_cmdenv diff --git a/ucb/source/core/providermap.hxx b/ucb/source/core/providermap.hxx index c66e2215736f..72800a5b3513 100644 --- a/ucb/source/core/providermap.hxx +++ b/ucb/source/core/providermap.hxx @@ -31,29 +31,25 @@ namespace com { namespace sun { namespace star { namespace ucb { class ProviderListEntry_Impl { - com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider > m_xProvider; - mutable com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider > m_xResolvedProvider; + css::uno::Reference< + css::ucb::XContentProvider > m_xProvider; + mutable css::uno::Reference< + css::ucb::XContentProvider > m_xResolvedProvider; private: - com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider > resolveProvider() const; + css::uno::Reference< css::ucb::XContentProvider > resolveProvider() const; public: explicit ProviderListEntry_Impl( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider >& xProvider ) + const css::uno::Reference< css::ucb::XContentProvider >& xProvider ) : m_xProvider( xProvider ) {} - com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider > getProvider() const + css::uno::Reference< css::ucb::XContentProvider > getProvider() const { return m_xProvider; } - inline com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider > getResolvedProvider() const; + inline css::uno::Reference< css::ucb::XContentProvider > getResolvedProvider() const; }; -inline com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > +inline css::uno::Reference< css::ucb::XContentProvider > ProviderListEntry_Impl::getResolvedProvider() const { return m_xResolvedProvider.is() ? m_xResolvedProvider : resolveProvider(); diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx index 5f53198f01fb..073d0ab690a8 100644 --- a/ucb/source/core/provprox.hxx +++ b/ucb/source/core/provprox.hxx @@ -43,13 +43,12 @@ class UcbContentProviderProxyFactory : public cppu::WeakImplHelper < css::lang::XServiceInfo, css::ucb::XContentProviderFactory > { - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMgr; public: explicit UcbContentProviderProxyFactory( - const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rxSMgr ); + const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSMgr ); virtual ~UcbContentProviderProxyFactory(); // XServiceInfo @@ -68,10 +67,9 @@ public: css::lang::XMultiServiceFactory >& rxServiceMgr ); // XContentProviderFactory - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentProvider > SAL_CALL + virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL createContentProvider( const OUString& Service ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; }; @@ -82,11 +80,11 @@ public: class UcbContentProviderProxy : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::lang::XServiceInfo, - public com::sun::star::ucb::XContentProviderSupplier, - public com::sun::star::ucb::XContentProvider, - public com::sun::star::ucb::XParameterizedContentProvider + public css::lang::XTypeProvider, + public css::lang::XServiceInfo, + public css::ucb::XContentProviderSupplier, + public css::ucb::XContentProvider, + public css::ucb::XParameterizedContentProvider { ::osl::Mutex m_aMutex; OUString m_aService; @@ -95,17 +93,16 @@ class UcbContentProviderProxy : bool m_bReplace; bool m_bRegister; - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMgr; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > + css::uno::Reference< css::ucb::XContentProvider > m_xProvider; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > + css::uno::Reference< css::ucb::XContentProvider > m_xTargetProvider; public: UcbContentProviderProxy( - const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rxSMgr, + const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSMgr, const OUString& Service ); virtual ~UcbContentProviderProxy(); @@ -135,39 +132,34 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XContentProviderSupplier - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentProvider > SAL_CALL + virtual css::uno::Reference< + css::ucb::XContentProvider > SAL_CALL getContentProvider() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XContentProvider - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContent > SAL_CALL - queryContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier ) - throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< + css::ucb::XContent > SAL_CALL + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL - compareContentIds( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Id1, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Id2 ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + compareContentIds( const css::uno::Reference< css::ucb::XContentIdentifier >& Id1, + const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) + throw( css::uno::RuntimeException, std::exception ) override; // XParameterizedContentProvider - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentProvider > SAL_CALL + virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL registerInstance( const OUString& Template, const OUString& Arguments, sal_Bool ReplaceExisting ) - throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentProvider > SAL_CALL + throw( css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL deregisterInstance( const OUString& Template, const OUString& Arguments ) - throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; }; #endif // INCLUDED_UCB_SOURCE_CORE_PROVPROX_HXX diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 7ed2fff9464e..d6932477a729 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -227,7 +227,7 @@ bool createContentProviderData( UniversalContentBroker::UniversalContentBroker( - const Reference< com::sun::star::uno::XComponentContext >& xContext ) + const Reference< css::uno::XComponentContext >& xContext ) : m_xContext( xContext ), m_pDisposeEventListeners( NULL ), m_nInitCount( 0 ), //@@@ see initialize() method @@ -299,7 +299,7 @@ XTYPEPROVIDER_IMPL_9( UniversalContentBroker, // virtual void SAL_CALL UniversalContentBroker::dispose() - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { if ( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() ) { @@ -316,7 +316,7 @@ void SAL_CALL UniversalContentBroker::dispose() // virtual void SAL_CALL UniversalContentBroker::addEventListener( const Reference< XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { if ( !m_pDisposeEventListeners ) m_pDisposeEventListeners = new OInterfaceContainerHelper( m_aMutex ); @@ -328,7 +328,7 @@ void SAL_CALL UniversalContentBroker::addEventListener( // virtual void SAL_CALL UniversalContentBroker::removeEventListener( const Reference< XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { if ( m_pDisposeEventListeners ) m_pDisposeEventListeners->removeInterface( Listener ); @@ -361,10 +361,9 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UniversalContentBroker ); // virtual -void SAL_CALL UniversalContentBroker::initialize( - const com::sun::star::uno::Sequence< Any >& aArguments ) - throw( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL UniversalContentBroker::initialize( const css::uno::Sequence< Any >& aArguments ) + throw( css::uno::Exception, + css::uno::RuntimeException, std::exception ) { { osl::MutexGuard aGuard(m_aMutex); @@ -408,7 +407,7 @@ UniversalContentBroker::registerContentProvider( const Reference< XContentProvider >& Provider, const OUString& Scheme, sal_Bool ReplaceExisting ) - throw( DuplicateProviderException, com::sun::star::uno::RuntimeException, std::exception ) + throw( DuplicateProviderException, css::uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard(m_aMutex); @@ -454,7 +453,7 @@ UniversalContentBroker::registerContentProvider( void SAL_CALL UniversalContentBroker::deregisterContentProvider( const Reference< XContentProvider >& Provider, const OUString& Scheme ) - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard(m_aMutex); @@ -490,16 +489,15 @@ void SAL_CALL UniversalContentBroker::deregisterContentProvider( // virtual -com::sun::star::uno::Sequence< ContentProviderInfo > SAL_CALL +css::uno::Sequence< ContentProviderInfo > SAL_CALL UniversalContentBroker::queryContentProviders() - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { // Return a list with information about active(!) content providers. osl::MutexGuard aGuard(m_aMutex); - com::sun::star::uno::Sequence< ContentProviderInfo > aSeq( - m_aProviders.size() ); + css::uno::Sequence< ContentProviderInfo > aSeq( m_aProviders.size() ); ContentProviderInfo* pInfo = aSeq.getArray(); ProviderMap_Impl::const_iterator end = m_aProviders.end(); @@ -520,7 +518,7 @@ com::sun::star::uno::Sequence< ContentProviderInfo > SAL_CALL Reference< XContentProvider > SAL_CALL UniversalContentBroker::queryContentProvider( const OUString& Identifier ) - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { return queryContentProvider( Identifier, false ); } @@ -534,7 +532,7 @@ Reference< XContentProvider > SAL_CALL // virtual Reference< XContent > SAL_CALL UniversalContentBroker::queryContent( const Reference< XContentIdentifier >& Identifier ) - throw( IllegalIdentifierException, com::sun::star::uno::RuntimeException, std::exception ) + throw( IllegalIdentifierException, css::uno::RuntimeException, std::exception ) { // Let the content provider for the scheme given with the content @@ -557,7 +555,7 @@ Reference< XContent > SAL_CALL UniversalContentBroker::queryContent( sal_Int32 SAL_CALL UniversalContentBroker::compareContentIds( const Reference< XContentIdentifier >& Id1, const Reference< XContentIdentifier >& Id2 ) - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { OUString aURI1( Id1->getContentIdentifier() ); OUString aURI2( Id2->getContentIdentifier() ); @@ -586,7 +584,7 @@ sal_Int32 SAL_CALL UniversalContentBroker::compareContentIds( Reference< XContentIdentifier > SAL_CALL UniversalContentBroker::createContentIdentifier( const OUString& ContentId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) + throw( css::uno::RuntimeException, std::exception ) { // Let the content provider for the scheme given with content diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx index 5367adf0a4ab..dfd46f924fe3 100644 --- a/ucb/source/core/ucb.hxx +++ b/ucb/source/core/ucb.hxx @@ -55,14 +55,14 @@ namespace com { namespace sun { namespace star { namespace ucb { class UniversalContentBroker : public cppu::OWeakObject, - public com::sun::star::ucb::XUniversalContentBroker, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::lang::XServiceInfo, - public com::sun::star::lang::XInitialization, - public com::sun::star::util::XChangesListener + public css::ucb::XUniversalContentBroker, + public css::lang::XTypeProvider, + public css::lang::XServiceInfo, + public css::lang::XInitialization, + public css::util::XChangesListener { public: - explicit UniversalContentBroker( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); + explicit UniversalContentBroker( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~UniversalContentBroker(); // XInterface @@ -76,7 +76,7 @@ public: // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo @@ -97,118 +97,101 @@ public: // 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 >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - removeEventListener( const com::sun::star::uno::Reference< - com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< + css::lang::XEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // 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; + initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw( css::uno::Exception, + css::uno::RuntimeException, std::exception ) override; // XContentProviderManager - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider > SAL_CALL - registerContentProvider( const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider >& - Provider, + virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL + registerContentProvider( const css::uno::Reference< css::ucb::XContentProvider >& Provider, const OUString& Scheme, sal_Bool ReplaceExisting ) - throw( com::sun::star::ucb::DuplicateProviderException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::ucb::DuplicateProviderException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - deregisterContentProvider( const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider >& - Provider, + deregisterContentProvider( const css::uno::Reference< css::ucb::XContentProvider >& Provider, const OUString& Scheme ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< - com::sun::star::ucb::ContentProviderInfo > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::ucb::ContentProviderInfo > SAL_CALL queryContentProviders() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL queryContentProvider( const OUString& Identifier ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XContentProvider - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - queryContent( const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier ) - throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL - compareContentIds( const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Id1, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Id2 ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + compareContentIds( const css::uno::Reference< css::ucb::XContentIdentifier >& Id1, + const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) + throw( css::uno::RuntimeException, std::exception ) override; // XContentIdentifierFactory - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > SAL_CALL + virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL createContentIdentifier( const OUString& ContentId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XCommandProcessor virtual sal_Int32 SAL_CALL createCommandIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Any SAL_CALL - execute( const com::sun::star::ucb::Command& aCommand, + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, - com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, + css::ucb::CommandAbortedException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XCommandProcessor2 virtual void SAL_CALL releaseCommandIdentifier(sal_Int32 aCommandId) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XChangesListener - virtual void SAL_CALL changesOccurred( const com::sun::star::util::ChangesEvent& Event ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) + throw( css::uno::RuntimeException, std::exception ) override; // XEventListener ( base of XChangesLisetenr ) - 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; private: - com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > + css::uno::Reference< css::ucb::XContentProvider > queryContentProvider( const OUString& Identifier, bool bResolved ); - static com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo > + static css::uno::Reference< css::ucb::XCommandInfo > getCommandInfo(); void globalTransfer( - const com::sun::star::ucb::GlobalTransferCommandArgument2 & rArg, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw( com::sun::star::uno::Exception, std::exception ); + const css::ucb::GlobalTransferCommandArgument2 & rArg, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw( css::uno::Exception, std::exception ); - com::sun::star::uno::Any checkIn( const com::sun::star::ucb::CheckinArgument& rArg, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) throw( com::sun::star::uno::Exception ); + css::uno::Any checkIn( const css::ucb::CheckinArgument& rArg, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw( css::uno::Exception ); bool configureUcb() - throw ( com::sun::star::uno::RuntimeException); + throw ( css::uno::RuntimeException); bool getContentProviderData( const OUString & rKey1, @@ -217,13 +200,13 @@ private: void prepareAndRegister( const ucbhelper::ContentProviderDataList& rData); - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< + css::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< - com::sun::star::util::XChangesNotifier > m_xNotifier; + css::uno::Reference< + css::util::XChangesNotifier > m_xNotifier; - com::sun::star::uno::Sequence< com::sun::star::uno::Any > m_aArguments; + css::uno::Sequence< css::uno::Any > m_aArguments; ProviderMap_Impl m_aProviders; osl::Mutex m_aMutex; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx index 5e2ccf39bb3f..5f5d257343b4 100644 --- a/ucb/source/core/ucbprops.hxx +++ b/ucb/source/core/ucbprops.hxx @@ -46,12 +46,10 @@ class UcbPropertiesManager : public cppu::WeakImplHelper < private: bool queryProperty( const OUString& rName, - com::sun::star::beans::Property& rProp ); + css::beans::Property& rProp ); public: - explicit UcbPropertiesManager( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& - rxSMgr ); + explicit UcbPropertiesManager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSMgr ); virtual ~UcbPropertiesManager(); // XServiceInfo @@ -70,17 +68,16 @@ public: css::lang::XMultiServiceFactory >& rxServiceMgr ); // XPropertySetInfo - virtual com::sun::star::uno::Sequence< - com::sun::star::beans::Property > SAL_CALL + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::beans::Property SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; }; #endif // INCLUDED_UCB_SOURCE_CORE_UCBPROPS_HXX diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 9a6698316aae..3e3344a751bf 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -481,7 +481,7 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key ) // virtual -com::sun::star::uno::Type SAL_CALL PropertySetRegistry::getElementType() +css::uno::Type SAL_CALL PropertySetRegistry::getElementType() throw( RuntimeException, std::exception ) { return cppu::UnoType<XPersistentPropertySet>::get(); diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx index f79a7bbd6664..8c7cc34a541a 100644 --- a/ucb/source/core/ucbstore.hxx +++ b/ucb/source/core/ucbstore.hxx @@ -51,14 +51,11 @@ class UcbStore : public cppu::WeakImplHelper < css::ucb::XPropertySetRegistryFactory, css::lang::XInitialization > { - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; UcbStore_Impl* m_pImpl; public: - explicit UcbStore( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& xContext ); + explicit UcbStore( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~UcbStore(); // XServiceInfo @@ -77,19 +74,17 @@ public: css::lang::XMultiServiceFactory >& rxServiceMgr ); // XPropertySetRegistryFactory - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XPropertySetRegistry > SAL_CALL + virtual css::uno::Reference< css::ucb::XPropertySetRegistry > SAL_CALL createPropertySetRegistry( const OUString& URL ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // 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; + initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw( css::uno::Exception, + css::uno::RuntimeException, std::exception ) override; - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& + const css::uno::Sequence< css::uno::Any >& getInitArgs() const; }; @@ -105,12 +100,11 @@ class PropertySetRegistry : public cppu::WeakImplHelper < { friend class PersistentPropertySet; - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; PropertySetRegistry_Impl* m_pImpl; private: - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + css::uno::Reference< css::lang::XMultiServiceFactory > getConfigProvider(); void add ( PersistentPropertySet* pSet ); @@ -121,10 +115,8 @@ private: public: PropertySetRegistry( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& xContext, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any >& rInitArgs); + const css::uno::Reference< css::uno::XComponentContext >& xContext, + const css::uno::Sequence< css::uno::Any >& rInitArgs); virtual ~PropertySetRegistry(); @@ -140,39 +132,38 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XPropertySetRegistry - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XPersistentPropertySet > SAL_CALL + virtual css::uno::Reference< css::ucb::XPersistentPropertySet > SAL_CALL openPropertySet( const OUString& key, sal_Bool create ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertySet( const OUString& key ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XElementAccess ( XNameAccess is derived from it ) - virtual com::sun::star::uno::Type SAL_CALL + virtual css::uno::Type SAL_CALL getElementType() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + 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 + virtual css::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 + throw( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + 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; // Non-interface methods - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > getRootConfigReadAccess(); - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > getConfigWriteAccess( const OUString& rPath ); }; @@ -194,14 +185,13 @@ class PersistentPropertySet : public cppu::WeakImplHelper < private: void notifyPropertyChangeEvent( - const com::sun::star::beans::PropertyChangeEvent& rEvent ) const; + const css::beans::PropertyChangeEvent& rEvent ) const; void notifyPropertySetInfoChange( - const com::sun::star::beans::PropertySetInfoChangeEvent& evt ) const; + const css::beans::PropertySetInfoChangeEvent& evt ) const; public: PersistentPropertySet( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, PropertySetRegistry& rCreator, const OUString& rKey ); virtual ~PersistentPropertySet(); @@ -220,118 +210,106 @@ public: // 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 >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - removeEventListener( const com::sun::star::uno::Reference< - com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XPropertySet - virtual com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + 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 com::sun::star::uno::Any SAL_CALL + 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( com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + 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; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; // XPersistentPropertySet - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XPropertySetRegistry > SAL_CALL + virtual css::uno::Reference< css::ucb::XPropertySetRegistry > SAL_CALL getRegistry() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getKey() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // 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; // XPropertyContainer virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, - const com::sun::star::uno::Any& DefaultValue ) - throw( com::sun::star::beans::PropertyExistException, - com::sun::star::beans::IllegalTypeException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Any& DefaultValue ) + throw( css::beans::PropertyExistException, + css::beans::IllegalTypeException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeProperty( const OUString& Name ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::beans::UnknownPropertyException, + css::beans::NotRemoveableException, + css::uno::RuntimeException, std::exception ) override; // XPropertySetInfoChangeNotifier virtual void SAL_CALL - addPropertySetInfoChangeListener( const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + addPropertySetInfoChangeListener( const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - removePropertySetInfoChangeListener( const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removePropertySetInfoChangeListener( const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XPropertyAccess - virtual com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue > SAL_CALL + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - setPropertyValues( const com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue >& aProps ) - 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; + setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) + throw( css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; // Non-interface methods. PropertySetRegistry& getPropertySetRegistry(); diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx index 606423852bf6..33fc1aa49e5a 100644 --- a/ucb/source/inc/regexpmap.hxx +++ b/ucb/source/inc/regexpmap.hxx @@ -434,10 +434,8 @@ public: bool add(OUString const & rKey, Val const & rValue, bool bOverwrite, OUString * pReverse = 0); - // throws com::sun::star::lang::IllegalArgumentException iterator find(OUString const & rKey, OUString * pReverse = 0); - // throws com::sun::star::lang::IllegalArgumentException void erase(iterator const & rPos); diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index 63075b27ce89..9725ad87b319 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -501,7 +501,7 @@ SortedDynamicResultSetFactory_CreateInstance( const css::uno::Reference< css::uno::Sequence< OUString > SortedDynamicResultSetFactory::getSupportedServiceNames_Static() { - com::sun::star::uno::Sequence< OUString > aSNS( 1 ); + css::uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = DYNAMIC_RESULTSET_FACTORY_NAME; return aSNS; } diff --git a/ucb/source/ucp/cmis/auth_provider.cxx b/ucb/source/ucp/cmis/auth_provider.cxx index 500b601b7179..3adefe88473b 100644 --- a/ucb/source/ucp/cmis/auth_provider.cxx +++ b/ucb/source/ucp/cmis/auth_provider.cxx @@ -22,7 +22,7 @@ using namespace std; namespace cmis { - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment> + css::uno::Reference< css::ucb::XCommandEnvironment> AuthProvider::sm_xEnv; bool AuthProvider::authenticationQuery( string& username, string& password ) { @@ -75,8 +75,8 @@ namespace cmis "box below. For example:\n" "https://login.live.com/oauth20_desktop.srf?code=YOUR_CODE&lc=1033"; OUString url_oustr( url, strlen( url ), RTL_TEXTENCODING_UTF8 ); - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment> xEnv = getXEnv( ); + const css::uno::Reference< + css::ucb::XCommandEnvironment> xEnv = getXEnv( ); if ( xEnv.is() ) { diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx index fa50054241ad..1c521d52d8e8 100644 --- a/ucb/source/ucp/cmis/auth_provider.hxx +++ b/ucb/source/ucp/cmis/auth_provider.hxx @@ -17,14 +17,13 @@ namespace cmis { class AuthProvider : public libcmis::AuthProvider { - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment>& m_xEnv; - static com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment> sm_xEnv; + const css::uno::Reference< css::ucb::XCommandEnvironment>& m_xEnv; + static css::uno::Reference< css::ucb::XCommandEnvironment> sm_xEnv; OUString m_sUrl; OUString m_sBindingUrl; public: - AuthProvider ( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment>& xEnv, + AuthProvider ( const css::uno::Reference< css::ucb::XCommandEnvironment>& xEnv, const OUString& sUrl, const OUString& sBindingUrl ): m_xEnv( xEnv ), m_sUrl( sUrl ), m_sBindingUrl( sBindingUrl ) { } @@ -35,11 +34,9 @@ namespace cmis const char* /*username*/, const char* /*password*/ ); - static void setXEnv( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment>& xEnv ) { sm_xEnv = xEnv; } + static void setXEnv( const css::uno::Reference< css::ucb::XCommandEnvironment>& xEnv ) { sm_xEnv = xEnv; } - static com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment> getXEnv( ) { return sm_xEnv; } + static css::uno::Reference< css::ucb::XCommandEnvironment> getXEnv( ) { return sm_xEnv; } }; } diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx b/ucb/source/ucp/cmis/certvalidation_handler.hxx index e0e7ea3b7417..dde7b8774fc6 100644 --- a/ucb/source/ucp/cmis/certvalidation_handler.hxx +++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx @@ -20,16 +20,14 @@ namespace cmis { class CertValidationHandler : public libcmis::CertValidationHandler { - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment>& m_xEnv; - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& m_xContext; + const css::uno::Reference< css::ucb::XCommandEnvironment>& m_xEnv; + const css::uno::Reference< css::uno::XComponentContext >& m_xContext; OUString m_sHostname; public: CertValidationHandler ( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment>& xEnv, - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext>& xContext, + const css::uno::Reference< css::ucb::XCommandEnvironment>& xEnv, + const css::uno::Reference< css::uno::XComponentContext>& xContext, const OUString& sHostname ): m_xEnv( xEnv ), m_xContext( xContext ), m_sHostname( sHostname ) { } diff --git a/ucb/source/ucp/cmis/children_provider.hxx b/ucb/source/ucp/cmis/children_provider.hxx index 1473318e2567..770c29e68d11 100644 --- a/ucb/source/ucp/cmis/children_provider.hxx +++ b/ucb/source/ucp/cmis/children_provider.hxx @@ -20,7 +20,7 @@ namespace cmis public: virtual ~ChildrenProvider( ) { }; - virtual std::list< com::sun::star::uno::Reference< com::sun::star::ucb::XContent > > getChildren( ) = 0; + virtual std::list< css::uno::Reference< css::ucb::XContent > > getChildren( ) = 0; }; } diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 6da4cd9881b1..16c1298aa910 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -346,11 +346,11 @@ namespace cmis #ifndef SYSTEM_CURL // Initialize NSS library to make sure libcmis (and curl) can access CACERTs using NSS // when using internal libcurl. - uno::Reference< com::sun::star::xml::crypto::XNSSInitializer > - xNSSInitializer = com::sun::star::xml::crypto::NSSInitializer::create( m_xContext ); + uno::Reference< css::xml::crypto::XNSSInitializer > + xNSSInitializer = css::xml::crypto::NSSInitializer::create( m_xContext ); - uno::Reference< com::sun::star::xml::crypto::XDigestContext > xDigestContext( - xNSSInitializer->getDigestContext( com::sun::star::xml::crypto::DigestID::SHA256, + uno::Reference< css::xml::crypto::XDigestContext > xDigestContext( + xNSSInitializer->getDigestContext( css::xml::crypto::DigestID::SHA256, uno::Sequence< beans::NamedValue >() ), uno::UNO_SET_THROW ); #endif diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx index 40b69a943c22..f835a963524f 100644 --- a/ucb/source/ucp/cmis/cmis_content.hxx +++ b/ucb/source/ucp/cmis/cmis_content.hxx @@ -50,7 +50,7 @@ namespace cmis class ContentProvider; class Content : public ::ucbhelper::ContentImplHelper, - public com::sun::star::ucb::XContentCreator, + public css::ucb::XContentCreator, public ChildrenProvider { private: @@ -68,91 +68,86 @@ private: libcmis::ObjectTypePtr m_pObjectType; std::map< std::string, libcmis::PropertyPtr > m_pObjectProps; - bool isFolder( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ); + bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); void setCmisProperty(const std::string& rName, const std::string& rValue, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); - com::sun::star::uno::Any getBadArgExcept(); + css::uno::Any getBadArgExcept(); - com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + css::uno::Reference< css::sdbc::XRow > getPropertyValues( - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProperties, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ); + const css::uno::Sequence< css::beans::Property >& rProperties, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); - libcmis::Session* getSession( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ); - libcmis::ObjectTypePtr getObjectType( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ); + libcmis::Session* getSession( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); + libcmis::ObjectTypePtr getObjectType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); private: typedef rtl::Reference< Content > ContentRef; typedef std::list< ContentRef > ContentRefList; - com::sun::star::uno::Any open(const com::sun::star::ucb::OpenCommandArgument2 & rArg, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( com::sun::star::uno::Exception, libcmis::Exception ); + css::uno::Any open(const css::ucb::OpenCommandArgument2 & rArg, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, libcmis::Exception ); - void transfer( const com::sun::star::ucb::TransferInfo& rTransferInfo, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( com::sun::star::uno::Exception ); + void transfer( const css::ucb::TransferInfo& rTransferInfo, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception ); - void insert( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & xInputStream, + void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream, bool bReplaceExisting, const OUString & rMimeType, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw (css::uno::Exception, std::exception); - OUString checkIn( const com::sun::star::ucb::CheckinArgument& rArg, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( com::sun::star::uno::Exception ); + OUString checkIn( const css::ucb::CheckinArgument& rArg, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception ); - OUString checkOut( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( com::sun::star::uno::Exception ); + OUString checkOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception ); - OUString cancelCheckOut( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( com::sun::star::uno::Exception ); + OUString cancelCheckOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception ); - static void copyData( com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xIn, - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOut ); + static void copyData( css::uno::Reference< css::io::XInputStream > xIn, + css::uno::Reference< css::io::XOutputStream > xOut ); - com::sun::star::uno::Sequence< com::sun::star::uno::Any > - setPropertyValues( const com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue >& rValues, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ); + css::uno::Sequence< css::uno::Any > + setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); - com::sun::star::uno::Sequence< com::sun::star::document::CmisVersion > - getAllVersions( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw(com::sun::star::uno::Exception, + css::uno::Sequence< css::document::CmisVersion > + getAllVersions( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw(css::uno::Exception, std::exception); - bool feedSink( com::sun::star::uno::Reference< com::sun::star::uno::XInterface> aSink, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ); + bool feedSink( css::uno::Reference< css::uno::XInterface> aSink, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); public: - Content( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, ContentProvider *pProvider, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier, + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + ContentProvider *pProvider, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, libcmis::ObjectPtr pObject = libcmis::ObjectPtr( ) ) - throw ( com::sun::star::ucb::ContentCreationException ); + throw ( css::ucb::ContentCreationException ); - Content( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, ContentProvider *pProvider, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier, + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + ContentProvider *pProvider, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, bool bIsFolder) - throw ( com::sun::star::ucb::ContentCreationException ); + throw ( css::ucb::ContentCreationException ); virtual ~Content(); - virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > - getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::beans::Property > + getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; libcmis::ObjectPtr updateProperties( - const com::sun::star::uno::Any& iCmisProps, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv); + const css::uno::Any& iCmisProps, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv); - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > - getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::ucb::CommandInfo > + getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; virtual OUString getParentURL() override; @@ -171,40 +166,40 @@ public: virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Any SAL_CALL - execute( const com::sun::star::ucb::Command& aCommand, + virtual css::uno::Any SAL_CALL + execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > + virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > - SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > + SAL_CALL createNewContent( const css::ucb::ContentInfo& Info ) + throw( css::uno::RuntimeException, std::exception ) override; - com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > - queryCreatableContentsInfo( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw( com::sun::star::uno::RuntimeException ); + css::uno::Sequence< css::ucb::ContentInfo > + queryCreatableContentsInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw( css::uno::RuntimeException ); - virtual std::list< com::sun::star::uno::Reference< com::sun::star::ucb::XContent > > getChildren( ) override; + virtual std::list< css::uno::Reference< css::ucb::XContent > > getChildren( ) override; - libcmis::ObjectPtr getObject( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception); + libcmis::ObjectPtr getObject( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception); }; } diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx index 9fe7b7739368..b637dab707a9 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx @@ -23,10 +23,10 @@ namespace cmis struct ResultListEntry { - com::sun::star::uno::Reference< com::sun::star::ucb::XContent > xContent; - com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > xRow; + css::uno::Reference< css::ucb::XContent > xContent; + css::uno::Reference< css::sdbc::XRow > xRow; - explicit ResultListEntry( com::sun::star::uno::Reference< com::sun::star::ucb::XContent > xCnt ) : xContent( xCnt ) + explicit ResultListEntry( css::uno::Reference< css::ucb::XContent > xCnt ) : xContent( xCnt ) { } @@ -52,9 +52,9 @@ namespace cmis virtual ~DataSupplier(); virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > + virtual css::uno::Reference< css::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > + virtual css::uno::Reference< css::ucb::XContent > queryContent( sal_uInt32 nIndex ) override; virtual bool getResult( sal_uInt32 nIndex ) override; @@ -63,14 +63,14 @@ namespace cmis virtual sal_uInt32 currentCount() override; virtual bool isCountFinal() override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + virtual css::uno::Reference< css::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) override; virtual void releasePropertyValues( sal_uInt32 nIndex ) override; virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) override; + throw( css::ucb::ResultSetException ) override; }; } diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index c9819b51c423..292da1b83e6a 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -20,11 +20,10 @@ using namespace com::sun::star; namespace cmis { -uno::Reference< com::sun::star::ucb::XContent > SAL_CALL +uno::Reference< css::ucb::XContent > SAL_CALL ContentProvider::queryContent( - const uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier ) - throw( com::sun::star::ucb::IllegalIdentifierException, + const uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -48,13 +47,13 @@ ContentProvider::queryContent( registerNewContent( xContent ); } } - catch ( com::sun::star::ucb::ContentCreationException const & ) + catch ( css::ucb::ContentCreationException const & ) { - throw com::sun::star::ucb::IllegalIdentifierException(); + throw css::ucb::IllegalIdentifierException(); } if ( !xContent->getIdentifier().is() ) - throw com::sun::star::ucb::IllegalIdentifierException(); + throw css::ucb::IllegalIdentifierException(); return xContent; } @@ -117,7 +116,7 @@ css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & r XTYPEPROVIDER_IMPL_3( ContentProvider, lang::XTypeProvider, lang::XServiceInfo, - com::sun::star::ucb::XContentProvider ); + css::ucb::XContentProvider ); XSERVICEINFO_IMPL_1_CTX( ContentProvider, OUString("com.sun.star.comp.CmisContentProvider"), diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx index 4cff7beab5db..bf818a6a7f87 100644 --- a/ucb/source/ucp/cmis/cmis_provider.hxx +++ b/ucb/source/ucp/cmis/cmis_provider.hxx @@ -23,8 +23,7 @@ private: std::map< std::pair< OUString, OUString >, libcmis::Session* > m_aSessionCache; public: - explicit ContentProvider( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext ); + explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ContentProvider(); // XInterface @@ -57,12 +56,10 @@ public: css::lang::XMultiServiceFactory >& rxServiceMgr ); // XContentProvider - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContent > SAL_CALL - queryContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier ) - throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, + css::uno::RuntimeException, std::exception ) override; libcmis::Session* getSession( const OUString& sBindingUrl, const OUString& sUsername ); void registerSession( const OUString& sBindingUrl, const OUString& sUsername, libcmis::Session* pSession ); diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index 2cf091522e7c..40d88c769b7c 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -131,11 +131,11 @@ namespace cmis #ifndef SYSTEM_CURL // Initialize NSS library to make sure libcmis (and curl) can access CACERTs using NSS // when using internal libcurl. - uno::Reference< com::sun::star::xml::crypto::XNSSInitializer > - xNSSInitializer = com::sun::star::xml::crypto::NSSInitializer::create( m_xContext ); + uno::Reference< css::xml::crypto::XNSSInitializer > + xNSSInitializer = css::xml::crypto::NSSInitializer::create( m_xContext ); - uno::Reference< com::sun::star::xml::crypto::XDigestContext > xDigestContext( - xNSSInitializer->getDigestContext( com::sun::star::xml::crypto::DigestID::SHA256, + uno::Reference< css::xml::crypto::XDigestContext > xDigestContext( + xNSSInitializer->getDigestContext( css::xml::crypto::DigestID::SHA256, uno::Sequence< beans::NamedValue >() ), uno::UNO_SET_THROW ); #endif diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx index cd5cc6311c87..42ba9bbbbc3b 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.hxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx @@ -57,38 +57,34 @@ private: private: - com::sun::star::uno::Any getBadArgExcept(); + css::uno::Any getBadArgExcept(); - com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + css::uno::Reference< css::sdbc::XRow > getPropertyValues( - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProperties, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ); + const css::uno::Sequence< css::beans::Property >& rProperties, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /* * Call me to ensure the repositories have been fetched */ - void getRepositories( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ); + void getRepositories( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); - libcmis::RepositoryPtr getRepository( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ); + libcmis::RepositoryPtr getRepository( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); public: - RepoContent( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, ContentProvider *pProvider, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier, + RepoContent( const css::uno::Reference< + css::uno::XComponentContext >& rxContext, ContentProvider *pProvider, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, std::vector< libcmis::RepositoryPtr > aRepos = std::vector< libcmis::RepositoryPtr > ( ) ) - throw ( com::sun::star::ucb::ContentCreationException ); + throw ( css::ucb::ContentCreationException ); virtual ~RepoContent(); - virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > - getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::beans::Property > + getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > - getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::ucb::CommandInfo > + getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; virtual OUString getParentURL() override; @@ -107,26 +103,26 @@ public: virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Any SAL_CALL - execute( const com::sun::star::ucb::Command& aCommand, + virtual css::uno::Any SAL_CALL + execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual std::list< com::sun::star::uno::Reference< com::sun::star::ucb::XContent > > getChildren( ) override; + virtual std::list< css::uno::Reference< css::ucb::XContent > > getChildren( ) override; }; } diff --git a/ucb/source/ucp/cmis/cmis_resultset.hxx b/ucb/source/ucp/cmis/cmis_resultset.hxx index c3e05e2dfa83..e8d57c199e1f 100644 --- a/ucb/source/ucp/cmis/cmis_resultset.hxx +++ b/ucb/source/ucp/cmis/cmis_resultset.hxx @@ -20,7 +20,7 @@ namespace cmis class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper { ChildrenProvider* m_pChildrenProvider; - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; private: virtual void initStatic() override; @@ -29,11 +29,10 @@ namespace cmis public: DynamicResultSet( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, ChildrenProvider* pChildrenProvider, - const com::sun::star::ucb::OpenCommandArgument2& rCommand, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv ); + const css::ucb::OpenCommandArgument2& rCommand, + const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv ); }; } diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx index 86facae26906..fcd0a433d92e 100644 --- a/ucb/source/ucp/ext/ucpext_content.hxx +++ b/ucb/source/ucp/ext/ucpext_content.hxx @@ -54,22 +54,22 @@ namespace ucb { namespace ucp { namespace ext { public: Content( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, ::ucbhelper::ContentProviderImplHelper* pProvider, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ); - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > + static css::uno::Reference< css::sdbc::XRow > getArtificialNodePropertyValues( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProperties, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Sequence< css::beans::Property >& rProperties, const OUString& rTitle ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > + css::uno::Reference< css::sdbc::XRow > getPropertyValues( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProperties, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv + const css::uno::Sequence< css::beans::Property >& rProperties, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); static OUString @@ -90,39 +90,39 @@ namespace ucb { namespace ucp { namespace ext virtual ~Content(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) 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 css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; // XContent - virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getContentType() throw( css::uno::RuntimeException, std::exception ) override; // XCommandProcessor - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL execute( - const com::sun::star::ucb::Command& aCommand, + const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw ( ::com::sun::star::uno::Exception - , ::com::sun::star::ucb::CommandAbortedException - , ::com::sun::star::uno::RuntimeException, std::exception + throw ( css::uno::Exception + , css::ucb::CommandAbortedException + , css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception + throw ( css::uno::RuntimeException, std::exception ) override; private: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > getProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& i_rEnv ) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::CommandInfo > getCommands( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& i_rEnv ) override; + virtual css::uno::Sequence< css::beans::Property > getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment >& i_rEnv ) override; + virtual css::uno::Sequence< css::ucb::CommandInfo > getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment >& i_rEnv ) override; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > + css::uno::Sequence< css::uno::Any > setPropertyValues( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv + const css::uno::Sequence< css::beans::PropertyValue >& rValues, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); static bool denotesRootContent( const OUString& i_rContentIdentifier ); diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx index aedc4e60faa4..207d9186342d 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx @@ -41,7 +41,7 @@ namespace ucb { namespace ucp { namespace ext { public: DataSupplier( - const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rContent, const sal_Int32 nOpenMode ); @@ -52,8 +52,8 @@ namespace ucb { namespace ucp { namespace ext virtual ~DataSupplier(); virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > queryContent( sal_uInt32 nIndex ) override; + virtual css::uno::Reference< css::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) override; + virtual css::uno::Reference< css::ucb::XContent > queryContent( sal_uInt32 nIndex ) override; virtual bool getResult( sal_uInt32 nIndex ) override; @@ -61,12 +61,12 @@ namespace ucb { namespace ucp { namespace ext virtual sal_uInt32 currentCount() override; virtual bool isCountFinal() override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) override; + virtual css::uno::Reference< css::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) override; virtual void releasePropertyValues( sal_uInt32 nIndex ) override; virtual void close() override; - virtual void validate() throw( com::sun::star::ucb::ResultSetException ) override; + virtual void validate() throw( css::ucb::ResultSetException ) override; private: std::unique_ptr< DataSupplier_Impl > m_pImpl; diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx index baeff9a4eefe..6bf33eee1e70 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -34,20 +34,20 @@ namespace ucb { namespace ucp { namespace ext class ContentProvider : public ContentProvider_Base { public: - explicit ContentProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ContentProvider(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) 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 css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - static versions - static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static() throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ); + static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static() throw (css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::uno::XComponentContext >& i_rContext ); // XContentProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > SAL_CALL queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw (::com::sun::star::ucb::IllegalIdentifierException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) throw (css::ucb::IllegalIdentifierException, css::uno::RuntimeException, std::exception) override; public: static OUString getRootURL(); diff --git a/ucb/source/ucp/ext/ucpext_resultset.hxx b/ucb/source/ucp/ext/ucpext_resultset.hxx index 8f4d68372d86..ad48b4d7b94d 100644 --- a/ucb/source/ucp/ext/ucpext_resultset.hxx +++ b/ucb/source/ucp/ext/ucpext_resultset.hxx @@ -37,15 +37,15 @@ namespace ucb { namespace ucp { namespace ext { public: ResultSet( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& i_rContent, - const com::sun::star::ucb::OpenCommandArgument2& i_rCommand, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& i_rEnv + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const rtl::Reference< Content >& i_rContent, + const css::ucb::OpenCommandArgument2& i_rCommand, + const css::uno::Reference< css::ucb::XCommandEnvironment >& i_rEnv ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > m_xEnvironment; - ::rtl::Reference< Content > m_xContent; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnvironment; + ::rtl::Reference< Content > m_xContent; private: virtual void initStatic() override; diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx index 8d39045bef6e..d35a139af6b3 100644 --- a/ucb/source/ucp/file/bc.hxx +++ b/ucb/source/ucp/file/bc.hxx @@ -59,16 +59,16 @@ namespace fileaccess { class BaseContent: public cppu::OWeakObject, - public com::sun::star::lang::XComponent, - public com::sun::star::lang::XServiceInfo, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::ucb::XCommandProcessor, - public com::sun::star::beans::XPropertiesChangeNotifier, - public com::sun::star::beans::XPropertyContainer, - public com::sun::star::beans::XPropertySetInfoChangeNotifier, - public com::sun::star::ucb::XContentCreator, - public com::sun::star::container::XChild, - public com::sun::star::ucb::XContent, + public css::lang::XComponent, + public css::lang::XServiceInfo, + public css::lang::XTypeProvider, + public css::ucb::XCommandProcessor, + public css::beans::XPropertiesChangeNotifier, + public css::beans::XPropertyContainer, + public css::beans::XPropertySetInfoChangeNotifier, + public css::ucb::XContentCreator, + public css::container::XChild, + public css::ucb::XContent, public fileaccess::Notifier // implementation class { private: @@ -81,16 +81,16 @@ namespace fileaccess { public: BaseContent( shell* pMyShell, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xContentIdentifier, + const css::uno::Reference< css::ucb::XContentIdentifier >& xContentIdentifier, const OUString& aUnqPath ); virtual ~BaseContent(); // XInterface - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Type& aType ) + throw( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( @@ -107,96 +107,91 @@ namespace fileaccess { virtual void SAL_CALL dispose( void ) - 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 >& aListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw( css::uno::RuntimeException, std::exception ) override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() 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; + throw( css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XCommandProcessor virtual sal_Int32 SAL_CALL - createCommandIdentifier( - void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + createCommandIdentifier() + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL execute( - const com::sun::star::ucb::Command& aCommand, + const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, - com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, + css::ucb::CommandAbortedException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XContent - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL - getIdentifier( - void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL + getIdentifier() + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL - getContentType( - void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + getContentType() + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addContentEventListener( - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeContentEventListener( - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XPropertiesChangeNotifier virtual void SAL_CALL addPropertiesChangeListener( - const com::sun::star::uno::Sequence< OUString >& PropertyNames, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< OUString >& PropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - removePropertiesChangeListener( const com::sun::star::uno::Sequence< OUString >& PropertyNames, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removePropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XPropertyContainer @@ -204,57 +199,55 @@ namespace fileaccess { addProperty( const OUString& Name, sal_Int16 Attributes, - const com::sun::star::uno::Any& DefaultValue ) - throw( com::sun::star::beans::PropertyExistException, - com::sun::star::beans::IllegalTypeException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Any& DefaultValue ) + throw( css::beans::PropertyExistException, + css::beans::IllegalTypeException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeProperty( const OUString& Name ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::beans::UnknownPropertyException, + css::beans::NotRemoveableException, + css::uno::RuntimeException, std::exception ) override; // XPropertySetInfoChangeNotifier virtual void SAL_CALL addPropertySetInfoChangeListener( - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertySetInfoChangeListener( - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XContentCreator - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL + virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL createNewContent( - const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::ucb::ContentInfo& Info ) + throw( css::uno::RuntimeException, std::exception ) override; // XChild - virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( - void ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; + void ) throw( css::uno::RuntimeException, std::exception ) override; // Not supported 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; + setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) + throw( css::lang::NoSupportException, + css::uno::RuntimeException, std::exception) override; // Notifier @@ -267,9 +260,9 @@ namespace fileaccess { private: // Data members - shell* m_pMyShell; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xContentIdentifier; - OUString m_aUncPath; + shell* m_pMyShell; + css::uno::Reference< css::ucb::XContentIdentifier > m_xContentIdentifier; + OUString m_aUncPath; enum state { NameForInsertionSet = 1, JustInserted = 2, @@ -289,30 +282,30 @@ namespace fileaccess { // Private Methods - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo > SAL_CALL + css::uno::Reference< css::ucb::XCommandInfo > SAL_CALL getCommandInfo() - throw( com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( sal_Int32 nMyCommandIdentifier ) - throw( com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); - com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > SAL_CALL + css::uno::Reference< css::sdbc::XRow > SAL_CALL getPropertyValues( sal_Int32 nMyCommandIdentifier, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& PropertySet ) + const css::uno::Sequence< css::beans::Property >& PropertySet ) throw( css::uno::RuntimeException, std::exception ); - com::sun::star::uno::Sequence< com::sun::star::uno::Any > SAL_CALL + css::uno::Sequence< css::uno::Any > SAL_CALL setPropertyValues( sal_Int32 nMyCommandIdentifier, - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Values ); + const css::uno::Sequence< css::beans::PropertyValue >& Values ); - com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > SAL_CALL + css::uno::Reference< css::ucb::XDynamicResultSet > SAL_CALL open( sal_Int32 nMyCommandIdentifier, - const com::sun::star::ucb::OpenCommandArgument2& aCommandArgument ); + const css::ucb::OpenCommandArgument2& aCommandArgument ); void SAL_CALL deleteContent( sal_Int32 nMyCommandIdentifier ); @@ -320,11 +313,11 @@ namespace fileaccess { void SAL_CALL transfer( sal_Int32 nMyCommandIdentifier, - const com::sun::star::ucb::TransferInfo& aTransferInfo ); + const css::ucb::TransferInfo& aTransferInfo ); void SAL_CALL insert( sal_Int32 nMyCommandIdentifier, - const com::sun::star::ucb::InsertCommandArgument& aInsertArgument ); + const css::ucb::InsertCommandArgument& aInsertArgument ); void SAL_CALL endTask( sal_Int32 CommandId ); diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx index 27daba8a6b1f..c0d22df40c66 100644 --- a/ucb/source/ucp/file/filcmd.hxx +++ b/ucb/source/ucp/file/filcmd.hxx @@ -35,7 +35,7 @@ namespace fileaccess { class XCommandInfo_impl : public cppu::OWeakObject, - public com::sun::star::ucb::XCommandInfo + public css::ucb::XCommandInfo { public: @@ -44,10 +44,10 @@ namespace fileaccess { virtual ~XCommandInfo_impl(); // XInterface - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Type& aType ) + throw( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( @@ -61,38 +61,38 @@ namespace fileaccess { // XCommandInfo - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > SAL_CALL + virtual css::uno::Sequence< css::ucb::CommandInfo > SAL_CALL getCommands( void ) - throw( com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::ucb::CommandInfo SAL_CALL + virtual css::ucb::CommandInfo SAL_CALL getCommandInfoByName( const OUString& Name ) - throw( com::sun::star::ucb::UnsupportedCommandException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::ucb::UnsupportedCommandException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::ucb::CommandInfo SAL_CALL + virtual css::ucb::CommandInfo SAL_CALL getCommandInfoByHandle( sal_Int32 Handle ) - throw( com::sun::star::ucb::UnsupportedCommandException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::ucb::UnsupportedCommandException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: - shell* m_pMyShell; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; + shell* m_pMyShell; + css::uno::Reference< css::ucb::XContentProvider > m_xProvider; }; } diff --git a/ucb/source/ucp/file/filglob.hxx b/ucb/source/ucp/file/filglob.hxx index 2792e74b48e4..2bbecb3a8756 100644 --- a/ucb/source/ucp/file/filglob.hxx +++ b/ucb/source/ucp/file/filglob.hxx @@ -81,8 +81,7 @@ namespace fileaccess { extern void throw_handler( sal_Int32 errorCode, sal_Int32 minorCode, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv, const OUString& aUncPath, BaseContent* pContent, bool isHandled = false); diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx index 8d58001f4df0..abd60b1373ca 100644 --- a/ucb/source/ucp/file/filid.hxx +++ b/ucb/source/ucp/file/filid.hxx @@ -30,8 +30,8 @@ namespace fileaccess { class FileContentIdentifier : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::ucb::XContentIdentifier + public css::lang::XTypeProvider, + public css::ucb::XContentIdentifier { // This implementation has to be reworked @@ -42,10 +42,10 @@ namespace fileaccess { virtual ~FileContentIdentifier(); // XInterface - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Type& aType ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire( @@ -58,26 +58,26 @@ namespace fileaccess { throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XContentIdentifier virtual OUString SAL_CALL getContentIdentifier( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getContentProviderScheme( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: OUString m_aContentId; // The URL string diff --git a/ucb/source/ucp/file/filinl.hxx b/ucb/source/ucp/file/filinl.hxx index 48e1e256c00a..003f11b325c8 100644 --- a/ucb/source/ucp/file/filinl.hxx +++ b/ucb/source/ucp/file/filinl.hxx @@ -27,15 +27,15 @@ inline const sal_Int32& SAL_CALL shell::MyProperty::getHandle() const { return Handle; } -inline const com::sun::star::uno::Type& SAL_CALL shell::MyProperty::getType() const +inline const css::uno::Type& SAL_CALL shell::MyProperty::getType() const { return Typ; } -inline const com::sun::star::uno::Any& SAL_CALL shell::MyProperty::getValue() const +inline const css::uno::Any& SAL_CALL shell::MyProperty::getValue() const { return Value; } -inline const com::sun::star::beans::PropertyState& SAL_CALL shell::MyProperty::getState() const +inline const css::beans::PropertyState& SAL_CALL shell::MyProperty::getState() const { return State; } @@ -43,11 +43,11 @@ inline const sal_Int16& SAL_CALL shell::MyProperty::getAttributes() const { return Attributes; } -inline void SAL_CALL shell::MyProperty::setValue( const com::sun::star::uno::Any& __Value ) const +inline void SAL_CALL shell::MyProperty::setValue( const css::uno::Any& __Value ) const { const_cast<MyProperty*>(this)->Value = __Value; } -inline void SAL_CALL shell::MyProperty::setState( const com::sun::star::beans::PropertyState& __State ) const +inline void SAL_CALL shell::MyProperty::setState( const css::beans::PropertyState& __State ) const { const_cast<MyProperty*>(this)->State = __State; } diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx index d97bca854611..3fcc4b593765 100644 --- a/ucb/source/ucp/file/filinpstr.hxx +++ b/ucb/source/ucp/file/filinpstr.hxx @@ -36,9 +36,9 @@ namespace fileaccess { class XInputStream_impl : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::io::XInputStream, - public com::sun::star::io::XSeekable + public css::lang::XTypeProvider, + public css::io::XInputStream, + public css::io::XSeekable { public: @@ -61,10 +61,10 @@ namespace fileaccess { virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Type& rType ) + throw( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( @@ -78,68 +78,67 @@ namespace fileaccess { virtual sal_Int32 SAL_CALL readBytes( - com::sun::star::uno::Sequence< sal_Int8 >& aData, + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL readSomeBytes( - com::sun::star::uno::Sequence< sal_Int8 >& aData, + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL available( void ) - 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( void ) - 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 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( void ) - 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( void ) - throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; private: - com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider > m_xProvider; - bool m_nIsOpen; + css::uno::Reference< css::ucb::XContentProvider > m_xProvider; + bool m_nIsOpen; ReconnectingFile m_aFile; diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx index 4ed056c1b4d1..511d8f2daf50 100644 --- a/ucb/source/ucp/file/filinsreq.hxx +++ b/ucb/source/ucp/file/filinsreq.hxx @@ -46,13 +46,13 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< } virtual void SAL_CALL select() - throw (::com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { m_bSelected = true; } void SAL_CALL setName(const OUString& Name) - throw(::com::sun::star::uno::RuntimeException, std::exception) override + throw(css::uno::RuntimeException, std::exception) override { m_aNewName = Name; } @@ -86,7 +86,7 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< } virtual void SAL_CALL select() - throw (::com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { m_bSelected = true; } @@ -110,8 +110,7 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< XInteractionRequestImpl( const OUString& aClashingName, - const com::sun::star::uno::Reference< - com::sun::star::uno::XInterface>& xOrigin, + const css::uno::Reference< css::uno::XInterface>& xOrigin, shell* pShell, sal_Int32 CommandId); @@ -142,8 +141,7 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< css::uno::Reference<css::task::XInteractionRequest> m_xRequest; OUString m_aClashingName; - com::sun::star::uno::Reference< - com::sun::star::uno::XInterface> m_xOrigin; + css::uno::Reference< css::uno::XInterface> m_xOrigin; }; } diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx index 2f84445aae84..aba54e3c5fcd 100644 --- a/ucb/source/ucp/file/filnot.cxx +++ b/ucb/source/ucp/file/filnot.cxx @@ -201,8 +201,8 @@ PropertySetInfoChangeNotifier::notifyPropertyRemoved( const OUString & aProperty PropertyChangeNotifier::PropertyChangeNotifier( - const com::sun::star::uno::Reference< XContent >& xCreatorContent, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId, + const css::uno::Reference< XContent >& xCreatorContent, + const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, ListenerMap* pListeners ) : m_xCreatorContent( xCreatorContent ), m_xCreatorId( xCreatorId ), diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx index 95db8640767f..b65af7ad7042 100644 --- a/ucb/source/ucp/file/filnot.hxx +++ b/ucb/source/ucp/file/filnot.hxx @@ -34,26 +34,24 @@ namespace fileaccess { { private: shell* m_pMyShell; - com::sun::star::uno::Reference< com::sun::star::ucb::XContent > m_xCreatorContent; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xCreatorId; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xOldId; - com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > > m_sListeners; + css::uno::Reference< css::ucb::XContent > m_xCreatorContent; + css::uno::Reference< css::ucb::XContentIdentifier > m_xCreatorId; + css::uno::Reference< css::ucb::XContentIdentifier > m_xOldId; + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > m_sListeners; public: ContentEventNotifier( shell* pMyShell, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContent >& xCreatorContent, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId, - const com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >& sListeners ); + const css::uno::Reference< css::ucb::XContent >& xCreatorContent, + const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, + const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& sListeners ); ContentEventNotifier( shell* pMyShell, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContent >& xCreatorContent, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xOldId, - const com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >& sListeners ); + const css::uno::Reference< css::ucb::XContent >& xCreatorContent, + const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, + const css::uno::Reference< css::ucb::XContentIdentifier >& xOldId, + const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& sListeners ); void notifyChildInserted( const OUString& aChildName ); void notifyDeleted(); @@ -65,15 +63,14 @@ namespace fileaccess { class PropertySetInfoChangeNotifier { private: - com::sun::star::uno::Reference< com::sun::star::ucb::XContent > m_xCreatorContent; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xCreatorId; - com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > > m_sListeners; + css::uno::Reference< css::ucb::XContent > m_xCreatorContent; + css::uno::Reference< css::ucb::XContentIdentifier > m_xCreatorId; + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > m_sListeners; public: PropertySetInfoChangeNotifier( - const com::sun::star::uno::Reference< com::sun::star::ucb::XContent >& xCreatorContent, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId, - const com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >& sListeners ); + const css::uno::Reference< css::ucb::XContent >& xCreatorContent, + const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, + const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& sListeners ); void SAL_CALL notifyPropertyAdded( const OUString & aPropertyName ); void SAL_CALL notifyPropertyRemoved( const OUString & aPropertyName ); @@ -81,25 +78,25 @@ namespace fileaccess { typedef std::unordered_map< OUString, - com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >, + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >, OUStringHash > ListenerMap; class PropertyChangeNotifier { private: - com::sun::star::uno::Reference< com::sun::star::ucb::XContent > m_xCreatorContent; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xCreatorId; + css::uno::Reference< css::ucb::XContent > m_xCreatorContent; + css::uno::Reference< css::ucb::XContentIdentifier > m_xCreatorId; ListenerMap* m_pListeners; public: PropertyChangeNotifier( - const com::sun::star::uno::Reference< com::sun::star::ucb::XContent >& xCreatorContent, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId, + const css::uno::Reference< css::ucb::XContent >& xCreatorContent, + const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, ListenerMap* pListeners ); ~PropertyChangeNotifier(); void notifyPropertyChanged( - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyChangeEvent >& seqChanged ); + const css::uno::Sequence< css::beans::PropertyChangeEvent >& seqChanged ); }; diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx index b3c53ea1ae64..ecb92c8eb7a1 100644 --- a/ucb/source/ucp/file/filprp.hxx +++ b/ucb/source/ucp/file/filprp.hxx @@ -33,30 +33,30 @@ class XPropertySetInfo_impl : public cppu::WeakImplHelper< { public: XPropertySetInfo_impl( shell* pMyShell,const OUString& aUnqPath ); - XPropertySetInfo_impl( shell* pMyShell,const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq ); + XPropertySetInfo_impl( shell* pMyShell,const css::uno::Sequence< css::beans::Property >& seq ); virtual ~XPropertySetInfo_impl(); - virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > SAL_CALL + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::beans::Property SAL_CALL + virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: shell* m_pMyShell; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; + css::uno::Reference< css::ucb::XContentProvider > m_xProvider; sal_Int32 m_count; - com::sun::star::uno::Sequence< com::sun::star::beans::Property > m_seq; + css::uno::Sequence< css::beans::Property > m_seq; }; } diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx index 80828ed6f772..ad497f6997d8 100644 --- a/ucb/source/ucp/file/filrow.cxx +++ b/ucb/source/ucp/file/filrow.cxx @@ -25,7 +25,7 @@ using namespace fileaccess; using namespace com::sun::star; -using namespace com::sun::star::uno; +using namespace css::uno; #if OSL_DEBUG_LEVEL > 0 #define THROW_WHERE SAL_WHERE diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx index 1e900f1b49a3..5be0822e1303 100644 --- a/ucb/source/ucp/file/filrow.hxx +++ b/ucb/source/ucp/file/filrow.hxx @@ -32,138 +32,138 @@ namespace fileaccess { css::sdbc::XRow > { public: - XRow_impl( shell* pShell,const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& __m_aValueMap ); + XRow_impl( shell* pShell,const css::uno::Sequence< css::uno::Any >& __m_aValueMap ); virtual ~XRow_impl(); virtual sal_Bool SAL_CALL wasNull( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw( - com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::util::Date SAL_CALL + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::util::Time SAL_CALL + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::util::DateTime SAL_CALL + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRef > SAL_CALL + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob > SAL_CALL + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XClob > SAL_CALL + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XArray > SAL_CALL + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; private: osl::Mutex m_aMutex; - com::sun::star::uno::Sequence< com::sun::star::uno::Any > m_aValueMap; + css::uno::Sequence< css::uno::Any > m_aValueMap; bool m_nWasNull; shell* m_pMyShell; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; - com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter > m_xTypeConverter; + css::uno::Reference< css::ucb::XContentProvider > m_xProvider; + css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter; }; } // end namespace fileaccess diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index 7ffcd870870d..e018d67787e3 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -56,8 +56,8 @@ class XResultSet_impl : public Notifier, XResultSet_impl( shell* pMyShell, const OUString& aUnqPath, sal_Int32 OpenMode, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq, - const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort ); + const css::uno::Sequence< css::beans::Property >& seq, + const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort ); virtual ~XResultSet_impl(); @@ -92,31 +92,31 @@ class XResultSet_impl : public Notifier, // XEventListener virtual void SAL_CALL disposing( - const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::lang::EventObject& Source ) + throw( css::uno::RuntimeException, std::exception ) override; // XComponent virtual void SAL_CALL dispose( void ) - 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 >& aListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw( css::uno::RuntimeException, std::exception ) override; // XRow virtual sal_Bool SAL_CALL wasNull( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0<= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) m_nWasNull = m_aItems[m_nRow]->wasNull(); @@ -128,8 +128,8 @@ class XResultSet_impl : public Notifier, virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getString( columnIndex ); @@ -140,8 +140,8 @@ class XResultSet_impl : public Notifier, virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBoolean( columnIndex ); @@ -152,8 +152,8 @@ class XResultSet_impl : public Notifier, virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getByte( columnIndex ); @@ -165,8 +165,8 @@ class XResultSet_impl : public Notifier, getShort( sal_Int32 columnIndex ) throw( - com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getShort( columnIndex ); @@ -177,8 +177,8 @@ class XResultSet_impl : public Notifier, virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getInt( columnIndex ); @@ -189,8 +189,8 @@ class XResultSet_impl : public Notifier, virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getLong( columnIndex ); @@ -201,8 +201,8 @@ class XResultSet_impl : public Notifier, virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getFloat( columnIndex ); @@ -213,8 +213,8 @@ class XResultSet_impl : public Notifier, virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDouble( columnIndex ); @@ -222,137 +222,137 @@ class XResultSet_impl : public Notifier, return double( 0 ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBytes( columnIndex ); else - return com::sun::star::uno::Sequence< sal_Int8 >(); + return css::uno::Sequence< sal_Int8 >(); } - virtual com::sun::star::util::Date SAL_CALL + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDate( columnIndex ); else - return com::sun::star::util::Date(); + return css::util::Date(); } - virtual com::sun::star::util::Time SAL_CALL + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTime( columnIndex ); else - return com::sun::star::util::Time(); + return css::util::Time(); } - virtual com::sun::star::util::DateTime SAL_CALL + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTimestamp( columnIndex ); else - return com::sun::star::util::DateTime(); + return css::util::DateTime(); } - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBinaryStream( columnIndex ); else - return com::sun::star::uno::Reference< com::sun::star::io::XInputStream >(); + return css::uno::Reference< css::io::XInputStream >(); } - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getCharacterStream( columnIndex ); else - return com::sun::star::uno::Reference< com::sun::star::io::XInputStream >(); + return css::uno::Reference< css::io::XInputStream >(); } - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + const css::uno::Reference< css::container::XNameAccess >& typeMap ) + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getObject( columnIndex,typeMap ); else - return com::sun::star::uno::Any(); + return css::uno::Any(); } - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRef > SAL_CALL + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getRef( columnIndex ); else - return com::sun::star::uno::Reference< com::sun::star::sdbc::XRef >(); + return css::uno::Reference< css::sdbc::XRef >(); } - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob > SAL_CALL + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBlob( columnIndex ); else - return com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob >(); + return css::uno::Reference< css::sdbc::XBlob >(); } - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XClob > SAL_CALL + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getClob( columnIndex ); else - return com::sun::star::uno::Reference< com::sun::star::sdbc::XClob >(); + return css::uno::Reference< css::sdbc::XClob >(); } - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XArray > SAL_CALL + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getArray( columnIndex ); else - return com::sun::star::uno::Reference< com::sun::star::sdbc::XArray >(); + return css::uno::Reference< css::sdbc::XArray >(); } @@ -361,138 +361,138 @@ class XResultSet_impl : public Notifier, virtual sal_Bool SAL_CALL next( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isBeforeFirst( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAfterLast( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isFirst( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isLast( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL beforeFirst( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL afterLast( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL first( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL last( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getRow( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL previous( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL refreshRow( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL rowUpdated( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL rowInserted( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL rowDeleted( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; // XDynamicResultSet - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > SAL_CALL + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getStaticResultSet( void ) - throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::ucb::ListenerAlreadySetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setListener( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSetListener >& Listener ) - throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< + css::ucb::XDynamicResultSetListener >& Listener ) + throw( css::ucb::ListenerAlreadySetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - connectToCache( const com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > & xCache ) - throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::ucb::AlreadyInitializedException, - com::sun::star::ucb::ServiceNotFoundException, - com::sun::star::uno::RuntimeException, std::exception ) override; + connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) + throw( css::ucb::ListenerAlreadySetException, + css::ucb::AlreadyInitializedException, + css::ucb::ServiceNotFoundException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL getCapabilities() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XCloseable @@ -500,85 +500,85 @@ class XResultSet_impl : public Notifier, virtual void SAL_CALL close( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; // XContentAccess virtual OUString SAL_CALL queryContentIdentifierString( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL + virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XResultSetMetaDataSupplier - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > SAL_CALL + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( com::sun::star::uno::RuntimeException, std::exception) override; + 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 com::sun::star::uno::Any SAL_CALL + 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( com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; private: @@ -587,15 +587,15 @@ class XResultSet_impl : public Notifier, // const uno::Reference< ucb::XContentProvider > m_xProvider; shell* m_pMyShell; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; + css::uno::Reference< css::ucb::XContentProvider > m_xProvider; bool m_nIsOpen; sal_Int32 m_nRow; bool m_nWasNull; sal_Int32 m_nOpenMode; bool m_bRowCountFinal; - typedef std::vector< com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > > IdentSet; - typedef std::vector< com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > > ItemSet; + typedef std::vector< css::uno::Reference< css::ucb::XContentIdentifier > > IdentSet; + typedef std::vector< css::uno::Reference< css::sdbc::XRow > > ItemSet; typedef std::vector< OUString > UnqPathSet; IdentSet m_aIdents; @@ -604,8 +604,8 @@ class XResultSet_impl : public Notifier, const OUString m_aBaseDirectory; osl::Directory m_aFolder; - com::sun::star::uno::Sequence< com::sun::star::beans::Property > m_sProperty; - com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo > m_sSortingInfo; + css::uno::Sequence< css::beans::Property > m_sProperty; + css::uno::Sequence< css::ucb::NumberedSortingInfo > m_sSortingInfo; osl::Mutex m_aMutex; osl::Mutex m_aEventListenerMutex; @@ -614,7 +614,7 @@ class XResultSet_impl : public Notifier, cppu::OInterfaceContainerHelper* m_pRowCountListeners; cppu::OInterfaceContainerHelper* m_pIsFinalListeners; - com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSetListener > m_xListener; + css::uno::Reference< css::ucb::XDynamicResultSetListener > m_xListener; bool m_bStatic; sal_Int32 m_nErrorCode; diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 68010c9e0e83..ca8598035fc8 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -27,7 +27,7 @@ using namespace fileaccess; using namespace com::sun::star; -using namespace com::sun::star::ucb; +using namespace css::ucb; #if OSL_DEBUG_LEVEL > 0 #define THROW_WHERE SAL_WHERE diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index df107f20c525..f031fc836022 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -62,117 +62,117 @@ class XStream_impl : public cppu::WeakImplHelper< // XStream - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > SAL_CALL + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XTruncate virtual void SAL_CALL truncate() - throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; // XInputStream sal_Int32 SAL_CALL readBytes( - com::sun::star::uno::Sequence< sal_Int8 >& aData, + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; sal_Int32 SAL_CALL readSomeBytes( - com::sun::star::uno::Sequence< sal_Int8 >& aData, + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; 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; sal_Int32 SAL_CALL available( void ) - 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; void SAL_CALL closeInput( void ) - 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 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; sal_Int64 SAL_CALL getPosition( void ) - throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; sal_Int64 SAL_CALL getLength( void ) - throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; // XOutputStream 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; + writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; 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; void SAL_CALL closeOutput( void ) - 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 waitForCompletion() throw ( - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + css::io::IOException, + css::uno::RuntimeException, std::exception) override; private: @@ -180,7 +180,7 @@ class XStream_impl : public cppu::WeakImplHelper< bool m_bInputStreamCalled,m_bOutputStreamCalled; shell* m_pMyShell; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; + css::uno::Reference< css::ucb::XContentProvider > m_xProvider; bool m_nIsOpen; ReconnectingFile m_aFile; @@ -193,9 +193,9 @@ class XStream_impl : public cppu::WeakImplHelper< void SAL_CALL closeStream( void ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException ); }; diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index d24aec4fdb83..44e6870b3216 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -54,16 +54,16 @@ namespace fileaccess bool m_bAbort,m_bHandled; sal_Int32 m_nErrorCode,m_nMinorCode; - com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInteractionHandler; - com::sun::star::uno::Reference< com::sun::star::ucb::XProgressHandler > m_xProgressHandler; - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xCommandEnvironment; + css::uno::Reference< css::task::XInteractionHandler > m_xInteractionHandler; + css::uno::Reference< css::ucb::XProgressHandler > m_xProgressHandler; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xCommandEnvironment; public: explicit TaskHandling( - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xCommandEnv - = com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >( 0 ) ) + const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv + = css::uno::Reference< css::ucb::XCommandEnvironment >( 0 ) ) : m_bAbort( false ), m_bHandled( false ), m_nErrorCode( TASKHANDLER_NO_ERROR ), @@ -112,7 +112,7 @@ namespace fileaccess return m_nMinorCode; } - com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > SAL_CALL + css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() { if( ! m_xInteractionHandler.is() && m_xCommandEnvironment.is() ) @@ -121,7 +121,7 @@ namespace fileaccess return m_xInteractionHandler; } - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > SAL_CALL + css::uno::Reference< css::ucb::XCommandEnvironment > SAL_CALL getCommandEnvironment() { return m_xCommandEnvironment; @@ -145,8 +145,8 @@ namespace fileaccess void SAL_CALL startTask( sal_Int32 CommandId, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xCommandEnv ) - throw( com::sun::star::ucb::DuplicateCommandIdentifierException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv ) + throw( css::ucb::DuplicateCommandIdentifierException ); sal_Int32 SAL_CALL getCommandId(); void SAL_CALL abort( sal_Int32 CommandId ); @@ -182,7 +182,7 @@ namespace fileaccess */ void SAL_CALL handleTask( sal_Int32 CommandId, - const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& request ); + const css::uno::Reference< css::task::XInteractionRequest >& request ); /** * Clears any error which are set on the commandid diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index d51363932d2a..82cfca68f3b0 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -146,30 +146,6 @@ Reference< XSingleServiceFactory > SAL_CALL FileProvider::createServiceFactory( const Reference< XMultiServiceFactory >& rxServiceMgr ) { - /** - * Create a single service factory.<BR> - * Note: The function pointer ComponentInstantiation points to a function throws Exception. - * - * @param rServiceManager the service manager used by the implementation. - * @param rImplementationName the implementation name. An empty string is possible. - * @param ComponentInstantiation the function pointer to create an object. - * @param rServiceNames the service supported by the implementation. - * @return a factory that support the interfaces XServiceProvider, XServiceInfo - * XSingleServiceFactory and XComponent. - * - * @see createOneInstanceFactory - */ - /* - * Reference< ::com::sun::star::XSingleServiceFactory > createSingleFactory - * ( - * const ::com::sun::star::Reference< ::com::sun::star::XMultiServiceFactory > & rServiceManager, - * const OUString & rImplementationName, - * ComponentInstantiation pCreateFunction, - - * const ::com::sun::star::Sequence< OUString > & rServiceNames - * ); - */ - return Reference< XSingleServiceFactory > ( cppu::createSingleFactory( rxServiceMgr, fileaccess::shell::getImplementationName_static(), diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index db15667e622d..d65aedd19ca7 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -59,130 +59,130 @@ namespace fileaccess { friend class BaseContent; public: - explicit FileProvider( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + explicit FileProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~FileProvider(); // XServiceInfo virtual OUString SAL_CALL getImplementationName( void ) - 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; + throw(css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - static com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > SAL_CALL + static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL createServiceFactory( - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr ); + const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr ); - static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > SAL_CALL CreateInstance( - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMultiServiceFactory ); + const css::uno::Reference< css::lang::XMultiServiceFactory >& xMultiServiceFactory ); // 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; + const css::uno::Sequence< css::uno::Any >& aArguments ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XContentProvider - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) - throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, + css::uno::RuntimeException, std::exception ) override; // XContentIdentifierFactory - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL + virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL createContentIdentifier( const OUString& ContentId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL compareContentIds( - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id1, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id2 ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentIdentifier >& Id1, + const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) + throw( css::uno::RuntimeException, std::exception ) override; // XProperySet - virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + 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 com::sun::star::uno::Any SAL_CALL + 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( com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + 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; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XFileIdentifierConverter virtual sal_Int32 SAL_CALL getFileProviderLocality( const OUString& BaseURL ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getFileURLFromSystemPath( const OUString& BaseURL, - const OUString& SystemPath ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const OUString& SystemPath ) + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getSystemPathFromFileURL( const OUString& URL ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: @@ -190,7 +190,7 @@ namespace fileaccess { void SAL_CALL init(); // Members - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; void SAL_CALL initProperties(); osl::Mutex m_aMutex; @@ -198,9 +198,9 @@ namespace fileaccess { OUString m_HomeDirectory; sal_Int32 m_FileSystemNotation; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > m_xPropertySetInfo; + css::uno::Reference< css::beans::XPropertySetInfo > m_xPropertySetInfo; - shell* m_pMyShell; + shell* m_pMyShell; }; } // end namespace fileaccess diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index 982e68480b35..2d3cea0631d7 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -121,13 +121,13 @@ shell::MyProperty::MyProperty( const OUString& __Propert // empty } -shell::MyProperty::MyProperty( const bool& __isNative, - const OUString& __PropertyName, - const sal_Int32& __Handle, - const com::sun::star::uno::Type& __Typ, - const com::sun::star::uno::Any& __Value, - const com::sun::star::beans::PropertyState& __State, - const sal_Int16& __Attributes ) +shell::MyProperty::MyProperty( const bool& __isNative, + const OUString& __PropertyName, + const sal_Int32& __Handle, + const css::uno::Type& __Typ, + const css::uno::Any& __Value, + const css::beans::PropertyState& __State, + const sal_Int16& __Attributes ) : PropertyName( __PropertyName ), Handle( __Handle ), isNative( __isNative ), @@ -3044,7 +3044,7 @@ uno::Sequence< OUString > SAL_CALL shell::getSupportedServiceNames_static() { OUString Supported("com.sun.star.ucb.FileContentProvider"); - com::sun::star::uno::Sequence< OUString > Seq( &Supported,1 ); + css::uno::Sequence< OUString > Seq( &Supported,1 ); return Seq; } diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx index 5b1ff4249537..c629d65c59fc 100644 --- a/ucb/source/ucp/file/shell.hxx +++ b/ucb/source/ucp/file/shell.hxx @@ -79,36 +79,36 @@ namespace fileaccess { class MyProperty { private: - OUString PropertyName; - sal_Int32 Handle; - bool isNative; - com::sun::star::uno::Type Typ; // Duplicates information in Value - com::sun::star::uno::Any Value; - com::sun::star::beans::PropertyState State; - sal_Int16 Attributes; + OUString PropertyName; + sal_Int32 Handle; + bool isNative; + css::uno::Type Typ; // Duplicates information in Value + css::uno::Any Value; + css::beans::PropertyState State; + sal_Int16 Attributes; public: MyProperty(); explicit MyProperty( const OUString& __PropertyName ); - MyProperty( const bool& __isNative, - const OUString& __PropertyName, - const sal_Int32& __Handle, - const com::sun::star::uno::Type& __Typ, - const com::sun::star::uno::Any& __Value, - const com::sun::star::beans::PropertyState& __State, - const sal_Int16& __Attributes ); + MyProperty( const bool& __isNative, + const OUString& __PropertyName, + const sal_Int32& __Handle, + const css::uno::Type& __Typ, + const css::uno::Any& __Value, + const css::beans::PropertyState& __State, + const sal_Int16& __Attributes ); ~MyProperty(); inline const bool& SAL_CALL IsNative() const; inline const OUString& SAL_CALL getPropertyName() const { return PropertyName; } inline const sal_Int32& SAL_CALL getHandle() const; - inline const com::sun::star::uno::Type& SAL_CALL getType() const; - inline const com::sun::star::uno::Any& SAL_CALL getValue() const; - inline const com::sun::star::beans::PropertyState& SAL_CALL getState() const; + inline const css::uno::Type& SAL_CALL getType() const; + inline const css::uno::Any& SAL_CALL getValue() const; + inline const css::beans::PropertyState& SAL_CALL getState() const; inline const sal_Int16& SAL_CALL getAttributes() const; // The set* functions are declared const, because the key of "this" stays intact - inline void SAL_CALL setValue( const com::sun::star::uno::Any& __Value ) const; - inline void SAL_CALL setState( const com::sun::star::beans::PropertyState& __State ) const; + inline void SAL_CALL setValue( const css::uno::Any& __Value ) const; + inline void SAL_CALL setState( const css::beans::PropertyState& __State ) const; }; struct eMyProperty @@ -143,9 +143,9 @@ namespace fileaccess { NotifierList* notifier; // Three views on the PersistentPropertySet - com::sun::star::uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xS; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertyContainer > xC; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertyAccess > xA; + css::uno::Reference< css::ucb::XPersistentPropertySet > xS; + css::uno::Reference< css::beans::XPropertyContainer > xC; + css::uno::Reference< css::beans::XPropertyAccess > xA; }; typedef std::unordered_map< OUString,UnqPathData,OUStringHash > ContentMap; @@ -153,7 +153,7 @@ namespace fileaccess { public: // MethodenDefinitionen - shell( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, + shell( const css::uno::Reference< css::uno::XComponentContext >& rxContext, FileProvider* pProvider, bool bWithConfig ); virtual ~shell(); @@ -179,18 +179,18 @@ namespace fileaccess { void SAL_CALL associate( const OUString& UnqPath, const OUString& PropertyName, - const com::sun::star::uno::Any& DefaultValue, + const css::uno::Any& DefaultValue, const sal_Int16 Attributes ) - throw( com::sun::star::beans::PropertyExistException, - com::sun::star::beans::IllegalTypeException, - com::sun::star::uno::RuntimeException); + throw( css::beans::PropertyExistException, + css::beans::IllegalTypeException, + css::uno::RuntimeException); void SAL_CALL deassociate( const OUString& UnqPath, const OUString& PropertyName ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException); + throw( css::beans::UnknownPropertyException, + css::beans::NotRemoveableException, + css::uno::RuntimeException); @@ -207,14 +207,14 @@ namespace fileaccess { void SAL_CALL page( sal_Int32 CommandId, const OUString& aUnqPath, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xOutputStream ); + const css::uno::Reference< css::io::XOutputStream >& xOutputStream ); /** * Given a file URL aUnqPath, this methods returns a XInputStream which reads from the open file. */ - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL + css::uno::Reference< css::io::XInputStream > SAL_CALL open( sal_Int32 CommandId, const OUString& aUnqPath, bool bLock ); @@ -225,7 +225,7 @@ namespace fileaccess { * to read and write from/to the file. */ - com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL + css::uno::Reference< css::io::XStream > SAL_CALL open_rw( sal_Int32 CommandId, const OUString& aUnqPath, bool bLock ); @@ -236,12 +236,12 @@ namespace fileaccess { * to file URL aUnqPath */ - com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > SAL_CALL + css::uno::Reference< css::ucb::XDynamicResultSet > SAL_CALL ls( sal_Int32 CommandId, const OUString& aUnqPath, const sal_Int32 OpenMode, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& sProperty, - const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo > & sSortingInfo ); + const css::uno::Sequence< css::beans::Property >& sProperty, + const css::uno::Sequence< css::ucb::NumberedSortingInfo > & sSortingInfo ); /** @@ -249,11 +249,11 @@ namespace fileaccess { */ // Info for commands - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo > SAL_CALL + css::uno::Reference< css::ucb::XCommandInfo > SAL_CALL info_c(); // Info for the properties - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL info_p( const OUString& aUnqPath ); @@ -261,9 +261,9 @@ namespace fileaccess { * Sets the values of the properties belonging to fileURL aUnqPath */ - com::sun::star::uno::Sequence< com::sun::star::uno::Any > SAL_CALL + css::uno::Sequence< css::uno::Any > SAL_CALL setv( const OUString& aUnqPath, - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& values ); + const css::uno::Sequence< css::beans::PropertyValue >& values ); /** @@ -271,10 +271,10 @@ namespace fileaccess { * Returns an XRow object containing the values in the requested order. */ - com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > SAL_CALL + css::uno::Reference< css::sdbc::XRow > SAL_CALL getv( sal_Int32 CommandId, const OUString& aUnqPath, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& properties ); + const css::uno::Sequence< css::beans::Property >& properties ); /********************************************************************************/ @@ -339,7 +339,7 @@ namespace fileaccess { mkfil( sal_Int32 CommandId, const OUString& aFileName, bool OverWrite, - const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ); + const css::uno::Reference< css::io::XInputStream >& aInputStream ); /** @@ -351,13 +351,13 @@ namespace fileaccess { write( sal_Int32 CommandId, const OUString& aUnqPath, bool OverWrite, - const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ); + const css::uno::Reference< css::io::XInputStream >& aInputStream ); void SAL_CALL insertDefaultProperties( const OUString& aUnqPath ); - com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > + css::uno::Sequence< css::ucb::ContentInfo > queryCreatableContentsInfo(); @@ -374,9 +374,9 @@ namespace fileaccess { bool m_bWithConfig; - FileProvider* m_pProvider; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< com::sun::star::ucb::XPropertySetRegistry > m_xFileRegistry; + FileProvider* m_pProvider; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::ucb::XPropertySetRegistry > m_xFileRegistry; private: @@ -408,7 +408,7 @@ namespace fileaccess { static void SAL_CALL notifyPropertyChanges( std::list< PropertyChangeNotifier* >* listeners, - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyChangeEvent >& seqChanged ); + const css::uno::Sequence< css::beans::PropertyChangeEvent >& seqChanged ); static void SAL_CALL notifyContentExchanged( std::vector< std::list< ContentEventNotifier* >* >* listeners_vec ); @@ -452,9 +452,9 @@ namespace fileaccess { // Special optimized method for getting the properties of a directoryitem, which // is returned by osl::DirectoryItem::getNextItem() - com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > SAL_CALL + css::uno::Reference< css::sdbc::XRow > SAL_CALL getv( Notifier* pNotifier, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& properties, + const css::uno::Sequence< css::beans::Property >& properties, osl::DirectoryItem& DirItem, OUString& aUnqPath, bool& bIsRegular ); @@ -488,7 +488,7 @@ namespace fileaccess { void SAL_CALL getMaskFromProperties( sal_Int32& n_Mask, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq ); + const css::uno::Sequence< css::beans::Property >& seq ); // Helper function for public copy @@ -542,8 +542,8 @@ namespace fileaccess { private: - PropertySet m_aDefaultProperties; - com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > m_sCommandInfo; + PropertySet m_aDefaultProperties; + css::uno::Sequence< css::ucb::CommandInfo > m_sCommandInfo; public: // Misceancellous: @@ -553,7 +553,7 @@ namespace fileaccess { static OUString SAL_CALL getImplementationName_static(); - static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); }; // end class shell diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index b492c5d582c5..cab4ccc35f9a 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -104,7 +104,7 @@ OUString SAL_CALL FTPContentIdentifier::getContentIdentifier( ) throw ( - com::sun::star::uno::RuntimeException, std::exception + css::uno::RuntimeException, std::exception ) { return m_ident; @@ -115,7 +115,7 @@ OUString SAL_CALL FTPContentIdentifier::getContentProviderScheme( ) throw ( - com::sun::star::uno::RuntimeException, std::exception + css::uno::RuntimeException, std::exception ) { return OUString("ftp"); diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx index 71d6eb1c9257..6b4b4138d3f0 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx @@ -41,8 +41,8 @@ namespace ftp { class FTPContentIdentifier : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::ucb::XContentIdentifier + public css::lang::XTypeProvider, + public css::ucb::XContentIdentifier { public: @@ -52,9 +52,9 @@ namespace ftp { // 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; @@ -63,35 +63,31 @@ namespace ftp { // XTypeProvider virtual - com::sun::star::uno::Sequence<com::sun::star::uno::Type> SAL_CALL - getTypes( - ) + css::uno::Sequence<css::uno::Type> SAL_CALL + getTypes() throw( - com::sun::star::uno::RuntimeException, std::exception + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId( - ) + virtual css::uno::Sequence<sal_Int8> SAL_CALL + getImplementationId() throw( - com::sun::star::uno::RuntimeException, std::exception + css::uno::RuntimeException, std::exception ) override; // XContentIdentifier virtual OUString SAL_CALL - getContentIdentifier( - ) + getContentIdentifier() throw ( - com::sun::star::uno::RuntimeException, std::exception + css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL - getContentProviderScheme( - ) + getContentProviderScheme() throw ( - ::com::sun::star::uno::RuntimeException, std::exception + css::uno::RuntimeException, std::exception ) override; diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx index 5a6d2dc6fd32..13b344464be4 100644 --- a/ucb/source/ucp/ftp/ftpdirp.hxx +++ b/ucb/source/ucp/ftp/ftpdirp.hxx @@ -39,7 +39,7 @@ namespace ftp { *======================================================================*/ struct DateTime - : public com::sun::star::util::DateTime + : public css::util::DateTime { DateTime(const sal_uInt32& nanoSeconds, const sal_uInt16& seconds, @@ -48,7 +48,7 @@ namespace ftp { const sal_uInt16& day, const sal_uInt16& month, const sal_uInt16& year) - : com::sun::star::util::DateTime(nanoSeconds, + : css::util::DateTime(nanoSeconds, seconds, minutes, hours, diff --git a/ucb/source/ucp/ftp/ftpdynresultset.hxx b/ucb/source/ucp/ftp/ftpdynresultset.hxx index 757855d497c4..757bc68d4e0a 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.hxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.hxx @@ -32,8 +32,7 @@ namespace ftp { class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper { rtl::Reference< FTPContent > m_xContent; - com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > m_xEnv; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; ResultSetFactory* m_pFactory; private: @@ -42,12 +41,10 @@ namespace ftp { public: DynamicResultSet( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< FTPContent >& rxContent, - const com::sun::star::ucb::OpenCommandArgument2& rCommand, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv, + const css::ucb::OpenCommandArgument2& rCommand, + const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv, ResultSetFactory* pFactory ); virtual ~DynamicResultSet(); diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx index 409dbdb9c4b0..8088755ba06c 100644 --- a/ucb/source/ucp/ftp/ftpintreq.hxx +++ b/ucb/source/ucp/ftp/ftpintreq.hxx @@ -62,7 +62,7 @@ namespace ftp { XInteractionDisapproveImpl(); virtual void SAL_CALL select() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: diff --git a/ucb/source/ucp/ftp/ftpresultsetI.hxx b/ucb/source/ucp/ftp/ftpresultsetI.hxx index 6437debb9bf5..eb4442346b82 100644 --- a/ucb/source/ucp/ftp/ftpresultsetI.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetI.hxx @@ -35,15 +35,11 @@ namespace ftp { public: ResultSetI( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext>& rxContext, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider>& xProvider, + const css::uno::Reference< css::uno::XComponentContext>& rxContext, + const css::uno::Reference< css::ucb::XContentProvider>& xProvider, sal_Int32 nOpenMode, - const com::sun::star::uno::Sequence< - com::sun::star::beans::Property >& seq, - const com::sun::star::uno::Sequence< - com::sun::star::ucb::NumberedSortingInfo >& seqSort, + const css::uno::Sequence< css::beans::Property >& seq, + const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort, const std::vector<FTPDirentry>& dirvec); private: diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx index 2ee5d63fd036..7a45ba050a66 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx @@ -40,33 +40,29 @@ namespace ftp { class ResultSetBase : public cppu::OWeakObject, - public com::sun::star::lang::XComponent, - public com::sun::star::sdbc::XRow, - public com::sun::star::sdbc::XResultSet, - public com::sun::star::sdbc::XCloseable, - public com::sun::star::sdbc::XResultSetMetaDataSupplier, - public com::sun::star::beans::XPropertySet, - public com::sun::star::ucb::XContentAccess + public css::lang::XComponent, + public css::sdbc::XRow, + public css::sdbc::XResultSet, + public css::sdbc::XCloseable, + public css::sdbc::XResultSetMetaDataSupplier, + public css::beans::XPropertySet, + public css::ucb::XContentAccess { public: - ResultSetBase(const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider >& xProvider, + ResultSetBase(const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::ucb::XContentProvider >& xProvider, sal_Int32 nOpenMode, - const com::sun::star::uno::Sequence< - com::sun::star::beans::Property >& seq, - const com::sun::star::uno::Sequence< - com::sun::star::ucb::NumberedSortingInfo >& seqSort); + const css::uno::Sequence< css::beans::Property >& seq, + const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort); virtual ~ResultSetBase(); // XInterface - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Type& aType ) + throw( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( @@ -82,26 +78,23 @@ namespace ftp { virtual void SAL_CALL dispose( void ) - 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 >& aListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw( css::uno::RuntimeException, std::exception ) override; // XRow virtual sal_Bool SAL_CALL - wasNull( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + wasNull() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0<= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) m_nWasNull = m_aItems[m_nRow]->wasNull(); @@ -113,8 +106,8 @@ namespace ftp { virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { OUString ret; if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) @@ -126,8 +119,8 @@ namespace ftp { virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBoolean( columnIndex ); @@ -138,8 +131,8 @@ namespace ftp { virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getByte( columnIndex ); @@ -151,8 +144,8 @@ namespace ftp { getShort( sal_Int32 columnIndex ) throw( - com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getShort( columnIndex ); @@ -163,8 +156,8 @@ namespace ftp { virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getInt( columnIndex ); @@ -175,8 +168,8 @@ namespace ftp { virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getLong( columnIndex ); @@ -187,8 +180,8 @@ namespace ftp { virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getFloat( columnIndex ); @@ -199,8 +192,8 @@ namespace ftp { virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDouble( columnIndex ); @@ -208,149 +201,139 @@ namespace ftp { return double( 0 ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBytes( columnIndex ); else - return com::sun::star::uno::Sequence< sal_Int8 >(); + return css::uno::Sequence< sal_Int8 >(); } - virtual com::sun::star::util::Date SAL_CALL + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDate( columnIndex ); else - return com::sun::star::util::Date(); + return css::util::Date(); } - virtual com::sun::star::util::Time SAL_CALL + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTime( columnIndex ); else - return com::sun::star::util::Time(); + return css::util::Time(); } - virtual com::sun::star::util::DateTime SAL_CALL + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTimestamp( columnIndex ); else - return com::sun::star::util::DateTime(); + return css::util::DateTime(); } - virtual com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBinaryStream( columnIndex ); else - return com::sun::star::uno::Reference< - com::sun::star::io::XInputStream >(); + return css::uno::Reference< css::io::XInputStream >(); } - virtual com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getCharacterStream( columnIndex ); else - return com::sun::star::uno::Reference< - com::sun::star::io::XInputStream >(); + return css::uno::Reference< css::io::XInputStream >(); } - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const com::sun::star::uno::Reference< - com::sun::star::container::XNameAccess >& typeMap ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + const css::uno::Reference< css::container::XNameAccess >& typeMap ) + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getObject( columnIndex,typeMap ); else - return com::sun::star::uno::Any(); + return css::uno::Any(); } - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XRef > SAL_CALL + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getRef( columnIndex ); else - return com::sun::star::uno::Reference< com::sun::star::sdbc::XRef >(); + return css::uno::Reference< css::sdbc::XRef >(); } - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XBlob > SAL_CALL + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBlob( columnIndex ); else - return com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob >(); + return css::uno::Reference< css::sdbc::XBlob >(); } - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XClob > SAL_CALL + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getClob( columnIndex ); else - return com::sun::star::uno::Reference< - com::sun::star::sdbc::XClob >(); + return css::uno::Reference< css::sdbc::XClob >(); } - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XArray > SAL_CALL + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getArray( columnIndex ); else - return com::sun::star::uno::Reference< - com::sun::star::sdbc::XArray >(); + return css::uno::Reference< + css::sdbc::XArray >(); } @@ -359,221 +342,194 @@ namespace ftp { virtual sal_Bool SAL_CALL next( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - isBeforeFirst( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + isBeforeFirst() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - isAfterLast( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + isAfterLast() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - isFirst( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + isFirst() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - isLast( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + isLast() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - beforeFirst( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + beforeFirst() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - afterLast( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + afterLast() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - first( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + first() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL last( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getRow( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - previous( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + previous() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - refreshRow( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + refreshRow() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - rowUpdated( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + rowUpdated() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - rowInserted( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + rowInserted() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - rowDeleted( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + rowDeleted() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Reference< - com::sun::star::uno::XInterface > SAL_CALL - getStatement( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL + getStatement() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; // XCloseable virtual void SAL_CALL - close( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + close() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; // XContentAccess virtual OUString SAL_CALL - queryContentIdentifierString( - void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + queryContentIdentifierString() + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > SAL_CALL - queryContentIdentifier( - void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL + queryContentIdentifier() + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - queryContent( - void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + queryContent() + throw( css::uno::RuntimeException, std::exception ) override; // XResultSetMetaDataSupplier - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSetMetaData > SAL_CALL - getMetaData( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL + getMetaData() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( com::sun::star::uno::RuntimeException, std::exception) override; + 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 com::sun::star::uno::Any SAL_CALL + 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( com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; protected: - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider > m_xProvider; + css::uno::Reference< + css::uno::XComponentContext > m_xContext; + css::uno::Reference< + css::ucb::XContentProvider > m_xProvider; sal_Int32 m_nRow; - bool m_nWasNull; + bool m_nWasNull; sal_Int32 m_nOpenMode; - bool m_bRowCountFinal; + bool m_bRowCountFinal; - typedef std::vector< com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > > IdentSet; - typedef std::vector< com::sun::star::uno::Reference< - com::sun::star::sdbc::XRow > > ItemSet; + typedef std::vector< css::uno::Reference< + css::ucb::XContentIdentifier > > IdentSet; + typedef std::vector< css::uno::Reference< + css::sdbc::XRow > > ItemSet; typedef std::vector< OUString > PathSet; @@ -581,10 +537,10 @@ namespace ftp { ItemSet m_aItems; PathSet m_aPath; - com::sun::star::uno::Sequence< - com::sun::star::beans::Property > m_sProperty; - com::sun::star::uno::Sequence< - com::sun::star::ucb::NumberedSortingInfo > m_sSortingInfo; + css::uno::Sequence< + css::beans::Property > m_sProperty; + css::uno::Sequence< + css::ucb::NumberedSortingInfo > m_sSortingInfo; osl::Mutex m_aMutex; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; diff --git a/ucb/source/ucp/ftp/ftpstrcont.hxx b/ucb/source/ucp/ftp/ftpstrcont.hxx index 383995c47275..9c88272c83f5 100644 --- a/ucb/source/ucp/ftp/ftpstrcont.hxx +++ b/ucb/source/ucp/ftp/ftpstrcont.hxx @@ -38,14 +38,13 @@ namespace ftp { : public FTPStreamContainer { public: - explicit FTPOutputStreamContainer(const com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream>& out); + explicit FTPOutputStreamContainer(const css::uno::Reference< + css::io::XOutputStream>& out); virtual ~FTPOutputStreamContainer() {} private: - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream> m_out; + css::uno::Reference< css::io::XOutputStream> m_out; }; @@ -57,8 +56,7 @@ namespace ftp { virtual ~FTPInputStreamContainer() {} - com::sun::star::uno::Reference< - com::sun::star::io::XInputStream> operator()(); + css::uno::Reference< css::io::XInputStream> operator()(); private: FTPInputStream* m_out; diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx index 180ba638d649..eb2094984806 100644 --- a/ucb/source/ucp/gio/gio_content.hxx +++ b/ucb/source/ucp/gio/gio_content.hxx @@ -53,14 +53,14 @@ namespace gio #define GIO_FILE_TYPE "application/vnd.sun.staroffice.gio-file" #define GIO_FOLDER_TYPE "application/vnd.sun.staroffice.gio-folder" -com::sun::star::uno::Any convertToException(GError *pError, - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rContext, bool bThrow=true); +css::uno::Any convertToException(GError *pError, + const css::uno::Reference< css::uno::XInterface >& rContext, bool bThrow=true); void convertToIOException(GError *pError, - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rContext) + const css::uno::Reference< css::uno::XInterface >& rContext) throw (css::io::IOException, css::uno::RuntimeException, std::exception); class ContentProvider; -class Content : public ::ucbhelper::ContentImplHelper, public com::sun::star::ucb::XContentCreator +class Content : public ::ucbhelper::ContentImplHelper, public css::ucb::XContentCreator { private: ContentProvider *m_pProvider; @@ -68,17 +68,17 @@ private: GFileInfo *mpInfo; bool mbTransient; - GFileInfo *getGFileInfo(const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv, + GFileInfo *getGFileInfo(const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv, GError **ppError=NULL); - bool isFolder(const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv); + bool isFolder(const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv); - com::sun::star::uno::Any mapGIOError( GError *error ); - com::sun::star::uno::Any getBadArgExcept(); + css::uno::Any mapGIOError( GError *error ); + css::uno::Any getBadArgExcept(); - com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + css::uno::Reference< css::sdbc::XRow > getPropertyValues( - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProperties, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ); + const css::uno::Sequence< css::beans::Property >& rProperties, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); private: typedef rtl::Reference< Content > ContentRef; typedef std::list< ContentRef > ContentRefList; @@ -87,60 +87,60 @@ private: bool doSetFileInfo ( GFileInfo *pNewInfo ); - com::sun::star::uno::Any open(const com::sun::star::ucb::OpenCommandArgument2 & rArg, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( com::sun::star::uno::Exception ); + css::uno::Any open(const css::ucb::OpenCommandArgument2 & rArg, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception ); - void transfer( const com::sun::star::ucb::TransferInfo& rTransferInfo, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( com::sun::star::uno::Exception, std::exception ); + void transfer( const css::ucb::TransferInfo& rTransferInfo, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); - void insert( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & xInputStream, - bool bReplaceExisting, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw( com::sun::star::uno::Exception ); + void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream, + bool bReplaceExisting, const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw( css::uno::Exception ); - void destroy( bool bDeletePhysical ) throw( com::sun::star::uno::Exception, std::exception ); + void destroy( bool bDeletePhysical ) throw( css::uno::Exception, std::exception ); - static void copyData( com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xIn, - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOut ); + static void copyData( css::uno::Reference< css::io::XInputStream > xIn, + css::uno::Reference< css::io::XOutputStream > xOut ); - com::sun::star::uno::Sequence< com::sun::star::uno::Any > - setPropertyValues( const com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue >& rValues, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ); + css::uno::Sequence< css::uno::Any > + setPropertyValues( const css::uno::Sequence< + css::beans::PropertyValue >& rValues, + const css::uno::Reference< + css::ucb::XCommandEnvironment >& xEnv ); - bool feedSink( com::sun::star::uno::Reference< com::sun::star::uno::XInterface> aSink, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ); + bool feedSink( css::uno::Reference< css::uno::XInterface> aSink, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); - bool exchangeIdentity(const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xNewId); + bool exchangeIdentity(const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId); public: - Content( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, ContentProvider *pProvider, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier) - throw ( com::sun::star::ucb::ContentCreationException ); - - Content( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, ContentProvider *pProvider, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier, + Content( const css::uno::Reference< + css::uno::XComponentContext >& rxContext, ContentProvider *pProvider, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier) + throw ( css::ucb::ContentCreationException ); + + Content( const css::uno::Reference< + css::uno::XComponentContext >& rxContext, ContentProvider *pProvider, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, bool bIsFolder) - throw ( com::sun::star::ucb::ContentCreationException ); + throw ( css::ucb::ContentCreationException ); virtual ~Content(); - com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > getPropertyValuesFromGFileInfo( - GFileInfo *pInfo, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProperties); + css::uno::Reference< css::sdbc::XRow > getPropertyValuesFromGFileInfo( + GFileInfo *pInfo, const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv, + const css::uno::Sequence< css::beans::Property >& rProperties); - virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > - getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::beans::Property > + getProperties( const css::uno::Reference< + css::ucb::XCommandEnvironment > & xEnv ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > - getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::ucb::CommandInfo > + getCommands( const css::uno::Reference< + css::ucb::XCommandEnvironment > & xEnv ) override; virtual OUString getParentURL() override; @@ -159,36 +159,36 @@ public: virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Any SAL_CALL - execute( const com::sun::star::ucb::Command& aCommand, + virtual css::uno::Any SAL_CALL + execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > + virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > - SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > + SAL_CALL createNewContent( const css::ucb::ContentInfo& Info ) + throw( css::uno::RuntimeException, std::exception ) override; - com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > + css::uno::Sequence< css::ucb::ContentInfo > queryCreatableContentsInfo( - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv) - throw( com::sun::star::uno::RuntimeException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv) + throw( css::uno::RuntimeException ); GFile* getGFile(); }; diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx index 824b1174f320..d359cc4ca12d 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.hxx +++ b/ucb/source/ucp/gio/gio_datasupplier.hxx @@ -32,9 +32,9 @@ class Content; struct ResultListEntry { OUString aId; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > xId; - com::sun::star::uno::Reference< com::sun::star::ucb::XContent > xContent; - com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > xRow; + css::uno::Reference< css::ucb::XContentIdentifier > xId; + css::uno::Reference< css::ucb::XContent > xContent; + css::uno::Reference< css::sdbc::XRow > xRow; GFileInfo *pInfo; explicit ResultListEntry( GFileInfo *pInInfo ) : pInfo(pInInfo) @@ -53,21 +53,21 @@ typedef std::vector< ResultListEntry* > ResultList; class DataSupplier : public ucbhelper::ResultSetDataSupplier { private: - com::sun::star::uno::Reference< ::gio::Content > mxContent; - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xSMgr; + css::uno::Reference< ::gio::Content > mxContent; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMgr; sal_Int32 mnOpenMode; bool mbCountFinal; bool getData(); ResultList maResults; public: - DataSupplier( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSMgr, - const com::sun::star::uno::Reference< Content >& rContent, sal_Int32 nOpenMode ); + DataSupplier( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSMgr, + const css::uno::Reference< Content >& rContent, sal_Int32 nOpenMode ); virtual ~DataSupplier(); virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > + virtual css::uno::Reference< css::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > + virtual css::uno::Reference< css::ucb::XContent > queryContent( sal_uInt32 nIndex ) override; virtual bool getResult( sal_uInt32 nIndex ) override; @@ -76,14 +76,14 @@ public: virtual sal_uInt32 currentCount() override; virtual bool isCountFinal() override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + virtual css::uno::Reference< css::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) override; virtual void releasePropertyValues( sal_uInt32 nIndex ) override; virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) override; + throw( css::ucb::ResultSetException ) override; }; } diff --git a/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx index ca2bac2018d2..ea096d5cf607 100644 --- a/ucb/source/ucp/gio/gio_inputstream.hxx +++ b/ucb/source/ucp/gio/gio_inputstream.hxx @@ -41,35 +41,35 @@ public: virtual ~InputStream(); // XInputStream - virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 > & aData, + virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 > & aData, sal_Int32 nBytesToRead ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; - virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 > & aData, + virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 > & aData, sal_Int32 nMaxBytesToRead ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL available() - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL closeInput() - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; }; } // namespace gio diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx index 4ac8b2987e60..ff3c75fe910b 100644 --- a/ucb/source/ucp/gio/gio_mount.cxx +++ b/ucb/source/ucp/gio/gio_mount.cxx @@ -70,7 +70,7 @@ static void ooo_mount_operation_ask_password (GMountOperation *op, OOoMountOperation *pThis = reinterpret_cast<OOoMountOperation*>(op); - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > &xEnv = *(pThis->pEnv); + const css::uno::Reference< css::ucb::XCommandEnvironment > &xEnv = *(pThis->pEnv); if (xEnv.is()) xIH = xEnv->getInteractionHandler(); diff --git a/ucb/source/ucp/gio/gio_mount.hxx b/ucb/source/ucp/gio/gio_mount.hxx index 0f3c14559447..3b6c057499d6 100644 --- a/ucb/source/ucp/gio/gio_mount.hxx +++ b/ucb/source/ucp/gio/gio_mount.hxx @@ -36,7 +36,7 @@ struct OOoMountOperation { GMountOperation parent_instance; - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > *pEnv; + const css::uno::Reference< css::ucb::XCommandEnvironment > *pEnv; char *m_pPrevUsername; char *m_pPrevPassword; }; @@ -54,7 +54,7 @@ struct OOoMountOperationClass GType ooo_mount_operation_get_type(); -GMountOperation *ooo_mount_operation_new(const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& rEnv); +GMountOperation *ooo_mount_operation_new(const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv); G_END_DECLS #endif diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx index 1161bc299781..743d04b8a23b 100644 --- a/ucb/source/ucp/gio/gio_outputstream.cxx +++ b/ucb/source/ucp/gio/gio_outputstream.cxx @@ -40,7 +40,7 @@ OutputStream::~OutputStream() closeOutput(); } -void SAL_CALL OutputStream::writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& rData ) +void SAL_CALL OutputStream::writeBytes( const css::uno::Sequence< sal_Int8 >& rData ) throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { diff --git a/ucb/source/ucp/gio/gio_outputstream.hxx b/ucb/source/ucp/gio/gio_outputstream.hxx index e11beab088a8..73158eba8b4e 100644 --- a/ucb/source/ucp/gio/gio_outputstream.hxx +++ b/ucb/source/ucp/gio/gio_outputstream.hxx @@ -34,7 +34,7 @@ namespace gio { class OutputStream : - public ::com::sun::star::io::XOutputStream, + public css::io::XOutputStream, public Seekable { private: @@ -45,29 +45,29 @@ public: virtual ~OutputStream(); // XInterface - virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & type ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw () override { OWeakObject::acquire(); } virtual void SAL_CALL release() throw() override { OWeakObject::release(); } // XOutputStream - virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL flush() - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL closeOutput() - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; }; } // namespace gio diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 527f1ef0b627..32745dec1c98 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -27,11 +27,10 @@ using namespace com::sun::star; namespace gio { -uno::Reference< com::sun::star::ucb::XContent > SAL_CALL +uno::Reference< css::ucb::XContent > SAL_CALL ContentProvider::queryContent( - const uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier ) - throw( com::sun::star::ucb::IllegalIdentifierException, + const uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, uno::RuntimeException, std::exception ) { SAL_INFO("ucb.ucp.gio", "QueryContent: " << Identifier->getContentIdentifier()); @@ -46,13 +45,13 @@ ContentProvider::queryContent( { xContent = new ::gio::Content(m_xContext, this, Identifier); } - catch ( com::sun::star::ucb::ContentCreationException const & ) + catch ( css::ucb::ContentCreationException const & ) { - throw com::sun::star::ucb::IllegalIdentifierException(); + throw css::ucb::IllegalIdentifierException(); } if ( !xContent->getIdentifier().is() ) - throw com::sun::star::ucb::IllegalIdentifierException(); + throw css::ucb::IllegalIdentifierException(); return xContent; } @@ -94,7 +93,7 @@ css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & r XTYPEPROVIDER_IMPL_3( ContentProvider, lang::XTypeProvider, lang::XServiceInfo, - com::sun::star::ucb::XContentProvider ); + css::ucb::XContentProvider ); XSERVICEINFO_IMPL_1_CTX( ContentProvider, OUString( "com.sun.star.comp.GIOContentProvider" ), diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx index 863e0e46a895..dbb3f8542ef4 100644 --- a/ucb/source/ucp/gio/gio_provider.hxx +++ b/ucb/source/ucp/gio/gio_provider.hxx @@ -30,8 +30,7 @@ namespace gio class ContentProvider : public ::ucbhelper::ContentProviderImplHelper { public: - explicit ContentProvider( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext ); + explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ContentProvider(); // XInterface @@ -64,12 +63,10 @@ public: css::lang::XMultiServiceFactory >& rxServiceMgr ); // XContentProvider - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContent > SAL_CALL - queryContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier ) - throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, + css::uno::RuntimeException, std::exception ) override; }; } diff --git a/ucb/source/ucp/gio/gio_resultset.hxx b/ucb/source/ucp/gio/gio_resultset.hxx index 236a7e18c889..543b38455b54 100644 --- a/ucb/source/ucp/gio/gio_resultset.hxx +++ b/ucb/source/ucp/gio/gio_resultset.hxx @@ -28,20 +28,19 @@ namespace gio class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper { - com::sun::star::uno::Reference< Content > m_xContent; - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; + css::uno::Reference< Content > m_xContent; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; private: - virtual void initStatic() override; - virtual void initDynamic() override; + virtual void initStatic() override; + virtual void initDynamic() override; public: - DynamicResultSet( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< Content >& rxContent, - const com::sun::star::ucb::OpenCommandArgument2& rCommand, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv ); + DynamicResultSet( + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< Content >& rxContent, + const css::ucb::OpenCommandArgument2& rCommand, + const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv ); }; } diff --git a/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx index 339b8281da6a..b4e5e078e174 100644 --- a/ucb/source/ucp/gio/gio_seekable.hxx +++ b/ucb/source/ucp/gio/gio_seekable.hxx @@ -32,8 +32,8 @@ namespace gio { -class Seekable : public ::com::sun::star::io::XTruncate, - public ::com::sun::star::io::XSeekable, +class Seekable : public css::io::XTruncate, + public css::io::XSeekable, public ::cppu::OWeakObject { private: @@ -43,29 +43,29 @@ public: virtual ~Seekable(); // XInterface - virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & type ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw () override { OWeakObject::acquire(); } virtual void SAL_CALL release() throw() override { OWeakObject::release(); } // XSeekable virtual void SAL_CALL seek( sal_Int64 location ) - throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IllegalArgumentException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getPosition() - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getLength() - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; // XTruncate virtual void SAL_CALL truncate() - throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; }; } // namespace gio diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.hxx b/ucb/source/ucp/hierarchy/dynamicresultset.hxx index bb4bba1fd3aa..9dd4780f6096 100644 --- a/ucb/source/ucp/hierarchy/dynamicresultset.hxx +++ b/ucb/source/ucp/hierarchy/dynamicresultset.hxx @@ -36,10 +36,9 @@ private: public: DynamicResultSet( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< HierarchyContent >& rxContent, - const com::sun::star::ucb::OpenCommandArgument2& rCommand ); + const css::ucb::OpenCommandArgument2& rCommand ); }; } diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx index 6bdb4e9be3ea..60740ae039ca 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx @@ -81,7 +81,7 @@ public: bool getIsDocument() const { return !getIsFolder(); } - com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > + css::uno::Sequence< css::ucb::ContentInfo > getCreatableContentsInfo() const; const HierarchyEntryData & getHierarchyEntryData() const { return m_aData; } @@ -96,7 +96,7 @@ private: class HierarchyContentProvider; class HierarchyContent : public ::ucbhelper::ContentImplHelper, - public com::sun::star::ucb::XContentCreator + public css::ucb::XContentCreator { enum ContentKind { LINK, FOLDER, ROOT }; enum ContentState { TRANSIENT, // created via CreateNewContent, @@ -114,61 +114,46 @@ class HierarchyContent : public ::ucbhelper::ContentImplHelper, private: HierarchyContent( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, HierarchyContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, const HierarchyContentProperties& rProps ); HierarchyContent( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, HierarchyContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier, - const com::sun::star::ucb::ContentInfo& Info ); - - virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > - getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > - getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, + const css::ucb::ContentInfo& Info ); + + virtual css::uno::Sequence< css::beans::Property > + getProperties( const css::uno::Reference<css::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::ucb::CommandInfo > + getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; virtual OUString getParentURL() override; static bool hasData( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, HierarchyContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier ); + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ); bool hasData( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier ) + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) { return hasData( m_xContext, m_pProvider, Identifier ); } static bool loadData( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, HierarchyContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, HierarchyContentProperties& rProps ); bool storeData(); - bool renameData( const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& xOldId, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& xNewId ); + bool renameData( const css::uno::Reference< css::ucb::XContentIdentifier >& xOldId, + const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId ); bool removeData(); - void setKind( const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier ); + void setKind( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ); bool isReadOnly(); bool isFolder() const { return ( m_eKind > LINK ); } - ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier > + css::uno::Reference< css::ucb::XContentIdentifier > makeNewIdentifier( const OUString& rTitle ); typedef rtl::Reference< HierarchyContent > HierarchyContentRef; @@ -176,52 +161,42 @@ private: void queryChildren( HierarchyContentRefList& rChildren ); bool exchangeIdentity( - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& xNewId ); + const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > + css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties ); + css::uno::Sequence< css::uno::Any > setPropertyValues( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& rValues, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); + const css::uno::Sequence< css::beans::PropertyValue >& rValues, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); void insert( sal_Int32 nNameClashResolve, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); void destroy( bool bDeletePhysical, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); - void transfer( const ::com::sun::star::ucb::TransferInfo& rInfo, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); + void transfer( const css::ucb::TransferInfo& rInfo, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); public: // Create existing content. Fail, if not already exists. static HierarchyContent* create( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, HierarchyContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier ); + const css::uno::Reference< + css::ucb::XContentIdentifier >& Identifier ); // Create new content. Fail, if already exists. static HierarchyContent* create( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, HierarchyContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier, - const com::sun::star::ucb::ContentInfo& Info ); + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, + const css::ucb::ContentInfo& Info ); virtual ~HierarchyContent(); @@ -242,56 +217,50 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL getIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XCommandProcessor - virtual com::sun::star::uno::Any SAL_CALL - execute( const com::sun::star::ucb::Command& aCommand, + virtual css::uno::Any SAL_CALL + execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, - com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, + css::ucb::CommandAbortedException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // Additional interfaces // XContentCreator - virtual com::sun::star::uno::Sequence< - com::sun::star::ucb::ContentInfo > SAL_CALL + virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + createNewContent( const css::ucb::ContentInfo& Info ) + throw( css::uno::RuntimeException, std::exception ) override; // Non-interface methods. - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties, + static css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Sequence< css::beans::Property >& rProperties, const HierarchyContentProperties& rData, HierarchyContentProvider* pProvider, const OUString& rContentId ); diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx index a9eb1a705106..cb02be2209ee 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx @@ -81,27 +81,21 @@ class HierarchyEntry OUString m_aName; OUString m_aPath; ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider; - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XHierarchicalNameAccess > + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xConfigProvider; + css::uno::Reference< css::container::XHierarchicalNameAccess > m_xRootReadAccess; - ::com::sun::star::uno::Reference< - ::com::sun::star::util::XOfficeInstallationDirectories > + css::uno::Reference< css::util::XOfficeInstallationDirectories > m_xOfficeInstDirs; bool m_bTriedToGetRootReadAccess; private: static OUString createPathFromHierarchyURL( const HierarchyUri & rURI ); - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XHierarchicalNameAccess > + css::uno::Reference< css::container::XHierarchicalNameAccess > getRootReadAccess(); public: - HierarchyEntry( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, + HierarchyEntry( const css::uno::Reference< css::uno::XComponentContext >& rxContext, HierarchyContentProvider* pProvider, const OUString& rURL ); diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index d3cdf8ff8cde..41cfa3dc4b4a 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -117,7 +117,7 @@ public: // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override; // XComponent diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx index 1ecd4932aa5f..505149a5abc5 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx @@ -40,17 +40,15 @@ private: public: HierarchyResultSetDataSupplier( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< HierarchyContent >& rContent, - sal_Int32 nOpenMode = com::sun::star::ucb::OpenMode::ALL ); + sal_Int32 nOpenMode = css::ucb::OpenMode::ALL ); virtual ~HierarchyResultSetDataSupplier(); virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > + virtual css::uno::Reference< css::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > + virtual css::uno::Reference< css::ucb::XContent > queryContent( sal_uInt32 nIndex ) override; virtual bool getResult( sal_uInt32 nIndex ) override; @@ -59,14 +57,14 @@ public: virtual sal_uInt32 currentCount() override; virtual bool isCountFinal() override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + virtual css::uno::Reference< css::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) override; virtual void releasePropertyValues( sal_uInt32 nIndex ) override; virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) override; + throw( css::ucb::ResultSetException ) override; }; } // namespace hierarchy_ucp diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index 290865ed0d96..aa6a93b11e44 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -48,10 +48,8 @@ namespace hierarchy_ucp { struct ConfigProviderMapEntry { - com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > xConfigProvider; - com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess > xRootReadAccess; + css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider; + css::uno::Reference< css::container::XHierarchicalNameAccess > xRootReadAccess; bool bTriedToGetRootReadAccess; ConfigProviderMapEntry() : bTriedToGetRootReadAccess( false ) {} @@ -66,16 +64,14 @@ typedef std::unordered_map ConfigProviderMap; class HierarchyContentProvider : public ::ucbhelper::ContentProviderImplHelper, - public com::sun::star::lang::XInitialization + public css::lang::XInitialization { ConfigProviderMap m_aConfigProviderMap; - com::sun::star::uno::Reference< - com::sun::star::util::XOfficeInstallationDirectories > m_xOfficeInstDirs; + css::uno::Reference< css::util::XOfficeInstallationDirectories > m_xOfficeInstDirs; public: explicit HierarchyContentProvider( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~HierarchyContentProvider(); // XInterface @@ -108,31 +104,25 @@ public: css::lang::XMultiServiceFactory >& rxServiceMgr ); // XContentProvider - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - queryContent( const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier ) - throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, + css::uno::RuntimeException, std::exception ) override; // 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; + initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw( css::uno::Exception, + css::uno::RuntimeException, std::exception ) override; // Non-Interface methods - com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > + css::uno::Reference< css::lang::XMultiServiceFactory > getConfigProvider( const OUString & rServiceSpecifier ); - com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess > + css::uno::Reference< css::container::XHierarchicalNameAccess > getRootConfigReadNameAccess( const OUString & rServiceSpecifier ); // Note: may retrun an empty reference. - com::sun::star::uno::Reference< - com::sun::star::util::XOfficeInstallationDirectories > + css::uno::Reference< css::util::XOfficeInstallationDirectories > getOfficeInstallationDirectories(); }; diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx index d0d49d088a3c..ff0a91741a54 100644 --- a/ucb/source/ucp/package/pkgcontent.hxx +++ b/ucb/source/ucp/package/pkgcontent.hxx @@ -61,14 +61,13 @@ namespace package_ucp struct ContentProperties { - OUString aTitle; // Title - OUString aContentType; // ContentType + OUString aTitle; // Title + OUString aContentType; // ContentType bool bIsDocument; // IsDocument bool bIsFolder; // IsFolder - OUString aMediaType; // MediaType - com::sun::star::uno::Sequence < - sal_Int8 > aEncryptionKey; // EncryptionKey - sal_Int64 nSize; // Size + OUString aMediaType; // MediaType + css::uno::Sequence < sal_Int8 > aEncryptionKey; // EncryptionKey + sal_Int64 nSize; // Size bool bCompressed; // Compressed bool bEncrypted; // Encrypted bool bHasEncryptedEntries; // HasEncryptedEntries @@ -80,7 +79,7 @@ struct ContentProperties explicit ContentProperties( const OUString& rContentType ); - com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > + css::uno::Sequence< css::ucb::ContentInfo > getCreatableContentsInfo( PackageUri const & rUri ) const; }; @@ -89,7 +88,7 @@ struct ContentProperties class ContentProvider; class Content : public ::ucbhelper::ContentImplHelper, - public com::sun::star::ucb::XContentCreator + public css::ucb::XContentCreator { enum ContentState { TRANSIENT, // created via CreateNewContent, // but did not process "insert" yet @@ -100,90 +99,67 @@ class Content : public ::ucbhelper::ContentImplHelper, PackageUri m_aUri; ContentProperties m_aProps; ContentState m_eState; - com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess > m_xPackage; + css::uno::Reference< + css::container::XHierarchicalNameAccess > m_xPackage; ContentProvider* m_pProvider; sal_uInt32 m_nModifiedProps; private: - Content( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier, - const ::com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess >& Package, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, + const css::uno::Reference< css::container::XHierarchicalNameAccess >& Package, const PackageUri& rUri, const ContentProperties& rProps ); - Content( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier, - const com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess >& Package, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, + const css::uno::Reference< css::container::XHierarchicalNameAccess >& Package, const PackageUri& rUri, - const com::sun::star::ucb::ContentInfo& Info ); - - virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > - getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > - getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + const css::ucb::ContentInfo& Info ); + + virtual css::uno::Sequence< css::beans::Property > + getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::ucb::CommandInfo > + getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; virtual OUString getParentURL() override; - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties, + static css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Sequence< css::beans::Property >& rProperties, const ContentProperties& rData, - const rtl::Reference< - ::ucbhelper::ContentProviderImplHelper >& rProvider, + const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, const OUString& rContentId ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - setPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& rValues, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); - - com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess > + css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties ); + css::uno::Sequence< css::uno::Any > + setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); + + css::uno::Reference< css::container::XHierarchicalNameAccess > getPackage( const PackageUri& rURI ); - com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess > + css::uno::Reference< css::container::XHierarchicalNameAccess > getPackage(); static bool loadData( ContentProvider* pProvider, const PackageUri& rURI, ContentProperties& rProps, - com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess > & - rxPackage ); + css::uno::Reference< css::container::XHierarchicalNameAccess > & rxPackage ); static bool hasData( ContentProvider* pProvider, const PackageUri& rURI, - com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess > & - rxPackage ); + css::uno::Reference< css::container::XHierarchicalNameAccess > & rxPackage ); bool hasData( const PackageUri& rURI ); bool - renameData( const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& xOldId, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& xNewId ); + renameData( const css::uno::Reference< css::ucb::XContentIdentifier >& xOldId, + const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId ); bool - storeData( const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream >& xStream ); + storeData( const css::uno::Reference< css::io::XInputStream >& xStream ); bool removeData(); @@ -195,33 +171,29 @@ private: void queryChildren( ContentRefList& rChildren ); bool - exchangeIdentity( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& xNewId ); + exchangeIdentity( const css::uno::Reference< + css::ucb::XContentIdentifier >& xNewId ); - ::com::sun::star::uno::Any - open( const ::com::sun::star::ucb::OpenCommandArgument2& rArg, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); + css::uno::Any + open( const css::ucb::OpenCommandArgument2& rArg, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); - void insert( const ::com::sun::star::uno::Reference< - ::com::sun::star::io::XInputStream >& xStream, + void insert( const css::uno::Reference< css::io::XInputStream >& xStream, sal_Int32 nNameClashResolve, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); + const css::uno::Reference< + css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); void destroy( bool bDeletePhysical, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); - void transfer( const ::com::sun::star::ucb::TransferInfo& rInfo, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); + void transfer( const css::ucb::TransferInfo& rInfo, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > getInputStream(); bool isFolder() const { return m_aProps.bIsFolder; } @@ -229,20 +201,16 @@ private: public: // Create existing content. Fail, if not already exists. static Content* create( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier ); + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ); // Create new content. Fail, if already exists. static Content* create( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier, - const com::sun::star::ucb::ContentInfo& Info ); + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, + const css::ucb::ContentInfo& Info ); virtual ~Content(); @@ -263,59 +231,53 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XCommandProcessor - virtual com::sun::star::uno::Any SAL_CALL - execute( const com::sun::star::ucb::Command& aCommand, + virtual css::uno::Any SAL_CALL + execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, - com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, + css::ucb::CommandAbortedException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // Additional interfaces // XContentCreator - virtual com::sun::star::uno::Sequence< - com::sun::star::ucb::ContentInfo > SAL_CALL + virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + createNewContent( const css::ucb::ContentInfo& Info ) + throw( css::uno::RuntimeException, std::exception ) override; // Non-interface methods. // Called from resultset data supplier. - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties, + static css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Sequence< css::beans::Property >& rProperties, ContentProvider* pProvider, const OUString& rContentId ); // Called from resultset data supplier. - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XEnumeration > + css::uno::Reference< css::container::XEnumeration > getIterator(); static OUString diff --git a/ucb/source/ucp/package/pkgdatasupplier.hxx b/ucb/source/ucp/package/pkgdatasupplier.hxx index 493409b3dad5..4696ad10440e 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.hxx +++ b/ucb/source/ucp/package/pkgdatasupplier.hxx @@ -33,17 +33,15 @@ class DataSupplier : public ::ucbhelper::ResultSetDataSupplier DataSupplier_Impl* m_pImpl; public: - DataSupplier( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + DataSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rContent, sal_Int32 nOpenMode ); virtual ~DataSupplier(); virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > + virtual css::uno::Reference< css::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > + virtual css::uno::Reference< css::ucb::XContent > queryContent( sal_uInt32 nIndex ) override; virtual bool getResult( sal_uInt32 nIndex ) override; @@ -52,14 +50,14 @@ public: virtual sal_uInt32 currentCount() override; virtual bool isCountFinal() override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + virtual css::uno::Reference< css::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) override; virtual void releasePropertyValues( sal_uInt32 nIndex ) override; virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) override; + throw( css::ucb::ResultSetException ) override; OUString assembleChildURL( const OUString& aName ); }; diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx index 906efa2e4f3e..cec29da07554 100644 --- a/ucb/source/ucp/package/pkgprovider.hxx +++ b/ucb/source/ucp/package/pkgprovider.hxx @@ -50,8 +50,7 @@ class ContentProvider : public ::ucbhelper::ContentProviderImplHelper Packages* m_pPackages; public: - explicit ContentProvider( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext ); + explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ContentProvider(); // XInterface @@ -84,12 +83,10 @@ public: css::lang::XMultiServiceFactory >& rxServiceMgr ); // XContentProvider - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContent > SAL_CALL - queryContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier ) - throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, + css::uno::RuntimeException, std::exception ) override; // Additional interfaces @@ -99,8 +96,7 @@ public: // Non-interface methods. - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XHierarchicalNameAccess > + css::uno::Reference< css::container::XHierarchicalNameAccess > createPackage( const PackageUri & rParam ); bool removePackage( const OUString & rName ); diff --git a/ucb/source/ucp/package/pkgresultset.hxx b/ucb/source/ucp/package/pkgresultset.hxx index 8b1ccb4ca7a7..60a443ff9ea6 100644 --- a/ucb/source/ucp/package/pkgresultset.hxx +++ b/ucb/source/ucp/package/pkgresultset.hxx @@ -29,8 +29,7 @@ namespace package_ucp { class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper { rtl::Reference< Content > m_xContent; - com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > m_xEnv; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; private: virtual void initStatic() override; @@ -38,12 +37,10 @@ private: public: DynamicResultSet( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, - const com::sun::star::ucb::OpenCommandArgument2& rCommand, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv ); + const css::ucb::OpenCommandArgument2& rCommand, + const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv ); }; } diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx index aa513b442259..1ae0e658e383 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.hxx +++ b/ucb/source/ucp/tdoc/tdoc_content.hxx @@ -73,7 +73,7 @@ public: const OUString & getTitle() const { return m_aTitle; } void setTitle( const OUString & rTitle ) { m_aTitle = rTitle; } - com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > + css::uno::Sequence< css::ucb::ContentInfo > getCreatableContentsInfo() const; bool isContentCreator() const; @@ -87,7 +87,7 @@ private: class Content : public ::ucbhelper::ContentImplHelper, - public com::sun::star::ucb::XContentCreator + public css::ucb::XContentCreator { enum ContentState { TRANSIENT, // created via createNewContent, // but did not process "insert" yet @@ -100,25 +100,19 @@ class Content : public ::ucbhelper::ContentImplHelper, ContentProvider* m_pProvider; private: - Content( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, const ContentProperties & rProps ); - Content( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier, - const com::sun::star::ucb::ContentInfo& Info ); - - virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > - getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > - getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, + const css::ucb::ContentInfo& Info ); + + virtual css::uno::Sequence< css::beans::Property > + getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::ucb::CommandInfo > + getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; virtual OUString getParentURL() override; static bool hasData( ContentProvider* pProvider, const Uri & rUri ); @@ -127,23 +121,18 @@ private: static bool loadData( ContentProvider* pProvider, const Uri & rUri, ContentProperties& rProps ); - bool storeData( const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream >& xData, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw ( ::com::sun::star::ucb::CommandFailedException, - ::com::sun::star::task::DocumentPasswordRequest, + bool storeData( const css::uno::Reference< css::io::XInputStream >& xData, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw ( css::ucb::CommandFailedException, + css::task::DocumentPasswordRequest, css::uno::RuntimeException ); - bool renameData( const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& xOldId, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& xNewId ); + bool renameData( const css::uno::Reference< css::ucb::XContentIdentifier >& xOldId, + const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId ); bool removeData(); bool copyData( const Uri & rSourceUri, const OUString & rNewName ); - ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier > + css::uno::Reference< css::ucb::XContentIdentifier > makeNewIdentifier( const OUString& rTitle ); typedef rtl::Reference< Content > ContentRef; @@ -151,83 +140,66 @@ private: void queryChildren( ContentRefList& rChildren ); bool exchangeIdentity( - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& xNewId ); + const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > + css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties ); + css::uno::Sequence< css::uno::Any > setPropertyValues( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& rValues, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); - - com::sun::star::uno::Any - open( const ::com::sun::star::ucb::OpenCommandArgument2& rArg, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw( ::com::sun::star::uno::Exception ); - - void insert( const ::com::sun::star::uno::Reference< - ::com::sun::star::io::XInputStream >& xData, + const css::uno::Sequence< css::beans::PropertyValue >& rValues, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); + + css::uno::Any + open( const css::ucb::OpenCommandArgument2& rArg, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw( css::uno::Exception ); + + void insert( const css::uno::Reference< css::io::XInputStream >& xData, sal_Int32 nNameClashResolve, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception ); void destroy( bool bDeletePhysical, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); - - void transfer( const ::com::sun::star::ucb::TransferInfo& rInfo, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); - - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); + + void transfer( const css::ucb::TransferInfo& rInfo, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); + + static css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Sequence< css::beans::Property >& rProperties, const ContentProperties& rData, ContentProvider* pProvider, const OUString& rContentId ); static bool commitStorage( - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xStorage ); + const css::uno::Reference< css::embed::XStorage > & xStorage ); static bool closeOutputStream( - const com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & xOut ); + const css::uno::Reference< css::io::XOutputStream > & xOut ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - getInputStream( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & - xEnv ) + css::uno::Reference< css::io::XInputStream > + getInputStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( css::ucb::CommandFailedException, css::task::DocumentPasswordRequest, css::uno::RuntimeException ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > + css::uno::Reference< css::io::XOutputStream > getTruncatedOutputStream( - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( css::ucb::CommandFailedException, css::task::DocumentPasswordRequest, css::uno::RuntimeException ); - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > + css::uno::Reference< css::ucb::XContent > queryChildContent( const OUString & rRelativeChildUri ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > - getStream( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) + css::uno::Reference< css::io::XStream > + getStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( css::ucb::CommandFailedException, css::task::DocumentPasswordRequest, css::uno::RuntimeException ); @@ -235,20 +207,16 @@ private: public: // Create existing content. Fail, if not already exists. static Content* create( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier ); + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ); // Create new content. Fail, if already exists. static Content* create( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier, - const com::sun::star::ucb::ContentInfo& Info ); + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, + const css::ucb::ContentInfo& Info ); virtual ~Content(); @@ -269,56 +237,50 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL getIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XCommandProcessor - virtual com::sun::star::uno::Any SAL_CALL - execute( const com::sun::star::ucb::Command& aCommand, + virtual css::uno::Any SAL_CALL + execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, - com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, + css::ucb::CommandAbortedException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // Additional interfaces // XContentCreator - virtual com::sun::star::uno::Sequence< - com::sun::star::ucb::ContentInfo > SAL_CALL + virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + createNewContent( const css::ucb::ContentInfo& Info ) + throw( css::uno::RuntimeException, std::exception ) override; // Non-interface methods. - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties, + static css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Sequence< css::beans::Property >& rProperties, ContentProvider* pProvider, const OUString& rContentId ); diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx index 9facfc074ac9..1bb38c4ec59f 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx @@ -39,17 +39,15 @@ private: public: ResultSetDataSupplier( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rContent, - sal_Int32 nOpenMode = com::sun::star::ucb::OpenMode::ALL ); + sal_Int32 nOpenMode = css::ucb::OpenMode::ALL ); virtual ~ResultSetDataSupplier(); virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > + virtual css::uno::Reference< css::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > + virtual css::uno::Reference< css::ucb::XContent > queryContent( sal_uInt32 nIndex ) override; virtual bool getResult( sal_uInt32 nIndex ) override; @@ -58,14 +56,14 @@ public: virtual sal_uInt32 currentCount() override; virtual bool isCountFinal() override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + virtual css::uno::Reference< css::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) override; virtual void releasePropertyValues( sal_uInt32 nIndex ) override; virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) override; + throw( css::ucb::ResultSetException ) override; }; } // namespace tdoc_ucp diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx index c914d645e66e..801e61e265db 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx @@ -51,19 +51,15 @@ namespace tdoc_ucp { struct StorageInfo { OUString aTitle; - com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > xStorage; - com::sun::star::uno::Reference< - com::sun::star::frame::XModel > xModel; + css::uno::Reference< css::embed::XStorage > xStorage; + css::uno::Reference< css::frame::XModel > xModel; StorageInfo() {}; // needed for STL map only. StorageInfo( const OUString & rTitle, - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & rxStorage, - const com::sun::star::uno::Reference< - com::sun::star::frame::XModel > & rxModel ) + const css::uno::Reference< css::embed::XStorage > & rxStorage, + const css::uno::Reference< css::frame::XModel > & rxModel ) : aTitle( rTitle ), xStorage( rxStorage ), xModel( rxModel ) {} }; @@ -83,10 +79,10 @@ namespace tdoc_ucp { class OfficeDocumentsManager : - public cppu::WeakImplHelper< com::sun::star::document::XDocumentEventListener > + public cppu::WeakImplHelper< css::document::XDocumentEventListener > { class OfficeDocumentsCloseListener : - public cppu::WeakImplHelper< com::sun::star::util::XCloseListener > + public cppu::WeakImplHelper< css::util::XCloseListener > { public: @@ -95,19 +91,19 @@ namespace tdoc_ucp { // util::XCloseListener virtual void SAL_CALL queryClosing( - const ::com::sun::star::lang::EventObject& Source, + const css::lang::EventObject& Source, sal_Bool GetsOwnership ) - throw (::com::sun::star::util::CloseVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::util::CloseVetoException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL notifyClosing( - const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) + throw (css::uno::RuntimeException, std::exception) override; // lang::XEventListener (base of util::XCloseListener) virtual void SAL_CALL disposing( - const com::sun::star::lang::EventObject & Source ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::lang::EventObject & Source ) + throw ( css::uno::RuntimeException, std::exception ) override; void Dispose() { m_pManager = 0; } @@ -117,8 +113,7 @@ namespace tdoc_ucp { public: OfficeDocumentsManager( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, OfficeDocumentsEventListener * pDocEventListener ); virtual ~OfficeDocumentsManager(); @@ -126,26 +121,25 @@ namespace tdoc_ucp { // document::XDocumentEventListener virtual void SAL_CALL documentEventOccured( - const com::sun::star::document::DocumentEvent & Event ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::document::DocumentEvent & Event ) + throw ( css::uno::RuntimeException, std::exception ) override; // lang::XEventListener (base of document::XDocumentEventListener) virtual void SAL_CALL disposing( - const com::sun::star::lang::EventObject & Source ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::lang::EventObject & Source ) + throw ( css::uno::RuntimeException, std::exception ) override; // Non-interface - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > queryStorage( const OUString & rDocId ); static OUString queryDocumentId( - const com::sun::star::uno::Reference< - com::sun::star::frame::XModel > & xModel ); + const css::uno::Reference< css::frame::XModel > & xModel ); - com::sun::star::uno::Reference< com::sun::star::frame::XModel > + css::uno::Reference< css::frame::XModel > queryDocumentModel( const OUString & rDocId ); - com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > queryDocuments(); OUString @@ -155,33 +149,25 @@ namespace tdoc_ucp { void buildDocumentsList(); bool isOfficeDocument( - const com::sun::star::uno::Reference< - com::sun::star::uno::XInterface > & xDoc ); + const css::uno::Reference< css::uno::XInterface > & xDoc ); static bool isDocumentPreview( - const com::sun::star::uno::Reference< - com::sun::star::frame::XModel > & xModel ); + const css::uno::Reference< css::frame::XModel > & xModel ); static bool isWithoutOrInTopLevelFrame( - const com::sun::star::uno::Reference< - com::sun::star::frame::XModel > & xModel ); + const css::uno::Reference< css::frame::XModel > & xModel ); bool isBasicIDE( - const com::sun::star::uno::Reference< - com::sun::star::frame::XModel > & xModel ); + const css::uno::Reference< css::frame::XModel > & xModel ); static bool isHelpDocument( - const com::sun::star::uno::Reference< - com::sun::star::frame::XModel > & xModel ); + const css::uno::Reference< css::frame::XModel > & xModel ); osl::Mutex m_aMtx; - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< - com::sun::star::frame::XGlobalEventBroadcaster > m_xDocEvtNotifier; - com::sun::star::uno::Reference< - com::sun::star::frame::XModuleManager2 > m_xModuleMgr; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::frame::XGlobalEventBroadcaster > m_xDocEvtNotifier; + css::uno::Reference< css::frame::XModuleManager2 > m_xModuleMgr; DocumentList m_aDocs; OfficeDocumentsEventListener * m_pDocEventListener; ::rtl::Reference<OfficeDocumentsCloseListener> m_xDocCloseListener; diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx index d67cd90b2ed5..fdff4bf01721 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx @@ -30,47 +30,41 @@ namespace tdoc_ucp { class DocumentContentFactory : public cppu::WeakImplHelper< - com::sun::star::frame::XTransientDocumentsDocumentContentFactory, - com::sun::star::lang::XServiceInfo > + css::frame::XTransientDocumentsDocumentContentFactory, + css::lang::XServiceInfo > { public: - explicit DocumentContentFactory( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rXSMgr ); + explicit DocumentContentFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rXSMgr ); virtual ~DocumentContentFactory(); // 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; + throw ( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; // XTransientDocumentsDocumentContentFactory - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - createDocumentContent( const ::com::sun::star::uno::Reference< - com::sun::star::frame::XModel >& Model ) - throw ( com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + createDocumentContent( const css::uno::Reference< css::frame::XModel >& Model ) + throw ( css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; // Non-UNO interfaces static OUString getImplementationName_Static(); - static com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static com::sun::star::uno::Reference< - com::sun::star::lang::XSingleServiceFactory > - createServiceFactory( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > & rxServiceMgr ); + static css::uno::Reference< css::lang::XSingleServiceFactory > + createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxServiceMgr ); private: - com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > m_xSMgr; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMgr; }; } // namespace tdoc_ucp diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx index 4a10ee2f6811..f4bfae216646 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx @@ -82,7 +82,7 @@ namespace tdoc_ucp { { public: DocumentPasswordRequest( - com::sun::star::task::PasswordRequestMode eMode, + css::task::PasswordRequestMode eMode, const OUString & rDocumentName ); }; diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx index c1000b7a7fc6..3fa3f91d6ee5 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.hxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx @@ -58,12 +58,11 @@ class StorageElementFactory; class ContentProvider : public ::ucbhelper::ContentProviderImplHelper, - public com::sun::star::frame::XTransientDocumentsDocumentContentFactory, + public css::frame::XTransientDocumentsDocumentContentFactory, public OfficeDocumentsEventListener { public: - explicit ContentProvider( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext ); + explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ContentProvider(); // XInterface @@ -96,56 +95,53 @@ public: css::lang::XMultiServiceFactory >& rxServiceMgr ); // XContentProvider - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - queryContent( const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier ) - throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, + css::uno::RuntimeException, std::exception ) override; // XTransientDocumentsDocumentContentFactory - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - createDocumentContent( const ::com::sun::star::uno::Reference< - com::sun::star::frame::XModel >& Model ) - throw ( com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + createDocumentContent( const css::uno::Reference< + css::frame::XModel >& Model ) + throw ( css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; // Non-UNO interfaces - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > queryStorage( const OUString & rUri, StorageAccessMode eMode ) const; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > queryStorageClone( const OUString & rUri ) const; - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > queryInputStream( const OUString & rUri, const OUString & rPassword ) const - throw ( com::sun::star::packages::WrongPasswordException, + throw ( css::packages::WrongPasswordException, css::uno::RuntimeException ); - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > + css::uno::Reference< css::io::XOutputStream > queryOutputStream( const OUString & rUri, const OUString & rPassword, bool bTruncate ) const - throw ( com::sun::star::packages::WrongPasswordException, + throw ( css::packages::WrongPasswordException, css::uno::RuntimeException ); - com::sun::star::uno::Reference< com::sun::star::io::XStream > + css::uno::Reference< css::io::XStream > queryStream( const OUString & rUri, const OUString & rPassword, bool bTruncate ) const - throw ( com::sun::star::packages::WrongPasswordException, + throw ( css::packages::WrongPasswordException, css::uno::RuntimeException ); bool queryNamesOfChildren( const OUString & rUri, - com::sun::star::uno::Sequence< OUString > & rNames ) const; + css::uno::Sequence< OUString > & rNames ) const; // storage properties OUString queryStorageTitle( const OUString & rUri ) const; - com::sun::star::uno::Reference< com::sun::star::frame::XModel > + css::uno::Reference< css::frame::XModel > queryDocumentModel( const OUString & rUri ) const; // interface OfficeDocumentsEventListener diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.hxx b/ucb/source/ucp/tdoc/tdoc_resultset.hxx index c740534bf398..cbaec16cbba7 100644 --- a/ucb/source/ucp/tdoc/tdoc_resultset.hxx +++ b/ucb/source/ucp/tdoc/tdoc_resultset.hxx @@ -37,10 +37,9 @@ private: public: DynamicResultSet( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, - const com::sun::star::ucb::OpenCommandArgument2& rCommand ); + const css::ucb::OpenCommandArgument2& rCommand ); }; } diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx index 2aab25863482..f92b86fa037c 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx @@ -49,22 +49,19 @@ class ParentStorageHolder : public MutexHolder { public: ParentStorageHolder( - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xParentStorage, + const css::uno::Reference< css::embed::XStorage > & xParentStorage, const OUString & rUri ); bool isParentARootStorage() const { return m_bParentIsRootStorage; } - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > getParentStorage() const { return m_xParentStorage; } - void setParentStorage( const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xStg ) + void setParentStorage( const css::uno::Reference< css::embed::XStorage > & xStg ) { osl::MutexGuard aGuard( m_aMutex ); m_xParentStorage = xStg; } private: - com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > m_xParentStorage; + css::uno::Reference< css::embed::XStorage > m_xParentStorage; bool m_bParentIsRootStorage; }; @@ -72,29 +69,26 @@ private: typedef cppu::WeakImplHelper< - com::sun::star::embed::XStorage, - com::sun::star::embed::XTransactedObject > StorageUNOBase; + css::embed::XStorage, + css::embed::XTransactedObject > StorageUNOBase; class Storage : public StorageUNOBase, public ParentStorageHolder { public: Storage( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, const rtl::Reference< StorageElementFactory > & xFactory, const OUString & rUri, - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xParentStorage, - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xStorageToWrap ); + const css::uno::Reference< css::embed::XStorage > & xParentStorage, + const css::uno::Reference< css::embed::XStorage > & xStorageToWrap ); virtual ~Storage(); bool isDocumentStorage() const { return m_bIsDocumentStorage; } // XInterface - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type& aType ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type& aType ) + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() @@ -102,199 +96,189 @@ public: // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; // XComponent ( one of XStorage bases ) 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; + addEventListener( 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 >& aListener ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw ( css::uno::RuntimeException, std::exception ) override; // XNameAccess ( one of XStorage bases ) - virtual com::sun::star::uno::Any SAL_CALL + virtual css::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 + throw ( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + 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; // XElementAccess (base of XNameAccess) - virtual com::sun::star::uno::Type SAL_CALL + virtual css::uno::Type SAL_CALL getElementType() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + 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; // 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 com::sun::star::uno::Reference< com::sun::star::io::XStream > 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 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 + 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& aPassword ) - 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 + 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 nOpenMode ) - 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::Reference< com::sun::star::io::XStream > SAL_CALL + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + 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 + 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& aPassword ) - 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; + copyLastCommitTo( 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 > & + const css::uno::Reference< + css::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; + 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& aEleName, 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 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; // XTransactedObject virtual void SAL_CALL commit() - throw ( com::sun::star::io::IOException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::io::IOException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL revert() - throw ( com::sun::star::io::IOException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::io::IOException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; private: explicit Storage( const rtl::Reference< Storage > & rFactory ); // n.i. rtl::Reference< StorageElementFactory > m_xFactory; - com::sun::star::uno::Reference< - com::sun::star::uno::XAggregation > m_xAggProxy; - com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > m_xWrappedStorage; - com::sun::star::uno::Reference< - com::sun::star::embed::XTransactedObject > m_xWrappedTransObj; - com::sun::star::uno::Reference< - com::sun::star::lang::XComponent > m_xWrappedComponent; - com::sun::star::uno::Reference< - com::sun::star::lang::XTypeProvider > m_xWrappedTypeProv; + css::uno::Reference< css::uno::XAggregation > m_xAggProxy; + css::uno::Reference< css::embed::XStorage > m_xWrappedStorage; + css::uno::Reference< css::embed::XTransactedObject > m_xWrappedTransObj; + css::uno::Reference< css::lang::XComponent > m_xWrappedComponent; + css::uno::Reference< css::lang::XTypeProvider > m_xWrappedTypeProv; bool m_bIsDocumentStorage; StorageElementFactory::StorageMap::iterator m_aContainerIt; @@ -307,225 +291,213 @@ private: typedef cppu::WeakImplHelper< - com::sun::star::io::XOutputStream, - com::sun::star::lang::XComponent > OutputStreamUNOBase; + css::io::XOutputStream, + css::lang::XComponent > OutputStreamUNOBase; class OutputStream : public OutputStreamUNOBase, public ParentStorageHolder { public: OutputStream( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, const OUString & rUri, - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xParentStorage, - const com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & xStreamToWrap ); + const css::uno::Reference< css::embed::XStorage > & xParentStorage, + const css::uno::Reference< css::io::XOutputStream > & xStreamToWrap ); virtual ~OutputStream(); // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( const com::sun::star::uno::Type& aType ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + queryInterface( const css::uno::Type& aType ) + throw ( css::uno::RuntimeException, std::exception ) override; // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( 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; + 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; // Note: We need to intercept this one. 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; // XComponent // Note: We need to intercept this one. 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; + addEventListener( 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 >& aListener ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw ( css::uno::RuntimeException, std::exception ) override; private: - com::sun::star::uno::Reference< - com::sun::star::uno::XAggregation > m_xAggProxy; - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > m_xWrappedStream; - com::sun::star::uno::Reference< - com::sun::star::lang::XComponent > m_xWrappedComponent; - com::sun::star::uno::Reference< - com::sun::star::lang::XTypeProvider > m_xWrappedTypeProv; + css::uno::Reference< + css::uno::XAggregation > m_xAggProxy; + css::uno::Reference< + css::io::XOutputStream > m_xWrappedStream; + css::uno::Reference< + css::lang::XComponent > m_xWrappedComponent; + css::uno::Reference< + css::lang::XTypeProvider > m_xWrappedTypeProv; }; -typedef cppu::WeakImplHelper< com::sun::star::io::XStream, - com::sun::star::io::XOutputStream, - com::sun::star::io::XTruncate, - com::sun::star::io::XInputStream, - com::sun::star::lang::XComponent > +typedef cppu::WeakImplHelper< css::io::XStream, + css::io::XOutputStream, + css::io::XTruncate, + css::io::XInputStream, + css::lang::XComponent > StreamUNOBase; class Stream : public StreamUNOBase, public ParentStorageHolder { public: Stream( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, const OUString & rUri, - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xParentStorage, - const com::sun::star::uno::Reference< - com::sun::star::io::XStream > & xStreamToWrap ); + const css::uno::Reference< css::embed::XStorage > & xParentStorage, + const css::uno::Reference< css::io::XStream > & xStreamToWrap ); virtual ~Stream(); // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( const com::sun::star::uno::Type& aType ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + queryInterface( const css::uno::Type& aType ) + throw ( css::uno::RuntimeException, std::exception ) override; // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; // XStream - virtual com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > SAL_CALL + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( 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; + writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL flush() - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL closeOutput() - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; // XTruncate virtual void SAL_CALL truncate() - throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; // XInputStream virtual sal_Int32 SAL_CALL - readBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData, + readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL - readSomeBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData, + readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL available() - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL closeInput() - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; // XComponent // Note: We need to intercept this one. 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; + addEventListener( 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 >& aListener ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw ( css::uno::RuntimeException, std::exception ) override; private: void commitChanges() - throw( com::sun::star::io::IOException ); - - com::sun::star::uno::Reference< - com::sun::star::uno::XAggregation > m_xAggProxy; - com::sun::star::uno::Reference< - com::sun::star::io::XStream > m_xWrappedStream; - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > m_xWrappedOutputStream; - com::sun::star::uno::Reference< - com::sun::star::io::XTruncate > m_xWrappedTruncate; - com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > m_xWrappedInputStream; - com::sun::star::uno::Reference< - com::sun::star::lang::XComponent > m_xWrappedComponent; - com::sun::star::uno::Reference< - com::sun::star::lang::XTypeProvider > m_xWrappedTypeProv; + throw( css::io::IOException ); + + css::uno::Reference< + css::uno::XAggregation > m_xAggProxy; + css::uno::Reference< + css::io::XStream > m_xWrappedStream; + css::uno::Reference< + css::io::XOutputStream > m_xWrappedOutputStream; + css::uno::Reference< + css::io::XTruncate > m_xWrappedTruncate; + css::uno::Reference< + css::io::XInputStream > m_xWrappedInputStream; + css::uno::Reference< + css::lang::XComponent > m_xWrappedComponent; + css::uno::Reference< + css::lang::XTypeProvider > m_xWrappedTypeProv; }; } // namespace tdoc_ucp diff --git a/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx index 9c2fcd7cbbeb..ff4fdaab774f 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.hxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.hxx @@ -44,94 +44,93 @@ namespace tdoc_ucp { { public: StorageElementFactory( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, const rtl::Reference< OfficeDocumentsManager > & xDocsMgr ); virtual ~StorageElementFactory(); - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > createTemporaryStorage() - throw ( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException ); + throw ( css::uno::Exception, + css::uno::RuntimeException ); - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > createStorage( const OUString & rUri, StorageAccessMode eMode ) - 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 ); + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > createInputStream( const OUString & rUri, const OUString & rPassword ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::packages::WrongPasswordException, - com::sun::star::uno::RuntimeException ); - - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::packages::WrongPasswordException, + css::uno::RuntimeException ); + + css::uno::Reference< css::io::XOutputStream > createOutputStream( const OUString & rUri, const OUString & rPassword, bool bTruncate ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::packages::WrongPasswordException, - com::sun::star::uno::RuntimeException ); - - com::sun::star::uno::Reference< com::sun::star::io::XStream > + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::packages::WrongPasswordException, + css::uno::RuntimeException ); + + css::uno::Reference< css::io::XStream > createStream( const OUString & rUri, const OUString & rPassword, bool bTruncate ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::packages::WrongPasswordException, - com::sun::star::uno::RuntimeException ); + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::packages::WrongPasswordException, + css::uno::RuntimeException ); private: friend class Storage; void releaseElement( Storage * pElement ); - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > queryParentStorage( const OUString & rUri, StorageAccessMode eMode ) - 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 ); - - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > - queryStorage( const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xParentStorage, + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException ); + + css::uno::Reference< css::embed::XStorage > + queryStorage( const css::uno::Reference< + css::embed::XStorage > & xParentStorage, const OUString & rUri, StorageAccessMode eMode ) - 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 ); - - com::sun::star::uno::Reference< com::sun::star::io::XStream > - queryStream( const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xParentStorage, + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException ); + + css::uno::Reference< css::io::XStream > + queryStream( const css::uno::Reference< + css::embed::XStorage > & xParentStorage, const OUString & rPassword, const OUString & rUri, StorageAccessMode eMode, bool bTruncate /* ignored for read-only streams */ ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::packages::WrongPasswordException, - com::sun::star::uno::RuntimeException ); + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::packages::WrongPasswordException, + css::uno::RuntimeException ); struct ltstrbool { @@ -155,8 +154,7 @@ namespace tdoc_ucp { StorageMap m_aMap; osl::Mutex m_aMutex; rtl::Reference< OfficeDocumentsManager > m_xDocsMgr; - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; }; } // namespace tdoc_ucp diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx index de70572f9258..63f0de7f3d19 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx @@ -405,7 +405,7 @@ void ContentProperties::addProperty( const DAVPropertyValue & rProp ) void ContentProperties::addProperty( const OUString & rName, - const com::sun::star::uno::Any & rValue, + const css::uno::Any & rValue, bool bIsCaseSensitive ) { if ( rName.equals( DAVProperties::CREATIONDATE ) ) diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx index 3943f8dd620a..e3f6bf02466b 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx @@ -50,20 +50,20 @@ struct DAVResource; class PropertyValue { private: - ::com::sun::star::uno::Any m_aValue; - bool m_bIsCaseSensitive; + css::uno::Any m_aValue; + bool m_bIsCaseSensitive; public: PropertyValue() : m_bIsCaseSensitive( true ) {} - PropertyValue( const ::com::sun::star::uno::Any & rValue, + PropertyValue( const css::uno::Any & rValue, bool bIsCaseSensitive ) : m_aValue( rValue), m_bIsCaseSensitive( bIsCaseSensitive ) {} bool isCaseSensitive() const { return m_bIsCaseSensitive; } - const ::com::sun::star::uno::Any & value() const { return m_aValue; } + const css::uno::Any & value() const { return m_aValue; } }; @@ -94,7 +94,7 @@ public: bool contains( const OUString & rName ) const; - const com::sun::star::uno::Any & + const css::uno::Any & getValue( const OUString & rName ) const; // Maps the UCB property names contained in rProps with their DAV property @@ -104,9 +104,7 @@ public: // DAVResourceAccess::PROPFIND. The result from PROPFIND // (vector< DAVResource >) can be used to create a ContentProperties // instance which can map DAV properties back to UCB properties. - static void UCBNamesToDAVNames( const com::sun::star::uno::Sequence< - com::sun::star::beans::Property > & - rProps, + static void UCBNamesToDAVNames( const css::uno::Sequence< css::beans::Property > & rProps, std::vector< OUString > & resources, bool bIncludeUnmatched = true ); @@ -117,9 +115,7 @@ public: // DAVResourceAccess::HEAD. The result from HEAD (vector< DAVResource >) // can be used to create a ContentProperties instance which can map header // names back to UCB properties. - static void UCBNamesToHTTPNames( const com::sun::star::uno::Sequence< - com::sun::star::beans::Property > & - rProps, + static void UCBNamesToHTTPNames( const css::uno::Sequence< css::beans::Property > & rProps, std::vector< OUString > & resources, bool bIncludeUnmatched = true ); @@ -127,8 +123,7 @@ public: // this ContentProperties instance. Otherwiese, false will be returned. // rNamesNotContained contain the missing names. bool containsAllNames( - const com::sun::star::uno::Sequence< - com::sun::star::beans::Property >& rProps, + const css::uno::Sequence< css::beans::Property >& rProps, std::vector< OUString > & rNamesNotContained ) const; // adds all properties described by rProps that are actually contained in @@ -139,7 +134,7 @@ public: // overwrites probably existing entry. void addProperty( const OUString & rName, - const com::sun::star::uno::Any & rValue, + const css::uno::Any & rValue, bool bIsCaseSensitive ); // overwrites probably existing entry. @@ -159,7 +154,7 @@ private: std::unique_ptr< PropertyValueMap > m_xProps; bool m_bTrailingSlash; - static com::sun::star::uno::Any m_aEmptyAny; + static css::uno::Any m_aEmptyAny; ContentProperties & operator=( const ContentProperties & ) = delete; @@ -182,12 +177,11 @@ public: void addProperties( const std::vector< DAVPropertyValue > & rProps ); bool containsAllNames( - const com::sun::star::uno::Sequence< - com::sun::star::beans::Property >& rProps, + const css::uno::Sequence< css::beans::Property >& rProps, std::vector< OUString > & rNamesNotContained ) const { return m_aProps.containsAllNames( rProps, rNamesNotContained ); } - const com::sun::star::uno::Any & + const css::uno::Any & getValue( const OUString & rName ) const { return m_aProps.getValue( rName ); } diff --git a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx index 87b7b7651e04..36a902cd1fea 100644 --- a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx @@ -52,8 +52,7 @@ namespace webdav_ucp public: DAVAuthListener_Impl( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment>& xEnv, + const css::uno::Reference< css::ucb::XCommandEnvironment>& xEnv, const OUString & inURL ) : m_xEnv( xEnv ), m_aURL( inURL ) { @@ -66,8 +65,7 @@ namespace webdav_ucp bool bCanUseSystemCredentials ) override; private: - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > m_xEnv; + const css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; const OUString m_aURL; OUString m_aPrevPassword; diff --git a/ucb/source/ucp/webdav-neon/DAVResource.hxx b/ucb/source/ucp/webdav-neon/DAVResource.hxx index 20c0e6afa31e..1368619263f2 100644 --- a/ucb/source/ucp/webdav-neon/DAVResource.hxx +++ b/ucb/source/ucp/webdav-neon/DAVResource.hxx @@ -40,9 +40,9 @@ namespace webdav_ucp struct DAVPropertyValue { - OUString Name; - com::sun::star::uno::Any Value; - bool IsCaseSensitive; + OUString Name; + css::uno::Any Value; + bool IsCaseSensitive; DAVPropertyValue() : IsCaseSensitive( true ) {} }; diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx index 481fc1720f09..819be1e1d9b7 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx @@ -57,25 +57,22 @@ class DAVResourceAccess osl::Mutex m_aMutex; OUString m_aURL; OUString m_aPath; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aFlags; + css::uno::Sequence< css::beans::NamedValue > m_aFlags; rtl::Reference< DAVSession > m_xSession; rtl::Reference< DAVSessionFactory > m_xSessionFactory; - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; std::vector< NeonUri > m_aRedirectURIs; public: DAVResourceAccess() : m_xSessionFactory( 0 ) {} - DAVResourceAccess( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext, - rtl::Reference< - DAVSessionFactory > const & rSessionFactory, + DAVResourceAccess( const css::uno::Reference< css::uno::XComponentContext > & rxContext, + rtl::Reference< DAVSessionFactory > const & rSessionFactory, const OUString & rURL ); DAVResourceAccess( const DAVResourceAccess & rOther ); DAVResourceAccess & operator=( const DAVResourceAccess & rOther ); - void setFlags( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) + void setFlags( const css::uno::Sequence< css::beans::NamedValue >& rFlags ) throw ( DAVException ); void setURL( const OUString & rNewURL ) @@ -94,8 +91,7 @@ public: #if 0 // currently not used, but please don't remove code void OPTIONS( DAVCapabilities & rCapabilities, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); #endif @@ -104,131 +100,107 @@ public: PROPFIND( const Depth nDepth, const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); // propnames void PROPFIND( const Depth nDepth, std::vector< DAVResourceInfo > & rResInfo, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void PROPPATCH( const std::vector< ProppatchValue > & rValues, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ); void HEAD( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + css::uno::Reference< css::io::XInputStream > + GET( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - GET( com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & rStream, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + GET( css::uno::Reference< css::io::XOutputStream > & rStream, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > GET( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - GET( com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & rStream, + GET( css::uno::Reference< css::io::XOutputStream > & rStream, const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - PUT( const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & rStream, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + PUT( const css::uno::Reference< css::io::XInputStream > & rStream, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw (css::uno::RuntimeException, DAVException); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > POST( const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & rInputStream, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) + const css::uno::Reference< css::io::XInputStream > & rInputStream, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, DAVException); void POST( const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & rInputStream, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & rOutputStream, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) + const css::uno::Reference< css::io::XInputStream > & rInputStream, + css::uno::Reference< css::io::XOutputStream > & rOutputStream, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, DAVException); void - MKCOL( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + MKCOL( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void COPY( const OUString & rSourcePath, const OUString & rDestinationURI, bool bOverwrite, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void MOVE( const OUString & rSourcePath, const OUString & rDestinationURI, bool bOverwrite, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - DESTROY( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + DESTROY( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); // set new lock. void - LOCK( com::sun::star::ucb::Lock & inLock, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + LOCK( css::ucb::Lock & inLock, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw( DAVException ); #if 0 // currently not used, but please don't remove code // refresh existing lock. sal_Int64 LOCK( sal_Int64 nTimeout, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); #endif void - UNLOCK( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void @@ -238,10 +210,9 @@ public: // helper static void getUserRequestHeaders( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv, const OUString & rURI, - com::sun::star::ucb::WebDAVHTTPMethod eMethod, + css::ucb::WebDAVHTTPMethod eMethod, DAVRequestHeaders & rRequestHeaders ); private: diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx index 8180507c02a8..9f32abfcf11e 100644 --- a/ucb/source/ucp/webdav-neon/DAVSession.hxx +++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx @@ -69,7 +69,7 @@ public: } virtual bool CanUse( const OUString & inPath, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) = 0; + const css::uno::Sequence< css::beans::NamedValue >& rFlags ) = 0; virtual bool UsesProxy() = 0; @@ -101,18 +101,17 @@ public: const DAVRequestEnvironment & rEnv ) throw( std::exception ) = 0; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( std::exception ) = 0; virtual void GET( const OUString & inPath, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream >& o, + css::uno::Reference< css::io::XOutputStream >& o, const DAVRequestEnvironment & rEnv ) throw( std::exception ) = 0; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, @@ -121,34 +120,30 @@ public: virtual void GET( const OUString & inPath, - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& o, + css::uno::Reference< css::io::XOutputStream >& o, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( std::exception ) = 0; virtual void PUT( const OUString & inPath, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream >& s, + const css::uno::Reference< css::io::XInputStream >& s, const DAVRequestEnvironment & rEnv ) throw( std::exception ) = 0; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > POST( const OUString & inPath, const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & inInputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( std::exception ) = 0; virtual void POST( const OUString & inPath, const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & inInputStream, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & oOutputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, + css::uno::Reference< css::io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) throw ( std::exception ) = 0; @@ -174,7 +169,7 @@ public: // set new lock. virtual void LOCK( const OUString & inPath, - com::sun::star::ucb::Lock & inLock, + css::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( std::exception ) = 0; diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx index f23bb0dad43f..1eb0eef6993d 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx @@ -63,7 +63,7 @@ public: rtl::Reference< DAVSession > createDAVSession( const OUString & inUri, - const ::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags, + const ::uno::Sequence< css::beans::NamedValue >& rFlags, const ::uno::Reference< ::uno::XComponentContext >& rxContext ) throw( DAVException ); diff --git a/ucb/source/ucp/webdav-neon/DAVTypes.hxx b/ucb/source/ucp/webdav-neon/DAVTypes.hxx index 2bf20c8aed3d..4ad4dab5944a 100644 --- a/ucb/source/ucp/webdav-neon/DAVTypes.hxx +++ b/ucb/source/ucp/webdav-neon/DAVTypes.hxx @@ -72,13 +72,13 @@ enum ProppatchOperation { PROPSET = 0, PROPREMOVE = 1 }; struct ProppatchValue { - ProppatchOperation operation; + ProppatchOperation operation; OUString name; - com::sun::star::uno::Any value; + css::uno::Any value; ProppatchValue( const ProppatchOperation o, const OUString & n, - const com::sun::star::uno::Any & v ) + const css::uno::Any & v ) : operation( o ), name( n ), value( v ) {} }; diff --git a/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx index 5a00d8e497f9..b1a80b867916 100644 --- a/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx +++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx @@ -46,14 +46,14 @@ private: static sal_Int32 convertMonthToInt (const OUString& ); static bool ISO8601_To_DateTime (const OUString&, - ::com::sun::star::util::DateTime& ); + css::util::DateTime& ); static bool RFC2068_To_DateTime (const OUString&, - ::com::sun::star::util::DateTime& ); + css::util::DateTime& ); public: static bool convert (const OUString&, - ::com::sun::star::util::DateTime& ); + css::util::DateTime& ); }; } // namespace webdav_ucp diff --git a/ucb/source/ucp/webdav-neon/LinkSequence.hxx b/ucb/source/ucp/webdav-neon/LinkSequence.hxx index d0228d93d178..8c88610dd8dc 100644 --- a/ucb/source/ucp/webdav-neon/LinkSequence.hxx +++ b/ucb/source/ucp/webdav-neon/LinkSequence.hxx @@ -40,10 +40,8 @@ class LinkSequence { public: static bool createFromXML( const OString & rInData, - com::sun::star::uno::Sequence< - com::sun::star::ucb::Link > & rOutData ); - static bool toXML( const com::sun::star::uno::Sequence< - com::sun::star::ucb::Link > & rInData, + css::uno::Sequence< css::ucb::Link > & rOutData ); + static bool toXML( const css::uno::Sequence< css::ucb::Link > & rInData, OUString & rOutData ); }; diff --git a/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx index 9536428db10d..87f173203828 100644 --- a/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx +++ b/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx @@ -40,8 +40,7 @@ class LockEntrySequence { public: static bool createFromXML( const OString & rInData, - com::sun::star::uno::Sequence< - com::sun::star::ucb::LockEntry > & rOutData ); + css::uno::Sequence< css::ucb::LockEntry > & rOutData ); }; } diff --git a/ucb/source/ucp/webdav-neon/LockSequence.hxx b/ucb/source/ucp/webdav-neon/LockSequence.hxx index acecb259d910..a35ddee996f6 100644 --- a/ucb/source/ucp/webdav-neon/LockSequence.hxx +++ b/ucb/source/ucp/webdav-neon/LockSequence.hxx @@ -41,8 +41,7 @@ class LockSequence { public: static bool createFromXML( const OString & rInData, - com::sun::star::uno::Sequence< - com::sun::star::ucb::Lock > & rOutData ); + css::uno::Sequence< css::ucb::Lock > & rOutData ); }; } diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx index c90c07da0dbc..c6c65a906656 100644 --- a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx +++ b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx @@ -66,11 +66,11 @@ Any NeonInputStream::queryInterface( const Type &type ) // "Reads" the specified number of bytes from the stream sal_Int32 SAL_CALL NeonInputStream::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 ) + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) { // Work out how much we're actually going to write sal_Int32 theBytes2Read = nBytesToRead; @@ -92,11 +92,11 @@ sal_Int32 SAL_CALL NeonInputStream::readBytes( } sal_Int32 SAL_CALL NeonInputStream::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 ) + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) { // Warning: What should this be doing ? return readBytes( aData, nMaxBytesToRead ); @@ -104,10 +104,10 @@ sal_Int32 SAL_CALL NeonInputStream::readSomeBytes( // Moves the current stream position forward void SAL_CALL NeonInputStream::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 ) + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) { mPos += nBytesToSkip; if ( mPos >= mLen ) @@ -116,44 +116,44 @@ void SAL_CALL NeonInputStream::skipBytes( sal_Int32 nBytesToSkip ) // Returns the number of unread bytes currently remaining on the stream sal_Int32 SAL_CALL NeonInputStream::available( ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) { return sal::static_int_cast<sal_Int32>(mLen - mPos); } void SAL_CALL NeonInputStream::closeInput() - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) { } void SAL_CALL NeonInputStream::seek( sal_Int64 location ) - throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::lang::IllegalArgumentException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) { if ( location < 0 ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); if ( location <= mLen ) mPos = location; else - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } sal_Int64 SAL_CALL NeonInputStream::getPosition() - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) { return mPos; } sal_Int64 SAL_CALL NeonInputStream::getLength() - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) { return mLen; } diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx index 30deb7e2ed50..48a01f2da662 100644 --- a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx +++ b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx @@ -41,12 +41,12 @@ namespace webdav_ucp // A simple XInputStream implementation provided specifically for use // by the DAVSession::GET method. -class NeonInputStream : public ::com::sun::star::io::XInputStream, - public ::com::sun::star::io::XSeekable, +class NeonInputStream : public css::io::XInputStream, + public css::io::XSeekable, public ::cppu::OWeakObject { private: - com::sun::star::uno::Sequence< sal_Int8 > mInputBuffer; + css::uno::Sequence< sal_Int8 > mInputBuffer; sal_Int64 mLen; sal_Int64 mPos; @@ -58,9 +58,8 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream, void AddToStream( const char * inBuf, sal_Int32 inLen ); // XInterface - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & type ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & type ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw () override @@ -73,50 +72,50 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream, // XInputStream virtual sal_Int32 SAL_CALL readBytes( - ::com::sun::star::uno::Sequence< sal_Int8 > & aData, + css::uno::Sequence< sal_Int8 > & aData, sal_Int32 nBytesToRead ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL readSomeBytes( - ::com::sun::star::uno::Sequence< sal_Int8 > & aData, + css::uno::Sequence< sal_Int8 > & aData, sal_Int32 nMaxBytesToRead ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL available() - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL closeInput() - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; // 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; }; } // namespace webdav_ucp diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx index 16d5b1d062f7..60651287d4e6 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.hxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx @@ -52,7 +52,7 @@ private: OUString m_aProxyName; sal_Int32 m_nPort; sal_Int32 m_nProxyPort; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aFlags; + css::uno::Sequence< css::beans::NamedValue > m_aFlags; HttpSession * m_pHttpSession; void * m_pRequestData; const ucbhelper::InternetProxyDecider & m_rProxyDecider; @@ -73,13 +73,13 @@ protected: public: NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, const OUString& inUri, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags, + const css::uno::Sequence< css::beans::NamedValue >& rFlags, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( std::exception ); // DAVSession methods virtual bool CanUse( const OUString & inPath, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) override; + const css::uno::Sequence< css::beans::NamedValue >& rFlags ) override; virtual bool UsesProxy() override; @@ -116,19 +116,18 @@ public: const DAVRequestEnvironment & rEnv ) throw ( std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( std::exception ) override; virtual void GET( const OUString & inPath, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & ioOutputStream, + css::uno::Reference< css::io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) throw ( std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, @@ -137,8 +136,7 @@ public: virtual void GET( const OUString & inPath, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & ioOutputStream, + css::uno::Reference< css::io::XOutputStream > & ioOutputStream, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) @@ -146,17 +144,15 @@ public: virtual void PUT( const OUString & inPath, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & inInputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > POST( const OUString & inPath, const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & inInputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( std::exception ) override; @@ -164,10 +160,8 @@ public: POST( const OUString & inPath, const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & inInputStream, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & oOutputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, + css::uno::Reference< css::io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) throw ( std::exception ) override; @@ -196,7 +190,7 @@ public: // set new lock. virtual void LOCK( const OUString & inURL, - com::sun::star::ucb::Lock & inLock, + css::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( std::exception ) override; @@ -270,9 +264,8 @@ private: // Helper: XInputStream -> Sequence< sal_Int8 > static bool getDataFromInputStream( - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & xStream, - com::sun::star::uno::Sequence< sal_Int8 > & rData, + const css::uno::Reference< css::io::XInputStream > & xStream, + css::uno::Sequence< sal_Int8 > & rData, bool bAppendTrailingZeroByte ); OUString makeAbsoluteURL( OUString const & rURL ) const; diff --git a/ucb/source/ucp/webdav-neon/PropertyMap.hxx b/ucb/source/ucp/webdav-neon/PropertyMap.hxx index 2cd84ced131f..27def70db167 100644 --- a/ucb/source/ucp/webdav-neon/PropertyMap.hxx +++ b/ucb/source/ucp/webdav-neon/PropertyMap.hxx @@ -39,8 +39,8 @@ namespace webdav_ucp { struct equalPropertyName { - bool operator()( const ::com::sun::star::beans::Property & p1, - const ::com::sun::star::beans::Property & p2 ) const + bool operator()( const css::beans::Property & p1, + const css::beans::Property & p2 ) const { return !!( p1.Name == p2.Name ); } @@ -48,7 +48,7 @@ struct equalPropertyName struct hashPropertyName { - size_t operator()( const ::com::sun::star::beans::Property & p ) const + size_t operator()( const css::beans::Property & p ) const { return p.Name.hashCode(); } @@ -56,7 +56,7 @@ struct hashPropertyName typedef std::unordered_set < - ::com::sun::star::beans::Property, + css::beans::Property, hashPropertyName, equalPropertyName > diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx index 20aba9f87d43..f0c93bee9c38 100644 --- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx +++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx @@ -53,11 +53,11 @@ private: static const OUString aXMLEnd; public: - static bool supportsType( const com::sun::star::uno::Type & rType ); + static bool supportsType( const css::uno::Type & rType ); static bool createFromXML( const OString & rInData, - com::sun::star::uno::Any & rOutData ); - static bool toXML( const com::sun::star::uno::Any & rInData, + css::uno::Any & rOutData ); + static bool toXML( const css::uno::Any & rInData, OUString & rOutData ); }; diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx index fcb894e10403..67d4b3b4bfe6 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx @@ -74,7 +74,7 @@ class ContentProperties; class CachableContentProperties; class Content : public ::ucbhelper::ContentImplHelper, - public com::sun::star::ucb::XContentCreator + public css::ucb::XContentCreator { enum ResourceType { @@ -100,144 +100,119 @@ class Content : public ::ucbhelper::ContentImplHelper, std::vector< OUString > m_aFailedPropNames; private: - virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > - getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > - getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::beans::Property > + getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::ucb::CommandInfo > + getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; virtual OUString getParentURL() override; - bool isFolder( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw ( ::com::sun::star::uno::Exception, std::exception ); + bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw ( css::uno::Exception, std::exception ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw ( ::com::sun::star::uno::Exception, std::exception ); + css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw ( css::uno::Exception, std::exception ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - setPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& rValues, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw ( ::com::sun::star::uno::Exception, std::exception ); + css::uno::Sequence< css::uno::Any > + setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw ( css::uno::Exception, std::exception ); typedef rtl::Reference< Content > ContentRef; typedef std::list< ContentRef > ContentRefList; void queryChildren( ContentRefList& rChildren); bool - exchangeIdentity( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& xNewId ); + exchangeIdentity( const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId ); const OUString getBaseURI( const std::unique_ptr< DAVResourceAccess > & rResAccess ); ResourceType - getResourceType( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw ( ::com::sun::star::uno::Exception, std::exception ); + getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw ( css::uno::Exception, std::exception ); ResourceType - getResourceType( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv, + getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv, const std::unique_ptr< DAVResourceAccess > & rResAccess, bool * networkAccessAllowed = 0) - throw ( ::com::sun::star::uno::Exception, std::exception ); + throw ( css::uno::Exception, std::exception ); // Command "open" - com::sun::star::uno::Any open( - const com::sun::star::ucb::OpenCommandArgument3 & rArg, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + css::uno::Any open( + const css::ucb::OpenCommandArgument3 & rArg, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw (css::uno::Exception, std::exception); // Command "post" - void post( const com::sun::star::ucb::PostCommandArgument2 & rArg, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); + void post( const css::ucb::PostCommandArgument2 & rArg, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); // Command "insert" - void insert( const ::com::sun::star::uno::Reference< - ::com::sun::star::io::XInputStream > & xInputStream, + void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream, bool bReplaceExisting, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( ::com::sun::star::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, std::exception ); // Command "transfer" - void transfer( const ::com::sun::star::ucb::TransferInfo & rArgs, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( ::com::sun::star::uno::Exception, std::exception ); + void transfer( const css::ucb::TransferInfo & rArgs, + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, std::exception ); // Command "delete" void destroy( bool bDeletePhysical ) - throw( ::com::sun::star::uno::Exception, std::exception ); + throw( css::uno::Exception, std::exception ); // Command "lock" - void lock( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( ::com::sun::star::uno::Exception, std::exception ); + void lock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, std::exception ); // Command "unlock" - void unlock( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( ::com::sun::star::uno::Exception, std::exception ); + void unlock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, std::exception ); - ::com::sun::star::uno::Any MapDAVException( const DAVException & e, + css::uno::Any MapDAVException( const DAVException & e, bool bWrite ); void cancelCommandExecution( const DAVException & e, - const ::com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv, bool bWrite = false ) - throw( ::com::sun::star::uno::Exception, std::exception ); + throw( css::uno::Exception, std::exception ); static bool shouldAccessNetworkAfterException( const DAVException & e ); ResourceType resourceTypeForLocks( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ); - - void addProperty( const com::sun::star::ucb::PropertyCommandArgument &aCmdArg, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::beans::PropertyExistException, - com::sun::star::beans::IllegalTypeException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); + + void addProperty( const css::ucb::PropertyCommandArgument &aCmdArg, + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::beans::PropertyExistException, + css::beans::IllegalTypeException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ); void removeProperty( const OUString& Name, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException, + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::beans::UnknownPropertyException, + css::beans::NotRemoveableException, + css::uno::RuntimeException, std::exception ); public: - Content( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, rtl::Reference< DAVSessionFactory > const & rSessionFactory ) - throw ( ::com::sun::star::ucb::ContentCreationException ); - Content( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, + throw ( css::ucb::ContentCreationException ); + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, rtl::Reference< DAVSessionFactory > const & rSessionFactory, bool isCollection ) - throw ( ::com::sun::star::ucb::ContentCreationException ); + throw ( css::ucb::ContentCreationException ); virtual ~Content(); // XInterface @@ -257,59 +232,56 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XCommandProcessor - virtual com::sun::star::uno::Any SAL_CALL - execute( const com::sun::star::ucb::Command& aCommand, + virtual css::uno::Any SAL_CALL + execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, - com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, + css::ucb::CommandAbortedException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XPropertyContainer virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, - const com::sun::star::uno::Any& DefaultValue ) - throw( com::sun::star::beans::PropertyExistException, - com::sun::star::beans::IllegalTypeException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Any& DefaultValue ) + throw( css::beans::PropertyExistException, + css::beans::IllegalTypeException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeProperty( const OUString& Name ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::beans::UnknownPropertyException, + css::beans::NotRemoveableException, + css::uno::RuntimeException, std::exception ) override; // Additional interfaces // XContentCreator - virtual com::sun::star::uno::Sequence< - com::sun::star::ucb::ContentInfo > SAL_CALL + virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + createNewContent( const css::ucb::ContentInfo& Info ) + throw( css::uno::RuntimeException, std::exception ) override; // Non-interface methods. @@ -318,14 +290,11 @@ public: DAVResourceAccess & getResourceAccess() { return *m_xResAccess; } // Called from resultset data supplier. - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties, + static css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Sequence< css::beans::Property >& rProperties, const ContentProperties& rData, - const rtl::Reference< - ::ucbhelper::ContentProviderImplHelper >& rProvider, + const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, const OUString& rContentId ); }; diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx index d3415f7594eb..057f49c3674c 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx @@ -48,18 +48,16 @@ private: bool getData(); public: - DataSupplier( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + DataSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rContent, sal_Int32 nOpenMode); virtual ~DataSupplier(); virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > + virtual css::uno::Reference< css::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > + virtual css::uno::Reference< css::ucb::XContent > queryContent( sal_uInt32 nIndex ) override; virtual bool getResult( sal_uInt32 nIndex ) override; @@ -68,14 +66,14 @@ public: virtual sal_uInt32 currentCount() override; virtual bool isCountFinal() override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + virtual css::uno::Reference< css::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) override; virtual void releasePropertyValues( sal_uInt32 nIndex ) override; virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) override; + throw( css::ucb::ResultSetException ) override; }; } diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx index 58eb438750c3..bdf929a18cdf 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx @@ -78,8 +78,7 @@ class ContentProvider : public ::ucbhelper::ContentProviderImplHelper PropertyMap * m_pProps; public: - explicit ContentProvider( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext ); + explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ContentProvider(); // XInterface @@ -112,18 +111,16 @@ public: css::lang::XMultiServiceFactory >& rxServiceMgr ); // XContentProvider - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContent > SAL_CALL - queryContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier ) - throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, + css::uno::RuntimeException, std::exception ) override; // Non-interface methods. bool getProperty( const OUString & rPropName, - ::com::sun::star::beans::Property & rProp, + css::beans::Property & rProp, bool bStrict = false ); }; diff --git a/ucb/source/ucp/webdav-neon/webdavresultset.hxx b/ucb/source/ucp/webdav-neon/webdavresultset.hxx index 98e9515a2ffe..470b16f2558d 100644 --- a/ucb/source/ucp/webdav-neon/webdavresultset.hxx +++ b/ucb/source/ucp/webdav-neon/webdavresultset.hxx @@ -40,20 +40,17 @@ namespace webdav_ucp { class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper { rtl::Reference< Content > m_xContent; - com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > m_xEnv; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; private: virtual void initStatic() override; virtual void initDynamic() override; public: - DynamicResultSet( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + DynamicResultSet( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, - const com::sun::star::ucb::OpenCommandArgument2& rCommand, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv ); + const css::ucb::OpenCommandArgument2& rCommand, + const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv ); }; } diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index 5d3187047c65..b63c51ba1448 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -421,7 +421,7 @@ void ContentProperties::addProperty( const DAVPropertyValue & rProp ) void ContentProperties::addProperty( const OUString & rName, - const com::sun::star::uno::Any & rValue, + const css::uno::Any & rValue, bool bIsCaseSensitive ) { if ( rName == DAVProperties::CREATIONDATE ) diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx index 98bd884735ef..0287f09f45bd 100644 --- a/ucb/source/ucp/webdav/ContentProperties.hxx +++ b/ucb/source/ucp/webdav/ContentProperties.hxx @@ -42,20 +42,20 @@ struct DAVResource; class PropertyValue { private: - ::com::sun::star::uno::Any m_aValue; - bool m_bIsCaseSensitive; + css::uno::Any m_aValue; + bool m_bIsCaseSensitive; public: PropertyValue() : m_bIsCaseSensitive( true ) {} - explicit PropertyValue( const ::com::sun::star::uno::Any & rValue, + explicit PropertyValue( const css::uno::Any & rValue, bool bIsCaseSensitive ) : m_aValue( rValue), m_bIsCaseSensitive( bIsCaseSensitive ) {} bool isCaseSensitive() const { return m_bIsCaseSensitive; } - const ::com::sun::star::uno::Any & value() const { return m_aValue; } + const css::uno::Any & value() const { return m_aValue; } }; @@ -95,9 +95,7 @@ public: // DAVResourceAccess::PROPFIND. The result from PROPFIND // (vector< DAVResource >) can be used to create a ContentProperties // instance which can map DAV properties back to UCB properties. - static void UCBNamesToDAVNames( const com::sun::star::uno::Sequence< - com::sun::star::beans::Property > & - rProps, + static void UCBNamesToDAVNames( const css::uno::Sequence< css::beans::Property > & rProps, std::vector< OUString > & resources, bool bIncludeUnmatched = true ); @@ -108,9 +106,7 @@ public: // DAVResourceAccess::HEAD. The result from HEAD (vector< DAVResource >) // can be used to create a ContentProperties instance which can map header // names back to UCB properties. - static void UCBNamesToHTTPNames( const com::sun::star::uno::Sequence< - com::sun::star::beans::Property > & - rProps, + static void UCBNamesToHTTPNames( const css::uno::Sequence< css::beans::Property > & rProps, std::vector< OUString > & resources, bool bIncludeUnmatched = true ); @@ -118,8 +114,7 @@ public: // this ContentProperties instance. Otherwiese, false will be returned. // rNamesNotContained contain the missing names. bool containsAllNames( - const com::sun::star::uno::Sequence< - com::sun::star::beans::Property >& rProps, + const css::uno::Sequence< css::beans::Property >& rProps, std::vector< OUString > & rNamesNotContained ) const; // adds all properties described by rProps that are actually contained in @@ -136,7 +131,7 @@ public: // overwrites probably existing entry. void addProperty( const OUString & rName, - const com::sun::star::uno::Any & rValue, + const css::uno::Any & rValue, bool bIsCaseSensitive ); // overwrites probably existing entry. @@ -156,7 +151,7 @@ private: std::unique_ptr< PropertyValueMap > m_xProps; bool m_bTrailingSlash; - static com::sun::star::uno::Any m_aEmptyAny; + static css::uno::Any m_aEmptyAny; ContentProperties & operator=( const ContentProperties & ); // n.i. @@ -179,12 +174,11 @@ public: void addProperties( const std::vector< DAVPropertyValue > & rProps ); bool containsAllNames( - const com::sun::star::uno::Sequence< - com::sun::star::beans::Property >& rProps, + const css::uno::Sequence< css::beans::Property >& rProps, std::vector< OUString > & rNamesNotContained ) const { return m_aProps.containsAllNames( rProps, rNamesNotContained ); } - const com::sun::star::uno::Any & + const css::uno::Any & getValue( const OUString & rName ) const { return m_aProps.getValue( rName ); } diff --git a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx index 2e0c91c9cf40..877b88712522 100644 --- a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx @@ -44,8 +44,7 @@ namespace http_dav_ucp public: DAVAuthListener_Impl( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment>& xEnv, + const css::uno::Reference<css::ucb::XCommandEnvironment>& xEnv, const OUString & inURL ) : m_xEnv( xEnv ), m_aURL( inURL ) { @@ -59,8 +58,7 @@ namespace http_dav_ucp bool bUsePreviousCredentials = true ) override; private: - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > m_xEnv; + const css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; const OUString m_aURL; OUString m_aPrevPassword; diff --git a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx index bc95075d2956..80ccc284f3b7 100644 --- a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx +++ b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx @@ -34,15 +34,13 @@ struct DAVRequestEnvironment { OUString m_aRequestURI; rtl::Reference< DAVAuthListener > m_xAuthListener; -// rtl::Reference< DAVStatusListener > m_xStatusListener; -// rtl::Reference< DAVProgressListener > m_xStatusListener; DAVRequestHeaders m_aRequestHeaders; - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; DAVRequestEnvironment( const OUString & rRequestURI, const rtl::Reference< DAVAuthListener > & xListener, const DAVRequestHeaders & rRequestHeaders, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv) : m_aRequestURI( rRequestURI ), m_xAuthListener( xListener ), m_aRequestHeaders( rRequestHeaders ), diff --git a/ucb/source/ucp/webdav/DAVResource.hxx b/ucb/source/ucp/webdav/DAVResource.hxx index 77885b0bf087..5e91ba43382d 100644 --- a/ucb/source/ucp/webdav/DAVResource.hxx +++ b/ucb/source/ucp/webdav/DAVResource.hxx @@ -33,8 +33,8 @@ namespace http_dav_ucp struct DAVPropertyValue { OUString Name; - com::sun::star::uno::Any Value; - bool IsCaseSensitive; + css::uno::Any Value; + bool IsCaseSensitive; DAVPropertyValue() : IsCaseSensitive( true ) {} }; diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx index 6e51a42f99e7..b2f1af6a8c61 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx @@ -50,16 +50,13 @@ class DAVResourceAccess OUString m_aPath; rtl::Reference< DAVSession > m_xSession; rtl::Reference< DAVSessionFactory > m_xSessionFactory; - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; std::vector< SerfUri > m_aRedirectURIs; public: DAVResourceAccess() : m_xSessionFactory( 0 ) {} - DAVResourceAccess( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rContext, - rtl::Reference< - DAVSessionFactory > const & rSessionFactory, + DAVResourceAccess( const css::uno::Reference< css::uno::XComponentContext > & rContext, + rtl::Reference< DAVSessionFactory > const & rSessionFactory, const OUString & rURL ); DAVResourceAccess( const DAVResourceAccess & rOther ); @@ -83,139 +80,114 @@ public: PROPFIND( const Depth nDepth, const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); // propnames void PROPFIND( const Depth nDepth, std::vector< DAVResourceInfo > & rResInfo, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void PROPPATCH( const std::vector< ProppatchValue > & rValues, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ); void HEAD( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + css::uno::Reference< css::io::XInputStream > + GET( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - GET( com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & rStream, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + GET( css::uno::Reference< css::io::XOutputStream > & rStream, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > GET( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > GET( DAVRequestHeaders & rRequestHeaders, const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - GET( com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & rStream, + GET( css::uno::Reference< css::io::XOutputStream > & rStream, const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - PUT( const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & rStream, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + PUT( const css::uno::Reference< css::io::XInputStream > & rStream, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > POST( const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & rInputStream, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) + const css::uno::Reference< css::io::XInputStream > & rInputStream, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ); void POST( const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & rInputStream, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & rOutputStream, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) + const css::uno::Reference< css::io::XInputStream > & rInputStream, + css::uno::Reference< css::io::XOutputStream > & rOutputStream, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ); void - MKCOL( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + MKCOL( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void COPY( const OUString & rSourcePath, const OUString & rDestinationURI, bool bOverwrite, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void MOVE( const OUString & rSourcePath, const OUString & rDestinationURI, bool bOverwrite, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - DESTROY( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + DESTROY( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); // set new lock. void - LOCK( com::sun::star::ucb::Lock & inLock, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + LOCK( css::ucb::Lock & inLock, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw( DAVException ); #if 0 // currently not used, but please don't remove code // refresh existing lock. sal_Int64 LOCK( sal_Int64 nTimeout, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); #endif void - UNLOCK( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void @@ -225,10 +197,9 @@ public: // helper static void getUserRequestHeaders( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv, const rtl::OUString & rURI, - com::sun::star::ucb::WebDAVHTTPMethod eMethod, + css::ucb::WebDAVHTTPMethod eMethod, DAVRequestHeaders & rRequestHeaders ); private: diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx index 0647a544a5c8..83caf7c92c51 100644 --- a/ucb/source/ucp/webdav/DAVSession.hxx +++ b/ucb/source/ucp/webdav/DAVSession.hxx @@ -100,18 +100,17 @@ public: const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual void GET( const OUString & inPath, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream >& o, + css::uno::Reference< css::io::XOutputStream >& o, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, @@ -120,34 +119,30 @@ public: virtual void GET( const OUString & inPath, - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& o, + css::uno::Reference< css::io::XOutputStream >& o, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual void PUT( const OUString & inPath, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream >& s, + const css::uno::Reference< css::io::XInputStream >& s, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > POST( const OUString & inPath, const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & inInputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; virtual void POST( const OUString & inPath, const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & inInputStream, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & oOutputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, + css::uno::Reference< css::io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; @@ -173,7 +168,7 @@ public: // set new lock. virtual void LOCK( const OUString & inPath, - com::sun::star::ucb::Lock & inLock, + css::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx index 55e01f2c03fa..c1a8025b3fec 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx @@ -51,9 +51,7 @@ public: rtl::Reference< DAVSession > createDAVSession( const OUString & inUri, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& - rxContext ) + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw( DAVException ); private: diff --git a/ucb/source/ucp/webdav/DAVTypes.hxx b/ucb/source/ucp/webdav/DAVTypes.hxx index 2c576757a772..e0130ab995a9 100644 --- a/ucb/source/ucp/webdav/DAVTypes.hxx +++ b/ucb/source/ucp/webdav/DAVTypes.hxx @@ -65,12 +65,12 @@ enum ProppatchOperation { PROPSET = 0, PROPREMOVE = 1 }; struct ProppatchValue { ProppatchOperation operation; - OUString name; - com::sun::star::uno::Any value; + OUString name; + css::uno::Any value; ProppatchValue( const ProppatchOperation o, const OUString & n, - const com::sun::star::uno::Any & v ) + const css::uno::Any & v ) : operation( o ), name( n ), value( v ) {} }; diff --git a/ucb/source/ucp/webdav/DateTimeHelper.hxx b/ucb/source/ucp/webdav/DateTimeHelper.hxx index eede6f8229e9..91d1e2be9bc5 100644 --- a/ucb/source/ucp/webdav/DateTimeHelper.hxx +++ b/ucb/source/ucp/webdav/DateTimeHelper.hxx @@ -41,14 +41,14 @@ private: static sal_Int32 convertMonthToInt (const OUString& ); static bool ISO8601_To_DateTime (const OUString&, - ::com::sun::star::util::DateTime& ); + css::util::DateTime& ); static bool RFC2068_To_DateTime (const OUString&, - ::com::sun::star::util::DateTime& ); + css::util::DateTime& ); public: static bool convert (const OUString&, - ::com::sun::star::util::DateTime& ); + css::util::DateTime& ); }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/PropertyMap.hxx b/ucb/source/ucp/webdav/PropertyMap.hxx index 25ed28639517..63f345810a02 100644 --- a/ucb/source/ucp/webdav/PropertyMap.hxx +++ b/ucb/source/ucp/webdav/PropertyMap.hxx @@ -29,8 +29,8 @@ namespace http_dav_ucp { struct equalPropertyName { - bool operator()( const ::com::sun::star::beans::Property & p1, - const ::com::sun::star::beans::Property & p2 ) const + bool operator()( const css::beans::Property & p1, + const css::beans::Property & p2 ) const { return !!( p1.Name == p2.Name ); } @@ -38,7 +38,7 @@ struct equalPropertyName struct hashPropertyName { - size_t operator()( const ::com::sun::star::beans::Property & p ) const + size_t operator()( const css::beans::Property & p ) const { return p.Name.hashCode(); } @@ -46,7 +46,7 @@ struct hashPropertyName typedef std::unordered_set < - ::com::sun::star::beans::Property, + css::beans::Property, hashPropertyName, equalPropertyName > diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx index 8c9ee4a91ebc..470e730615ba 100644 --- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx @@ -26,7 +26,7 @@ namespace http_dav_ucp SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm ) + const css::uno::Reference< SerfInputStream > & xioInStrm ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , xInputStream( xioInStrm ) , xOutputStream() @@ -37,7 +37,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm, + const css::uno::Reference< SerfInputStream > & xioInStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) @@ -50,7 +50,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm ) + const css::uno::Reference< css::io::XOutputStream > & xioOutStrm ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , xInputStream() , xOutputStream( xioOutStrm ) @@ -61,7 +61,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm, + const css::uno::Reference< css::io::XOutputStream > & xioOutStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx index 2c382398508c..a91c5405f73a 100644 --- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx @@ -37,21 +37,21 @@ class SerfGetReqProcImpl : public SerfRequestProcessorImpl public: SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm ); + const css::uno::Reference< SerfInputStream > & xioInStrm ); SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm, + const css::uno::Reference< SerfInputStream > & xioInStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ); SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm ); + const css::uno::Reference< css::io::XOutputStream > & xioOutStrm ); SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm, + const css::uno::Reference< css::io::XOutputStream > & xioOutStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ); @@ -71,8 +71,8 @@ protected: void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override; private: - com::sun::star::uno::Reference< SerfInputStream > xInputStream; - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOutputStream; + css::uno::Reference< SerfInputStream > xInputStream; + css::uno::Reference< css::io::XOutputStream > xOutputStream; const std::vector< OUString > * mpHeaderNames; DAVResource* mpResource; }; diff --git a/ucb/source/ucp/webdav/SerfInputStream.cxx b/ucb/source/ucp/webdav/SerfInputStream.cxx index 0c3a5b68d054..66ef8bb8c20f 100644 --- a/ucb/source/ucp/webdav/SerfInputStream.cxx +++ b/ucb/source/ucp/webdav/SerfInputStream.cxx @@ -73,11 +73,11 @@ Any SerfInputStream::queryInterface( const Type &type ) // "Reads" the specified number of bytes from the stream sal_Int32 SAL_CALL SerfInputStream::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 ) + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException ) { // Work out how much we're actually going to write sal_Int32 theBytes2Read = nBytesToRead; @@ -102,11 +102,11 @@ sal_Int32 SAL_CALL SerfInputStream::readBytes( // readSomeBytes sal_Int32 SAL_CALL SerfInputStream::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 ) + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException ) { // Warning: What should this be doing ? return readBytes( aData, nMaxBytesToRead ); @@ -117,10 +117,10 @@ sal_Int32 SAL_CALL SerfInputStream::readSomeBytes( // Moves the current stream position forward void SAL_CALL SerfInputStream::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 ) { mPos += nBytesToSkip; if ( mPos >= mLen ) @@ -132,9 +132,9 @@ void SAL_CALL SerfInputStream::skipBytes( sal_Int32 nBytesToSkip ) // Returns the number of unread bytes currently remaining on the stream sal_Int32 SAL_CALL SerfInputStream::available( ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException ) { return sal::static_int_cast<sal_Int32>(mLen - mPos); } @@ -143,9 +143,9 @@ sal_Int32 SAL_CALL SerfInputStream::available( ) // closeInput void SAL_CALL SerfInputStream::closeInput() - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException ) { } @@ -153,25 +153,25 @@ void SAL_CALL SerfInputStream::closeInput() // seek void SAL_CALL SerfInputStream::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 ) { if ( location < 0 ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); if ( location <= mLen ) mPos = location; else - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } // getPosition sal_Int64 SAL_CALL SerfInputStream::getPosition() - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + throw( css::io::IOException, + css::uno::RuntimeException ) { return mPos; } @@ -180,8 +180,8 @@ sal_Int64 SAL_CALL SerfInputStream::getPosition() // getLength sal_Int64 SAL_CALL SerfInputStream::getLength() - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + throw( css::io::IOException, + css::uno::RuntimeException ) { return mLen; } diff --git a/ucb/source/ucp/webdav/SerfInputStream.hxx b/ucb/source/ucp/webdav/SerfInputStream.hxx index 81c42e538874..328a79ca5ea7 100644 --- a/ucb/source/ucp/webdav/SerfInputStream.hxx +++ b/ucb/source/ucp/webdav/SerfInputStream.hxx @@ -36,12 +36,12 @@ namespace http_dav_ucp // A simple XInputStream implementation provided specifically for use // by the DAVSession::GET method. -class SerfInputStream : public ::com::sun::star::io::XInputStream, - public ::com::sun::star::io::XSeekable, +class SerfInputStream : public css::io::XInputStream, + public css::io::XSeekable, public ::cppu::OWeakObject { private: - com::sun::star::uno::Sequence< sal_Int8 > mInputBuffer; + css::uno::Sequence< sal_Int8 > mInputBuffer; sal_Int64 mLen; sal_Int64 mPos; @@ -53,9 +53,8 @@ class SerfInputStream : public ::com::sun::star::io::XInputStream, void AddToStream( const char * inBuf, sal_Int32 inLen ); // XInterface - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & type ) - throw( ::com::sun::star::uno::RuntimeException ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & type ) + throw( css::uno::RuntimeException ) override; virtual void SAL_CALL acquire() throw () override @@ -68,50 +67,50 @@ class SerfInputStream : public ::com::sun::star::io::XInputStream, // XInputStream virtual sal_Int32 SAL_CALL readBytes( - ::com::sun::star::uno::Sequence< sal_Int8 > & aData, + css::uno::Sequence< sal_Int8 > & aData, sal_Int32 nBytesToRead ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException ) override; virtual sal_Int32 SAL_CALL readSomeBytes( - ::com::sun::star::uno::Sequence< sal_Int8 > & aData, + css::uno::Sequence< sal_Int8 > & aData, sal_Int32 nMaxBytesToRead ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException ) 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 ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException ) override; virtual sal_Int32 SAL_CALL available() - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException ) override; virtual void SAL_CALL closeInput() - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException ) 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 ) override; + throw( css::lang::IllegalArgumentException, + css::io::IOException, + css::uno::RuntimeException ) override; virtual sal_Int64 SAL_CALL getPosition() - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) override; + throw( css::io::IOException, + css::uno::RuntimeException ) override; virtual sal_Int64 SAL_CALL getLength() - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) override; + throw( css::io::IOException, + css::uno::RuntimeException ) override; }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx index 89d4e2fe5bf7..08c757627a62 100644 --- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx @@ -32,7 +32,7 @@ SerfPostReqProcImpl::SerfPostReqProcImpl( const char* inPath, apr_size_t inDataLen, const char* inContentType, const char* inReferer, - const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm ) + const css::uno::Reference< SerfInputStream > & xioInStrm ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , mpPostData( inData ) , mnPostDataLen( inDataLen ) @@ -49,7 +49,7 @@ SerfPostReqProcImpl::SerfPostReqProcImpl( const char* inPath, apr_size_t inDataLen, const char* inContentType, const char* inReferer, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm ) + const css::uno::Reference< css::io::XOutputStream > & xioOutStrm ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , mpPostData( inData ) , mnPostDataLen( inDataLen ) diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx index 9d04e27ef22f..4696f7fe5898 100644 --- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx @@ -37,7 +37,7 @@ public: apr_size_t inDataLen, const char* inContentType, const char* inReferer, - const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm ); + const css::uno::Reference< SerfInputStream > & xioInStrm ); SerfPostReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, @@ -45,7 +45,7 @@ public: apr_size_t inDataLen, const char* inContentType, const char* inReferer, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm ); + const css::uno::Reference< css::io::XOutputStream > & xioOutStrm ); virtual ~SerfPostReqProcImpl(); @@ -64,8 +64,8 @@ private: apr_size_t mnPostDataLen; const char* mpContentType; const char* mpReferer; - com::sun::star::uno::Reference< SerfInputStream > xInputStream; - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOutputStream; + css::uno::Reference< SerfInputStream > xInputStream; + css::uno::Reference< css::io::XOutputStream > xOutputStream; }; diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx index 955cebd1c7b8..4c3db5db7c92 100644 --- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx @@ -67,7 +67,7 @@ private: std::vector< DAVResourceInfo > * mpResInfo; const bool mbOnlyPropertyNames; - com::sun::star::uno::Reference< SerfInputStream > xInputStream; + css::uno::Reference< SerfInputStream > xInputStream; }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx index cb3ab7e48d9d..ff6b2e63af2b 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx @@ -129,7 +129,7 @@ bool SerfRequestProcessor::processPropPatch( const std::vector< ProppatchValue > } // GET -bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, +bool SerfRequestProcessor::processGet( const css::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ) { mpProcImpl = new SerfGetReqProcImpl( mPathStr, @@ -141,7 +141,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< Ser } // GET inclusive header fields -bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, +bool SerfRequestProcessor::processGet( const css::uno::Reference< SerfInputStream >& xioInStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ) @@ -157,7 +157,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< Ser } // GET -bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, +bool SerfRequestProcessor::processGet( const css::uno::Reference< css::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ) { mpProcImpl = new SerfGetReqProcImpl( mPathStr, @@ -169,7 +169,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com } // GET inclusive header fields -bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, +bool SerfRequestProcessor::processGet( const css::uno::Reference< css::io::XOutputStream >& xioOutStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ) @@ -223,7 +223,7 @@ bool SerfRequestProcessor::processPost( const char* inData, apr_size_t inDataLen, const OUString & inContentType, const OUString & inReferer, - const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + const css::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ) { mContentType = apr_pstrdup( SerfSession::getAprPool(), @@ -247,7 +247,7 @@ bool SerfRequestProcessor::processPost( const char* inData, apr_size_t inDataLen, const OUString & inContentType, const OUString & inReferer, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + const css::uno::Reference< css::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ) { mContentType = apr_pstrdup( SerfSession::getAprPool(), diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx index 771981ee0d22..301b9f5952ed 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx @@ -64,21 +64,21 @@ public: apr_status_t& outSerfStatus ); // GET - bool processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + bool processGet( const css::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ); // GET inclusive header fields - bool processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + bool processGet( const css::uno::Reference< SerfInputStream >& xioInStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ); // GET - bool processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + bool processGet( const css::uno::Reference< css::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ); // GET inclusive header fields - bool processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + bool processGet( const css::uno::Reference< css::io::XOutputStream >& xioOutStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ); @@ -98,7 +98,7 @@ public: apr_size_t inDataLen, const OUString & inContentType, const OUString & inReferer, - const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + const css::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ); // POST @@ -106,7 +106,7 @@ public: apr_size_t inDataLen, const OUString & inContentType, const OUString & inReferer, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + const css::uno::Reference< css::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ); // DELETE diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx index e595c17da44c..bf0ee4f0d99e 100644 --- a/ucb/source/ucp/webdav/SerfSession.hxx +++ b/ucb/source/ucp/webdav/SerfSession.hxx @@ -147,19 +147,18 @@ public: bool isHeadRequestInProgress(); - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) override; virtual void GET( const OUString & inPath, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & ioOutputStream, + css::uno::Reference< css::io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, @@ -168,8 +167,7 @@ public: virtual void GET( const OUString & inPath, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & ioOutputStream, + css::uno::Reference< css::io::XOutputStream > & ioOutputStream, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) @@ -177,17 +175,15 @@ public: virtual void PUT( const OUString & inPath, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & inInputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > POST( const OUString & inPath, const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & inInputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) override; @@ -195,10 +191,8 @@ public: POST( const OUString & inPath, const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & inInputStream, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & oOutputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, + css::uno::Reference< css::io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) override; @@ -227,7 +221,7 @@ public: // set new lock. virtual void LOCK( const OUString & inURL, - com::sun::star::ucb::Lock & inLock, + css::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) override; @@ -273,42 +267,12 @@ private: // unlock, called by SerfLockStore::~SerfLockStore void UNLOCK( const OUString& rLock ); - /* - // low level GET implementation, used by public GET implementations - static int GET( serf_connection_t * sess, - const char * uri, - //ne_block_reader reader, - bool getheaders, - void * userdata ); - - // Buffer-based PUT implementation. Serf only has file descriptor- - // based API. - static int PUT( serf_connection_t * sess, - const char * uri, - const char * buffer, - size_t size ); - - // Buffer-based POST implementation. Serf only has file descriptor- - // based API. - int POST( serf_connection_t * sess, - const char * uri, - const char * buffer, - //ne_block_reader reader, - void * userdata, - const OUString & rContentType, - const OUString & rReferer ); - */ - // Helper: XInputStream -> Sequence< sal_Int8 > static bool getDataFromInputStream( - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & xStream, - com::sun::star::uno::Sequence< sal_Int8 > & rData, + const css::uno::Reference< + css::io::XInputStream > & xStream, + css::uno::Sequence< sal_Int8 > & rData, bool bAppendTrailingZeroByte ); - - /* - OUString makeAbsoluteURL( OUString const & rURL ) const; - */ }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx index c76da376b1d7..c1cd5addfd9c 100644 --- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx @@ -46,11 +46,11 @@ private: static const OUString aXMLEnd; public: - static bool supportsType( const com::sun::star::uno::Type & rType ); + static bool supportsType( const css::uno::Type & rType ); static bool createFromXML( const OString & rInData, - com::sun::star::uno::Any & rOutData ); - static bool toXML( const com::sun::star::uno::Any & rInData, + css::uno::Any & rOutData ); + static bool toXML( const css::uno::Any & rInData, OUString & rOutData ); }; diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 9dbfd921721f..1fb3547f7de6 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -848,7 +848,7 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) -void Content::addProperty( const com::sun::star::ucb::PropertyCommandArgument &aCmdArg, +void Content::addProperty( const css::ucb::PropertyCommandArgument &aCmdArg, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( beans::PropertyExistException, beans::IllegalTypeException, diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx index 364b5478c68a..5aa918015156 100644 --- a/ucb/source/ucp/webdav/webdavcontent.hxx +++ b/ucb/source/ucp/webdav/webdavcontent.hxx @@ -66,7 +66,7 @@ class ContentProperties; class CachableContentProperties; class Content : public ::ucbhelper::ContentImplHelper, - public com::sun::star::ucb::XContentCreator + public css::ucb::XContentCreator { enum ResourceType { @@ -87,142 +87,118 @@ class Content : public ::ucbhelper::ContentImplHelper, std::vector< OUString > m_aFailedPropNames; private: - virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > - getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > - getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::beans::Property > + getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::ucb::CommandInfo > + getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; virtual OUString getParentURL() override; - bool isFolder( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw ( ::com::sun::star::uno::Exception ); + bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw ( css::uno::Exception ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw ( ::com::sun::star::uno::Exception ); + css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw ( css::uno::Exception ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - setPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& rValues, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw ( ::com::sun::star::uno::Exception ); + css::uno::Sequence< css::uno::Any > + setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw ( css::uno::Exception ); typedef rtl::Reference< Content > ContentRef; typedef std::list< ContentRef > ContentRefList; void queryChildren( ContentRefList& rChildren); bool - exchangeIdentity( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& xNewId ); + exchangeIdentity( const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId ); const OUString getBaseURI( const std::unique_ptr< DAVResourceAccess > & rResAccess ); ResourceType - getResourceType( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw ( ::com::sun::star::uno::Exception ); + getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw ( css::uno::Exception ); ResourceType - getResourceType( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv, + getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv, const std::unique_ptr< DAVResourceAccess > & rResAccess, bool * networkAccessAllowed = 0 ) - throw ( ::com::sun::star::uno::Exception ); + throw ( css::uno::Exception ); // Command "open" - com::sun::star::uno::Any open( - const com::sun::star::ucb::OpenCommandArgument2 & rArg, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception ); + css::uno::Any open( + const css::ucb::OpenCommandArgument2 & rArg, + const css::uno::Reference< + css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception ); // Command "post" - void post( const com::sun::star::ucb::PostCommandArgument2 & rArg, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception ); + void post( const css::ucb::PostCommandArgument2 & rArg, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception ); // Command "insert" - void insert( const ::com::sun::star::uno::Reference< - ::com::sun::star::io::XInputStream > & xInputStream, + void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream, bool bReplaceExisting, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception ); // Command "transfer" - void transfer( const ::com::sun::star::ucb::TransferInfo & rArgs, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( ::com::sun::star::uno::Exception ); + void transfer( const css::ucb::TransferInfo & rArgs, + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception ); // Command "delete" void destroy( bool bDeletePhysical ) - throw( ::com::sun::star::uno::Exception ); + throw( css::uno::Exception ); // Command "lock" - void lock( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( ::com::sun::star::uno::Exception ); + void lock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception ); // Command "unlock" - void unlock( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( ::com::sun::star::uno::Exception ); + void unlock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception ); - ::com::sun::star::uno::Any MapDAVException( const DAVException & e, + css::uno::Any MapDAVException( const DAVException & e, bool bWrite ); void cancelCommandExecution( const DAVException & e, - const ::com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv, bool bWrite = false ) - throw( ::com::sun::star::uno::Exception ); + throw( css::uno::Exception ); static bool shouldAccessNetworkAfterException( const DAVException & e ); bool supportsExclusiveWriteLock( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); // XPropertyContainer replacement - void addProperty( const com::sun::star::ucb::PropertyCommandArgument &aCmdArg, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::beans::PropertyExistException, - com::sun::star::beans::IllegalTypeException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException ); + void addProperty( const css::ucb::PropertyCommandArgument &aCmdArg, + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::beans::PropertyExistException, + css::beans::IllegalTypeException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException ); void removeProperty( const rtl::OUString& Name, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::beans::UnknownPropertyException, + css::beans::NotRemoveableException, + css::uno::RuntimeException ); public: - Content( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, rtl::Reference< DAVSessionFactory > const & rSessionFactory ) - throw ( ::com::sun::star::ucb::ContentCreationException ); - Content( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, + throw ( css::ucb::ContentCreationException ); + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, rtl::Reference< DAVSessionFactory > const & rSessionFactory, bool isCollection ) - throw ( ::com::sun::star::ucb::ContentCreationException ); + throw ( css::ucb::ContentCreationException ); virtual ~Content(); // XInterface @@ -242,59 +218,56 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ) override; + throw( css::uno::RuntimeException ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException ) override; + throw( css::uno::RuntimeException ) override; // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException ) override; + throw( css::uno::RuntimeException ) override; // XCommandProcessor - virtual com::sun::star::uno::Any SAL_CALL - execute( const com::sun::star::ucb::Command& aCommand, + virtual css::uno::Any SAL_CALL + execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, - com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, + css::ucb::CommandAbortedException, + css::uno::RuntimeException ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException ) override; + throw( css::uno::RuntimeException ) override; // XPropertyContainer virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, - const com::sun::star::uno::Any& DefaultValue ) - throw( com::sun::star::beans::PropertyExistException, - com::sun::star::beans::IllegalTypeException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException ) override; + const css::uno::Any& DefaultValue ) + throw( css::beans::PropertyExistException, + css::beans::IllegalTypeException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException ) override; virtual void SAL_CALL removeProperty( const OUString& Name ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException ) override; + throw( css::beans::UnknownPropertyException, + css::beans::NotRemoveableException, + css::uno::RuntimeException ) override; // Additional interfaces // XContentCreator - virtual com::sun::star::uno::Sequence< - com::sun::star::ucb::ContentInfo > SAL_CALL + virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException ) override; + throw( css::uno::RuntimeException ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + createNewContent( const css::ucb::ContentInfo& Info ) + throw( css::uno::RuntimeException ) override; // Non-interface methods. @@ -303,14 +276,11 @@ public: DAVResourceAccess & getResourceAccess() { return *m_xResAccess; } // Called from resultset data supplier. - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rContext, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties, + static css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rContext, + const css::uno::Sequence< css::beans::Property >& rProperties, const ContentProperties& rData, - const rtl::Reference< - ::ucbhelper::ContentProviderImplHelper >& rProvider, + const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, const OUString& rContentId ); }; diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx index 0bdd8273e5bb..b22f110d90d7 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx @@ -41,18 +41,16 @@ private: bool getData(); public: - DataSupplier( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + DataSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rContent, sal_Int32 nOpenMode); virtual ~DataSupplier(); virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > + virtual css::uno::Reference< css::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > + virtual css::uno::Reference< css::ucb::XContent > queryContent( sal_uInt32 nIndex ) override; virtual bool getResult( sal_uInt32 nIndex ) override; @@ -61,14 +59,14 @@ public: virtual sal_uInt32 currentCount() override; virtual bool isCountFinal() override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + virtual css::uno::Reference< css::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) override; virtual void releasePropertyValues( sal_uInt32 nIndex ) override; virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) override; + throw( css::ucb::ResultSetException ) override; }; } diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx index 8d696545a941..47521d6ae468 100644 --- a/ucb/source/ucp/webdav/webdavprovider.hxx +++ b/ucb/source/ucp/webdav/webdavprovider.hxx @@ -68,8 +68,7 @@ class ContentProvider : public ::ucbhelper::ContentProviderImplHelper PropertyMap * m_pProps; public: - explicit ContentProvider( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rContext ); + explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rContext ); virtual ~ContentProvider(); // XInterface @@ -102,18 +101,16 @@ public: css::lang::XMultiServiceFactory >& rxServiceMgr ); // XContentProvider - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContent > SAL_CALL - queryContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier ) - throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, + css::uno::RuntimeException ) override; // Non-interface methods. bool getProperty( const OUString & rPropName, - ::com::sun::star::beans::Property & rProp, + css::beans::Property & rProp, bool bStrict = false ); }; diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index b04ea8188799..6c97031be6b9 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -287,7 +287,7 @@ namespace WebDAVResponseParserMode_Lock }; - class WebDAVResponseParser : public cppu::WeakImplHelper< com::sun::star::xml::sax::XDocumentHandler > + class WebDAVResponseParser : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > { private: std::vector< ucb::Lock > maResult_Lock; diff --git a/ucb/source/ucp/webdav/webdavresultset.hxx b/ucb/source/ucp/webdav/webdavresultset.hxx index 7b7af17ad496..31b1a01c3d96 100644 --- a/ucb/source/ucp/webdav/webdavresultset.hxx +++ b/ucb/source/ucp/webdav/webdavresultset.hxx @@ -32,20 +32,17 @@ namespace http_dav_ucp { class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper { rtl::Reference< Content > m_xContent; - com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > m_xEnv; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; private: virtual void initStatic() override; virtual void initDynamic() override; public: - DynamicResultSet( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + DynamicResultSet( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, - const com::sun::star::ucb::OpenCommandArgument2& rCommand, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv ); + const css::ucb::OpenCommandArgument2& rCommand, + const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv ); }; } |