lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 14 lotuswordpro/source/filter/LotusWordProImportFilter.hxx | 62 +- mysqlc/source/mysqlc_connection.hxx | 20 mysqlc/source/mysqlc_databasemetadata.cxx | 4 mysqlc/source/mysqlc_databasemetadata.hxx | 8 mysqlc/source/mysqlc_driver.cxx | 4 mysqlc/source/mysqlc_driver.hxx | 16 mysqlc/source/mysqlc_general.cxx | 44 - mysqlc/source/mysqlc_general.hxx | 16 mysqlc/source/mysqlc_preparedstatement.cxx | 2 mysqlc/source/mysqlc_preparedstatement.hxx | 44 - mysqlc/source/mysqlc_resultset.cxx | 6 mysqlc/source/mysqlc_resultset.hxx | 72 +- mysqlc/source/mysqlc_resultsetmetadata.cxx | 2 mysqlc/source/mysqlc_resultsetmetadata.hxx | 4 mysqlc/source/mysqlc_statement.cxx | 2 mysqlc/source/mysqlc_statement.hxx | 36 - mysqlc/source/mysqlc_subcomponent.hxx | 14 oox/inc/drawingml/chart/axisconverter.hxx | 2 oox/inc/drawingml/chart/chartdrawingfragment.hxx | 8 oox/inc/drawingml/chart/chartspaceconverter.hxx | 4 oox/inc/drawingml/chart/converterbase.hxx | 18 oox/inc/drawingml/chart/datasourceconverter.hxx | 4 oox/inc/drawingml/chart/objectformatter.hxx | 2 oox/inc/drawingml/chart/plotareaconverter.hxx | 12 oox/inc/drawingml/chart/seriesconverter.hxx | 20 oox/inc/drawingml/chart/titleconverter.hxx | 12 oox/inc/drawingml/chart/typegroupconverter.hxx | 14 oox/inc/drawingml/customshapeproperties.hxx | 33 - oox/inc/drawingml/diagram/diagram.hxx | 12 oox/inc/drawingml/table/tablecell.hxx | 9 oox/inc/drawingml/table/tableproperties.hxx | 5 oox/inc/drawingml/textbody.hxx | 4 oox/inc/drawingml/textbodycontext.hxx | 2 oox/inc/drawingml/textbodyproperties.hxx | 2 oox/inc/drawingml/textfield.hxx | 4 oox/inc/drawingml/textparagraph.hxx | 4 oox/inc/drawingml/textparagraphproperties.hxx | 32 - oox/inc/drawingml/textparagraphpropertiescontext.hxx | 2 oox/inc/drawingml/textrun.hxx | 4 oox/inc/drawingml/textspacing.hxx | 8 oox/source/core/fragmenthandler2.cxx | 2 oox/source/docprop/docprophandler.hxx | 34 - oox/source/docprop/ooxmldocpropimport.hxx | 20 oox/source/drawingml/chart/axisconverter.cxx | 4 oox/source/drawingml/chart/chartspaceconverter.cxx | 2 oox/source/drawingml/chart/typegroupconverter.cxx | 2 oox/source/drawingml/color.cxx | 2 oox/source/drawingml/customshapegeometry.cxx | 10 oox/source/drawingml/customshapeproperties.cxx | 2 oox/source/drawingml/diagram/diagramfragmenthandler.hxx | 4 oox/source/drawingml/diagram/diagramlayoutatoms.hxx | 10 oox/source/drawingml/shape.cxx | 2 oox/source/drawingml/table/tablecell.cxx | 6 oox/source/drawingml/textparagraphproperties.cxx | 18 oox/source/drawingml/textparagraphpropertiescontext.cxx | 2 oox/source/drawingml/texttabstoplistcontext.hxx | 4 oox/source/export/ColorPropertySet.cxx | 2 oox/source/export/ColorPropertySet.hxx | 91 +-- oox/source/export/drawingml.cxx | 12 oox/source/helper/graphichelper.cxx | 4 oox/source/helper/textinputstream.cxx | 2 oox/source/helper/zipstorage.cxx | 8 oox/source/ole/axbinarywriter.cxx | 2 oox/source/ole/olehelper.cxx | 17 oox/source/ole/vbaproject.cxx | 4 oox/source/ppt/animationspersist.cxx | 2 oox/source/ppt/animationtypes.hxx | 4 oox/source/ppt/animvariantcontext.hxx | 6 oox/source/ppt/commonbehaviorcontext.hxx | 2 oox/source/ppt/commontimenodecontext.cxx | 400 ++++++++-------- oox/source/ppt/commontimenodecontext.hxx | 4 oox/source/ppt/conditioncontext.hxx | 6 oox/source/ppt/customshowlistcontext.cxx | 2 oox/source/ppt/dgmimport.cxx | 2 oox/source/ppt/pptfilterhelpers.cxx | 78 +-- oox/source/ppt/presentationfragmenthandler.cxx | 2 oox/source/ppt/slidepersist.cxx | 4 oox/source/ppt/timeanimvaluecontext.hxx | 2 oox/source/ppt/timenode.cxx | 6 oox/source/shape/ShapeContextHandler.cxx | 8 oox/source/shape/ShapeContextHandler.hxx | 10 oox/source/shape/ShapeDrawingFragmentHandler.hxx | 2 oox/source/shape/ShapeFilterBase.hxx | 4 oox/source/vml/vmlshape.cxx | 12 85 files changed, 706 insertions(+), 703 deletions(-)
New commits: commit c733be973e1483fb40f48bacc9182ccf0977ede3 Author: Noel Grandin <n...@peralex.com> Date: Fri Oct 23 14:35:25 2015 +0200 com::sun::star->css in lotuswordpro,mysqlc,oox Change-Id: Id99ff87c4eb3f1b36702261ce63d5d2793ea35d7 diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx index d0bc268..c7fbada 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx @@ -60,7 +60,7 @@ using com::sun::star::xml::sax::XParser; // W o r d P r o static const sal_Int8 header[] = { 0x57, 0x6f, 0x72, 0x64, 0x50, 0x72, 0x6f }; -bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) +bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor ) throw (RuntimeException) { @@ -97,7 +97,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportLWP(const OUString &rURL return ( ReadWordproFile(aFileStream, xHandler) == 0 ); } -sal_Bool SAL_CALL LotusWordProImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) +sal_Bool SAL_CALL LotusWordProImportFilter::filter( const Sequence< css::beans::PropertyValue >& aDescriptor ) throw (RuntimeException, std::exception) { return importImpl ( aDescriptor ); @@ -108,15 +108,15 @@ void SAL_CALL LotusWordProImportFilter::cancel( ) } // XImporter -void SAL_CALL LotusWordProImportFilter::setTargetDocument( const uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL LotusWordProImportFilter::setTargetDocument( const uno::Reference< css::lang::XComponent >& xDoc ) + throw (css::lang::IllegalArgumentException, RuntimeException, std::exception) { mxDoc = xDoc; } // XExtendedFilterDetection -OUString SAL_CALL LotusWordProImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue >& Descriptor ) - throw( com::sun::star::uno::RuntimeException, std::exception ) +OUString SAL_CALL LotusWordProImportFilter::detect( css::uno::Sequence< PropertyValue >& Descriptor ) + throw( css::uno::RuntimeException, std::exception ) { OUString sTypeName( "writer_LotusWordPro_Document" ); @@ -134,7 +134,7 @@ OUString SAL_CALL LotusWordProImportFilter::detect( com::sun::star::uno::Sequenc pValue[i].Value >>= sURL; } - uno::Reference< com::sun::star::ucb::XCommandEnvironment > xEnv; + uno::Reference< css::ucb::XCommandEnvironment > xEnv; if (!xInputStream.is()) { try diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx index 6ad3ab4..f529875 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx @@ -34,72 +34,72 @@ * member calls */ class LotusWordProImportFilter : public cppu::WeakImplHelper < - com::sun::star::document::XFilter, - com::sun::star::document::XImporter, - com::sun::star::document::XExtendedFilterDetection, - com::sun::star::lang::XInitialization, - com::sun::star::lang::XServiceInfo + css::document::XFilter, + css::document::XImporter, + css::document::XExtendedFilterDetection, + css::lang::XInitialization, + css::lang::XServiceInfo > { private: protected: // oo.org declares - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc; + css::uno::Reference< css::uno::XComponentContext > mxContext; + css::uno::Reference< css::lang::XComponent > mxDoc; OUString msFilterName; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler; + css::uno::Reference< css::xml::sax::XDocumentHandler > mxHandler; - bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) + throw (css::uno::RuntimeException); public: - explicit LotusWordProImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext) + explicit LotusWordProImportFilter( const css::uno::Reference< css::uno::XComponentContext > &rxContext) : mxContext( rxContext ) { } virtual ~LotusWordProImportFilter() {} // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL cancel( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; //XExtendedFilterDetection - virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) + throw( css::uno::RuntimeException, std::exception ) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw (css::uno::RuntimeException, std::exception) override; }; OUString LotusWordProImportFilter_getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); bool SAL_CALL LotusWordProImportFilter_supportsService( const OUString& ServiceName ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); -::com::sun::star::uno::Sequence< OUString > SAL_CALL LotusWordProImportFilter_getSupportedServiceNames( ) - throw ( ::com::sun::star::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL LotusWordProImportFilter_getSupportedServiceNames( ) + throw ( css::uno::RuntimeException ); -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > -SAL_CALL LotusWordProImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) - throw ( ::com::sun::star::uno::Exception ); +css::uno::Reference< css::uno::XInterface > +SAL_CALL LotusWordProImportFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) + throw ( css::uno::Exception ); #endif diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index b9dc132..e21b2f6 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -59,11 +59,11 @@ namespace connectivity using ::com::sun::star::sdbc::SQLWarning; using ::com::sun::star::sdbc::SQLException; using ::com::sun::star::uno::RuntimeException; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > my_XNameAccessRef; + typedef css::uno::Reference< css::container::XNameAccess > my_XNameAccessRef; - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::lang::XServiceInfo + typedef ::cppu::WeakComponentImplHelper3< css::sdbc::XConnection, + css::sdbc::XWarningsSupplier, + css::lang::XServiceInfo > OMetaConnection_BASE; struct ConnectionSettings { @@ -79,7 +79,7 @@ namespace connectivity typedef OMetaConnection_BASE OConnection_BASE; - typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; + typedef std::vector< css::uno::WeakReferenceHelper > OWeakRefArray; class OConnection : public OBase_Mutex, public OConnection_BASE, @@ -91,14 +91,14 @@ namespace connectivity ConnectionSettings m_settings; private: - ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_typeMap; - ::com::sun::star::uno::Reference< com::sun::star::util::XStringSubstitution > m_xParameterSubstitution; + css::uno::Reference< css::container::XNameAccess > m_typeMap; + css::uno::Reference< css::util::XStringSubstitution > m_xParameterSubstitution; protected: // Data attributes - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::WeakReference< css::sdbc::XDatabaseMetaData > m_xMetaData; OWeakRefArray m_aStatements; // vector containing a list // of all the Statement objects @@ -121,7 +121,7 @@ namespace connectivity sal_Int32 getMysqlVersion() throw(SQLException, RuntimeException); - virtual void construct(const rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) + virtual void construct(const rtl::OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info) throw(SQLException); OConnection(MysqlCDriver& _rDriver, sql::Driver * cppDriver); @@ -206,7 +206,7 @@ namespace connectivity void SAL_CALL close() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XWarningsSupplier - ::com::sun::star::uno::Any SAL_CALL getWarnings() + css::uno::Any SAL_CALL getWarnings() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL clearWarnings() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index 8cea781..fdb73d6 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -976,9 +976,9 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(sal_Int32 setT OSL_TRACE("ODatabaseMetaData::supportsResultSetConcurrency"); /* TODO: Check this out */ try { - return meta->supportsResultSetConcurrency(setType, concurrency==com::sun::star::sdbc::TransactionIsolation::READ_COMMITTED? + return meta->supportsResultSetConcurrency(setType, concurrency==css::sdbc::TransactionIsolation::READ_COMMITTED? sql::TRANSACTION_READ_COMMITTED: - (concurrency == com::sun::star::sdbc::TransactionIsolation::SERIALIZABLE? + (concurrency == css::sdbc::TransactionIsolation::SERIALIZABLE? sql::TRANSACTION_SERIALIZABLE:sql::TRANSACTION_SERIALIZABLE)); } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::supportsResultSetConcurrency", *this); diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx index a7a6bd8..687039d 100644 --- a/mysqlc/source/mysqlc_databasemetadata.hxx +++ b/mysqlc/source/mysqlc_databasemetadata.hxx @@ -37,7 +37,7 @@ namespace connectivity //************ Class: ODatabaseMetaData - typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE; + typedef ::cppu::WeakImplHelper1< css::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE; class ODatabaseMetaData : public ODatabaseMetaData_BASE { @@ -189,7 +189,7 @@ namespace connectivity sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern, const rtl::OUString& columnNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< rtl::OUString >& types) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const css::uno::Sequence< rtl::OUString >& types) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -216,8 +216,8 @@ namespace connectivity sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsBatchUpdates() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } } diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index 96a4e66..ed43d27 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -276,7 +276,7 @@ namespace mysqlc { Reference< XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory) - throw(::com::sun::star::uno::Exception) + throw(css::uno::Exception) { return(*(new MysqlCDriver(_rxFactory))); } @@ -284,7 +284,7 @@ Reference< XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< X void release(oslInterlockedCount& _refCount, ::cppu::OBroadcastHelper& rBHelper, Reference< XInterface >& _xInterface, - ::com::sun::star::lang::XComponent* _pObject) + css::lang::XComponent* _pObject) { if (osl_atomic_decrement(&_refCount) == 0) { osl_atomic_increment(&_refCount); diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx index f95e914..85f82d2 100644 --- a/mysqlc/source/mysqlc_driver.hxx +++ b/mysqlc/source/mysqlc_driver.hxx @@ -48,17 +48,17 @@ namespace connectivity using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; - Reference< ::com::sun::star::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw(Exception); + Reference< css::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw(Exception); - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, - ::com::sun::star::lang::XServiceInfo > ODriver_BASE; + typedef ::cppu::WeakComponentImplHelper2< css::sdbc::XDriver, + css::lang::XServiceInfo > ODriver_BASE; typedef void* (SAL_CALL * OMysqlCConnection_CreateInstanceFunction)(void* _pDriver); class MysqlCDriver : public ODriver_BASE { protected: - Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + Reference< css::lang::XMultiServiceFactory > m_xFactory; ::osl::Mutex m_aMutex; // mutex is need to control member access OWeakRefArray m_xConnections; // vector containing a list // of all the Connection objects @@ -76,7 +76,7 @@ namespace connectivity public: - MysqlCDriver(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); + MysqlCDriver(const Reference< css::lang::XMultiServiceFactory >& _rxFactory); // OComponentHelper void SAL_CALL disposing() SAL_OVERRIDE; @@ -90,17 +90,17 @@ namespace connectivity Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XDriver - Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect(const rtl::OUString& url, const Sequence< ::com::sun::star::beans::PropertyValue >& info) + Reference< css::sdbc::XConnection > SAL_CALL connect(const rtl::OUString& url, const Sequence< css::beans::PropertyValue >& info) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL acceptsURL(const rtl::OUString& url) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo(const rtl::OUString& url, const Sequence< ::com::sun::star::beans::PropertyValue >& info) + Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo(const rtl::OUString& url, const Sequence< css::beans::PropertyValue >& info) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getMajorVersion() throw(RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getMinorVersion() throw(RuntimeException, std::exception) SAL_OVERRIDE; - inline Reference< ::com::sun::star::lang::XMultiServiceFactory > getFactory() const { return m_xFactory; } + inline Reference< css::lang::XMultiServiceFactory > getFactory() const { return m_xFactory; } static rtl_TextEncoding getDefaultEncoding() { return RTL_TEXTENCODING_UTF8; } diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx index 885bb02..57683f6 100644 --- a/mysqlc/source/mysqlc_general.cxx +++ b/mysqlc/source/mysqlc_general.cxx @@ -58,7 +58,7 @@ void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, const Re ); } -void translateAndThrow(const ::sql::SQLException& _error, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _context, const rtl_TextEncoding encoding) +void translateAndThrow(const ::sql::SQLException& _error, const css::uno::Reference< css::uno::XInterface >& _context, const rtl_TextEncoding encoding) { throw SQLException( convert(_error.what(), encoding), @@ -81,70 +81,70 @@ int mysqlToOOOType(int cppConnType) { switch (cppConnType) { case sql::DataType::BIT: - return com::sun::star::sdbc::DataType::VARCHAR; + return css::sdbc::DataType::VARCHAR; case sql::DataType::TINYINT: - return com::sun::star::sdbc::DataType::TINYINT; + return css::sdbc::DataType::TINYINT; case sql::DataType::SMALLINT: - return com::sun::star::sdbc::DataType::SMALLINT; + return css::sdbc::DataType::SMALLINT; case sql::DataType::INTEGER: - return com::sun::star::sdbc::DataType::INTEGER; + return css::sdbc::DataType::INTEGER; case sql::DataType::BIGINT: - return com::sun::star::sdbc::DataType::BIGINT; + return css::sdbc::DataType::BIGINT; case sql::DataType::REAL: - return com::sun::star::sdbc::DataType::REAL; + return css::sdbc::DataType::REAL; case sql::DataType::DOUBLE: - return com::sun::star::sdbc::DataType::DOUBLE; + return css::sdbc::DataType::DOUBLE; case sql::DataType::DECIMAL: - return com::sun::star::sdbc::DataType::DECIMAL; + return css::sdbc::DataType::DECIMAL; case sql::DataType::CHAR: - return com::sun::star::sdbc::DataType::CHAR; + return css::sdbc::DataType::CHAR; case sql::DataType::BINARY: - return com::sun::star::sdbc::DataType::BINARY; + return css::sdbc::DataType::BINARY; case sql::DataType::ENUM: case sql::DataType::SET: case sql::DataType::VARCHAR: - return com::sun::star::sdbc::DataType::VARCHAR; + return css::sdbc::DataType::VARCHAR; case sql::DataType::VARBINARY: - return com::sun::star::sdbc::DataType::VARBINARY; + return css::sdbc::DataType::VARBINARY; case sql::DataType::LONGVARCHAR: - return com::sun::star::sdbc::DataType::LONGVARCHAR; + return css::sdbc::DataType::LONGVARCHAR; case sql::DataType::LONGVARBINARY: - return com::sun::star::sdbc::DataType::LONGVARBINARY; + return css::sdbc::DataType::LONGVARBINARY; case sql::DataType::TIMESTAMP: - return com::sun::star::sdbc::DataType::TIMESTAMP; + return css::sdbc::DataType::TIMESTAMP; case sql::DataType::DATE: - return com::sun::star::sdbc::DataType::DATE; + return css::sdbc::DataType::DATE; case sql::DataType::TIME: - return com::sun::star::sdbc::DataType::TIME; + return css::sdbc::DataType::TIME; case sql::DataType::GEOMETRY: - return com::sun::star::sdbc::DataType::VARCHAR; + return css::sdbc::DataType::VARCHAR; case sql::DataType::SQLNULL: - return com::sun::star::sdbc::DataType::SQLNULL; + return css::sdbc::DataType::SQLNULL; case sql::DataType::UNKNOWN: - return com::sun::star::sdbc::DataType::VARCHAR; + return css::sdbc::DataType::VARCHAR; } OSL_FAIL( "mysqlToOOOType: unhandled case, falling back to VARCHAR" ); - return com::sun::star::sdbc::DataType::VARCHAR; + return css::sdbc::DataType::VARCHAR; } rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding) diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx index d78f823..8331894 100644 --- a/mysqlc/source/mysqlc_general.hxx +++ b/mysqlc/source/mysqlc_general.hxx @@ -29,23 +29,23 @@ namespace mysqlc_sdbc_driver { - rtl::OUString getStringFromAny(const ::com::sun::star::uno::Any& _rAny); + rtl::OUString getStringFromAny(const css::uno::Any& _rAny); void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, - const ::com::sun::star::uno::Any* _pNextException = NULL + const css::uno::Reference< css::uno::XInterface >& _rxContext, + const css::uno::Any* _pNextException = NULL ) - throw (::com::sun::star::sdbc::SQLException); + throw (css::sdbc::SQLException); void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, - const ::com::sun::star::uno::Any* _pNextException = NULL + const css::uno::Reference< css::uno::XInterface >& _rxContext, + const css::uno::Any* _pNextException = NULL ) - throw (::com::sun::star::sdbc::SQLException); + throw (css::sdbc::SQLException); - void translateAndThrow(const ::sql::SQLException& _error, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _context, const rtl_TextEncoding encoding); + void translateAndThrow(const ::sql::SQLException& _error, const css::uno::Reference< css::uno::XInterface >& _context, const rtl_TextEncoding encoding); int mysqlToOOOType(int mysqlType) throw (); diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index 7736e73..96d756f 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -626,7 +626,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, c ) break; - Reference< ::com::sun::star::io::XInputStream > xBinStream; + Reference< css::io::XInputStream > xBinStream; if ( _value >>= xBinStream ) { setBinaryStream( _parameterIndex, xBinStream, xBinStream->available() ); diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx index b037c1c..693d21f 100644 --- a/mysqlc/source/mysqlc_preparedstatement.hxx +++ b/mysqlc/source/mysqlc_preparedstatement.hxx @@ -41,11 +41,11 @@ namespace connectivity using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::sdbc::XResultSetMetaData; - typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, - ::com::sun::star::sdbc::XParameters, - ::com::sun::star::sdbc::XPreparedBatchExecution, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::lang::XServiceInfo> OPreparedStatement_BASE; + typedef ::cppu::ImplHelper5< css::sdbc::XPreparedStatement, + css::sdbc::XParameters, + css::sdbc::XPreparedBatchExecution, + css::sdbc::XResultSetMetaDataSupplier, + css::lang::XServiceInfo> OPreparedStatement_BASE; class OPreparedStatement : public OCommonStatement, public OPreparedStatement_BASE @@ -59,7 +59,7 @@ namespace connectivity protected: void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) - throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; virtual ~OPreparedStatement(); public: virtual rtl::OUString SAL_CALL getImplementationName() @@ -81,17 +81,17 @@ namespace connectivity void SAL_CALL release() throw() SAL_OVERRIDE; //XTypeProvider - ::com::sun::star::uno::Sequence< Type > SAL_CALL getTypes() + css::uno::Sequence< Type > SAL_CALL getTypes() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XPreparedStatement - Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + Reference< css::sdbc::XResultSet > SAL_CALL executeQuery() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL executeUpdate() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL execute() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + Reference< css::sdbc::XConnection > SAL_CALL getConnection() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XStatement - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery(const rtl::OUString& sql) + css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(const rtl::OUString& sql) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; @@ -120,21 +120,21 @@ namespace connectivity void SAL_CALL setString(sal_Int32 parameter, const rtl::OUString& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setBytes(sal_Int32 parameter, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) + void SAL_CALL setBytes(sal_Int32 parameter, const css::uno::Sequence< sal_Int8 >& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setDate(sal_Int32 parameter, const ::com::sun::star::util::Date& x) + void SAL_CALL setDate(sal_Int32 parameter, const css::util::Date& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setTime(sal_Int32 parameter, const ::com::sun::star::util::Time& x) + void SAL_CALL setTime(sal_Int32 parameter, const css::util::Time& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setTimestamp(sal_Int32 parameter, const ::com::sun::star::util::DateTime& x) + void SAL_CALL setTimestamp(sal_Int32 parameter, const css::util::DateTime& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setBinaryStream(sal_Int32 parameter, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) + void SAL_CALL setBinaryStream(sal_Int32 parameter, const Reference< css::io::XInputStream >& x, sal_Int32 length) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setCharacterStream(sal_Int32 parameter, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) + void SAL_CALL setCharacterStream(sal_Int32 parameter, const Reference< css::io::XInputStream >& x, sal_Int32 length) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL setObject(sal_Int32 parameter, const Any& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; @@ -142,16 +142,16 @@ namespace connectivity void SAL_CALL setObjectWithInfo(sal_Int32 parameter, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setRef(sal_Int32 parameter, const Reference< ::com::sun::star::sdbc::XRef >& x) + void SAL_CALL setRef(sal_Int32 parameter, const Reference< css::sdbc::XRef >& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setBlob(sal_Int32 parameter, const Reference< ::com::sun::star::sdbc::XBlob >& x) + void SAL_CALL setBlob(sal_Int32 parameter, const Reference< css::sdbc::XBlob >& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setClob(sal_Int32 parameter, const Reference< ::com::sun::star::sdbc::XClob >& x) + void SAL_CALL setClob(sal_Int32 parameter, const Reference< css::sdbc::XClob >& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL setArray(sal_Int32 parameter, const Reference< ::com::sun::star::sdbc::XArray >& x) + void SAL_CALL setArray(sal_Int32 parameter, const Reference< css::sdbc::XArray >& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL clearParameters() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; @@ -159,13 +159,13 @@ namespace connectivity // XPreparedBatchExecution void SAL_CALL addBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL clearBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XCloseable void SAL_CALL close() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XResultSetMetaDataSupplier - Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData() + Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; }; } /* mysqlc */ diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index 9294338..c371bbc 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -1127,7 +1127,7 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & /* rConvertedValue */, Any & /* rOldValue */, sal_Int32 nHandle, const Any& /* rValue */) - throw (::com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { OSL_TRACE("OResultSet::convertFastPropertyValue"); switch (nHandle) { @@ -1135,7 +1135,7 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & /* rConvertedValue */, case PROPERTY_ID_CURSORNAME: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); case PROPERTY_ID_FETCHDIRECTION: case PROPERTY_ID_FETCHSIZE: default: @@ -1204,7 +1204,7 @@ void SAL_CALL OResultSet::release() OResultSet_BASE::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) { OSL_TRACE("OResultSet::getPropertySetInfo"); return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx index d6eb053..d971461 100644 --- a/mysqlc/source/mysqlc_resultset.hxx +++ b/mysqlc/source/mysqlc_resultset.hxx @@ -50,18 +50,18 @@ namespace connectivity /* ** OResultSet */ - typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XResultSetUpdate, - ::com::sun::star::sdbc::XRowUpdate, - ::com::sun::star::sdbcx::XRowLocate, - ::com::sun::star::sdbcx::XDeleteRows, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XColumnLocate, - ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; + typedef ::cppu::WeakComponentImplHelper12< css::sdbc::XResultSet, + css::sdbc::XRow, + css::sdbc::XResultSetMetaDataSupplier, + css::util::XCancellable, + css::sdbc::XWarningsSupplier, + css::sdbc::XResultSetUpdate, + css::sdbc::XRowUpdate, + css::sdbcx::XRowLocate, + css::sdbcx::XDeleteRows, + css::sdbc::XCloseable, + css::sdbc::XColumnLocate, + css::lang::XServiceInfo> OResultSet_BASE; class OResultSet : public OBase_Mutex, public OResultSet_BASE, @@ -69,8 +69,8 @@ namespace connectivity public OPropertyArrayUsageHelper<OResultSet> { protected: - ::com::sun::star::uno::WeakReferenceHelper m_aStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; + css::uno::WeakReferenceHelper m_aStatement; + css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData; sql::ResultSet *m_result; unsigned int fieldCount; rtl_TextEncoding m_encoding; @@ -80,10 +80,10 @@ namespace connectivity ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; sal_Bool SAL_CALL convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue) - throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) - throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; @@ -104,27 +104,27 @@ namespace connectivity OResultSet( OCommonStatement* pStmt, sql::ResultSet *result, rtl_TextEncoding _encoding ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() + css::uno::Reference< css::uno::XInterface > operator *() { - return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*static_cast<OResultSet_BASE*>(this)); + return css::uno::Reference< css::uno::XInterface >(*static_cast<OResultSet_BASE*>(this)); } // ::cppu::OComponentHelper void SAL_CALL disposing() SAL_OVERRIDE; // XInterface - Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType) + Any SAL_CALL queryInterface(const css::uno::Type & rType) throw(RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL acquire() throw() SAL_OVERRIDE; void SAL_CALL release() throw() SAL_OVERRIDE; //XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XResultSet @@ -152,7 +152,7 @@ namespace connectivity sal_Bool SAL_CALL rowInserted() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL rowDeleted() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement() + css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XRow sal_Bool SAL_CALL wasNull() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; @@ -168,13 +168,13 @@ namespace connectivity float SAL_CALL getFloat(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; double SAL_CALL getDouble(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 column) + css::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::util::Date SAL_CALL getDate(sal_Int32 column) + css::util::Date SAL_CALL getDate(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::util::Time SAL_CALL getTime(sal_Int32 column) + css::util::Time SAL_CALL getTime(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::util::DateTime SAL_CALL getTimestamp(sal_Int32 column) + css::util::DateTime SAL_CALL getTimestamp(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(sal_Int32 column) @@ -185,17 +185,17 @@ namespace connectivity Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef(sal_Int32 column) + css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob(sal_Int32 column) + css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob(sal_Int32 column) + css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray(sal_Int32 column) + css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XResultSetMetaDataSupplier - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData() + css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XCancellable @@ -228,13 +228,13 @@ namespace connectivity void SAL_CALL updateDouble(sal_Int32 column, double x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL updateString(sal_Int32 column, const rtl::OUString& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL updateBytes(sal_Int32 column, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) + void SAL_CALL updateBytes(sal_Int32 column, const css::uno::Sequence< sal_Int8 >& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL updateDate(sal_Int32 column, const ::com::sun::star::util::Date& x) + void SAL_CALL updateDate(sal_Int32 column, const css::util::Date& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL updateTime(sal_Int32 column, const ::com::sun::star::util::Time& x) + void SAL_CALL updateTime(sal_Int32 column, const css::util::Time& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL updateTimestamp(sal_Int32 column, const ::com::sun::star::util::DateTime& x) + void SAL_CALL updateTimestamp(sal_Int32 column, const css::util::DateTime& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL updateBinaryStream(sal_Int32 column, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; @@ -263,7 +263,7 @@ namespace connectivity throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XDeleteRows - ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const ::com::sun::star::uno::Sequence< Any >& rows) + css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const css::uno::Sequence< Any >& rows) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void checkColumnIndex(sal_Int32 index) throw(SQLException, RuntimeException); diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx index 464eab0..6466910 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.cxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx @@ -270,7 +270,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) } sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { OSL_TRACE("OResultSetMetaData::getScale"); checkColumnIndex(column); diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx index ef4c53e..e79bb9b 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.hxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx @@ -36,7 +36,7 @@ namespace connectivity //************ Class: ResultSetMetaData - typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; + typedef ::cppu::WeakImplHelper1< css::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OResultSetMetaData : public OResultSetMetaData_BASE { @@ -57,7 +57,7 @@ namespace connectivity } /// Avoid ambigous cast error from the compiler. - inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw() + inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw() { return this; } sal_Int32 SAL_CALL getColumnCount() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index fc167d7..56a9859 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -431,7 +431,7 @@ void SAL_CALL OStatement::release() OCommonStatement::release(); } -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo() +Reference< css::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo() throw(RuntimeException, std::exception) { OSL_TRACE("OCommonStatement::getPropertySetInfo"); diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx index f9eb191..18b63aa 100644 --- a/mysqlc/source/mysqlc_statement.hxx +++ b/mysqlc/source/mysqlc_statement.hxx @@ -45,11 +45,11 @@ namespace connectivity using ::com::sun::star::uno::Any; using ::com::sun::star::uno::RuntimeException; - typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XStatement, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XMultipleResults> OCommonStatement_IBase; + typedef ::cppu::WeakComponentImplHelper5< css::sdbc::XStatement, + css::sdbc::XWarningsSupplier, + css::util::XCancellable, + css::sdbc::XCloseable, + css::sdbc::XMultipleResults> OCommonStatement_IBase; class OCommonStatement; typedef OSubComponent< OCommonStatement, OCommonStatement_IBase > OStatement_CBase; @@ -87,10 +87,10 @@ namespace connectivity ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; sal_Bool SAL_CALL convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue) - throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) - throw(::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + throw(css::uno::Exception, std::exception) SAL_OVERRIDE; void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; virtual ~OCommonStatement(); @@ -100,7 +100,7 @@ namespace connectivity public: ::cppu::OBroadcastHelper& rBHelper; - using OCommonStatement_IBase::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; + using OCommonStatement_IBase::operator css::uno::Reference< css::uno::XInterface >; // OComponentHelper void SAL_CALL disposing() SAL_OVERRIDE; @@ -111,19 +111,19 @@ namespace connectivity void SAL_CALL acquire() throw() SAL_OVERRIDE; // XInterface - Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType) + Any SAL_CALL queryInterface(const css::uno::Type & rType) throw(RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XStatement - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery(const rtl::OUString& sql) + css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(const rtl::OUString& sql) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql) @@ -132,7 +132,7 @@ namespace connectivity sal_Bool SAL_CALL execute( const rtl::OUString& sql ) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() + css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XWarningsSupplier @@ -147,7 +147,7 @@ namespace connectivity void SAL_CALL close() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; // XMultipleResults - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet() + css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getUpdateCount() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; @@ -163,8 +163,8 @@ namespace connectivity class OStatement : public OCommonStatement, - public ::com::sun::star::sdbc::XBatchExecution, - public ::com::sun::star::lang::XServiceInfo + public css::sdbc::XBatchExecution, + public css::lang::XServiceInfo { protected: @@ -186,7 +186,7 @@ namespace connectivity getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) + Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL acquire() throw() SAL_OVERRIDE; @@ -198,7 +198,7 @@ namespace connectivity void SAL_CALL clearBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() + css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx index b225e67..e052bf8 100644 --- a/mysqlc/source/mysqlc_subcomponent.hxx +++ b/mysqlc/source/mysqlc_subcomponent.hxx @@ -52,21 +52,21 @@ namespace connectivity { void release(oslInterlockedCount& _refCount, ::cppu::OBroadcastHelper& rBHelper, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, - ::com::sun::star::lang::XComponent* _pObject); + css::uno::Reference< css::uno::XInterface >& _xInterface, + css::lang::XComponent* _pObject); - void checkDisposed(bool _bThrow) throw (::com::sun::star::lang::DisposedException); + void checkDisposed(bool _bThrow) throw (css::lang::DisposedException); template <class SELF, class WEAK> class OSubComponent { protected: // the parent must support the tunnel implementation - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; + css::uno::Reference< css::uno::XInterface > m_xParent; SELF* m_pDerivedImplementation; public: OSubComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParent, + const css::uno::Reference< css::uno::XInterface >& _xParent, SELF* _pDerivedImplementation) :m_xParent(_xParent) ,m_pDerivedImplementation(_pDerivedImplementation) @@ -178,14 +178,14 @@ namespace connectivity /// concat two sequences template <class T> - ::com::sun::star::uno::Sequence<T> concatSequences(const ::com::sun::star::uno::Sequence<T>& _rLeft, const ::com::sun::star::uno::Sequence<T>& _rRight) + css::uno::Sequence<T> concatSequences(const css::uno::Sequence<T>& _rLeft, const css::uno::Sequence<T>& _rRight) { sal_Int32 nLeft(_rLeft.getLength()), nRight(_rRight.getLength()); const T* pLeft = _rLeft.getConstArray(); const T* pRight = _rRight.getConstArray(); sal_Int32 nReturnLen(nLeft + nRight); - ::com::sun::star::uno::Sequence<T> aReturn(nReturnLen); + css::uno::Sequence<T> aReturn(nReturnLen); T* pReturn = aReturn.getArray(); internal::implCopySequence(pLeft, pReturn, nLeft); diff --git a/oox/inc/drawingml/chart/axisconverter.hxx b/oox/inc/drawingml/chart/axisconverter.hxx index fd464ad..3ef4f4e 100644 --- a/oox/inc/drawingml/chart/axisconverter.hxx +++ b/oox/inc/drawingml/chart/axisconverter.hxx @@ -45,7 +45,7 @@ public: /** Creates a chart2 axis and inserts it into the passed coordinate system. */ void convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& rxAxis); + const css::uno::Reference< css::chart2::XAxis >& rxAxis); }; struct AxisModel; diff --git a/oox/inc/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/drawingml/chart/chartdrawingfragment.hxx index c8043bf..8347e0d 100644 --- a/oox/inc/drawingml/chart/chartdrawingfragment.hxx +++ b/oox/inc/drawingml/chart/chartdrawingfragment.hxx @@ -85,9 +85,9 @@ public: explicit ChartDrawingFragment( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxDrawPage, - const ::com::sun::star::awt::Size& rChartSize, - const ::com::sun::star::awt::Point& rShapesOffset, + const css::uno::Reference< css::drawing::XShapes >& rxDrawPage, + const css::awt::Size& rChartSize, + const css::awt::Point& rShapesOffset, bool bOleSupport ); virtual ~ChartDrawingFragment(); @@ -96,7 +96,7 @@ public: virtual void onEndElement() override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > mxDrawPage; /// Drawing page of this sheet. ::oox::drawingml::ShapePtr mxShape; /// Current top-level shape. ShapeAnchorRef mxAnchor; /// Current anchor of top-level shape. diff --git a/oox/inc/drawingml/chart/chartspaceconverter.hxx b/oox/inc/drawingml/chart/chartspaceconverter.hxx index 6651bbe..62b77a6 100644 --- a/oox/inc/drawingml/chart/chartspaceconverter.hxx +++ b/oox/inc/drawingml/chart/chartspaceconverter.hxx @@ -42,8 +42,8 @@ public: /** Converts the contained OOXML chart model to a chart2 document. */ void convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxExternalPage, - const ::com::sun::star::awt::Point& rChartPos ); + const css::uno::Reference< css::drawing::XShapes >& rxExternalPage, + const css::awt::Point& rChartPos ); }; diff --git a/oox/inc/drawingml/chart/converterbase.hxx b/oox/inc/drawingml/chart/converterbase.hxx index 52a7072..9393a30 100644 --- a/oox/inc/drawingml/chart/converterbase.hxx +++ b/oox/inc/drawingml/chart/converterbase.hxx @@ -62,14 +62,14 @@ public: ::oox::core::XmlFilterBase& rFilter, ChartConverter& rChartConverter, const ChartSpaceModel& rChartModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc, - const ::com::sun::star::awt::Size& rChartSize ); + const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc, + const css::awt::Size& rChartSize ); virtual ~ConverterRoot(); /** Creates an instance for the passed service name, using the process service factory. */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > createInstance( const OUString& rServiceName ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > getComponentContext() const; protected: @@ -78,17 +78,17 @@ protected: /** Returns the chart converter. */ ChartConverter& getChartConverter() const; /** Returns the API chart document model. */ - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > + css::uno::Reference< css::chart2::XChartDocument > getChartDocument() const; /** Returns the position and size of the chart shape in 1/100 mm. */ - const ::com::sun::star::awt::Size& getChartSize() const; + const css::awt::Size& getChartSize() const; /** Returns the object formatter. */ ObjectFormatter& getFormatter() const; /** Registers a title object and its layout data, needed for conversion of the title position using the old Chart1 API. */ void registerTitleLayout( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& rxTitle, + const css::uno::Reference< css::chart2::XTitle >& rxTitle, const ModelRef< LayoutModel >& rxLayout, ObjectType eObjType, sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 ); /** Converts the positions of the main title and all axis titles. */ @@ -130,7 +130,7 @@ public: /** Tries to calculate the absolute position and size from the contained OOXML layout model. Returns true, if returned rectangle is valid. */ - bool calcAbsRectangle( ::com::sun::star::awt::Rectangle& orRect ) const; + bool calcAbsRectangle( css::awt::Rectangle& orRect ) const; /** Tries to set the position and size from the contained OOXML layout model. Returns true, if a manual position and size could be calculated. */ @@ -139,7 +139,7 @@ public: /** Tries to set the position from the contained OOXML layout model. Returns true, if a manual position could be calculated. */ bool convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, + const css::uno::Reference< css::drawing::XShape >& rxShape, double fRotationAngle ); bool getAutoLayout(){return mrModel.mbAutoLayout;} }; diff --git a/oox/inc/drawingml/chart/datasourceconverter.hxx b/oox/inc/drawingml/chart/datasourceconverter.hxx index 9935499..77fa3f9 100644 --- a/oox/inc/drawingml/chart/datasourceconverter.hxx +++ b/oox/inc/drawingml/chart/datasourceconverter.hxx @@ -41,7 +41,7 @@ public: virtual ~DataSequenceConverter(); /** Creates a data sequence object from the contained formula link. */ - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > + css::uno::Reference< css::chart2::data::XDataSequence > createDataSequence( const OUString& rRole ); }; @@ -56,7 +56,7 @@ public: virtual ~DataSourceConverter(); /** Creates a data sequence object from the contained series data. */ - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > + css::uno::Reference< css::chart2::data::XDataSequence > createDataSequence( const OUString& rRole ); }; diff --git a/oox/inc/drawingml/chart/objectformatter.hxx b/oox/inc/drawingml/chart/objectformatter.hxx index 1e4d6b6..3b632ef 100644 --- a/oox/inc/drawingml/chart/objectformatter.hxx +++ b/oox/inc/drawingml/chart/objectformatter.hxx @@ -74,7 +74,7 @@ class ObjectFormatter public: explicit ObjectFormatter( const ::oox::core::XmlFilterBase& rFilter, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc, + const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc, const ChartSpaceModel& rChartSpace ); ~ObjectFormatter(); diff --git a/oox/inc/drawingml/chart/plotareaconverter.hxx b/oox/inc/drawingml/chart/plotareaconverter.hxx index fd95cde..ed8c1c5 100644 --- a/oox/inc/drawingml/chart/plotareaconverter.hxx +++ b/oox/inc/drawingml/chart/plotareaconverter.hxx @@ -43,7 +43,7 @@ public: /** Converts the OOXML plot area model to a chart2 diagram. */ void convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& rxDiagram, + const css::uno::Reference< css::chart2::XDiagram >& rxDiagram, TypeGroupConverter& rTypeGroup ); }; @@ -59,7 +59,7 @@ public: /** Converts the OOXML wall/floor model to a chart2 diagram. */ void convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& rxDiagram, + const css::uno::Reference< css::chart2::XDiagram >& rxDiagram, ObjectType eObjType ); }; @@ -75,7 +75,7 @@ public: /** Converts the OOXML data table model to a chart2 diagram. */ void convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& rxDiagram); + const css::uno::Reference< css::chart2::XDiagram >& rxDiagram); }; @@ -94,12 +94,12 @@ public: void convertPositionFromModel(); /** Returns the automatic chart title if the chart contains only one series. */ - const OUString& getAutomaticTitle() const { return maAutoTitle; } + const OUString& getAutomaticTitle() const { return maAutoTitle; } /** Returns true, if chart type supports wall and floor format in 3D mode. */ - bool isWall3dChart() const { return mbWall3dChart; } + bool isWall3dChart() const { return mbWall3dChart; } private: - OUString maAutoTitle; + OUString maAutoTitle; bool mb3dChart; bool mbWall3dChart; bool mbPieChart; diff --git a/oox/inc/drawingml/chart/seriesconverter.hxx b/oox/inc/drawingml/chart/seriesconverter.hxx index 9971a55..82b6306 100644 --- a/oox/inc/drawingml/chart/seriesconverter.hxx +++ b/oox/inc/drawingml/chart/seriesconverter.hxx @@ -47,7 +47,7 @@ public: /** Converts OOXML data label settings for the passed data point. */ void convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxDataSeries, + const css::uno::Reference< css::chart2::XDataSeries >& rxDataSeries, const TypeGroupConverter& rTypeGroup ); }; @@ -61,7 +61,7 @@ public: /** Converts OOXML data label settings for the passed data series. */ void convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxDataSeries, + const css::uno::Reference< css::chart2::XDataSeries >& rxDataSeries, const TypeGroupConverter& rTypeGroup ); }; @@ -75,10 +75,10 @@ public: /** Converts an OOXML errorbar and inserts it into the passed data series. */ void convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxDataSeries ); + const css::uno::Reference< css::chart2::XDataSeries >& rxDataSeries ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > + css::uno::Reference< css::chart2::data::XLabeledDataSequence > createLabeledDataSequence( ErrorBarModel::SourceType eSourceType ); }; @@ -104,7 +104,7 @@ public: /** Converts an OOXML trendline and inserts it into the passed data series. */ void convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxDataSeries ); + const css::uno::Reference< css::chart2::XDataSeries >& rxDataSeries ); }; @@ -117,7 +117,7 @@ public: /** Converts settings for a data point in the passed series. */ void convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxDataSeries, + const css::uno::Reference< css::chart2::XDataSeries >& rxDataSeries, const TypeGroupConverter& rTypeGroup, const SeriesModel& rSeries ); }; @@ -131,17 +131,17 @@ public: virtual ~SeriesConverter(); /** Creates a labeled data sequence object from category data link. */ - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > + css::uno::Reference< css::chart2::data::XLabeledDataSequence > createCategorySequence( const OUString& rRole ); /** Creates a labeled data sequence object from value data link. */ - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > + css::uno::Reference< css::chart2::data::XLabeledDataSequence > createValueSequence( const OUString& rRole ); /** Creates a data series object with initialized source links. */ - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > + css::uno::Reference< css::chart2::XDataSeries > createDataSeries( const TypeGroupConverter& rTypeGroup, bool bVaryColorsByPoint ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > + css::uno::Reference< css::chart2::data::XLabeledDataSequence > createLabeledDataSequence( SeriesModel::SourceType eSourceType, const OUString& rRole, diff --git a/oox/inc/drawingml/chart/titleconverter.hxx b/oox/inc/drawingml/chart/titleconverter.hxx index d5f6525..b2140b4 100644 --- a/oox/inc/drawingml/chart/titleconverter.hxx +++ b/oox/inc/drawingml/chart/titleconverter.hxx @@ -46,19 +46,19 @@ public: virtual ~TextConverter(); /** Creates a data sequence object from the contained text data. */ - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > + css::uno::Reference< css::chart2::data::XDataSequence > createDataSequence( const OUString& rRole ); /** Creates a sequence of formatted string objects. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > > + css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > createStringSequence( const OUString& rDefaultText, const ModelRef< TextBody >& rxTextProp, ObjectType eObjType ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > + css::uno::Reference< css::chart2::XFormattedString > appendFormattedString( - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > >& orStringVec, + ::std::vector< css::uno::Reference< css::chart2::XFormattedString > >& orStringVec, const OUString& rString, bool bAddNewLine ) const; }; @@ -75,7 +75,7 @@ public: /** Creates a title text object and attaches it at the passed interface. */ void convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitled >& rxTitled, + const css::uno::Reference< css::chart2::XTitled >& rxTitled, const OUString& rAutoTitle, ObjectType eObjType, sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 ); }; @@ -92,7 +92,7 @@ public: /** Creates a legend object and attaches it at the passed diagram. */ void convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& rxDiagram ); + const css::uno::Reference< css::chart2::XDiagram >& rxDiagram ); }; diff --git a/oox/inc/drawingml/chart/typegroupconverter.hxx b/oox/inc/drawingml/chart/typegroupconverter.hxx index 6c5e855..0e71740 100644 --- a/oox/inc/drawingml/chart/typegroupconverter.hxx +++ b/oox/inc/drawingml/chart/typegroupconverter.hxx @@ -105,7 +105,7 @@ public: /** Converts the OOXML up/down bars. */ void convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& rxChartType ); + const css::uno::Reference< css::chart2::XChartType >& rxChartType ); }; struct TypeGroupModel; @@ -142,16 +142,16 @@ public: OUString getSingleSeriesTitle() const; /** Creates a coordinate system according to the contained chart type. */ - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > + css::uno::Reference< css::chart2::XCoordinateSystem > createCoordinateSystem(); /** Creates a labeled data sequence object for axis categories. */ - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > + css::uno::Reference< css::chart2::data::XLabeledDataSequence > createCategorySequence(); /** Converts the OOXML type group model into a chart2 coordinate system. */ void convertFromModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& rxDiagram, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& rxCoordSystem, + const css::uno::Reference< css::chart2::XDiagram >& rxDiagram, + const css::uno::Reference< css::chart2::XCoordinateSystem >& rxCoordSystem, sal_Int32 nAxesSetIdx, bool bSupportsVaryColorsByPoint ); /** Sets the passed OOXML marker style at the passed property set. */ @@ -169,8 +169,8 @@ public: private: /** Inserts the passed series into the chart type. Adds additional properties to the series. */ void insertDataSeries( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& rxChartType, - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxSeries, + const css::uno::Reference< css::chart2::XChartType >& rxChartType, + const css::uno::Reference< css::chart2::XDataSeries >& rxSeries, sal_Int32 nAxesSetIdx ); private: diff --git a/oox/inc/drawingml/customshapeproperties.hxx b/oox/inc/drawingml/customshapeproperties.hxx index 5826a0d..23feff1 100644 --- a/oox/inc/drawingml/customshapeproperties.hxx +++ b/oox/inc/drawingml/customshapeproperties.hxx @@ -57,19 +57,19 @@ struct CustomShapeGuide struct AdjustHandle { bool polar; - com::sun::star::drawing::EnhancedCustomShapeParameterPair + css::drawing::EnhancedCustomShapeParameterPair pos; // depending to the type (polar or not): OptValue< OUString > gdRef1; // gdRefX or gdRefR - OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter > + OptValue< css::drawing::EnhancedCustomShapeParameter > min1; // minX or minR - OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter > + OptValue< css::drawing::EnhancedCustomShapeParameter > max1; // maxX or maxR OptValue< OUString > gdRef2; // gdRefY or gdRefAng - OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter > + OptValue< css::drawing::EnhancedCustomShapeParameter > min2; // minX or minAng - OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter > + OptValue< css::drawing::EnhancedCustomShapeParameter > max2; // maxY or maxAng AdjustHandle( bool bPolar ) : polar( bPolar ) {}; @@ -77,18 +77,18 @@ struct AdjustHandle struct ConnectionSite { - com::sun::star::drawing::EnhancedCustomShapeParameterPair + css::drawing::EnhancedCustomShapeParameterPair pos; - com::sun::star::drawing::EnhancedCustomShapeParameter + css::drawing::EnhancedCustomShapeParameter ang; }; struct GeomRect { - com::sun::star::drawing::EnhancedCustomShapeParameter l; - com::sun::star::drawing::EnhancedCustomShapeParameter t; - com::sun::star::drawing::EnhancedCustomShapeParameter r; - com::sun::star::drawing::EnhancedCustomShapeParameter b; + css::drawing::EnhancedCustomShapeParameter l; + css::drawing::EnhancedCustomShapeParameter t; + css::drawing::EnhancedCustomShapeParameter r; + css::drawing::EnhancedCustomShapeParameter b; }; struct Path2D @@ -98,7 +98,7 @@ struct Path2D sal_Int32 fill; bool stroke; bool extrusionOk; - std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > parameter; + std::vector< css::drawing::EnhancedCustomShapeParameterPair > parameter; Path2D() : w( 0 ), h( 0 ), fill( XML_norm ), stroke( true ), extrusionOk( true ) {}; }; @@ -112,8 +112,9 @@ public: virtual ~CustomShapeProperties(); void pushToPropSet( const ::oox::core::FilterBase& rFilterBase, - const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet, - const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > & xShape, const ::com::sun::star::awt::Size &aSize ); + const css::uno::Reference < css::beans::XPropertySet > & xPropSet, + const css::uno::Reference < css::drawing::XShape > & xShape, + const css::awt::Size &aSize ); sal_Int32 getShapePresetType() const { return mnShapePresetType; } css::uno::Sequence< sal_Int8 > getShapePresetTypeName() const; @@ -127,7 +128,7 @@ public: std::vector< ConnectionSite >& getConnectionSiteList(){ return maConnectionSiteList; }; OptValue< GeomRect >& getTextRect(){ return maTextRect; }; std::vector< Path2D >& getPath2DList(){ return maPath2DList; }; - std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >& getSegments(){ return maSegments; }; + std::vector< css::drawing::EnhancedCustomShapeSegment >& getSegments(){ return maSegments; }; void setMirroredX( bool bMirroredX ) { mbMirroredX = bMirroredX; }; void setMirroredY( bool bMirroredY ) { mbMirroredY = bMirroredY; }; void setTextRotateAngle( sal_Int32 nAngle ) { mnTextRotateAngle = nAngle; }; @@ -148,7 +149,7 @@ private: OptValue< GeomRect > maTextRect; std::vector< Path2D > maPath2DList; - std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment > + std::vector< css::drawing::EnhancedCustomShapeSegment > maSegments; bool mbMirroredX; bool mbMirroredY; diff --git a/oox/inc/drawingml/diagram/diagram.hxx b/oox/inc/drawingml/diagram/diagram.hxx index d2bca17..05a4a5d 100644 --- a/oox/inc/drawingml/diagram/diagram.hxx +++ b/oox/inc/drawingml/diagram/diagram.hxx @@ -43,14 +43,10 @@ void loadDiagram( ShapePtr& pShape, void loadDiagram( const ShapePtr& pShape, core::XmlFilterBase& rFilter, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::dom::XDocument>& rXDataModelDom, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::dom::XDocument>& rXLayoutDom, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::dom::XDocument>& rXQStyleDom, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::dom::XDocument>& rXColorStyleDom ); + const css::uno::Reference< css::xml::dom::XDocument>& rXDataModelDom, + const css::uno::Reference< css::xml::dom::XDocument>& rXLayoutDom, + const css::uno::Reference< css::xml::dom::XDocument>& rXQStyleDom, + const css::uno::Reference< css::xml::dom::XDocument>& rXColorStyleDom ); } } #endif diff --git a/oox/inc/drawingml/table/tablecell.hxx b/oox/inc/drawingml/table/tablecell.hxx index b7f297a..5b7baf9 100644 --- a/oox/inc/drawingml/table/tablecell.hxx +++ b/oox/inc/drawingml/table/tablecell.hxx @@ -72,9 +72,12 @@ public: void setTextBody( const oox::drawingml::TextBodyPtr& pTextBody ){ mpTextBody = pTextBody; }; oox::drawingml::TextBodyPtr getTextBody(){ return mpTextBody; }; - void pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oox::drawingml::TextListStylePtr pMasterTextListStyle, - const ::com::sun::star::uno::Reference < ::com::sun::star::table::XCell >& rxCell, const TableProperties& rTableProperties, - const TableStyle& rTable, sal_Int32 nColumn, sal_Int32 nMaxColumn, sal_Int32 nRow, sal_Int32 nMaxRow ); + void pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, + ::oox::drawingml::TextListStylePtr pMasterTextListStyle, + const css::uno::Reference < css::table::XCell >& rxCell, + const TableProperties& rTableProperties, + const TableStyle& rTable, + sal_Int32 nColumn, sal_Int32 nMaxColumn, sal_Int32 nRow, sal_Int32 nMaxRow ); private: diff --git a/oox/inc/drawingml/table/tableproperties.hxx b/oox/inc/drawingml/table/tableproperties.hxx index 21550bb..5f49be8 100644 --- a/oox/inc/drawingml/table/tableproperties.hxx +++ b/oox/inc/drawingml/table/tableproperties.hxx @@ -52,14 +52,15 @@ public: bool& isBandCol(){ return mbBandCol; }; void pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBase, - const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet, ::oox::drawingml::TextListStylePtr pMasterTextListStyle ); + const css::uno::Reference < css::beans::XPropertySet > & xPropSet, + ::oox::drawingml::TextListStylePtr pMasterTextListStyle ); private: const TableStyle& getUsedTableStyle(const ::oox::core::XmlFilterBase& rFilterBase, TableStyle*& rTableStyleToDelete); OUString maStyleId; // either StyleId is available - std::shared_ptr< TableStyle > mpTableStyle; // or the complete TableStyle + std::shared_ptr< TableStyle > mpTableStyle; // or the complete TableStyle std::vector< sal_Int32 > mvTableGrid; std::vector< TableRow > mvTableRows; diff --git a/oox/inc/drawingml/textbody.hxx b/oox/inc/drawingml/textbody.hxx index ea9bca7..5f8b053 100644 --- a/oox/inc/drawingml/textbody.hxx +++ b/oox/inc/drawingml/textbody.hxx @@ -55,8 +55,8 @@ public: /** insert the text body at the text cursor */ void insertAt( const ::oox::core::XmlFilterBase& rFilterBase, - const ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > & xText, - const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor > & xAt, + const css::uno::Reference < css::text::XText > & xText, + const css::uno::Reference < css::text::XTextCursor > & xAt, const TextCharacterProperties& rTextStyleProperties, const TextListStylePtr& pMasterTextListStyle ) const; bool isEmpty(); diff --git a/oox/inc/drawingml/textbodycontext.hxx b/oox/inc/drawingml/textbodycontext.hxx index 253d8f0..dc026d0 100644 --- a/oox/inc/drawingml/textbodycontext.hxx +++ b/oox/inc/drawingml/textbodycontext.hxx @@ -37,7 +37,7 @@ public: protected: TextBody& mrTextBody; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > mxText; + css::uno::Reference< css::text::XText > mxText; }; // CT_RegularTextRun diff --git a/oox/inc/drawingml/textbodyproperties.hxx b/oox/inc/drawingml/textbodyproperties.hxx index c7a98cb..7810af9 100644 --- a/oox/inc/drawingml/textbodyproperties.hxx +++ b/oox/inc/drawingml/textbodyproperties.hxx @@ -41,7 +41,7 @@ struct TextBodyProperties boost::optional< sal_Int32 > moTextOffLeft; boost::optional< sal_Int32 > moTextOffLower; boost::optional< sal_Int32 > moTextOffRight; - ::com::sun::star::drawing::TextVerticalAdjust meVA; + css::drawing::TextVerticalAdjust meVA; explicit TextBodyProperties(); diff --git a/oox/inc/drawingml/textfield.hxx b/oox/inc/drawingml/textfield.hxx index c378e95..9f5bf9c 100644 --- a/oox/inc/drawingml/textfield.hxx +++ b/oox/inc/drawingml/textfield.hxx @@ -42,8 +42,8 @@ public: virtual sal_Int32 insertAt( const ::oox::core::XmlFilterBase& rFilterBase, - const ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > & xText, - const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor > &xAt, + const css::uno::Reference < css::text::XText > & xText, + const css::uno::Reference < css::text::XTextCursor > &xAt, const TextCharacterProperties& rTextCharacterStyle, float nDefaultCharHeight) const override; diff --git a/oox/inc/drawingml/textparagraph.hxx b/oox/inc/drawingml/textparagraph.hxx index 6a0643f..f96989c 100644 --- a/oox/inc/drawingml/textparagraph.hxx +++ b/oox/inc/drawingml/textparagraph.hxx @@ -50,8 +50,8 @@ public: void insertAt( const ::oox::core::XmlFilterBase& rFilterBase, - const ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > & xText, - const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor > &xAt, + const css::uno::Reference < css::text::XText > & xText, + const css::uno::Reference < css::text::XTextCursor > &xAt, const TextCharacterProperties& rTextStyleProperties, const TextListStyle& rTextListStyle, bool bFirst = false, diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx index b7309ba..6975c4c 100644 --- a/oox/inc/drawingml/textparagraphproperties.hxx +++ b/oox/inc/drawingml/textparagraphproperties.hxx @@ -57,21 +57,21 @@ public: void setBulletSize(sal_Int16 nSize); void setFontSize(sal_Int16 nSize); void setStyleName( const OUString& rStyleName ) { maStyleName <<= rStyleName; } - void setGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rXGraphic ); + void setGraphic( css::uno::Reference< css::graphic::XGraphic >& rXGraphic ); std::shared_ptr< ::oox::drawingml::Color > maBulletColorPtr; - ::com::sun::star::uno::Any mbBulletColorFollowText; - ::com::sun::star::uno::Any mbBulletFontFollowText; + css::uno::Any mbBulletColorFollowText; + css::uno::Any mbBulletFontFollowText; ::oox::drawingml::TextFont maBulletFont; - ::com::sun::star::uno::Any msBulletChar; - ::com::sun::star::uno::Any mnStartAt; - ::com::sun::star::uno::Any mnNumberingType; - ::com::sun::star::uno::Any msNumberingPrefix; - ::com::sun::star::uno::Any msNumberingSuffix; - ::com::sun::star::uno::Any mnSize; - ::com::sun::star::uno::Any mnFontSize; - ::com::sun::star::uno::Any maStyleName; - ::com::sun::star::uno::Any maGraphic; + css::uno::Any msBulletChar; + css::uno::Any mnStartAt; + css::uno::Any mnNumberingType; + css::uno::Any msNumberingPrefix; + css::uno::Any msNumberingSuffix; + css::uno::Any mnSize; + css::uno::Any mnFontSize; + css::uno::Any maStyleName; + css::uno::Any maGraphic; boost::optional< float > maFollowFontSize; }; @@ -99,8 +99,12 @@ public: void apply( const TextParagraphProperties& rSourceProps ); void pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase, - const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet, - PropertyMap& rioBulletList, const BulletList* pMasterBuList, bool bApplyBulletList, float fFontSize, bool bPushDefaultValues = false ) const; + const css::uno::Reference < css::beans::XPropertySet > & xPropSet, + PropertyMap& rioBulletList, + const BulletList* pMasterBuList, ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits