basctl/source/basicide/documentenumeration.hxx | 9 dbaccess/source/core/api/resultset.hxx | 259 +++++++-------- dbaccess/source/ui/app/AppController.hxx | 147 ++++---- forms/source/xforms/binding.cxx | 94 ++--- forms/source/xforms/binding.hxx | 225 +++++-------- forms/source/xforms/collection.hxx | 124 +++---- forms/source/xforms/model.cxx | 36 +- forms/source/xforms/model.hxx | 183 ++++------ forms/source/xforms/model_helper.hxx | 4 forms/source/xforms/model_ui.cxx | 8 forms/source/xforms/namedcollection.hxx | 20 - forms/source/xforms/xformsevent.cxx | 8 forms/source/xforms/xformsevent.hxx | 35 -- include/connectivity/sdbcx/VCollection.hxx | 2 include/vcl/svgdata.hxx | 9 reportdesign/inc/UndoActions.hxx | 1 reportdesign/source/ui/inc/statusbarcontroller.hxx | 4 sc/source/filter/excel/xechart.cxx | 8 sc/source/filter/inc/xechart.hxx | 119 ++---- sc/source/filter/inc/xeescher.hxx | 8 sc/source/filter/inc/xichart.hxx | 135 +++---- sc/source/filter/inc/xlchart.hxx | 20 - sc/source/ui/inc/spelleng.hxx | 4 sc/source/ui/view/spelleng.cxx | 2 svgio/qa/cppunit/SvgImportTest.cxx | 16 svtools/source/brwbox/brwimpl.hxx | 3 svx/source/dialog/frmsel.cxx | 2 svx/source/inc/datanavi.hxx | 10 svx/source/inc/fmcontrolbordermanager.hxx | 5 svx/source/inc/frmselimpl.hxx | 13 svx/source/sdr/primitive2d/primitivefactory2d.cxx | 8 sw/source/uibase/docvw/PageBreakWin.cxx | 12 uui/source/iahndl.hxx | 4 vcl/source/gdi/svgdata.cxx | 6 writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 17 writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 23 - writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 3 37 files changed, 710 insertions(+), 876 deletions(-)
New commits: commit 89c77994d4638c86635c70535fab6508e2f3d900 Author: Noel Grandin <[email protected]> Date: Tue Jun 30 14:35:23 2015 +0200 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::' Change-Id: I16f41c53837ec5c613545ae45df38b0daddcbadd Reviewed-on: https://gerrit.libreoffice.org/16730 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx index 4029bf6..642fa2d 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 e679380..52a913f 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 f8a76f4..05e9397 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 face92b..5c86447 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 ca07d02..b940f73 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 13ad182..0b50b3e 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; ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
