diff options
| author | Noel Grandin <noel@peralex.com> | 2015-06-30 14:35:23 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-02-06 16:32:44 -0500 |
| commit | f1aaedc48e56e04cbd07bbabbb775507a7ac34dd (patch) | |
| tree | c368865c34e277ad5940dd3ec38129d650bc8a82 | |
| parent | 56e7ee951f25b4ad0e58cabda2626462a4dd7d34 (diff) | |
remove some unnecessary typedefs around uno::Reference
Not very useful these days, since we have the css:: prefix to reduce
verbosity.
Found with a search like:
git grep -nP 'typedef .*uno::Reference.*<.*>\s+\w+;'
| grep -v 'std::'
Reviewed-on: https://gerrit.libreoffice.org/16730
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit 89c77994d4638c86635c70535fab6508e2f3d900)
Change-Id: I16f41c53837ec5c613545ae45df38b0daddcbadd
37 files changed, 710 insertions, 876 deletions
diff --git a/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx index 4029bf62c429..642fa2d33e83 100644 --- a/basctl/source/basicide/documentenumeration.hxx +++ b/basctl/source/basicide/documentenumeration.hxx @@ -33,13 +33,12 @@ namespace com { namespace sun { namespace star { namespace uno { namespace basctl { namespace docs { - typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > Model; - typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > > Controllers; + typedef ::std::vector< css::uno::Reference< css::frame::XController > > Controllers; struct DocumentDescriptor { - Model xModel; - Controllers aControllers; + css::uno::Reference< css::frame::XModel > xModel; + Controllers aControllers; }; typedef ::std::vector< DocumentDescriptor > Documents; @@ -72,7 +71,7 @@ namespace basctl { namespace docs { class DocumentEnumeration { public: - DocumentEnumeration( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & _rContext, const IDocumentDescriptorFilter* _pFilter = NULL ); + DocumentEnumeration( css::uno::Reference< css::uno::XComponentContext > const & _rContext, const IDocumentDescriptorFilter* _pFilter = NULL ); ~DocumentEnumeration(); /** retrieves a list of all currently known documents in the application diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx index e6793809a684..52a913fe83aa 100644 --- a/dbaccess/source/core/api/resultset.hxx +++ b/dbaccess/source/core/api/resultset.hxx @@ -44,20 +44,17 @@ namespace dbaccess { - typedef ::cppu::WeakComponentImplHelper11< ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XColumnLocate, - ::com::sun::star::sdbcx::XRowLocate, - ::com::sun::star::sdbcx::XColumnsSupplier, - ::com::sun::star::sdbc::XResultSetUpdate, - ::com::sun::star::sdbc::XRowUpdate, - ::com::sun::star::lang::XServiceInfo > OResultSetBase; - - typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> ONoWeakStatement; - + typedef ::cppu::WeakComponentImplHelper11< css::sdbc::XWarningsSupplier, + css::sdbc::XResultSet, + css::sdbc::XResultSetMetaDataSupplier, + css::sdbc::XRow, + css::sdbc::XCloseable, + css::sdbc::XColumnLocate, + css::sdbcx::XRowLocate, + css::sdbcx::XColumnsSupplier, + css::sdbc::XResultSetUpdate, + css::sdbc::XRowUpdate, + css::lang::XServiceInfo > OResultSetBase; // OResultSet @@ -67,12 +64,12 @@ namespace dbaccess public ::comphelper::OPropertyArrayUsageHelper < OResultSet > { protected: - ONoWeakStatement m_aStatement; + css::uno::Reference< css::uno::XInterface> m_aStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xDelegatorResultSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xDelegatorResultSetUpdate; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xDelegatorRow; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xDelegatorRowUpdate; + css::uno::Reference< css::sdbc::XResultSet > m_xDelegatorResultSet; + css::uno::Reference< css::sdbc::XResultSetUpdate > m_xDelegatorResultSetUpdate; + css::uno::Reference< css::sdbc::XRow > m_xDelegatorRow; + css::uno::Reference< css::sdbc::XRowUpdate > m_xDelegatorRowUpdate; ::dbtools::WarningsContainer m_aWarnings; OColumns* m_pColumns; @@ -81,33 +78,33 @@ namespace dbaccess bool m_bIsBookmarkable : 1; public: - OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _xResultSet, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xStatement, + OResultSet(const css::uno::Reference< css::sdbc::XResultSet >& _xResultSet, + const css::uno::Reference< css::uno::XInterface >& _xStatement, bool _bCaseSensitive); virtual ~OResultSet(); - // ::com::sun::star::lang::XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::lang::XTypeProvider + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::uno::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) SAL_OVERRIDE; + // css::uno::XInterface + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; - // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::lang::XServiceInfo + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::cppu::OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; - // ::com::sun::star::sdbc::XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::sdbc::XCloseable + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; @@ -116,107 +113,107 @@ namespace dbaccess virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any & rConvertedValue, - ::com::sun::star::uno::Any & rOldValue, + css::uno::Any & rConvertedValue, + css::uno::Any & rOldValue, sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + const css::uno::Any& rValue ) + throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue + const css::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XResultSetMetaDataSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbcx::XColumnsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::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) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XResultSet - virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbcx::XRowLocate - virtual ::com::sun::star::uno::Any SAL_CALL getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL compareBookmarks( const ::com::sun::star::uno::Any& first, const ::com::sun::star::uno::Any& second ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::sdbc::XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + + // css::sdbc::XWarningsSupplier + virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XResultSetMetaDataSupplier + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XColumnLocate + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbcx::XColumnsSupplier + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XRow + virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XResultSet + virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbcx::XRowLocate + virtual css::uno::Any SAL_CALL getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XResultSetUpdate + virtual void SAL_CALL insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XRowUpdate + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: void checkReadOnly() const; diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index f8a76f49b235..05e9397a8d8c 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -71,11 +71,11 @@ namespace dbaui class OApplicationView; class OLinkedDocumentsAccess; typedef OGenericUnoController OApplicationController_CBASE; - typedef ::cppu::ImplHelper5 < ::com::sun::star::container::XContainerListener - , ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::sdb::application::XDatabaseDocumentUI - , ::com::sun::star::ui::XContextMenuInterception - , ::com::sun::star::view::XSelectionSupplier + typedef ::cppu::ImplHelper5 < css::container::XContainerListener + , css::beans::XPropertyChangeListener + , css::sdb::application::XDatabaseDocumentUI + , css::ui::XContextMenuInterception + , css::view::XSelectionSupplier > OApplicationController_Base; class SelectionNotifier; @@ -86,24 +86,23 @@ namespace dbaui ,public IApplicationController { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > TContainer; - typedef ::std::vector< TContainer > TContainerVector; + typedef ::std::vector< css::uno::Reference< css::container::XContainer > > TContainerVector; private: OTableCopyHelper::DropDescriptor m_aAsyncDrop; SharedConnection m_xDataSourceConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; OModuleClient m_aModuleClient; TransferableDataHelper m_aSystemClipboard; // content of the clipboard - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xDataSource; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + css::uno::Reference< css::frame::XModel > m_xModel; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > + css::uno::Reference< css::util::XModifiable > m_xDocumentModify; ::cppu::OInterfaceContainerHelper m_aContextMenuInterceptors; @@ -148,7 +147,7 @@ namespace dbaui @param _xContainer The container where the element type has to be found @return the element type corresponding to the given container */ - static ElementType getElementType(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _xContainer); + static ElementType getElementType(const css::uno::Reference< css::container::XContainer >& _xContainer); /** opens a new frame with either the table or the query or report or form or view @param _sName @@ -161,7 +160,7 @@ namespace dbaui denotes the command which instigated the action. Might be 0. @return the form or report model will only be returned, otherwise <NULL/> */ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > openElement( + css::uno::Reference< css::lang::XComponent > openElement( const OUString& _sName, ElementType _eType, ElementOpenMode _eOpenMode, @@ -170,7 +169,7 @@ namespace dbaui /** opens a new sub frame with a table/query/form/report/view, passing additional arguments */ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > openElementWithArguments( + css::uno::Reference< css::lang::XComponent > openElementWithArguments( const OUString& _sName, ElementType _eType, ElementOpenMode _eOpenMode, @@ -184,11 +183,11 @@ namespace dbaui @param i_rAdditionalArguments Additional arguments to pass when creating the component */ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + css::uno::Reference< css::lang::XComponent > newElement( ElementType _eType, const ::comphelper::NamedValueCollection& i_rAdditionalArguments, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& o_rDocumentDefinition + css::uno::Reference< css::lang::XComponent >& o_rDocumentDefinition ); /** creates a new database object, using an auto pilot @@ -243,7 +242,7 @@ namespace dbaui TransferableHelper* copyObject(); /// returns the nameaccess - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getElements(ElementType _eType); + css::uno::Reference< css::container::XNameAccess > getElements(ElementType _eType); /** returns the document access for the specific type @param _eType @@ -253,7 +252,7 @@ namespace dbaui ::std::unique_ptr<OLinkedDocumentsAccess> getDocumentsAccess(ElementType _eType); /// returns the query definitions of the active data source. - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer> getQueryDefinitions() const; + css::uno::Reference< css::container::XNameContainer> getQueryDefinitions() const; /** pastes a special format from the system clipboard to the currently selected object types @param _nFormatId @@ -293,7 +292,7 @@ namespace dbaui @param _xCollection The collection where we want to listen on. */ - void addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xCollection); + void addContainerListener(const css::uno::Reference< css::container::XNameAccess>& _xCollection); /** opens a uno dialog withthe currently selected data source as initialize argument @param _sServiceName @@ -325,8 +324,8 @@ namespace dbaui const OUString& _rName, const sal_Int32 _nType, const ElementOpenMode _eMode, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _xDocument, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _xDefinition + const css::uno::Reference< css::lang::XComponent >& _xDocument, + const css::uno::Reference< css::lang::XComponent >& _xDefinition ); /** Inserts a new object into the hierarchy given be the type. @@ -344,7 +343,7 @@ namespace dbaui bool insertHierachyElement( ElementType _eType ,const OUString& _sParentFolder ,bool _bCollection = true - ,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent = ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>() + ,const css::uno::Reference< css::ucb::XContent>& _xContent = css::uno::Reference< css::ucb::XContent>() ,bool _bMove = false); /** checks if delete command or rename comamnd is allowed @param _eType @@ -398,17 +397,17 @@ namespace dbaui /** forces usage of a connection which we do not own <p>To be used from within XInitialization::initialize only.</p> */ - void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); + void initializeConnection( const css::uno::Reference< css::sdbc::XConnection >& _rxForeignConn ); - // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. + // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; // OGenericUnoController - virtual void onLoadedMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager ) SAL_OVERRIDE; + virtual void onLoadedMenu( const css::uno::Reference< css::frame::XLayoutManager >& _xLayoutManager ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getPrivateModel() const SAL_OVERRIDE + virtual css::uno::Reference< css::frame::XModel > getPrivateModel() const SAL_OVERRIDE { return m_xModel; } @@ -416,58 +415,58 @@ namespace dbaui virtual ~OApplicationController(); public: - OApplicationController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + OApplicationController(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // need by registration - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > 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::lang::XMultiServiceFactory >&); - - // ::com::sun::star::frame::XController - virtual void SAL_CALL attachFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL attachModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // ::com::sun::star::container::XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); + + // css::frame::XController + virtual void SAL_CALL attachFrame(const css::uno::Reference< css::frame::XFrame > & xFrame) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL attachModel(const css::uno::Reference< css::frame::XModel > & xModel) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + // css::container::XContainerListener + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDatabaseDocumentUI - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > SAL_CALL getDataSource() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getApplicationMainWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getActiveConnection() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > > SAL_CALL getSubComponents() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isConnected( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XDataSource > SAL_CALL getDataSource() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getApplicationMainWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::lang::XComponent > > SAL_CALL getSubComponents() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isConnected( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // DO NOT CALL with getMutex() held!! - virtual void SAL_CALL connect( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::beans::Pair< ::sal_Int32, OUString > SAL_CALL identifySubComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& SubComponent ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL closeSubComponents( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL loadComponent( ::sal_Int32 ObjectType, const OUString& ObjectName, sal_Bool ForEditing ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL loadComponentWithArguments( ::sal_Int32 ObjectType, const OUString& ObjectName, sal_Bool ForEditing, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL createComponent( ::sal_Int32 ObjectType, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& o_DocumentDefinition ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL createComponentWithArguments( ::sal_Int32 ObjectType, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& o_DocumentDefinition ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL connect( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::beans::Pair< ::sal_Int32, OUString > SAL_CALL identifySubComponent( const css::uno::Reference< css::lang::XComponent >& SubComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL closeSubComponents( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponent( ::sal_Int32 ObjectType, const OUString& ObjectName, sal_Bool ForEditing ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentWithArguments( ::sal_Int32 ObjectType, const OUString& ObjectName, sal_Bool ForEditing, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL createComponent( ::sal_Int32 ObjectType, css::uno::Reference< css::lang::XComponent >& o_DocumentDefinition ) throw (css::lang::IllegalArgumentException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL createComponentWithArguments( ::sal_Int32 ObjectType, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, css::uno::Reference< css::lang::XComponent >& o_DocumentDefinition ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XContextMenuInterception - virtual void SAL_CALL registerContextMenuInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XContextMenuInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL releaseContextMenuInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XContextMenuInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& xSelection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getSelection( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** retrieves the current connection, creates it if necessary @@ -485,7 +484,7 @@ namespace dbaui /// determines whether we're currently connected to the database bool isConnected() const { return m_xDataSourceConnection.is(); } - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& + const css::uno::Reference< css::sdbc::XDatabaseMetaData >& getConnectionMetaData() const { return m_xMetaData; } /** refreshes the tables @@ -501,20 +500,20 @@ namespace dbaui virtual void onPasteEntry() SAL_OVERRIDE; virtual void onDeleteEntry() SAL_OVERRIDE; virtual void previewChanged( sal_Int32 _nMode) SAL_OVERRIDE; - virtual void containerFound( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _xContainer) SAL_OVERRIDE; + virtual void containerFound( const css::uno::Reference< css::container::XContainer >& _xContainer) SAL_OVERRIDE; // IController (base of IApplicationController) - virtual void executeUnChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; - virtual void executeChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; - virtual void executeUnChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; - virtual void executeChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void executeUnChecked(const css::util::URL& _rCommand, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void executeChecked(const css::util::URL& _rCommand, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void executeUnChecked(sal_uInt16 _nCommandId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void executeChecked(sal_uInt16 _nCommandId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; virtual bool isCommandEnabled(sal_uInt16 _nCommandId) const SAL_OVERRIDE; virtual bool isCommandEnabled( const OUString& _rCompleteCommandURL ) const SAL_OVERRIDE; virtual sal_uInt16 registerCommandURL( const OUString& _rCompleteCommandURL ) SAL_OVERRIDE; virtual void notifyHiContrastChanged() SAL_OVERRIDE; virtual bool isDataSourceReadOnly() const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > - getXController() throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XController > + getXController() throw( css::uno::RuntimeException ) SAL_OVERRIDE; virtual bool interceptUserInput( const NotifyEvent& _rEvent ) SAL_OVERRIDE; // IControlActionListener overridables @@ -528,7 +527,7 @@ namespace dbaui virtual IController& getCommandController() SAL_OVERRIDE; virtual ::cppu::OInterfaceContainerHelper* getContextMenuInterceptors() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any + virtual css::uno::Any getCurrentSelection( Control& _rControl ) const SAL_OVERRIDE; void OnInvalidateClipboard(); @@ -551,7 +550,7 @@ namespace dbaui protected: // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index 96487e3d030e..5c86447281b2 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -140,14 +140,14 @@ Binding::~Binding() _setModel(NULL); } -void Binding::_setModel( const Model_t& xModel ) +void Binding::_setModel( const css::uno::Reference<css::xforms::XModel>& xModel ) { PropertyChangeNotifier aNotifyModelChange( *this, HANDLE_Model ); PropertyChangeNotifier aNotifyModelIDChange( *this, HANDLE_ModelID ); // prepare binding for removal of old model clear(); // remove all cached data (e.g. XPath evaluation results) - XNameContainer_t xNamespaces = getModelNamespaces(); // save namespaces + css::uno::Reference<css::container::XNameContainer> xNamespaces = getModelNamespaces(); // save namespaces mxModel = xModel; @@ -166,7 +166,7 @@ OUString Binding::getModelID() const } -Binding::XNodeList_t Binding::getXNodeList() +css::uno::Reference<css::xml::dom::XNodeList> Binding::getXNodeList() { // first make sure we are bound if( ! maBindingExpression.hasValue() ) @@ -314,7 +314,7 @@ EvaluationContext Binding::getEvaluationContext() const } -Binding::IntSequence_t Binding::getUnoTunnelID() +css::uno::Sequence<sal_Int8> Binding::getUnoTunnelID() { static cppu::OImplementationId aImplementationId; return aImplementationId.getImplementationId(); @@ -416,17 +416,17 @@ void Binding::setType( const OUString& sTypeName ) bindingModified(); } -void Binding::setBindingNamespaces( const XNameContainer_t& rNamespaces ) +void Binding::setBindingNamespaces( const css::uno::Reference<css::container::XNameContainer>& rNamespaces ) { _setNamespaces( rNamespaces, true ); } -Binding::XNameContainer_t Binding::getModelNamespaces() const +css::uno::Reference<css::container::XNameContainer> Binding::getModelNamespaces() const { return _getNamespaces(); } -void Binding::setModelNamespaces( const XNameContainer_t& rNamespaces ) +void Binding::setModelNamespaces( const css::uno::Reference<css::container::XNameContainer>& rNamespaces ) { _setNamespaces( rNamespaces, false ); } @@ -486,7 +486,7 @@ Model* Binding::getModelImpl() const return getModelImpl( mxModel ); } -Model* Binding::getModelImpl( const Model_t& xModel ) +Model* Binding::getModelImpl( const css::uno::Reference<css::xforms::XModel>& xModel ) { Reference<XUnoTunnel> xTunnel( xModel, UNO_QUERY ); Model* pModel = xTunnel.is() @@ -599,7 +599,7 @@ void Binding::bind( bool bForceRebind ) // 2) register suitable listeners on the instance (and remove old ones) if( maEventNodes.empty() || bForceRebind ) { - for( XNodes_t::iterator aIter = maEventNodes.begin(); + for( auto aIter = maEventNodes.begin(); aIter != maEventNodes.end(); ++aIter ) lcl_removeListenerFromNode( *aIter, this ); @@ -660,7 +660,7 @@ void Binding::bind( bool bForceRebind ) // helper for Binding::valueModified -static void lcl_modified( const Binding::XModifyListener_t xListener, +static void lcl_modified( const css::uno::Reference<css::util::XModifyListener>& xListener, const Reference<XInterface>& xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); @@ -668,7 +668,7 @@ static void lcl_modified( const Binding::XModifyListener_t xListener, } // helper for Binding::valueModified -static void lcl_listentry( const Binding::XListEntryListener_t xListener, +static void lcl_listentry( const css::uno::Reference<css::form::binding::XListEntryListener>& xListener, const Reference<XInterface>& xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); @@ -677,7 +677,7 @@ static void lcl_listentry( const Binding::XListEntryListener_t xListener, } // helper for Binding::valueModified -static void lcl_validate( const Binding::XValidityConstraintListener_t xListener, +static void lcl_validate( const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener, const Reference<XInterface>& xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); @@ -725,7 +725,7 @@ void Binding::valueModified() distributeMIP( xNode->getFirstChild() ); } -void Binding::distributeMIP( const XNode_t & rxNode ) { +void Binding::distributeMIP( const css::uno::Reference<css::xml::dom::XNode> & rxNode ) { typedef com::sun::star::xforms::XFormsEventConcrete XFormsEvent_t; OUString sEventName("xforms-generic"); @@ -734,12 +734,12 @@ void Binding::distributeMIP( const XNode_t & rxNode ) { Reference<XEvent> xEvent(pEvent); // naive depth-first traversal - XNode_t xNode( rxNode ); + css::uno::Reference<css::xml::dom::XNode> xNode( rxNode ); while(xNode.is()) { // notifications should be triggered at the // leaf nodes first, bubbling upwards the hierarchy. - XNode_t child(xNode->getFirstChild()); + css::uno::Reference<css::xml::dom::XNode> child(xNode->getFirstChild()); if(child.is()) distributeMIP(child); @@ -799,7 +799,7 @@ MIP Binding::getLocalMIP() const return aMIP; } -Binding::XDataType_t Binding::getDataType() +css::uno::Reference<css::xsd::XDataType> Binding::getDataType() { OSL_ENSURE( getModel().is(), "need model" ); OSL_ENSURE( getModel()->getDataTypeRepository().is(), "need types" ); @@ -836,7 +836,7 @@ void Binding::clear() pModel->removeMIPs( this ); // remove all references - for( XNodes_t::iterator aIter = maEventNodes.begin(); + for( auto aIter = maEventNodes.begin(); aIter != maEventNodes.end(); ++aIter ) lcl_removeListenerFromNode( *aIter, this ); @@ -854,8 +854,8 @@ void Binding::clear() } -static void lcl_removeOtherNamespaces( const Binding::XNameContainer_t& xFrom, - Binding::XNameContainer_t& xTo ) +static void lcl_removeOtherNamespaces( const css::uno::Reference<css::container::XNameContainer>& xFrom, + css::uno::Reference<css::container::XNameContainer>& xTo ) { OSL_ENSURE( xFrom.is(), "no source" ); OSL_ENSURE( xTo.is(), "no target" ); @@ -881,8 +881,8 @@ static void lcl_removeOtherNamespaces( const Binding::XNameContainer_t& xFrom, * @param bFromSource true: use elements from source * false: use only elements from target */ -static void lcl_copyNamespaces( const Binding::XNameContainer_t& xFrom, - Binding::XNameContainer_t& xTo, +static void lcl_copyNamespaces( const css::uno::Reference<css::container::XNameContainer>& xFrom, + css::uno::Reference<css::container::XNameContainer>& xTo, bool bOverwrite ) { OSL_ENSURE( xFrom.is(), "no source" ); @@ -918,9 +918,9 @@ static void lcl_copyNamespaces( const Binding::XNameContainer_t& xFrom, // implement get*Namespaces() // (identical for both variants) -Binding::XNameContainer_t Binding::_getNamespaces() const +css::uno::Reference<css::container::XNameContainer> Binding::_getNamespaces() const { - XNameContainer_t xNamespaces = new NameContainer<OUString>(); + css::uno::Reference<css::container::XNameContainer> xNamespaces = new NameContainer<OUString>(); lcl_copyNamespaces( mxNamespaces, xNamespaces, true ); // merge model's with binding's own namespaces @@ -933,11 +933,11 @@ Binding::XNameContainer_t Binding::_getNamespaces() const // implement set*Namespaces() // bBinding = true: setBindingNamespaces, otherwise: setModelNamespaces -void Binding::_setNamespaces( const XNameContainer_t& rNamespaces, +void Binding::_setNamespaces( const css::uno::Reference<css::container::XNameContainer>& rNamespaces, bool bBinding ) { Model* pModel = getModelImpl(); - XNameContainer_t xModelNamespaces = ( pModel != NULL ) + css::uno::Reference<css::container::XNameContainer> xModelNamespaces = ( pModel != NULL ) ? pModel->getNamespaces() : NULL; OSL_ENSURE( ( pModel != NULL ) == xModelNamespaces.is(), "no model nmsp?"); @@ -966,7 +966,7 @@ void Binding::_setNamespaces( const XNameContainer_t& rNamespaces, && xModelNamespaces->hasByName( rName ) ); // write namespace into the appropriate namespace container - XNameContainer_t& rWhich = bLocal ? mxNamespaces : xModelNamespaces; + css::uno::Reference<css::container::XNameContainer>& rWhich = bLocal ? mxNamespaces : xModelNamespaces; OSL_ENSURE( rWhich.is(), "whoops" ); if( rWhich->hasByName( rName ) ) rWhich->replaceByName( rName, aValue ); @@ -1016,19 +1016,19 @@ void Binding::_checkBindingID() // XValueBinding -Binding::Sequence_Type_t Binding::getSupportedValueTypes() +css::uno::Sequence<css::uno::Type> Binding::getSupportedValueTypes() throw( RuntimeException, std::exception ) { return Convert::get().getTypes(); } -sal_Bool Binding::supportsType( const Type_t& rType ) +sal_Bool Binding::supportsType( const css::uno::Type& rType ) throw( RuntimeException, std::exception ) { return Convert::get().hasType( rType ); } -Binding::Any_t Binding::getValue( const Type_t& rType ) +css::uno::Any Binding::getValue( const css::uno::Type& rType ) throw( IncompatibleTypesException, RuntimeException, std::exception ) { @@ -1040,7 +1040,7 @@ Binding::Any_t Binding::getValue( const Type_t& rType ) throw IncompatibleTypesException( EXCEPT( "type unsupported" ) ); // return string value (if present; else return empty Any) - Binding::Any_t result = Any(); + css::uno::Any result; if(maBindingExpression.hasValue()) { OUString pathExpr(maBindingExpression.getString()); Convert &rConvert = Convert::get(); @@ -1050,7 +1050,7 @@ Binding::Any_t Binding::getValue( const Type_t& rType ) return result; } -void Binding::setValue( const Any_t& aValue ) +void Binding::setValue( const css::uno::Any& aValue ) throw( IncompatibleTypesException, InvalidBindingStateException, NoSupportException, @@ -1065,7 +1065,7 @@ void Binding::setValue( const Any_t& aValue ) if( maBindingExpression.hasValue() ) { - Binding::XNode_t xNode = maBindingExpression.getNode(); + css::uno::Reference<css::xml::dom::XNode> xNode = maBindingExpression.getNode(); if( xNode.is() ) { OUString sValue = Convert::get().toXSD( aValue ); @@ -1152,7 +1152,7 @@ Sequence<OUString> Binding::getAllListEntries() return aSequence; } -void Binding::addListEntryListener( const XListEntryListener_t& xListener ) +void Binding::addListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>& xListener ) throw( NullPointerException, RuntimeException, std::exception ) { @@ -1164,7 +1164,7 @@ void Binding::addListEntryListener( const XListEntryListener_t& xListener ) maListEntryListeners.push_back( xListener ); } -void Binding::removeListEntryListener( const XListEntryListener_t& xListener ) +void Binding::removeListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>& xListener ) throw( NullPointerException, RuntimeException, std::exception ) { @@ -1180,7 +1180,7 @@ void Binding::removeListEntryListener( const XListEntryListener_t& xListener ) // XValidator -sal_Bool Binding::isValid( const Any_t& ) +sal_Bool Binding::isValid( const css::uno::Any& ) throw( RuntimeException, std::exception ) { // first, check for model @@ -1191,7 +1191,7 @@ sal_Bool Binding::isValid( const Any_t& ) } OUString Binding::explainInvalid( - const Any_t& /*Value*/ ) + const css::uno::Any& /*Value*/ ) throw( RuntimeException, std::exception ) { // first, check for model @@ -1202,7 +1202,7 @@ OUString Binding::explainInvalid( } void Binding::addValidityConstraintListener( - const XValidityConstraintListener_t& xListener ) + const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener ) throw( NullPointerException, RuntimeException, std::exception ) { @@ -1213,7 +1213,7 @@ void Binding::addValidityConstraintListener( } void Binding::removeValidityConstraintListener( - const XValidityConstraintListener_t& xListener ) + const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener ) throw( NullPointerException, RuntimeException, std::exception ) { @@ -1230,7 +1230,7 @@ void Binding::removeValidityConstraintListener( // xml::dom::event::XEventListener -void Binding::handleEvent( const XEvent_t& xEvent ) +void Binding::handleEvent( const css::uno::Reference<css::xml::dom::events::XEvent>& xEvent ) throw( RuntimeException, std::exception ) { OUString sType(xEvent->getType()); @@ -1263,7 +1263,7 @@ void Binding::handleEvent( const XEvent_t& xEvent ) // lang::XUnoTunnel -sal_Int64 Binding::getSomething( const IntSequence_t& xId ) +sal_Int64 Binding::getSomething( const css::uno::Sequence<sal_Int8>& xId ) throw( RuntimeException, std::exception ) { return reinterpret_cast<sal_Int64>( ( xId == getUnoTunnelID() ) ? this : NULL ); @@ -1273,7 +1273,7 @@ sal_Int64 Binding::getSomething( const IntSequence_t& xId ) // XCloneable -Binding::XCloneable_t SAL_CALL Binding::createClone() +css::uno::Reference<css::util::XCloneable> SAL_CALL Binding::createClone() throw( RuntimeException, std::exception ) { Reference< XPropertySet > xClone; @@ -1286,7 +1286,7 @@ Binding::XCloneable_t SAL_CALL Binding::createClone() xClone = new Binding; copy( this, xClone ); } - return XCloneable_t( xClone, UNO_QUERY ); + return css::uno::Reference<css::util::XCloneable>( xClone, UNO_QUERY ); } @@ -1309,9 +1309,9 @@ void Binding::initializePropertySet() { REGISTER_PROPERTY ( BindingID, OUString ); REGISTER_PROPERTY ( BindingExpression, OUString ); - REGISTER_PROPERTY_RO ( Model, Model_t ); - REGISTER_PROPERTY ( BindingNamespaces, XNameContainer_t ); - REGISTER_PROPERTY ( ModelNamespaces, XNameContainer_t ); + REGISTER_PROPERTY_RO ( Model, css::uno::Reference<css::xforms::XModel> ); + REGISTER_PROPERTY ( BindingNamespaces, css::uno::Reference<css::container::XNameContainer> ); + REGISTER_PROPERTY ( ModelNamespaces, css::uno::Reference<css::container::XNameContainer> ); REGISTER_PROPERTY_RO ( ModelID, OUString ); REGISTER_PROPERTY ( ReadonlyExpression, OUString ); REGISTER_PROPERTY ( RelevantExpression, OUString ); @@ -1329,7 +1329,7 @@ void Binding::initializePropertySet() } void Binding::addModifyListener( - const XModifyListener_t& xListener ) + const css::uno::Reference<css::util::XModifyListener>& xListener ) throw( RuntimeException, std::exception ) { OSL_ENSURE( xListener.is(), "need listener!" ); @@ -1344,7 +1344,7 @@ void Binding::addModifyListener( } void Binding::removeModifyListener( - const XModifyListener_t& xListener ) + const css::uno::Reference<css::util::XModifyListener>& xListener ) throw( RuntimeException, std::exception ) { ModifyListeners_t::iterator aIter = diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx index ca07d0213880..b940f736de27 100644 --- a/forms/source/xforms/binding.hxx +++ b/forms/source/xforms/binding.hxx @@ -21,6 +21,22 @@ #define INCLUDED_FORMS_SOURCE_XFORMS_BINDING_HXX #include <com/sun/star/uno/Reference.hxx> +#include <cppuhelper/implbase8.hxx> +#include <propertysetbase.hxx> +#include <com/sun/star/form/binding/XValueBinding.hpp> +#include <com/sun/star/form/binding/XListEntrySource.hpp> +#include <com/sun/star/form/validation/XValidator.hpp> +#include <com/sun/star/util/XModifyBroadcaster.hpp> +#include <com/sun/star/container/XNamed.hpp> +#include <com/sun/star/xml/dom/events/XEventListener.hpp> +#include <com/sun/star/lang/XUnoTunnel.hpp> +#include <com/sun/star/util/XCloneable.hpp> + +#include "pathexpression.hxx" +#include "boolexpression.hxx" +#include "mip.hxx" +#include <rtl/ustring.hxx> +#include <vector> // forward declaractions namespace xforms @@ -42,23 +58,6 @@ namespace com { namespace sun { namespace star { namespace xsd { class XDataType; } } } } -#include <cppuhelper/implbase8.hxx> -#include <propertysetbase.hxx> -#include <com/sun/star/form/binding/XValueBinding.hpp> -#include <com/sun/star/form/binding/XListEntrySource.hpp> -#include <com/sun/star/form/validation/XValidator.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/xml/dom/events/XEventListener.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/util/XCloneable.hpp> - -#include "pathexpression.hxx" -#include "boolexpression.hxx" -#include "mip.hxx" -#include <rtl/ustring.hxx> -#include <vector> - namespace xforms @@ -76,41 +75,29 @@ namespace xforms typedef cppu::ImplInheritanceHelper8< PropertySetBase, - com::sun::star::form::binding::XValueBinding, - com::sun::star::form::binding::XListEntrySource, - com::sun::star::form::validation::XValidator, - com::sun::star::util::XModifyBroadcaster, - com::sun::star::container::XNamed, - com::sun::star::xml::dom::events::XEventListener, - com::sun::star::lang::XUnoTunnel, - com::sun::star::util::XCloneable + css::form::binding::XValueBinding, + css::form::binding::XListEntrySource, + css::form::validation::XValidator, + css::util::XModifyBroadcaster, + css::container::XNamed, + css::xml::dom::events::XEventListener, + css::lang::XUnoTunnel, + css::util::XCloneable > Binding_t; class Binding : public Binding_t { public: - typedef com::sun::star::uno::Reference<com::sun::star::xforms::XModel> Model_t; - typedef com::sun::star::uno::Reference<com::sun::star::util::XModifyListener> XModifyListener_t; - typedef std::vector<XModifyListener_t> ModifyListeners_t; - typedef com::sun::star::uno::Reference<com::sun::star::form::validation::XValidityConstraintListener> XValidityConstraintListener_t; - typedef std::vector<XValidityConstraintListener_t> XValidityConstraintListeners_t; - typedef com::sun::star::uno::Reference<com::sun::star::form::binding::XListEntryListener> XListEntryListener_t; - typedef std::vector<XListEntryListener_t> XListEntryListeners_t; - typedef com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> XNameContainer_t; - typedef com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> XNode_t; - typedef com::sun::star::uno::Reference<com::sun::star::xml::dom::XNodeList> XNodeList_t; - typedef com::sun::star::uno::Reference<com::sun::star::util::XCloneable> XCloneable_t; - typedef com::sun::star::uno::Sequence<sal_Int8> IntSequence_t; - typedef com::sun::star::uno::Sequence<OUString> StringSequence_t; - typedef std::vector<MIP> MIPs_t; - typedef std::vector<XNode_t> XNodes_t; + typedef std::vector<css::uno::Reference<css::util::XModifyListener> > ModifyListeners_t; + typedef std::vector<css::uno::Reference<css::form::validation::XValidityConstraintListener> > XValidityConstraintListeners_t; + typedef std::vector<css::uno::Reference<css::form::binding::XListEntryListener> > XListEntryListeners_t; private: /// the Model to which this Binding belongs; may be NULL - Model_t mxModel; + css::uno::Reference<css::xforms::XModel> mxModel; /// binding-ID. A document-wide unique ID for this binding element. OUString msBindingID; @@ -137,7 +124,7 @@ private: ComputedExpression maCalculate; /// the XML namespaces used for XML names/XPath-expressions in this binding - XNameContainer_t mxNamespaces; + css::uno::Reference<css::container::XNameContainer> mxNamespaces; /// a type name OUString msTypeName; @@ -152,7 +139,7 @@ private: XValidityConstraintListeners_t maValidityListeners; /// nodes on which we are listening for events - XNodes_t maEventNodes; + std::vector<css::uno::Reference<css::xml::dom::XNode> > maEventNodes; /// the current MIP object for the first node we are bound to MIP maMIP; @@ -178,8 +165,8 @@ public: // property methods: get/set value - Model_t getModel() const { return mxModel;} /// get XForms model - void _setModel( const Model_t& ); /// set XForms model (only called by Model) + css::uno::Reference<css::xforms::XModel> getModel() const { return mxModel;} /// get XForms model + void _setModel( const css::uno::Reference<css::xforms::XModel>& ); /// set XForms model (only called by Model) OUString getModelID() const; /// get ID of XForms model @@ -215,13 +202,13 @@ public: // access to a binding's namespace // (set-method only changes local namespaces (but may add to model)) - XNameContainer_t getBindingNamespaces() const { return mxNamespaces; } - void setBindingNamespaces( const XNameContainer_t& ); /// get binding nmsp. + css::uno::Reference<css::container::XNameContainer> getBindingNamespaces() const { return mxNamespaces; } + void setBindingNamespaces( const css::uno::Reference<css::container::XNameContainer>& ); /// get binding nmsp. // access to the model's namespaces // (set-method changes model's namespaces (unless a local one is present)) - XNameContainer_t getModelNamespaces() const; /// set model namespaces - void setModelNamespaces( const XNameContainer_t& ); /// get model nmsp. + css::uno::Reference<css::container::XNameContainer> getModelNamespaces() const; /// set model namespaces + void setModelNamespaces( const css::uno::Reference<css::container::XNameContainer>& ); /// get model nmsp. // read-only properties that map MIPs to control data source properties @@ -245,7 +232,7 @@ public: std::vector<xforms::EvaluationContext> getMIPEvaluationContexts(); /// get nodeset the bind is bound to - XNodeList_t getXNodeList(); + css::uno::Reference<css::xml::dom::XNodeList> getXNodeList(); /// heuristically determine whether this binding is simple binding /// (here: simple binding == does not depend on other parts of the @@ -274,48 +261,18 @@ public: // the ID for XUnoTunnel calls - static IntSequence_t getUnoTunnelID(); - static Binding* getBinding( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& ); - - - // class-scoped typedef for easy-to-read UNO interfaces - - - // basic types - typedef com::sun::star::uno::Any Any_t; - typedef com::sun::star::uno::Sequence<com::sun::star::uno::Type> Sequence_Type_t; - typedef com::sun::star::uno::Type Type_t; - - // reference types - typedef com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener> XPropertyChangeListener_t; - typedef com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> XPropertySetInfo_t; - typedef com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener> XVetoableChangeListener_t; - typedef com::sun::star::uno::Reference<com::sun::star::xml::xpath::XXPathAPI> XXPathAPI_t; - typedef com::sun::star::uno::Reference<com::sun::star::xml::dom::events::XEvent> XEvent_t; - typedef com::sun::star::uno::Reference<com::sun::star::xsd::XDataType> XDataType_t; - - // exceptions - typedef com::sun::star::beans::PropertyVetoException PropertyVetoException_t; - typedef com::sun::star::beans::UnknownPropertyException UnknownPropertyException_t; - typedef com::sun::star::lang::IllegalArgumentException IllegalArgumentException_t; - typedef com::sun::star::lang::NoSupportException NoSupportException_t; - typedef com::sun::star::lang::WrappedTargetException WrappedTargetException_t; - typedef com::sun::star::uno::RuntimeException RuntimeException_t; - typedef com::sun::star::form::binding::IncompatibleTypesException IncompatibleTypesException_t; - typedef com::sun::star::form::binding::InvalidBindingStateException InvalidBindingStateException_t; - typedef com::sun::star::lang::NullPointerException NullPointerException_t; - typedef com::sun::star::lang::IndexOutOfBoundsException IndexOutOfBoundsException_t; - + static css::uno::Sequence<sal_Int8> getUnoTunnelID(); + static Binding* getBinding( const css::uno::Reference<css::beans::XPropertySet>& ); private: /// check whether object is live, and throw suitable exception if not /// (to be used be API methods before acting on the object) - void checkLive() throw( RuntimeException_t ); + void checkLive() throw( css::uno::RuntimeException ); /// check whether binding has a model, and throw exception if not /// (to be used be API methods before acting on the object) - void checkModel() throw( RuntimeException_t ); + void checkModel() throw( css::uno::RuntimeException ); /// determine whether object is live /// live: has model, and model has been initialized @@ -323,7 +280,7 @@ private: /// get the model implementation xforms::Model* getModelImpl() const; - static xforms::Model* getModelImpl( const Model_t& xModel ); + static xforms::Model* getModelImpl( const css::uno::Reference<css::xforms::XModel>& xModel ); /// get MIP evaluation contexts /// (only valid if control has already been bound) @@ -348,7 +305,7 @@ private: MIP getLocalMIP() const; /// get the data type that applies to this binding - XDataType_t getDataType(); + css::uno::Reference<css::xsd::XDataType> getDataType(); /// determine whether binding is valid according to the given data type bool isValid_DataType(); @@ -360,13 +317,13 @@ private: void clear(); /// distribute MIPs from current node recursively to children - void distributeMIP( const XNode_t &rxNode ); + void distributeMIP( const css::uno::Reference<css::xml::dom::XNode> &rxNode ); /// implement get*Namespaces() - XNameContainer_t _getNamespaces() const; + css::uno::Reference<css::container::XNameContainer> _getNamespaces() const; /// implement set*Namespaces() - void _setNamespaces( const XNameContainer_t&, bool bBinding ); + void _setNamespaces( const css::uno::Reference<css::container::XNameContainer>&, bool bBinding ); /// set a useful default binding ID (if none is set) void _checkBindingID(); @@ -385,21 +342,21 @@ public: public: - virtual Sequence_Type_t SAL_CALL getSupportedValueTypes() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence<css::uno::Type> SAL_CALL getSupportedValueTypes() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsType( const Type_t& aType ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsType( const css::uno::Type& aType ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Any_t SAL_CALL getValue( const Type_t& aType ) - throw( IncompatibleTypesException_t, - RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue( const css::uno::Type& aType ) + throw( css::form::binding::IncompatibleTypesException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const Any_t& aValue ) - throw( IncompatibleTypesException_t, - InvalidBindingStateException_t, - NoSupportException_t, - RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& aValue ) + throw( css::form::binding::IncompatibleTypesException, + css::form::binding::InvalidBindingStateException, + css::lang::NoSupportException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -408,22 +365,22 @@ public: virtual sal_Int32 SAL_CALL getListEntryCount() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getListEntry( sal_Int32 nPosition ) - throw( IndexOutOfBoundsException_t, - RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual StringSequence_t SAL_CALL getAllListEntries() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getAllListEntries() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addListEntryListener( const XListEntryListener_t& ) - throw( NullPointerException_t, - RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>& ) + throw( css::lang::NullPointerException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeListEntryListener( const XListEntryListener_t&) - throw( NullPointerException_t, - RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>&) + throw( css::lang::NullPointerException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -432,22 +389,22 @@ public: virtual sal_Bool SAL_CALL isValid( - const Any_t& ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + const css::uno::Any& ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL explainInvalid( - const Any_t& ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + const css::uno::Any& ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addValidityConstraintListener( - const XValidityConstraintListener_t& xListener ) - throw( NullPointerException_t, - RuntimeException_t, std::exception ) SAL_OVERRIDE; + const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener ) + throw( css::lang::NullPointerException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeValidityConstraintListener( - const XValidityConstraintListener_t& xListener ) - throw( NullPointerException_t, - RuntimeException_t, std::exception ) SAL_OVERRIDE; + const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener ) + throw( css::lang::NullPointerException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -458,12 +415,12 @@ public: public: virtual void SAL_CALL addModifyListener( - const XModifyListener_t& xListener ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + const css::uno::Reference<css::util::XModifyListener>& xListener ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( - const XModifyListener_t& xListener ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + const css::uno::Reference<css::util::XModifyListener>& xListener ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -476,10 +433,10 @@ public: public: virtual OUString SAL_CALL getName() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setName( const OUString& ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -489,8 +446,8 @@ public: virtual void SAL_CALL handleEvent( - const XEvent_t& xEvent ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + const css::uno::Reference<css::xml::dom::events::XEvent>& xEvent ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -498,16 +455,16 @@ public: // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const IntSequence_t& ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XCloneable - virtual XCloneable_t SAL_CALL createClone() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/forms/source/xforms/collection.hxx b/forms/source/xforms/collection.hxx index 13ad182ccb34..0b50b3ebee4c 100644 --- a/forms/source/xforms/collection.hxx +++ b/forms/source/xforms/collection.hxx @@ -42,9 +42,9 @@ typedef cppu::WeakImplHelper3< - com::sun::star::container::XIndexReplace, - com::sun::star::container::XSet, - com::sun::star::container::XContainer> + css::container::XIndexReplace, + css::container::XSet, + css::container::XContainer> Collection_t; template<class ELEMENT_TYPE> @@ -52,8 +52,7 @@ class Collection : public Collection_t { public: typedef ELEMENT_TYPE T; - typedef com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> XContainerListener_t; - typedef std::vector<XContainerListener_t> Listeners_t; + typedef std::vector<css::uno::Reference<css::container::XContainerListener> > Listeners_t; protected: std::vector<T> maItems; @@ -145,117 +144,106 @@ protected: public: - typedef com::sun::star::uno::Type Type_t; - typedef com::sun::star::uno::Any Any_t; - typedef com::sun::star::uno::RuntimeException RuntimeException_t; - typedef com::sun::star::lang::IllegalArgumentException IllegalArgumentException_t; - typedef com::sun::star::container::NoSuchElementException NoSuchElementException_t; - typedef com::sun::star::lang::IndexOutOfBoundsException IndexOutOfBoundsException_t; - typedef com::sun::star::uno::Reference<com::sun::star::container::XEnumeration> XEnumeration_t; - typedef com::sun::star::lang::WrappedTargetException WrappedTargetException_t; - typedef com::sun::star::container::ElementExistException ElementExistException_t; - - // XElementAccess - virtual Type_t SAL_CALL getElementType() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE + virtual css::uno::Type SAL_CALL getElementType() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return cppu::UnoType<T>::get(); } virtual sal_Bool SAL_CALL hasElements() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return hasItems(); } // XIndexAccess : XElementAccess virtual sal_Int32 SAL_CALL getCount() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return countItems(); } - virtual Any_t SAL_CALL getByIndex( sal_Int32 nIndex ) - throw( IndexOutOfBoundsException_t, - WrappedTargetException_t, - RuntimeException_t, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) + throw( css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE { if( isValidIndex( nIndex ) ) - return com::sun::star::uno::makeAny( getItem( nIndex ) ); + return css::uno::makeAny( getItem( nIndex ) ); else - throw IndexOutOfBoundsException_t(); + throw css::lang::IndexOutOfBoundsException(); } // XIndexReplace : XIndexAccess virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, - const Any_t& aElement ) - throw( IllegalArgumentException_t, - IndexOutOfBoundsException_t, - WrappedTargetException_t, - RuntimeException_t, std::exception) SAL_OVERRIDE + const css::uno::Any& aElement ) + throw( css::lang::IllegalArgumentException, + css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE { T t; if( isValidIndex( nIndex) ) if( ( aElement >>= t ) && isValid( t ) ) setItem( nIndex, t ); else - throw IllegalArgumentException_t(); + throw css::lang::IllegalArgumentException(); else - throw IndexOutOfBoundsException_t(); + throw css::lang::IndexOutOfBoundsException(); } // XEnumerationAccess : XElementAccess - virtual XEnumeration_t SAL_CALL createEnumeration() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE + virtual css::uno::Reference<css::container::XEnumeration> SAL_CALL createEnumeration() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return new Enumeration( this ); } // XSet : XEnumerationAccess - virtual sal_Bool SAL_CALL has( const Any_t& aElement ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE + virtual sal_Bool SAL_CALL has( const css::uno::Any& aElement ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { T t; return ( aElement >>= t ) ? hasItem( t ) : sal_False; } - virtual void SAL_CALL insert( const Any_t& aElement ) - throw( IllegalArgumentException_t, - ElementExistException_t, - RuntimeException_t, std::exception ) SAL_OVERRIDE + virtual void SAL_CALL insert( const css::uno::Any& aElement ) + throw( css::lang::IllegalArgumentException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { T t; if( ( aElement >>= t ) && isValid( t ) ) if( ! hasItem( t ) ) addItem( t ); else - throw ElementExistException_t(); + throw css::container::ElementExistException(); else - throw IllegalArgumentException_t(); + throw css::lang::IllegalArgumentException(); } - virtual void SAL_CALL remove( const Any_t& aElement ) - throw( IllegalArgumentException_t, - NoSuchElementException_t, - RuntimeException_t, std::exception ) SAL_OVERRIDE + virtual void SAL_CALL remove( const css::uno::Any& aElement ) + throw( css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { T t; if( aElement >>= t ) if( hasItem( t ) ) removeItem( t ); else - throw NoSuchElementException_t(); + throw css::container::NoSuchElementException(); else - throw IllegalArgumentException_t(); + throw css::lang::IllegalArgumentException(); } // XContainer virtual void SAL_CALL addContainerListener( - const XContainerListener_t& xListener ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE + const css::uno::Reference<css::container::XContainerListener>& xListener ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { OSL_ENSURE( xListener.is(), "need listener!" ); if( std::find( maListeners.begin(), maListeners.end(), xListener) @@ -264,8 +252,8 @@ public: } virtual void SAL_CALL removeContainerListener( - const XContainerListener_t& xListener ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE + const css::uno::Reference<css::container::XContainerListener>& xListener ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { OSL_ENSURE( xListener.is(), "need listener!" ); Listeners_t::iterator aIter = @@ -280,11 +268,11 @@ protected: void _elementInserted( sal_Int32 nPos ) { OSL_ENSURE( isValidIndex(nPos), "invalid index" ); - com::sun::star::container::ContainerEvent aEvent( - static_cast<com::sun::star::container::XIndexReplace*>( this ), - com::sun::star::uno::makeAny( nPos ), - com::sun::star::uno::makeAny( getItem( nPos ) ), - com::sun::star::uno::Any() ); + css::container::ContainerEvent aEvent( + static_cast<css::container::XIndexReplace*>( this ), + css::uno::makeAny( nPos ), + css::uno::makeAny( getItem( nPos ) ), + css::uno::Any() ); for( Listeners_t::iterator aIter = maListeners.begin(); aIter != maListeners.end(); ++aIter ) @@ -295,11 +283,11 @@ protected: void _elementRemoved( const T& aOld ) { - com::sun::star::container::ContainerEvent aEvent( - static_cast<com::sun::star::container::XIndexReplace*>( this ), - com::sun::star::uno::Any(), - com::sun::star::uno::makeAny( aOld ), - com::sun::star::uno::Any() ); + css::container::ContainerEvent aEvent( + static_cast<css::container::XIndexReplace*>( this ), + css::uno::Any(), + css::uno::makeAny( aOld ), + css::uno::Any() ); for( Listeners_t::iterator aIter = maListeners.begin(); aIter != maListeners.end(); ++aIter ) @@ -311,11 +299,11 @@ protected: void _elementReplaced( const sal_Int32 nPos, const T& aNew ) { OSL_ENSURE( isValidIndex(nPos), "invalid index" ); - com::sun::star::container::ContainerEvent aEvent( - static_cast<com::sun::star::container::XIndexReplace*>( this ), - com::sun::star::uno::makeAny( nPos ), - com::sun::star::uno::makeAny( getItem( nPos ) ), - com::sun::star::uno::makeAny( aNew ) ); + css::container::ContainerEvent aEvent( + static_cast<css::container::XIndexReplace*>( this ), + css::uno::makeAny( nPos ), + css::uno::makeAny( getItem( nPos ) ), + css::uno::makeAny( aNew ) ); for( Listeners_t::iterator aIter = maListeners.begin(); aIter != maListeners.end(); ++aIter ) diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index c6774ddc0488..0700592a18dc 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -171,14 +171,14 @@ EvaluationContext Model::getEvaluationContext() } -Model::IntSequence_t Model::getUnoTunnelID() +css::uno::Sequence<sal_Int8> Model::getUnoTunnelID() { static cppu::OImplementationId aImplementationId; return aImplementationId.getImplementationId(); } -void Model::setForeignSchema( const XDocument_t& rDocument ) +void Model::setForeignSchema( const css::uno::Reference<css::xml::dom::XDocument>& rDocument ) { mxForeignSchema = rDocument; } @@ -190,7 +190,7 @@ void Model::setSchemaRef( const OUString& rSchemaRef ) } -void Model::setNamespaces( const XNameContainer_t& rNamespaces ) +void Model::setNamespaces( const css::uno::Reference<css::container::XNameContainer>& rNamespaces ) { if( rNamespaces.is() ) mxNamespaces = rNamespaces; @@ -488,7 +488,7 @@ void Model::refresh() void SAL_CALL Model::submitWithInteraction( const OUString& sID, - const XInteractionHandler_t& _rxHandler ) + const css::uno::Reference<css::task::XInteractionHandler>& _rxHandler ) throw( VetoException, WrappedTargetException, RuntimeException, std::exception ) @@ -514,7 +514,7 @@ void Model::submit( const OUString& sID ) submitWithInteraction( sID, NULL ); } -Model::XDataTypeRepository_t SAL_CALL Model::getDataTypeRepository( ) +css::uno::Reference<css::xforms::XDataTypeRepository> SAL_CALL Model::getDataTypeRepository( ) throw( RuntimeException, std::exception ) { if ( !mxDataTypes.is() ) @@ -527,13 +527,13 @@ Model::XDataTypeRepository_t SAL_CALL Model::getDataTypeRepository( ) // instance management -Model::XSet_t Model::getInstances() +css::uno::Reference<css::container::XSet> Model::getInstances() throw( RuntimeException, std::exception ) { return mxInstances; } -Model::XDocument_t Model::getInstanceDocument( const OUString& rName ) +css::uno::Reference<css::xml::dom::XDocument> Model::getInstanceDocument( const OUString& rName ) throw( RuntimeException, std::exception ) { ensureAtLeastOneInstance(); @@ -545,7 +545,7 @@ Model::XDocument_t Model::getInstanceDocument( const OUString& rName ) return aInstance; } -Model::XDocument_t SAL_CALL Model::getDefaultInstance() +css::uno::Reference<css::xml::dom::XDocument> SAL_CALL Model::getDefaultInstance() throw( RuntimeException, std::exception ) { ensureAtLeastOneInstance(); @@ -584,7 +584,7 @@ Model::XPropertySet_t Model::getBinding( const OUString& sId ) return mpBindings->hasItem( sId ) ? mpBindings->getItem( sId ) : NULL; } -Model::XSet_t Model::getBindings() +css::uno::Reference<css::container::XSet> Model::getBindings() throw( RuntimeException, std::exception ) { DBG_INVARIANT(); @@ -597,34 +597,34 @@ Model::XSet_t Model::getBindings() // submission management -Model::XSubmission_t Model::createSubmission() +css::uno::Reference<css::xforms::XSubmission> Model::createSubmission() throw( RuntimeException, std::exception ) { DBG_INVARIANT(); return new Submission(); } -Model::XSubmission_t Model::cloneSubmission(const XPropertySet_t& xSubmission) +css::uno::Reference<css::xforms::XSubmission> Model::cloneSubmission(const XPropertySet_t& xSubmission) throw( RuntimeException, std::exception ) { DBG_INVARIANT(); - XSubmission_t xNewSubmission = createSubmission(); + css::uno::Reference<css::xforms::XSubmission> xNewSubmission = createSubmission(); XPropertySet_t xAsPropertySet( xNewSubmission.get() ); copy( xSubmission.get(), xAsPropertySet ); return xNewSubmission; } -Model::XSubmission_t Model::getSubmission( const OUString& sId ) +css::uno::Reference<css::xforms::XSubmission> Model::getSubmission( const OUString& sId ) throw( RuntimeException, std::exception ) { DBG_INVARIANT(); - XSubmission_t xSubmission; + css::uno::Reference<css::xforms::XSubmission> xSubmission; if ( mpSubmissions->hasItem( sId ) ) xSubmission.set(mpSubmissions->getItem( sId ), css::uno::UNO_QUERY); return xSubmission; } -Model::XSet_t Model::getSubmissions() +css::uno::Reference<css::container::XSet> Model::getSubmissions() throw( RuntimeException, std::exception ) { DBG_INVARIANT(); @@ -656,9 +656,9 @@ Model::XSet_t Model::getSubmissions() void Model::initializePropertySet() { REGISTER_PROPERTY_API ( ID, OUString ); - REGISTER_PROPERTY ( ForeignSchema, XDocument_t ); + REGISTER_PROPERTY ( ForeignSchema, css::uno::Reference<css::xml::dom::XDocument> ); REGISTER_PROPERTY ( SchemaRef, OUString ); - REGISTER_PROPERTY ( Namespaces, XNameContainer_t ); + REGISTER_PROPERTY ( Namespaces, css::uno::Reference<css::container::XNameContainer> ); REGISTER_BOOL_PROPERTY( ExternalData ); } @@ -669,7 +669,7 @@ void Model::update() } -sal_Int64 Model::getSomething( const IntSequence_t& xId ) +sal_Int64 Model::getSomething( const css::uno::Sequence<sal_Int8>& xId ) throw( RuntimeException, std::exception ) { return reinterpret_cast<sal_Int64>( ( xId == getUnoTunnelID() ) ? this : NULL ); diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx index 08de93a3965d..fcb416aeaae1 100644 --- a/forms/source/xforms/model.hxx +++ b/forms/source/xforms/model.hxx @@ -68,35 +68,18 @@ namespace xforms */ typedef cppu::ImplInheritanceHelper< PropertySetBase, - com::sun::star::xforms::XModel2, - com::sun::star::xforms::XFormsUIHelper1, - com::sun::star::util::XUpdatable, - com::sun::star::lang::XUnoTunnel, + css::xforms::XModel2, + css::xforms::XFormsUIHelper1, + css::util::XUpdatable, + css::lang::XUnoTunnel, css::lang::XServiceInfo > Model_t; class Model : public Model_t { // a number of local typedefs, to make the remaining header readable - typedef com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument> XDocument_t; - typedef com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> XNode_t; - typedef com::sun::star::lang::IndexOutOfBoundsException IndexOutOfBoundsException_t; - typedef com::sun::star::lang::IllegalArgumentException IllegalArgumentException_t; - typedef com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> XPropertySet_t; - typedef com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository> XDataTypeRepository_t; - typedef com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> XNameContainer_t; - typedef com::sun::star::uno::Reference<com::sun::star::xforms::XSubmission> XSubmission_t; - typedef com::sun::star::uno::Reference<com::sun::star::frame::XModel> Frame_XModel_t; - typedef com::sun::star::uno::Reference<com::sun::star::xforms::XModel> XModel_t; - typedef com::sun::star::uno::Reference<com::sun::star::task::XInteractionHandler> XInteractionHandler_t; - - typedef com::sun::star::uno::Reference<com::sun::star::container::XSet> XSet_t; - typedef com::sun::star::beans::PropertyVetoException PropertyVetoException_t; - typedef com::sun::star::beans::UnknownPropertyException UnknownPropertyException_t; - typedef com::sun::star::util::VetoException VetoException_t; - typedef com::sun::star::lang::WrappedTargetException WrappedTargetException_t; - typedef com::sun::star::uno::RuntimeException RuntimeException_t; - typedef com::sun::star::uno::Any Any_t; - typedef com::sun::star::uno::Sequence<sal_Int8> IntSequence_t; + typedef css::uno::Reference<css::xml::dom::XNode> XNode_t; + typedef css::uno::Reference<css::beans::XPropertySet> XPropertySet_t; + typedef std::multimap<XNode_t,std::pair<void*,MIP> > MIPs_t; @@ -107,18 +90,18 @@ private: SubmissionCollection* mpSubmissions; /// the submissions InstanceCollection* mpInstances; /// the instance(s) - XDataTypeRepository_t mxDataTypes; /// the XSD data-types used - XDocument_t mxForeignSchema; /// the XSD-schema part we cannot + css::uno::Reference<css::xforms::XDataTypeRepository> mxDataTypes; /// the XSD data-types used + css::uno::Reference<css::xml::dom::XDocument> mxForeignSchema; /// the XSD-schema part we cannot /// map onto data types OUString msSchemaRef; /// xforms:model/@schema attribute - XNameContainer_t mxNamespaces; /// namespaces for entire model + css::uno::Reference<css::container::XNameContainer> mxNamespaces; /// namespaces for entire model // references to mpBindings/mpSubmissions, for UNO reference counting - XSet_t mxBindings; - XSet_t mxSubmissions; - XSet_t mxInstances; + css::uno::Reference<css::container::XSet> mxBindings; + css::uno::Reference<css::container::XSet> mxSubmissions; + css::uno::Reference<css::container::XSet> mxInstances; MIPs_t maMIPs; /// map nodes to their MIPs @@ -137,25 +120,25 @@ public: virtual ~Model() throw(); // get Model implementation from API object - static Model* getModel( const com::sun::star::uno::Reference<com::sun::star::xforms::XModel>& ); + static Model* getModel( const css::uno::Reference<css::xforms::XModel>& ); xforms::EvaluationContext getEvaluationContext(); - static IntSequence_t getUnoTunnelID(); + static css::uno::Sequence<sal_Int8> getUnoTunnelID(); // get/set that part of the schema, that we can't interpret as data types - XDocument_t getForeignSchema() const { return mxForeignSchema;} - void setForeignSchema( const XDocument_t& ); + css::uno::Reference<css::xml::dom::XDocument> getForeignSchema() const { return mxForeignSchema;} + void setForeignSchema( const css::uno::Reference<css::xml::dom::XDocument>& ); // get/set the xforms:model/@schema attribute OUString getSchemaRef() const { return msSchemaRef;} void setSchemaRef( const OUString& ); // get/set namespaces for entire model - XNameContainer_t getNamespaces() const { return mxNamespaces;} - void setNamespaces( const XNameContainer_t& ); + css::uno::Reference<css::container::XNameContainer> getNamespaces() const { return mxNamespaces;} + void setNamespaces( const css::uno::Reference<css::container::XNameContainer>& ); // get/set the ExternalData property bool getExternalData() const { return mbExternalData;} @@ -210,77 +193,77 @@ public: virtual OUString SAL_CALL getID() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setID( const OUString& sID ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL initialize() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL rebuild() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL recalculate() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL revalidate() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL refresh() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL submit( const OUString& sID ) - throw( VetoException_t, WrappedTargetException_t, RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::util::VetoException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL submitWithInteraction( const OUString& id, const XInteractionHandler_t& _rxHandler ) - throw( VetoException_t, WrappedTargetException_t, RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL submitWithInteraction( const OUString& id, const css::uno::Reference<css::task::XInteractionHandler>& _rxHandler ) + throw( css::util::VetoException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual XDataTypeRepository_t SAL_CALL getDataTypeRepository( ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference<css::xforms::XDataTypeRepository> SAL_CALL getDataTypeRepository( ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XModel: instance management - virtual XSet_t SAL_CALL getInstances() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference<css::container::XSet> SAL_CALL getInstances() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual XDocument_t SAL_CALL getInstanceDocument( const OUString& ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference<css::xml::dom::XDocument> SAL_CALL getInstanceDocument( const OUString& ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual XDocument_t SAL_CALL getDefaultInstance() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference<css::xml::dom::XDocument> SAL_CALL getDefaultInstance() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XModel: binding management virtual XPropertySet_t SAL_CALL createBinding() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual XPropertySet_t SAL_CALL cloneBinding( const XPropertySet_t& ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual XPropertySet_t SAL_CALL getBinding( const OUString& ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual XSet_t SAL_CALL getBindings() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference<css::container::XSet> SAL_CALL getBindings() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XModel: submission management - virtual XSubmission_t SAL_CALL createSubmission() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL createSubmission() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual XSubmission_t SAL_CALL cloneSubmission( const XPropertySet_t& ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL cloneSubmission( const XPropertySet_t& ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual XSubmission_t SAL_CALL getSubmission( const OUString& ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL getSubmission( const OUString& ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual XSet_t SAL_CALL getSubmissions() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference<css::container::XSet> SAL_CALL getSubmissions() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XPropertySet @@ -308,7 +291,7 @@ public: throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return PropertySetBase::getPropertySetInfo(); } - virtual void SAL_CALL setPropertyValue(const OUString& p1, const com::sun::star::uno::Any& p2) + virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { PropertySetBase::setPropertyValue(p1, p2); } @@ -319,10 +302,10 @@ public: /// determine a reasonable control service for a given node /// (based on data type MIP assigned to the node) - virtual OUString SAL_CALL getDefaultServiceNameForNode( const XNode_t& xNode ) throw (RuntimeException_t, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getDefaultServiceNameForNode( const XNode_t& xNode ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// call getDefaultBindingExpressionForNode with default evaluation context - virtual OUString SAL_CALL getDefaultBindingExpressionForNode( const XNode_t& xNode ) throw (RuntimeException_t, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getDefaultBindingExpressionForNode( const XNode_t& xNode ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// determine a reasonable default binding expression for a given node /// and a given evaluation context @@ -333,88 +316,88 @@ public: virtual OUString SAL_CALL getNodeDisplayName( const XNode_t&, sal_Bool bDetail ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getNodeName( const XNode_t& ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getBindingName( const XPropertySet_t&, sal_Bool bDetail ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getSubmissionName( const XPropertySet_t&, sal_Bool bDetail ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual XPropertySet_t SAL_CALL cloneBindingAsGhost( const XPropertySet_t& ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeBindingIfUseless( const XPropertySet_t& ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual XDocument_t SAL_CALL newInstance( const OUString& sName, + virtual css::uno::Reference<css::xml::dom::XDocument> SAL_CALL newInstance( const OUString& sName, const OUString& sURL, sal_Bool bURLOnce ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL renameInstance( const OUString& sFrom, const OUString& sTo, const OUString& sURL, sal_Bool bURLOnce ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeInstance( const OUString& sName ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual XModel_t SAL_CALL newModel( const Frame_XModel_t& xComponent, + virtual css::uno::Reference<css::xforms::XModel> SAL_CALL newModel( const css::uno::Reference<css::frame::XModel>& xComponent, const OUString& sName ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL renameModel( const Frame_XModel_t& xComponent, + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL renameModel( const css::uno::Reference<css::frame::XModel>& xComponent, const OUString& sFrom, const OUString& sTo ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeModel( const Frame_XModel_t& xComponent, + virtual void SAL_CALL removeModel( const css::uno::Reference<css::frame::XModel>& xComponent, const OUString& sName ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual XNode_t SAL_CALL createElement( const XNode_t& xParent, const OUString& sName ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual XNode_t SAL_CALL createAttribute( const XNode_t& xParent, const OUString& sName ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual XNode_t SAL_CALL renameNode( const XNode_t& xNode, const OUString& sName ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual XPropertySet_t SAL_CALL getBindingForNode( const XNode_t&, sal_Bool bCreate ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeBindingForNode( const XNode_t& ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getResultForExpression( const XPropertySet_t& xBinding, sal_Bool bIsBindingExpression, const OUString& sExpression ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isValidXMLName( const OUString& sName ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isValidPrefixName( const OUString& sName ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setNodeValue( const XNode_t& xNode, const OUString& sValue ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -423,23 +406,23 @@ public: public: virtual void SAL_CALL update() - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XUnoTunnel public: - virtual sal_Int64 SAL_CALL getSomething( const IntSequence_t& ) - throw( RuntimeException_t, std::exception ) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTypeProvider::getImplementationId public: - virtual IntSequence_t SAL_CALL getImplementationId() - throw( RuntimeException_t ) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException ) SAL_OVERRIDE; OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/forms/source/xforms/model_helper.hxx b/forms/source/xforms/model_helper.hxx index c6150b457747..d3254f7127f0 100644 --- a/forms/source/xforms/model_helper.hxx +++ b/forms/source/xforms/model_helper.hxx @@ -64,13 +64,13 @@ protected: virtual void _insert( const T& t ) SAL_OVERRIDE { OSL_ENSURE( Binding::getBinding( t ) != NULL, "invalid item?" ); - Binding::getBinding( t )->_setModel( Binding::Model_t( mpModel ) ); + Binding::getBinding( t )->_setModel( css::uno::Reference<css::xforms::XModel>( mpModel ) ); } virtual void _remove( const T& t ) SAL_OVERRIDE { OSL_ENSURE( Binding::getBinding( t ) != NULL, "invalid item?" ); - Binding::getBinding( t )->_setModel( Binding::Model_t() ); + Binding::getBinding( t )->_setModel( css::uno::Reference<css::xforms::XModel>() ); } }; diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index 37c122efe314..52843153d103 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -406,13 +406,13 @@ void Model::removeBindingIfUseless( const XPropertySet_t& xBinding ) } } -Model::XDocument_t Model::newInstance( const OUString& sName, +css::uno::Reference<css::xml::dom::XDocument> Model::newInstance( const OUString& sName, const OUString& sURL, sal_Bool bURLOnce ) throw( RuntimeException, std::exception ) { // create a default instance with <instanceData> element - XDocument_t xInstance = getDocumentBuilder()->newDocument(); + css::uno::Reference<css::xml::dom::XDocument> xInstance = getDocumentBuilder()->newDocument(); DBG_ASSERT( xInstance.is(), "failed to create DOM instance" ); Reference<XNode>( xInstance, UNO_QUERY_THROW )->appendChild( @@ -517,11 +517,11 @@ static Reference<XNameContainer> lcl_getModels( return xRet; } -Model::XModel_t Model::newModel( const Reference<com::sun::star::frame::XModel>& xCmp, +css::uno::Reference<css::xforms::XModel> Model::newModel( const Reference<com::sun::star::frame::XModel>& xCmp, const OUString& sName ) throw( RuntimeException, std::exception ) { - Model::XModel_t xModel; + css::uno::Reference<css::xforms::XModel> xModel; Reference<XNameContainer> xModels = lcl_getModels( xCmp ); if( xModels.is() && ! xModels->hasByName( sName ) ) diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx index d85add0f5897..dd4498d1e7e9 100644 --- a/forms/source/xforms/namedcollection.hxx +++ b/forms/source/xforms/namedcollection.hxx @@ -91,41 +91,41 @@ protected: public: // XElementAccess - virtual typename Collection<T>::Type_t SAL_CALL getElementType() - throw( typename Collection<T>::RuntimeException_t ) SAL_OVERRIDE + virtual css::uno::Type SAL_CALL getElementType() + throw( css::uno::RuntimeException ) SAL_OVERRIDE { return Collection<T>::getElementType(); } virtual sal_Bool SAL_CALL hasElements() - throw( typename Collection<T>::RuntimeException_t ) SAL_OVERRIDE + throw( css::uno::RuntimeException ) SAL_OVERRIDE { return Collection<T>::hasElements(); } // XNameAccess : XElementAccess - virtual typename Collection<T>::Any_t SAL_CALL getByName( + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw( typename Collection<T>::NoSuchElementException_t, - typename Collection<T>::WrappedTargetException_t, - typename Collection<T>::RuntimeException_t ) SAL_OVERRIDE + throw( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException ) SAL_OVERRIDE { if( hasItem( aName ) ) return com::sun::star::uno::makeAny( getItem( aName ) ); else - throw typename Collection<T>::NoSuchElementException_t(); + throw css::container::NoSuchElementException(); } virtual Names_t SAL_CALL getElementNames() - throw( typename Collection<T>::RuntimeException_t ) SAL_OVERRIDE + throw( css::uno::RuntimeException ) SAL_OVERRIDE { return getNames(); } virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw( typename Collection<T>::RuntimeException_t ) SAL_OVERRIDE + throw( css::uno::RuntimeException ) SAL_OVERRIDE { return hasItem( aName ) ? sal_True : sal_False; } diff --git a/forms/source/xforms/xformsevent.cxx b/forms/source/xforms/xformsevent.cxx index 04a06004e47c..7b12a235e23d 100644 --- a/forms/source/xforms/xformsevent.cxx +++ b/forms/source/xforms/xformsevent.cxx @@ -39,17 +39,17 @@ OUString SAL_CALL XFormsEventConcrete::getType() throw (RuntimeException, std::e return m_eventType; } -XFormsEventConcrete::XEventTarget_t SAL_CALL XFormsEventConcrete::getTarget() throw (RuntimeException, std::exception) +css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL XFormsEventConcrete::getTarget() throw (RuntimeException, std::exception) { return m_target; } -XFormsEventConcrete::XEventTarget_t SAL_CALL XFormsEventConcrete::getCurrentTarget() throw (RuntimeException, std::exception) +css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL XFormsEventConcrete::getCurrentTarget() throw (RuntimeException, std::exception) { return m_currentTarget; } -XFormsEventConcrete::PhaseType_t SAL_CALL XFormsEventConcrete::getEventPhase() throw (RuntimeException, std::exception) +css::xml::dom::events::PhaseType SAL_CALL XFormsEventConcrete::getEventPhase() throw (RuntimeException, std::exception) { return m_phase; } @@ -64,7 +64,7 @@ sal_Bool SAL_CALL XFormsEventConcrete::getCancelable() throw (RuntimeException, return m_cancelable; } -XFormsEventConcrete::Time_t SAL_CALL XFormsEventConcrete::getTimeStamp() throw (RuntimeException, std::exception) +css::util::Time SAL_CALL XFormsEventConcrete::getTimeStamp() throw (RuntimeException, std::exception) { return m_time; } diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx index e8ce811a94de..5628208ad4ad 100644 --- a/forms/source/xforms/xformsevent.hxx +++ b/forms/source/xforms/xformsevent.hxx @@ -34,11 +34,6 @@ class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > { public: - typedef com::sun::star::uno::RuntimeException RuntimeException_t; - typedef com::sun::star::uno::Reference< com::sun::star::xml::dom::events::XEventTarget > XEventTarget_t; - typedef com::sun::star::xml::dom::events::PhaseType PhaseType_t; - typedef com::sun::star::util::Time Time_t; - XFormsEventConcrete() : m_canceled(false) , m_phase(com::sun::star::xml::dom::events::PhaseType_CAPTURING_PHASE) @@ -48,27 +43,27 @@ class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > { } virtual ~XFormsEventConcrete() {} - virtual OUString SAL_CALL getType() throw (RuntimeException_t, std::exception) SAL_OVERRIDE; - virtual XEventTarget_t SAL_CALL getTarget() throw (RuntimeException_t, std::exception) SAL_OVERRIDE; - virtual XEventTarget_t SAL_CALL getCurrentTarget() throw (RuntimeException_t, std::exception) SAL_OVERRIDE; - virtual PhaseType_t SAL_CALL getEventPhase() throw (RuntimeException_t, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getBubbles() throw (RuntimeException_t, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getCancelable() throw (RuntimeException_t, std::exception) SAL_OVERRIDE; - virtual Time_t SAL_CALL getTimeStamp() throw (RuntimeException_t, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL stopPropagation() throw (RuntimeException_t, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL preventDefault() throw (RuntimeException_t, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL initXFormsEvent( const OUString& typeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg ) - throw (RuntimeException_t, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg) - throw (RuntimeException_t, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -77,12 +72,12 @@ class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > { protected: OUString m_eventType; - XEventTarget_t m_target; - XEventTarget_t m_currentTarget; - PhaseType_t m_phase; + css::uno::Reference< css::xml::dom::events::XEventTarget > m_target; + css::uno::Reference< css::xml::dom::events::XEventTarget > m_currentTarget; + css::xml::dom::events::PhaseType m_phase; bool m_bubbles; bool m_cancelable; - Time_t m_time; + css::util::Time m_time; }; } } } } diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx index e7838979bf32..06a68f065a8c 100644 --- a/include/connectivity/sdbcx/VCollection.hxx +++ b/include/connectivity/sdbcx/VCollection.hxx @@ -58,7 +58,7 @@ namespace connectivity ::com::sun::star::sdbcx::XDrop, ::com::sun::star::lang::XServiceInfo> OCollectionBase; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > ObjectType; + typedef css::uno::Reference< css::beans::XPropertySet > ObjectType; class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE IObjectCollection { diff --git a/include/vcl/svgdata.hxx b/include/vcl/svgdata.hxx index 15d27565b670..c8ee1864eb1d 100644 --- a/include/vcl/svgdata.hxx +++ b/include/vcl/svgdata.hxx @@ -28,15 +28,13 @@ typedef boost::shared_array< sal_uInt8 > SvgDataArray; -typedef ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > Primitive2DReference; -typedef ::com::sun::star::uno::Sequence< Primitive2DReference > Primitive2DSequence; // helper to convert any Primitive2DSequence to a good quality BitmapEx, // using default parameters and graphic::XPrimitive2DRenderer BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( - const Primitive2DSequence& rSequence, + const css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > >& rSequence, const basegfx::B2DRange& rTargetRange, const sal_uInt32 nMaximumQuadraticPixels = 500000); @@ -53,7 +51,8 @@ private: // on demand created content basegfx::B2DRange maRange; - Primitive2DSequence maSequence; + css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > + maSequence; BitmapEx maReplacement; // on demand creators @@ -74,7 +73,7 @@ public: /// data read and evtl. on demand creation const basegfx::B2DRange& getRange() const; - const Primitive2DSequence& getPrimitive2DSequence() const; + const css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > >& getPrimitive2DSequence() const; const BitmapEx& getReplacement() const; }; diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 72dd6193146f..b64b0a8e7ca7 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -79,7 +79,6 @@ namespace rptui static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); }; - typedef com::sun::star::uno::Reference< ::com::sun::star::report::XSection > TSection; /** Helper class to allow std::mem_fun for SAL_CALL */ diff --git a/reportdesign/source/ui/inc/statusbarcontroller.hxx b/reportdesign/source/ui/inc/statusbarcontroller.hxx index 07e6de106b57..e1d951e71fae 100644 --- a/reportdesign/source/ui/inc/statusbarcontroller.hxx +++ b/reportdesign/source/ui/inc/statusbarcontroller.hxx @@ -27,13 +27,11 @@ class SfxStatusBarControl; namespace rptui { - typedef com::sun::star::uno::Reference< com::sun::star::frame::XStatusbarController > TStatusbarRef; - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> OStatusbarController_BASE; class OStatusbarController : public ::svt::StatusbarController, public OStatusbarController_BASE { - TStatusbarRef m_rController; + css::uno::Reference< css::frame::XStatusbarController > m_rController; sal_uInt16 m_nSlotId; sal_uInt16 m_nId; public: diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index ce6746a9ff24..656de5f97b94 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -329,7 +329,7 @@ const XclChFormatInfo& XclExpChRoot::GetFormatInfo( XclChObjectType eObjType ) c return mxChData->mxFmtInfoProv->GetFormatInfo( eObjType ); } -void XclExpChRoot::InitConversion( XChartDocRef xChartDoc, const Rectangle& rChartRect ) const +void XclExpChRoot::InitConversion( css::uno::Reference< css::chart2::XChartDocument > xChartDoc, const Rectangle& rChartRect ) const { mxChData->InitConversion( GetRoot(), xChartDoc, rChartRect ); } @@ -1963,7 +1963,7 @@ bool XclExpChSeries::ConvertDataSeries( return bOk; } -bool XclExpChSeries::ConvertStockSeries( XDataSeriesRef xDataSeries, +bool XclExpChSeries::ConvertStockSeries( css::uno::Reference< css::chart2::XDataSeries > xDataSeries, const OUString& rValueRole, sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx, bool bCloseSymbol ) { bool bOk = false; @@ -2071,7 +2071,7 @@ void XclExpChSeries::InitFromParent( const XclExpChSeries& rParent ) maData.mnValueCount = rParent.maData.mnValueCount; } -void XclExpChSeries::CreateTrendLines( XDataSeriesRef xDataSeries ) +void XclExpChSeries::CreateTrendLines( css::uno::Reference< css::chart2::XDataSeries > xDataSeries ) { Reference< XRegressionCurveContainer > xRegCurveCont( xDataSeries, UNO_QUERY ); if( xRegCurveCont.is() ) @@ -3021,7 +3021,7 @@ void XclExpChAxis::Convert( Reference< XAxis > xAxis, Reference< XAxis > xCrossi } } -void XclExpChAxis::ConvertWall( XDiagramRef xDiagram ) +void XclExpChAxis::ConvertWall( css::uno::Reference< css::chart2::XDiagram > xDiagram ) { if( xDiagram.is() ) switch( GetAxisType() ) { diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index e6adff59b61e..4de16588ed5e 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -79,16 +79,14 @@ class XclExpChChart; class XclExpChRoot : public XclExpRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > XChartDocRef; - -public: explicit XclExpChRoot( const XclExpRoot& rRoot, XclExpChChart& rChartData ); virtual ~XclExpChRoot(); /** Returns this root instance - for code readability in derived classes. */ inline const XclExpChRoot& GetChRoot() const { return *this; } /** Returns the API Chart document model. */ - XChartDocRef GetChartDocument() const; + css::uno::Reference< css::chart2::XChartDocument > + GetChartDocument() const; /** Returns a reference to the parent chart data object. */ XclExpChChart& GetChartData() const; /** Returns chart type info for a unique chart type identifier. */ @@ -100,7 +98,8 @@ public: const XclChFormatInfo& GetFormatInfo( XclChObjectType eObjType ) const; /** Starts the API chart document conversion. Must be called once before all API conversion. */ - void InitConversion( XChartDocRef xChartDoc, const Rectangle& rChartRect ) const; + void InitConversion( css::uno::Reference< css::chart2::XChartDocument > xChartDoc, + const Rectangle& rChartRect ) const; /** Finishes the API chart document conversion. Must be called once after all API conversion. */ void FinishConversion() const; @@ -385,18 +384,14 @@ typedef std::shared_ptr< XclExpChFrame > XclExpChFrameRef; class XclExpChSourceLink : public XclExpRecord, protected XclExpChRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > XDataSequenceRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > XFormattedStringRef; - typedef ::com::sun::star::uno::Sequence< XFormattedStringRef > XFormattedStringSeq; - -public: explicit XclExpChSourceLink( const XclExpChRoot& rRoot, sal_uInt8 nDestType ); void ConvertString( const OUString& aString ); /** Converts the passed source link, returns the number of linked values. */ - sal_uInt16 ConvertDataSequence( XDataSequenceRef xDataSeq, bool bSplitToColumns, sal_uInt16 nDefCount = 0 ); + sal_uInt16 ConvertDataSequence( css::uno::Reference< css::chart2::data::XDataSequence > xDataSeq, + bool bSplitToColumns, sal_uInt16 nDefCount = 0 ); /** Converts the passed sequence of formatted string objects, returns leading font index. */ - sal_uInt16 ConvertStringSequence( const XFormattedStringSeq& rStringSeq ); + sal_uInt16 ConvertStringSequence( const css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > >& rStringSeq ); /** Converts the number format from the passed property set. */ void ConvertNumFmt( const ScfPropertySet& rPropSet, bool bPercent ); @@ -493,10 +488,6 @@ public: class XclExpChText : public XclExpChGroupBase, public XclExpChFontBase { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > XTitleRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > XRegressionCurveRef; - -public: explicit XclExpChText( const XclExpChRoot& rRoot ); /** Sets font color and color identifier to internal data structures. */ @@ -505,7 +496,7 @@ public: virtual void SetRotation( sal_uInt16 nRotation ) SAL_OVERRIDE; /** Converts all text settings of the passed title text object. */ - void ConvertTitle( XTitleRef xTitle, sal_uInt16 nTarget, const OUString* pSubTitle = NULL ); + void ConvertTitle( css::uno::Reference< css::chart2::XTitle > xTitle, sal_uInt16 nTarget, const OUString* pSubTitle = NULL ); /** Converts all text settings of the passed legend. */ void ConvertLegend( const ScfPropertySet& rPropSet ); /** Converts all settings of the passed data point caption text object. */ @@ -656,13 +647,11 @@ typedef std::shared_ptr< XclExpChDataFormat > XclExpChDataFormatRef; class XclExpChSerTrendLine : public XclExpRecord, protected XclExpChRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > XRegressionCurveRef; - -public: explicit XclExpChSerTrendLine( const XclExpChRoot& rRoot ); /** Converts the passed trend line, returns true if trend line type is supported. */ - bool Convert( XRegressionCurveRef xRegCurve, sal_uInt16 nSeriesIdx ); + bool Convert( css::uno::Reference< css::chart2::XRegressionCurve > xRegCurve, + sal_uInt16 nSeriesIdx ); /** Returns formatting information of the trend line, created in Convert(). */ inline XclExpChDataFormatRef GetDataFormat() const { return mxDataFmt; } @@ -707,30 +696,26 @@ typedef std::shared_ptr< XclExpChSerErrorBar > XclExpChSerErrorBarRef; class XclExpChSeries : public XclExpChGroupBase { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > XDataSeriesRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > XLabeledDataSeqRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > XRegressionCurveRef; - -public: explicit XclExpChSeries( const XclExpChRoot& rRoot, sal_uInt16 nSeriesIdx ); /** Converts the passed data series (source links and formatting). */ bool ConvertDataSeries( - XDiagramRef xDiagram, XDataSeriesRef xDataSeries, + css::uno::Reference< css::chart2::XDiagram > xDiagram, + css::uno::Reference< css::chart2::XDataSeries > xDataSeries, const XclChExtTypeInfo& rTypeInfo, sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx ); /** Converts the passed data series for stock charts. */ bool ConvertStockSeries( - XDataSeriesRef xDataSeries, + css::uno::Reference< css::chart2::XDataSeries > xDataSeries, const OUString& rValueRole, sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx, bool bCloseSymbol ); /** Converts the passed error bar settings (called at trend line child series). */ - bool ConvertTrendLine( const XclExpChSeries& rParent, XRegressionCurveRef xRegCurve ); + bool ConvertTrendLine( const XclExpChSeries& rParent, + css::uno::Reference< css::chart2::XRegressionCurve > xRegCurve ); /** Converts the passed error bar settings (called at error bar child series). */ bool ConvertErrorBar( const XclExpChSeries& rParent, const ScfPropertySet& rPropSet, sal_uInt8 nBarId ); /** Converts and inserts category ranges for all inserted series. */ - void ConvertCategSequence( XLabeledDataSeqRef xCategSeq ); + void ConvertCategSequence( css::uno::Reference< css::chart2::data::XLabeledDataSequence > xCategSeq ); /** Writes all embedded records. */ virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; @@ -739,7 +724,7 @@ private: /** Initializes members of this series to represent a child of the passed series. */ void InitFromParent( const XclExpChSeries& rParent ); /** Tries to create trend line series objects (called at parent series). */ - void CreateTrendLines( XDataSeriesRef xDataSeries ); + void CreateTrendLines( css::uno::Reference< css::chart2::XDataSeries > xDataSeries ); /** Tries to create positive and negative error bar series objects (called at parent series). */ void CreateErrorBars( const ScfPropertySet& rPropSet, const OUString& rBarPropName, @@ -776,15 +761,12 @@ typedef std::shared_ptr< XclExpChSeries > XclExpChSeriesRef; class XclExpChType : public XclExpRecord, protected XclExpChRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > XChartTypeRef; - -public: explicit XclExpChType( const XclExpChRoot& rRoot ); /** Converts the passed chart type and the contained data series. */ - void Convert( XDiagramRef xDiagram, XChartTypeRef xChartType, - sal_Int32 nApiAxesSetIdx, bool bSwappedAxesSet, bool bHasXLabels ); + void Convert( css::uno::Reference< css::chart2::XDiagram > xDiagram, + css::uno::Reference< css::chart2::XChartType > xChartType, + sal_Int32 nApiAxesSetIdx, bool bSwappedAxesSet, bool bHasXLabels ); /** Sets stacking mode (standard or percent) for the series in this chart type group. */ void SetStacked( bool bPercent ); @@ -888,22 +870,18 @@ typedef std::shared_ptr< XclExpChDropBar > XclExpChDropBarRef; class XclExpChTypeGroup : public XclExpChGroupBase { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > XChartTypeRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > XDataSeriesRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > XLabeledDataSeqRef; - -public: explicit XclExpChTypeGroup( const XclExpChRoot& rRoot, sal_uInt16 nGroupIdx ); /** Converts the passed chart type to Excel type settings. */ - void ConvertType( XDiagramRef xDiagram, XChartTypeRef xChartType, + void ConvertType( css::uno::Reference< css::chart2::XDiagram > xDiagram, + css::uno::Reference< css::chart2::XChartType > xChartType, sal_Int32 nApiAxesSetIdx, bool b3dChart, bool bSwappedAxesSet, bool bHasXLabels ); /** Converts and inserts all series from the passed chart type. */ - void ConvertSeries( XDiagramRef xDiagram, XChartTypeRef xChartType, + void ConvertSeries( css::uno::Reference< css::chart2::XDiagram > xDiagram, + css::uno::Reference< css::chart2::XChartType > xChartType, sal_Int32 nGroupAxesSetIdx, bool bPercent, bool bConnectorLines ); /** Converts and inserts category ranges for all inserted series. */ - void ConvertCategSequence( XLabeledDataSeqRef xCategSeq ); + void ConvertCategSequence( css::uno::Reference< css::chart2::data::XLabeledDataSequence > xCategSeq ); /** Creates a legend object and converts all legend settings. */ void ConvertLegend( const ScfPropertySet& rPropSet ); @@ -929,13 +907,13 @@ private: /** Returns an unused format index to be used for the next created series. */ sal_uInt16 GetFreeFormatIdx() const; /** Creates all data series of any chart type except stock charts. */ - void CreateDataSeries( XDiagramRef xDiagram, - XDataSeriesRef xDataSeries ); + void CreateDataSeries( css::uno::Reference< css::chart2::XDiagram > xDiagram, + css::uno::Reference< css::chart2::XDataSeries > xDataSeries ); /** Creates all data series of a stock chart. */ - void CreateAllStockSeries( XChartTypeRef xChartType, - XDataSeriesRef xDataSeries ); + void CreateAllStockSeries( css::uno::Reference< css::chart2::XChartType > xChartType, + css::uno::Reference< css::chart2::XDataSeries > xDataSeries ); /** Creates a single data series of a stock chart. */ - bool CreateStockSeries( XDataSeriesRef xDataSeries, + bool CreateStockSeries( css::uno::Reference< css::chart2::XDataSeries > xDataSeries, const OUString& rValueRole, bool bCloseSymbol ); virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; @@ -1034,11 +1012,6 @@ typedef std::shared_ptr< XclExpChTick > XclExpChTickRef; class XclExpChAxis : public XclExpChGroupBase, public XclExpChFontBase { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > XAxisRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart::XAxis > XChart1AxisRef; - -public: explicit XclExpChAxis( const XclExpChRoot& rRoot, sal_uInt16 nAxisType ); /** Sets font color and color identifier to internal data structures. */ @@ -1047,10 +1020,12 @@ public: virtual void SetRotation( sal_uInt16 nRotation ) SAL_OVERRIDE; /** Converts formatting and scaling settings from the passed axis. */ - void Convert( XAxisRef xAxis, XAxisRef xCrossingAxis, - XChart1AxisRef xChart1Axis, const XclChExtTypeInfo& rTypeInfo ); + void Convert( css::uno::Reference< css::chart2::XAxis > xAxis, + css::uno::Reference< css::chart2::XAxis > xCrossingAxis, + css::uno::Reference< css::chart::XAxis > xChart1Axis, + const XclChExtTypeInfo& rTypeInfo ); /** Converts and writes 3D wall/floor properties from the passed diagram. */ - void ConvertWall( XDiagramRef xDiagram ); + void ConvertWall( css::uno::Reference< css::chart2::XDiagram > xDiagram ); /** Returns the type of this axis. */ inline sal_uInt16 GetAxisType() const { return maData.mnType; } @@ -1087,15 +1062,12 @@ typedef std::shared_ptr< XclExpChAxis > XclExpChAxisRef; class XclExpChAxesSet : public XclExpChGroupBase { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > XCoordSystemRef; - -public: explicit XclExpChAxesSet( const XclExpChRoot& rRoot, sal_uInt16 nAxesSetId ); /** Converts the passed diagram to chart record data. @return First unused chart type group index. */ - sal_uInt16 Convert( XDiagramRef xDiagram, sal_uInt16 nFirstGroupIdx ); + sal_uInt16 Convert( css::uno::Reference< css::chart2::XDiagram > xDiagram, + sal_uInt16 nFirstGroupIdx ); /** Returns true, if this axes set exists (returns false if this is a dummy object). */ inline bool IsValidAxesSet() const { return !maTypeGroups.IsEmpty(); } @@ -1118,7 +1090,8 @@ private: /** Converts a complete axis object including axis title. */ void ConvertAxis( XclExpChAxisRef& rxChAxis, sal_uInt16 nAxisType, XclExpChTextRef& rxChAxisTitle, sal_uInt16 nTitleTarget, - XCoordSystemRef xCoordSystem, const XclChExtTypeInfo& rTypeInfo, + css::uno::Reference< css::chart2::XCoordinateSystem > xCoordSystem, + const XclChExtTypeInfo& rTypeInfo, sal_Int32 nCrossingAxisDim ); virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; @@ -1151,11 +1124,9 @@ typedef std::shared_ptr< XclExpChAxesSet > XclExpChAxesSetRef; class XclExpChChart : public XclExpChGroupBase { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > XChartDocRef; - -public: explicit XclExpChChart( const XclExpRoot& rRoot, - XChartDocRef xChartDoc, const Rectangle& rChartRect ); + css::uno::Reference< css::chart2::XChartDocument > xChartDoc, + const Rectangle& rChartRect ); /** Creates, registers and returns a new data series object. */ XclExpChSeriesRef CreateSeries(); @@ -1194,7 +1165,7 @@ class XclExpChartDrawing : public XclExpRecordBase, protected XclExpRoot public: explicit XclExpChartDrawing( const XclExpRoot& rRoot, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, + const ::com::sun::star::uno::Reference< css::frame::XModel >& rxModel, const Size& rChartSize ); virtual ~XclExpChartDrawing(); @@ -1209,11 +1180,9 @@ private: class XclExpChart : public XclExpSubStream, protected XclExpRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > XModelRef; - -public: explicit XclExpChart( const XclExpRoot& rRoot, - XModelRef xModel, const Rectangle& rChartRect ); + css::uno::Reference< css::frame::XModel > xModel, + const Rectangle& rChartRect ); }; #endif diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 0751b7a3392a..777b942dda9c 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -289,8 +289,6 @@ class XclExpChart; class XclExpChartObj : public XclObj, protected XclExpRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDocument > XChartDocRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > XShapeRef; explicit XclExpChartObj( XclExpObjectManager& rObjMgr, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, @@ -305,9 +303,9 @@ public: private: typedef std::shared_ptr< XclExpChart > XclExpChartRef; - XclExpChartRef mxChart; /// The chart itself (BOF/EOF substream data). - XShapeRef mxShape; - XChartDocRef mxChartDoc; + XclExpChartRef mxChart; /// The chart itself (BOF/EOF substream data). + css::uno::Reference< css::drawing::XShape > mxShape; + css::uno::Reference< css::chart::XChartDocument > mxChartDoc; }; /** Represents a NOTE record containing the relevant data of a cell note. diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index b33077465fc3..5e41c3442d5b 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -379,11 +379,6 @@ typedef boost::shared_ptr< XclImpChFrame > XclImpChFrameRef; class XclImpChSourceLink : protected XclImpChRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > XDataSequenceRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > XFormattedStringRef; - typedef ::com::sun::star::uno::Sequence< XFormattedStringRef > XFormattedStringSeq; - -public: explicit XclImpChSourceLink( const XclImpChRoot& rRoot ); virtual ~XclImpChSourceLink(); @@ -410,9 +405,11 @@ public: void ConvertNumFmt( ScfPropertySet& rPropSet, bool bPercent ) const; /** Creates a data sequence containing the link into the Calc document. */ - XDataSequenceRef CreateDataSequence( const OUString& rRole ) const; + css::uno::Reference< css::chart2::data::XDataSequence > + CreateDataSequence( const OUString& rRole ) const; /** Creates a sequence of formatted string objects. */ - XFormattedStringSeq CreateStringSequence( const XclImpChRoot& rRoot, + css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > + CreateStringSequence( const XclImpChRoot& rRoot, sal_uInt16 nLeadFontIdx, const Color& rLeadFontColor ) const; void FillSourceLink(::std::vector<ScTokenRef>& rTokens) const; @@ -471,9 +468,6 @@ typedef boost::shared_ptr< XclImpChFont > XclImpChFontRef; class XclImpChText : public XclImpChGroupBase, public XclImpChFontBase, protected XclImpChRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > XTitleRef; - -public: explicit XclImpChText( const XclImpChRoot& rRoot ); /** Reads the CHTEXT record (called by base class). */ @@ -515,7 +509,8 @@ public: /** Converts and writes all contained data to the passed data point label property set. */ void ConvertDataLabel( ScfPropertySet& rPropSet, const XclChTypeInfo& rTypeInfo ) const; /** Creates a title text object. */ - XTitleRef CreateTitle() const; + css::uno::Reference< css::chart2::XTitle > + CreateTitle() const; /** Converts the manual position of the specified title */ void ConvertTitlePosition( const XclChTextKey& rTitleKey ) const; @@ -698,9 +693,6 @@ typedef boost::shared_ptr< XclImpChDataFormat > XclImpChDataFormatRef; class XclImpChSerTrendLine : protected XclImpChRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > XRegressionCurveRef; - -public: explicit XclImpChSerTrendLine( const XclImpChRoot& rRoot ); /** Reads the CHSERTRENDLINE record. */ @@ -711,7 +703,8 @@ public: inline void SetTrendlineName( const OUString& aTrendlineName) { maTrendLineName = aTrendlineName; } /** Creates an API object representing this trend line. */ - XRegressionCurveRef CreateRegressionCurve() const; + css::uno::Reference< css::chart2::XRegressionCurve > + CreateRegressionCurve() const; private: OUString maTrendLineName; @@ -725,10 +718,6 @@ typedef boost::shared_ptr< XclImpChSerTrendLine > XclImpChSerTrendLineRef; class XclImpChSerErrorBar : protected XclImpChRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > XLabeledDataSeqRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > XPropertySetRef; - -public: explicit XclImpChSerErrorBar( const XclImpChRoot& rRoot ); /** Reads the CHSERERRORBAR record. */ @@ -741,10 +730,12 @@ public: /** Returns the type of this error bar (X/Y, plus/minus). */ inline sal_uInt8 GetBarType() const { return maData.mnBarType; } /** Creates a labeled data sequence object from value data link. */ - XLabeledDataSeqRef CreateValueSequence() const; + css::uno::Reference< css::chart2::data::XLabeledDataSequence > + CreateValueSequence() const; /** Tries to create an error bar API object from the specified Excel error bars. */ - static XPropertySetRef CreateErrorBar( + static css::uno::Reference< css::beans::XPropertySet > + CreateErrorBar( const XclImpChSerErrorBar* pPosBar, const XclImpChSerErrorBar* pNegBar ); @@ -765,11 +756,6 @@ typedef boost::shared_ptr< XclImpChSerErrorBar > XclImpChSerErrorBarRef; class XclImpChSeries : public XclImpChGroupBase, protected XclImpChRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > XDataSeriesRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > XLabeledDataSeqRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > XPropertySetRef; - -public: explicit XclImpChSeries( const XclImpChRoot& rRoot, sal_uInt16 nSeriesIdx ); /** Reads the CHSERIES record (called by base class). */ @@ -805,11 +791,14 @@ public: inline bool HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); } /** Creates a labeled data sequence object from value data link. */ - XLabeledDataSeqRef CreateValueSequence( const OUString& rValueRole ) const; + css::uno::Reference< css::chart2::data::XLabeledDataSequence > + CreateValueSequence( const OUString& rValueRole ) const; /** Creates a labeled data sequence object from category data link. */ - XLabeledDataSeqRef CreateCategSequence( const OUString& rCategRole ) const; + css::uno::Reference< css::chart2::data::XLabeledDataSequence > + CreateCategSequence( const OUString& rCategRole ) const; /** Creates a data series object with initialized source links. */ - XDataSeriesRef CreateDataSeries() const; + css::uno::Reference< css::chart2::XDataSeries > + CreateDataSeries() const; void FillAllSourceLinks(::std::vector<ScTokenRef>& rTokens) const; @@ -829,9 +818,10 @@ private: XclImpChDataFormatRef CreateDataFormat( sal_uInt16 nPointIdx, sal_uInt16 nFormatIdx ); /** Converts all trend lines and inserts them into the passed API data series object. */ - void ConvertTrendLines( XDataSeriesRef xDataSeries ) const; + void ConvertTrendLines( css::uno::Reference< css::chart2::XDataSeries > xDataSeries ) const; /** Tries to create an error bar API object from the specified Excel error bars. */ - XPropertySetRef CreateErrorBar( sal_uInt8 nPosBarId, sal_uInt8 nNegBarId ) const; + css::uno::Reference< css::beans::XPropertySet > + CreateErrorBar( sal_uInt8 nPosBarId, sal_uInt8 nNegBarId ) const; private: typedef ::std::map<sal_uInt16, XclImpChDataFormatRef> XclImpChDataFormatMap; @@ -861,11 +851,6 @@ typedef boost::shared_ptr< XclImpChSeries > XclImpChSeriesRef; class XclImpChType : protected XclImpChRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > XCoordSystemRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > XChartTypeRef; - -public: explicit XclImpChType( const XclImpChRoot& rRoot ); /** Reads a chart type record (e.g. CHBAR, CHLINE, CHPIE, ...). */ @@ -885,9 +870,11 @@ public: bool HasCategoryLabels() const; /** Creates a coordinate system according to the contained chart type. */ - XCoordSystemRef CreateCoordSystem( bool b3dChart ) const; + css::uno::Reference< css::chart2::XCoordinateSystem > + CreateCoordSystem( bool b3dChart ) const; /** Creates and returns an object that represents the contained chart type. */ - XChartTypeRef CreateChartType( XDiagramRef xDiagram, bool b3dChart ) const; + css::uno::Reference< css::chart2::XChartType > + CreateChartType( css::uno::Reference< css::chart2::XDiagram > xDiagram, bool b3dChart ) const; private: XclChType maData; /// Contents of the chart type record. @@ -920,9 +907,6 @@ typedef boost::shared_ptr< XclImpChChart3d > XclImpChChart3dRef; class XclImpChLegend : public XclImpChGroupBase, protected XclImpChRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XLegend > XLegendRef; - -public: explicit XclImpChLegend( const XclImpChRoot& rRoot ); /** Reads the CHLEGEND record (called by base class). */ @@ -933,7 +917,8 @@ public: void Finalize(); /** Creates a new legend object. */ - XLegendRef CreateLegend() const; + css::uno::Reference< css::chart2::XLegend > + CreateLegend() const; private: XclChLegend maData; /// Contents of the CHLEGEND record. @@ -978,13 +963,6 @@ typedef boost::shared_ptr< XclImpChDropBar > XclImpChDropBarRef; class XclImpChTypeGroup : public XclImpChGroupBase, protected XclImpChRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > XCoordSystemRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > XChartTypeRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > XDataSeriesRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > XLabeledDataSeqRef; - -public: explicit XclImpChTypeGroup( const XclImpChRoot& rRoot ); /** Reads the CHTYPEGROUP record (called by base class). */ @@ -1034,11 +1012,14 @@ public: /** Converts and writes all 3D settings to the passed diagram. */ void ConvertChart3d( ScfPropertySet& rPropSet ) const; /** Creates a coordinate system according to the contained chart type. */ - XCoordSystemRef CreateCoordSystem() const; + css::uno::Reference< css::chart2::XCoordinateSystem > + CreateCoordSystem() const; /** Creates and returns an object that represents the contained chart type. */ - XChartTypeRef CreateChartType( XDiagramRef xDiagram, sal_Int32 nApiAxesSetIdx ) const; + css::uno::Reference< css::chart2::XChartType > + CreateChartType( css::uno::Reference< css::chart2::XDiagram > xDiagram, sal_Int32 nApiAxesSetIdx ) const; /** Creates a labeled data sequence object for axis categories. */ - XLabeledDataSeqRef CreateCategSequence() const; + css::uno::Reference< css::chart2::data::XLabeledDataSequence > + CreateCategSequence() const; private: /** Reads a CHDROPBAR record group. */ @@ -1054,12 +1035,15 @@ private: inline bool HasDropBars() const { return !maDropBars.empty(); } /** Inserts the passed series into the chart type. Adds additional properties to the series. */ - void InsertDataSeries( XChartTypeRef xChartType, - XDataSeriesRef xSeries, sal_Int32 nApiAxesSetIdx ) const; + void InsertDataSeries( css::uno::Reference< css::chart2::XChartType > xChartType, + css::uno::Reference< css::chart2::XDataSeries > xSeries, + sal_Int32 nApiAxesSetIdx ) const; /** Creates all data series of any chart type except stock charts. */ - void CreateDataSeries( XChartTypeRef xChartType, sal_Int32 nApiAxesSetIdx ) const; + void CreateDataSeries( css::uno::Reference< css::chart2::XChartType > xChartType, + sal_Int32 nApiAxesSetIdx ) const; /** Creates all data series of a stock chart. */ - void CreateStockSeries( XChartTypeRef xChartType, sal_Int32 nApiAxesSetIdx ) const; + void CreateStockSeries( css::uno::Reference< css::chart2::XChartType > xChartType, + sal_Int32 nApiAxesSetIdx ) const; private: typedef ::std::vector< XclImpChSeriesRef > XclImpChSeriesVec; @@ -1087,16 +1071,13 @@ typedef boost::shared_ptr< XclImpChTypeGroup > XclImpChTypeGroupRef; class XclImpChLabelRange : protected XclImpChRoot { public: - typedef ::com::sun::star::chart2::ScaleData ScaleData; - -public: explicit XclImpChLabelRange( const XclImpChRoot& rRoot ); /** Reads the CHLABELRANGE record (category axis scaling properties). */ void ReadChLabelRange( XclImpStream& rStrm ); /** Reads the CHDATERANGE record (date axis scaling properties). */ void ReadChDateRange( XclImpStream& rStrm ); /** Converts category axis scaling settings. */ - void Convert( ScfPropertySet& rPropSet, ScaleData& rScaleData, bool bMirrorOrient ) const; + void Convert( ScfPropertySet& rPropSet, css::chart2::ScaleData& rScaleData, bool bMirrorOrient ) const; /** Converts position settings of this axis at a crossing axis. */ void ConvertAxisPosition( ScfPropertySet& rPropSet, bool b3dChart ) const; @@ -1110,14 +1091,11 @@ typedef boost::shared_ptr< XclImpChLabelRange > XclImpChLabelRangeRef; class XclImpChValueRange : protected XclImpChRoot { public: - typedef ::com::sun::star::chart2::ScaleData ScaleData; - -public: explicit XclImpChValueRange( const XclImpChRoot& rRoot ); /** Reads the CHVALUERANGE record (numeric axis scaling properties). */ void ReadChValueRange( XclImpStream& rStrm ); /** Converts value axis scaling settings. */ - void Convert( ScaleData& rScaleData, bool bMirrorOrient ) const; + void Convert( css::chart2::ScaleData& rScaleData, bool bMirrorOrient ) const; /** Converts position settings of this axis at a crossing axis. */ void ConvertAxisPosition( ScfPropertySet& rPropSet ) const; @@ -1159,9 +1137,6 @@ typedef boost::shared_ptr< XclImpChTick > XclImpChTickRef; class XclImpChAxis : public XclImpChGroupBase, public XclImpChFontBase, protected XclImpChRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > XAxisRef; - -public: explicit XclImpChAxis( const XclImpChRoot& rRoot, sal_uInt16 nAxisType = EXC_CHAXIS_NONE ); /** Reads the CHAXIS record (called by base class). */ @@ -1192,7 +1167,8 @@ public: inline bool HasMinorGrid() const { return static_cast< bool >(mxMinorGrid); } /** Creates an API axis object. */ - XAxisRef CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const; + css::uno::Reference< css::chart2::XAxis > + CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const; /** Converts and writes 3D wall/floor properties to the passed property set. */ void ConvertWall( ScfPropertySet& rPropSet ) const; /** Converts position settings of this axis at a crossing axis. */ @@ -1228,11 +1204,6 @@ typedef boost::shared_ptr< XclImpChAxis > XclImpChAxisRef; class XclImpChAxesSet : public XclImpChGroupBase, protected XclImpChRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > XDiagramRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > XCoordSystemRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > XAxisRef; - -public: explicit XclImpChAxesSet( const XclImpChRoot& rRoot, sal_uInt16 nAxesSetId ); /** Reads the CHAXESSET record (called by base class). */ @@ -1261,7 +1232,7 @@ public: OUString GetSingleSeriesTitle() const; /** Creates a coordinate system and converts all series and axis settings. */ - void Convert( XDiagramRef xDiagram ) const; + void Convert( css::uno::Reference< css::chart2::XDiagram > xDiagram ) const; /** Converts the manual positions of all axis titles. */ void ConvertTitlePositions() const; @@ -1279,14 +1250,17 @@ private: void UpdateAxisTitle( XclImpChTextRef xTitle ); /** Creates a coordinate system that contains all chart types for this axes set. */ - XCoordSystemRef CreateCoordSystem( XDiagramRef xDiagram ) const; + css::uno::Reference< css::chart2::XCoordinateSystem > + CreateCoordSystem( css::uno::Reference< css::chart2::XDiagram > xDiagram ) const; /** Creates and inserts an axis into the container and registers the coordinate system. */ void ConvertAxis( XclImpChAxisRef xChAxis, XclImpChTextRef xChAxisTitle, - XCoordSystemRef xCoordSystem, const XclImpChAxis* pCrossingAxis ) const; + css::uno::Reference< css::chart2::XCoordinateSystem > xCoordSystem, + const XclImpChAxis* pCrossingAxis ) const; /** Creates and returns an API axis object. */ - XAxisRef CreateAxis( const XclImpChAxis& rChAxis, const XclImpChAxis* pCrossingAxis ) const; + css::uno::Reference< css::chart2::XAxis > + CreateAxis( const XclImpChAxis& rChAxis, const XclImpChAxis* pCrossingAxis ) const; /** Writes all properties of the background area to the passed diagram. */ - void ConvertBackground( XDiagramRef xDiagram ) const; + void ConvertBackground( css::uno::Reference< css::chart2::XDiagram > xDiagram ) const; private: typedef ::std::map<sal_uInt16, XclImpChTypeGroupRef> XclImpChTypeGroupMap; @@ -1417,9 +1391,6 @@ private: class XclImpChart : protected XclImpRoot { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > XModelRef; - -public: /** Constructs a new chart object. @param bOwnTab True = chart is on an own sheet; false = chart is an embedded object. */ explicit XclImpChart( const XclImpRoot& rRoot, bool bOwnTab ); @@ -1437,7 +1408,7 @@ public: inline bool IsPivotChart() const { return mbIsPivotChart; } /** Creates the chart object in the passed component. */ - void Convert( XModelRef xModel, + void Convert( css::uno::Reference< css::frame::XModel > xModel, XclImpDffConverter& rDffConv, const OUString& rObjName, const Rectangle& rChartRect ) const; diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index f7ffec4d4049..ee5b575d23d1 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -1286,23 +1286,19 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > class XclChObjectTable { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > XNameContainerRef; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > XServiceFactoryRef; - -public: - explicit XclChObjectTable( XServiceFactoryRef xFactory, + explicit XclChObjectTable( css::uno::Reference< css::lang::XMultiServiceFactory > xFactory, const OUString& rServiceName, const OUString& rObjNameBase ); /** Returns a named formatting object from the chart document. */ - ::com::sun::star::uno::Any GetObject( const OUString& rObjName ); + css::uno::Any GetObject( const OUString& rObjName ); /** Insertes a named formatting object into the chart document. */ - OUString InsertObject( const ::com::sun::star::uno::Any& rObj ); + OUString InsertObject( const ::com::sun::star::uno::Any& rObj ); private: - XServiceFactoryRef mxFactory; /// Factory to create the container. - XNameContainerRef mxContainer; /// Container for the objects. - OUString maServiceName; /// Service name to create the container. - OUString maObjNameBase; /// Base of names for inserted objects. + css::uno::Reference< css::lang::XMultiServiceFactory > mxFactory; /// Factory to create the container. + css::uno::Reference< css::container::XNameContainer > mxContainer; /// Container for the objects. + OUString maServiceName; /// Service name to create the container. + OUString maObjNameBase; /// Base of names for inserted objects. sal_Int32 mnIndex; /// Index to create unique identifiers. }; @@ -1405,7 +1401,7 @@ struct XclChRootData typedef std::shared_ptr< XclChTypeInfoProvider > XclChTypeProvRef; typedef std::shared_ptr< XclChFormatInfoProvider > XclChFmtInfoProvRef; typedef std::shared_ptr< XclChObjectTable > XclChObjectTableRef; - typedef ::std::map< XclChTextKey, XclChGetShapeFunc > XclChGetShapeFuncMap; + typedef std::map< XclChTextKey, XclChGetShapeFunc > XclChGetShapeFuncMap; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > mxChartDoc; /// The chart document. diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index d2e46d22a7f4..150139e25a7f 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.hxx @@ -94,14 +94,12 @@ private: class ScSpellingEngine : public ScConversionEngineBase { public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > XSpellCheckerRef; - explicit ScSpellingEngine( SfxItemPool* pEnginePool, ScViewData& rViewData, ScDocument* pUndoDoc, ScDocument* pRedoDoc, - XSpellCheckerRef xSpeller ); + css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpeller ); /** Checks spelling of all cells in the selection or sheet. */ virtual void ConvertAll( EditView& rEditView ) SAL_OVERRIDE; diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index a8e0fca5a7e7..4621b6984deb 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -270,7 +270,7 @@ void ScConversionEngineBase::FillFromCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) ScSpellingEngine::ScSpellingEngine( SfxItemPool* pEnginePoolP, ScViewData& rViewData, ScDocument* pUndoDoc, ScDocument* pRedoDoc, - XSpellCheckerRef xSpeller ) : + css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpeller ) : ScConversionEngineBase( pEnginePoolP, rViewData, pUndoDoc, pRedoDoc ) { SetSpeller( xSpeller ); diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx index e97160fae71a..e756a1a89156 100644 --- a/svgio/qa/cppunit/SvgImportTest.cxx +++ b/svgio/qa/cppunit/SvgImportTest.cxx @@ -34,11 +34,11 @@ using drawinglayer::primitive2d::arePrimitive2DSequencesEqual; class Test : public test::BootstrapFixture, public XmlTestTools { - void checkRectPrimitive(Primitive2DSequence& rPrimitive); + void checkRectPrimitive(css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > >& rPrimitive); void testStyles(); - Primitive2DSequence parseSvg(const char* aSource); + css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > parseSvg(const char* aSource); public: virtual void setUp() SAL_OVERRIDE; @@ -49,7 +49,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -Primitive2DSequence Test::parseSvg(const char* aSource) +css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > Test::parseSvg(const char* aSource) { const Reference<XSvgParser> xSvgParser = SvgTools::create(m_xContext); @@ -78,7 +78,7 @@ void Test::tearDown() BootstrapFixture::tearDown(); } -void Test::checkRectPrimitive(Primitive2DSequence& rPrimitive) +void Test::checkRectPrimitive(css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > >& rPrimitive) { Primitive2dXmlDump dumper; xmlDocPtr pDocument = dumper.dumpAndParse(rPrimitive); @@ -96,19 +96,19 @@ void Test::checkRectPrimitive(Primitive2DSequence& rPrimitive) // however the end result should be the same. void Test::testStyles() { - Primitive2DSequence aSequenceRect = parseSvg("/svgio/qa/cppunit/data/Rect.svg"); + css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aSequenceRect = parseSvg("/svgio/qa/cppunit/data/Rect.svg"); CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRect.getLength()); checkRectPrimitive(aSequenceRect); - Primitive2DSequence aSequenceRectWithStyle = parseSvg("/svgio/qa/cppunit/data/RectWithStyles.svg"); + css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aSequenceRectWithStyle = parseSvg("/svgio/qa/cppunit/data/RectWithStyles.svg"); CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRectWithStyle.getLength()); checkRectPrimitive(aSequenceRectWithStyle); - Primitive2DSequence aSequenceRectWithParentStyle = parseSvg("/svgio/qa/cppunit/data/RectWithParentStyles.svg"); + css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aSequenceRectWithParentStyle = parseSvg("/svgio/qa/cppunit/data/RectWithParentStyles.svg"); CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRectWithParentStyle.getLength()); checkRectPrimitive(aSequenceRectWithParentStyle); - Primitive2DSequence aSequenceRectWithStylesByGroup = parseSvg("/svgio/qa/cppunit/data/RectWithStylesByGroup.svg"); + css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aSequenceRectWithStylesByGroup = parseSvg("/svgio/qa/cppunit/data/RectWithStylesByGroup.svg"); CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRectWithStylesByGroup.getLength()); checkRectPrimitive(aSequenceRectWithStylesByGroup); diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx index 325040a95ece..997769dd60db 100644 --- a/svtools/source/brwbox/brwimpl.hxx +++ b/svtools/source/brwbox/brwimpl.hxx @@ -31,8 +31,7 @@ namespace svt { // member public: - typedef ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > AccessibleRef; - typedef ::std::map< sal_Int32, AccessibleRef > THeaderCellMap; + typedef ::std::map< sal_Int32, css::uno::Reference< css::accessibility::XAccessible > > THeaderCellMap; struct THeaderCellMapFunctorDispose : ::std::unary_function<THeaderCellMap::value_type,void> { diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index c75912a10af4..9c5b38207532 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -272,7 +272,7 @@ FrameSelectorImpl::~FrameSelectorImpl() { if( mpAccess ) mpAccess->Invalidate(); - for( AccessibleImplVec::iterator aIt = maChildVec.begin(), aEnd = maChildVec.end(); aIt != aEnd; ++aIt ) + for( auto aIt = maChildVec.begin(), aEnd = maChildVec.end(); aIt != aEnd; ++aIt ) if( *aIt ) (*aIt)->Invalidate(); } diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 5dba115d44eb..f41a186c5c4f 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -311,12 +311,10 @@ namespace svxform inline void SetInstanceURL( const OUString &url ) { m_sInstanceURL=url; } inline void SetLinkOnce( bool bLinkOnce ) { m_bLinkOnce=bLinkOnce; } - typedef com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> XPropertySet_t; - typedef com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> XNode_t; - - inline XPropertySet_t GetBindingForNode( const XNode_t &xNode ) { return m_xUIHelper->getBindingForNode(xNode,true); } - inline OUString GetServiceNameForNode( const XNode_t &xNode ) { return m_xUIHelper->getDefaultServiceNameForNode(xNode); } - inline XFormsUIHelper1_ref GetXFormsHelper() const { return m_xUIHelper; } + inline css::uno::Reference<css::beans::XPropertySet> + GetBindingForNode( const css::uno::Reference<css::xml::dom::XNode> &xNode ) { return m_xUIHelper->getBindingForNode(xNode,true); } + inline OUString GetServiceNameForNode( const css::uno::Reference<css::xml::dom::XNode> &xNode ) { return m_xUIHelper->getDefaultServiceNameForNode(xNode); } + inline XFormsUIHelper1_ref GetXFormsHelper() const { return m_xUIHelper; } }; diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index 796e9df671cf..bcb1127f0d4c 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -126,9 +126,8 @@ namespace svxform }; typedef ::std::set< ControlData, ControlDataCompare > ControlBag; - typedef ::com::sun::star::awt::XVclWindowPeer WindowPeer; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer > WindowPeerRef; - typedef ::std::set< WindowPeerRef, ::comphelper::OInterfaceCompare< WindowPeer > > PeerBag; + typedef ::std::set< css::uno::Reference< css::awt::XVclWindowPeer >, + ::comphelper::OInterfaceCompare< css::awt::XVclWindowPeer > > PeerBag; PeerBag m_aColorableControls; PeerBag m_aNonColorableControls; diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index 4b516e83139b..441cb1e62b13 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -99,10 +99,6 @@ typedef std::vector< FrameBorder* > FrameBorderPtrVec; struct FrameSelectorImpl : public Resource { - typedef css::uno::Reference<css::accessibility::XAccessible> XAccessibleRef; - typedef std::vector<a11y::AccFrameSelector*> AccessibleImplVec; - typedef std::vector<XAccessibleRef> XAccessibleRefVec; - FrameSelector& mrFrameSel; /// The control itself. ScopedVclPtr<VirtualDevice> mpVirDev; /// For all buffered drawing operations. ImageList maILArrows; /// Arrows in current system colors. @@ -146,9 +142,12 @@ struct FrameSelectorImpl : public Resource bool mbHCMode; /// true = High contrast mode. a11y::AccFrameSelector* mpAccess; /// Pointer to accessibility object of the control. - XAccessibleRef mxAccess; /// Reference to accessibility object of the control. - AccessibleImplVec maChildVec; /// Pointers to accessibility objects for frame borders. - XAccessibleRefVec mxChildVec; /// References to accessibility objects for frame borders. + css::uno::Reference<css::accessibility::XAccessible> + mxAccess; /// Reference to accessibility object of the control. + std::vector<a11y::AccFrameSelector*> + maChildVec; /// Pointers to accessibility objects for frame borders. + std::vector<css::uno::Reference<css::accessibility::XAccessible> > + mxChildVec; /// References to accessibility objects for frame borders. explicit FrameSelectorImpl( FrameSelector& rFrameSel ); ~FrameSelectorImpl(); diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index df42d47b46ab..8544b3fc9d6f 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -63,11 +63,11 @@ public: } }; -Primitive2DSequence SAL_CALL PrimitiveFactory2D::createPrimitivesFromXShape( +css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL PrimitiveFactory2D::createPrimitivesFromXShape( const uno::Reference< drawing::XShape >& xShape, const uno::Sequence< beans::PropertyValue >& /*aParms*/ ) throw (uno::RuntimeException, std::exception) { - Primitive2DSequence aRetval; + css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aRetval; if(xShape.is()) { @@ -83,11 +83,11 @@ Primitive2DSequence SAL_CALL PrimitiveFactory2D::createPrimitivesFromXShape( return aRetval; } -Primitive2DSequence SAL_CALL PrimitiveFactory2D::createPrimitivesFromXDrawPage( +css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL PrimitiveFactory2D::createPrimitivesFromXDrawPage( const uno::Reference< drawing::XDrawPage >& xDrawPage, const uno::Sequence< beans::PropertyValue >& /*aParms*/ ) throw (uno::RuntimeException, std::exception) { - Primitive2DSequence aRetval; + css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aRetval; if(xDrawPage.is()) { diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index a9b020f3e2d5..72193f019ff1 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -164,9 +164,9 @@ void SwPageBreakWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) B2DPolygon aPolygon = createPolygonFromRect(aBRect, 3.0 / BUTTON_WIDTH, 3.0 / BUTTON_HEIGHT); // Create the polygon primitives - aSeq[0] = Primitive2DReference(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D( + aSeq[0] = css::uno::Reference< css::graphic::XPrimitive2D >(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D( B2DPolyPolygon(aPolygon), aOtherColor)); - aSeq[1] = Primitive2DReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D( + aSeq[1] = css::uno::Reference< css::graphic::XPrimitive2D >(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D( aPolygon, aColor)); // Create the primitive for the image @@ -174,7 +174,7 @@ void SwPageBreakWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) double nImgOfstX = 3.0; if (bRtl) nImgOfstX = aRect.Right() - aImg.GetSizePixel().Width() - 3.0; - aSeq[2] = Primitive2DReference(new drawinglayer::primitive2d::DiscreteBitmapPrimitive2D( + aSeq[2] = css::uno::Reference< css::graphic::XPrimitive2D >(new drawinglayer::primitive2d::DiscreteBitmapPrimitive2D( aImg.GetBitmapEx(), B2DPoint(nImgOfstX, 1.0))); double nTop = double(aRect.getHeight()) / 2.0; @@ -195,16 +195,16 @@ void SwPageBreakWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) aTriangleColor = Color(COL_WHITE).getBColor(); aSeq.realloc(aSeq.getLength() + 1); - aSeq[aSeq.getLength() - 1] = Primitive2DReference( + aSeq[aSeq.getLength() - 1] = css::uno::Reference< css::graphic::XPrimitive2D >( new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D( B2DPolyPolygon(aTriangle), aTriangleColor)); - Primitive2DSequence aGhostedSeq(1); + css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aGhostedSeq(1); double nFadeRate = double(m_nFadeRate) / 100.0; const basegfx::BColorModifierSharedPtr aBColorModifier( new basegfx::BColorModifier_interpolate(Color(COL_WHITE).getBColor(), 1.0 - nFadeRate)); - aGhostedSeq[0] = Primitive2DReference( + aGhostedSeq[0] = css::uno::Reference< css::graphic::XPrimitive2D >( new drawinglayer::primitive2d::ModifiedColorPrimitive2D( aSeq, aBColorModifier)); diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 437d0f26a541..822f37945a6b 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -75,8 +75,6 @@ struct InteractionHandlerData typedef std::vector< InteractionHandlerData > InteractionHandlerDataList; -typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > Continuations; - typedef std::unordered_map< OUString, OUString, OUStringHash > StringHashMap; class UUIInteractionHelper @@ -289,7 +287,7 @@ private: handleAuthFallbackRequest( OUString & instructions, OUString & url, - Continuations const & rContinuations ); + css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations ); }; class ErrorResource: private Resource diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx index 689ffd219fd9..d86fc8dbcef5 100644 --- a/vcl/source/gdi/svgdata.cxx +++ b/vcl/source/gdi/svgdata.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; BitmapEx convertPrimitive2DSequenceToBitmapEx( - const Primitive2DSequence& rSequence, + const css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > >& rSequence, const basegfx::B2DRange& rTargetRange, const sal_uInt32 nMaximumQuadraticPixels) { @@ -134,7 +134,7 @@ void SvgData::ensureSequenceAndRange() for(sal_Int32 a(0L); a < nCount; a++) { // get reference - const Primitive2DReference xReference(maSequence[a]); + const css::uno::Reference< css::graphic::XPrimitive2D > xReference(maSequence[a]); if(xReference.is()) { @@ -194,7 +194,7 @@ const basegfx::B2DRange& SvgData::getRange() const return maRange; } -const Primitive2DSequence& SvgData::getPrimitive2DSequence() const +const css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > >& SvgData::getPrimitive2DSequence() const { const_cast< SvgData* >(this)->ensureSequenceAndRange(); diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index e2c897f7dd3e..b148efa6c36a 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -51,7 +51,8 @@ using namespace ::std; #define DEF_BORDER_DIST 190 //0,19cm -DomainMapperTableHandler::DomainMapperTableHandler(TextReference_t const& xText, +DomainMapperTableHandler::DomainMapperTableHandler( + css::uno::Reference<css::text::XTextAppendAndConvert> const& xText, DomainMapper_Impl& rDMapper_Impl) : m_xText(xText), m_rDMapper_Impl( rDMapper_Impl ), @@ -247,7 +248,7 @@ struct TableInfo PropertyMapPtr pTableDefaults; PropertyMapPtr pTableBorders; TableStyleSheetEntry* pTableStyle; - TablePropertyValues_t aTableProperties; + css::beans::PropertyValues aTableProperties; TableInfo() : nLeftBorderDistance(DEF_BORDER_DIST) @@ -629,7 +630,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl sal_Int32 nRow = 0; //it's a uno::Sequence< beans::PropertyValues >* - RowPropertyValuesSeq_t* pCellProperties = aCellProperties.getArray(); + css::uno::Sequence<css::beans::PropertyValues>* pCellProperties = aCellProperties.getArray(); PropertyMapVector1::const_iterator aRowIter = m_aRowProperties.begin(); while( aRowOfCellsIterator != aRowOfCellsIteratorEnd ) { @@ -909,14 +910,14 @@ bool lcl_emptyRow(TableSequence_t& rTableSeq, sal_Int32 nRow) return true; } -RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties() +css::uno::Sequence<css::beans::PropertyValues> DomainMapperTableHandler::endTableGetRowProperties() { #ifdef DEBUG_WRITERFILTER TagLogger::getInstance().startElement("getRowProperties"); #endif static const int MINLAY = 23; // sw/inc/swtypes.hxx, minimal possible size of frames. - RowPropertyValuesSeq_t aRowProperties( m_aRowProperties.size() ); + css::uno::Sequence<css::beans::PropertyValues> aRowProperties( m_aRowProperties.size() ); PropertyMapVector1::const_iterator aRowIter = m_aRowProperties.begin(); PropertyMapVector1::const_iterator aRowIterEnd = m_aRowProperties.end(); sal_Int32 nRow = 0; @@ -994,7 +995,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel) std::vector<HorizontallyMergedCell> aMerges; CellPropertyValuesSeq_t aCellProperties = endTableGetCellProperties(aTableInfo, aMerges); - RowPropertyValuesSeq_t aRowProperties = endTableGetRowProperties(); + css::uno::Sequence<css::beans::PropertyValues> aRowProperties = endTableGetRowProperties(); #ifdef DEBUG_WRITERFILTER lcl_DumpPropertyValueSeq(aRowProperties); @@ -1169,7 +1170,7 @@ void DomainMapperTableHandler::endRow() #endif } -void DomainMapperTableHandler::startCell(const Handle_t & start, +void DomainMapperTableHandler::startCell(const css::uno::Reference< css::text::XTextRange > & start, TablePropertyMapPtr pProps ) { sal_uInt32 nRow = m_aRowProperties.size(); @@ -1199,7 +1200,7 @@ void DomainMapperTableHandler::startCell(const Handle_t & start, (*m_pCellSeq)[0] = start->getStart(); } -void DomainMapperTableHandler::endCell(const Handle_t & end) +void DomainMapperTableHandler::endCell(const css::uno::Reference< css::text::XTextRange > & end) { #ifdef DEBUG_WRITERFILTER TagLogger::getInstance().startElement("table.cell.end"); diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx index d91b140b770d..bec48a323705 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx @@ -28,19 +28,14 @@ namespace writerfilter { namespace dmapper { -typedef css::uno::Reference< css::text::XTextRange > Handle_t; -typedef css::uno::Sequence<Handle_t> CellSequence_t; +typedef css::uno::Sequence< css::uno::Reference< css::text::XTextRange > > CellSequence_t; typedef std::shared_ptr<CellSequence_t> CellSequencePointer_t; typedef css::uno::Sequence<CellSequence_t> RowSequence_t; typedef std::shared_ptr<RowSequence_t> RowSequencePointer_t; typedef css::uno::Sequence<RowSequence_t> TableSequence_t; typedef std::shared_ptr<TableSequence_t> TableSequencePointer_t; -typedef css::text::XTextAppendAndConvert Text_t; -typedef css::uno::Reference<Text_t> TextReference_t; -typedef css::beans::PropertyValues TablePropertyValues_t; -typedef css::uno::Sequence<TablePropertyValues_t> RowPropertyValuesSeq_t; -typedef css::uno::Sequence<RowPropertyValuesSeq_t> CellPropertyValuesSeq_t; +typedef css::uno::Sequence< css::uno::Sequence<css::beans::PropertyValues> > CellPropertyValuesSeq_t; typedef std::vector<PropertyMapPtr> PropertyMapVector1; typedef std::vector<PropertyMapVector1> PropertyMapVector2; @@ -67,13 +62,13 @@ struct HorizontallyMergedCell class DomainMapperTableHandler : public TableDataHandler { - TextReference_t m_xText; + css::uno::Reference<css::text::XTextAppendAndConvert> m_xText; DomainMapper_Impl& m_rDMapper_Impl; CellSequencePointer_t m_pCellSeq; RowSequencePointer_t m_pRowSeq; TableSequencePointer_t m_pTableSeq; - Handle_t m_xTableRange; + css::uno::Reference< css::text::XTextRange > m_xTableRange; // properties PropertyMapVector2 m_aCellProperties; @@ -88,12 +83,12 @@ class DomainMapperTableHandler : public TableDataHandler TableStyleSheetEntry * endTableGetTableStyle(TableInfo & rInfo, std::vector<css::beans::PropertyValue>& rFrameProperties); CellPropertyValuesSeq_t endTableGetCellProperties(TableInfo & rInfo, std::vector<HorizontallyMergedCell>& rMerges); - RowPropertyValuesSeq_t endTableGetRowProperties(); + css::uno::Sequence<css::beans::PropertyValues> endTableGetRowProperties(); public: typedef std::shared_ptr<DomainMapperTableHandler> Pointer_t; - DomainMapperTableHandler(TextReference_t const& xText, + DomainMapperTableHandler(css::uno::Reference<css::text::XTextAppendAndConvert> const& xText, DomainMapper_Impl& rDMapper_Impl); virtual ~DomainMapperTableHandler(); @@ -102,10 +97,10 @@ public: virtual void endTable(unsigned int nestedTableLevel) SAL_OVERRIDE; virtual void startRow(unsigned int nCells, TablePropertyMapPtr pProps) SAL_OVERRIDE; virtual void endRow() SAL_OVERRIDE; - virtual void startCell(const Handle_t & start, TablePropertyMapPtr pProps) SAL_OVERRIDE; - virtual void endCell(const Handle_t & end) SAL_OVERRIDE; + virtual void startCell(const css::uno::Reference< css::text::XTextRange > & start, TablePropertyMapPtr pProps) SAL_OVERRIDE; + virtual void endCell(const css::uno::Reference< css::text::XTextRange > & end) SAL_OVERRIDE; - Handle_t& getTable() { return m_xTableRange; }; + css::uno::Reference< css::text::XTextRange >& getTable() { return m_xTableRange; }; void setHadFootOrEndnote(bool bHadFootOrEndnote); }; diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 0eb22e8e5399..54b9bd33be43 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -471,8 +471,7 @@ public: bool isShapeSent( ) { return m_bShapeSent; } protected: - typedef css::uno::Reference<css::xml::sax::XFastShapeContextHandler> ShapeContextRef; - ShapeContextRef mrShapeContext; + css::uno::Reference<css::xml::sax::XFastShapeContextHandler> mrShapeContext; virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; |