diff options
120 files changed, 2014 insertions, 2029 deletions
diff --git a/remotebridges/examples/officeclient.cxx b/remotebridges/examples/officeclient.cxx index 3d381691ca03..dcdf44f198af 100644 --- a/remotebridges/examples/officeclient.cxx +++ b/remotebridges/examples/officeclient.cxx @@ -183,7 +183,7 @@ sal_Int32 OfficeClientMain::run( const Sequence< OUString > & aArguments ) throw OUString::createFromAscii( urls[i] ) , OUString( "_blank"), 0 , - Sequence < ::com::sun::star::beans::PropertyValue >() ); + Sequence < css::beans::PropertyValue >() ); if( 0 == i ) { diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx index 5a3bed105fbb..3a570cdeed92 100644 --- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx +++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx @@ -69,9 +69,9 @@ public: virtual ~ResolverImpl(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XUnoUrlResolver virtual Reference< XInterface > SAL_CALL resolve( const OUString & rUnoUrl ) @@ -87,19 +87,19 @@ ResolverImpl::~ResolverImpl() {} // XServiceInfo OUString ResolverImpl::getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return resolver_getImplementationName(); } sal_Bool ResolverImpl::supportsService( const OUString & rServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > ResolverImpl::getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return resolver_getSupportedServiceNames(); } diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx index a8668cb18b9f..722a7aed55c7 100644 --- a/reportdesign/inc/PropertyForward.hxx +++ b/reportdesign/inc/PropertyForward.hxx @@ -32,7 +32,7 @@ namespace rptui { - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::beans::XPropertyChangeListener + typedef ::cppu::WeakComponentImplHelper< css::beans::XPropertyChangeListener > OPropertyForward_Base; /** \class OPropertyMediator @@ -43,12 +43,12 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OPropertyMediator : public ::cppu::BaseMutex ,public OPropertyForward_Base { - TPropertyNamePair m_aNameMap; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xSource; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xSourceInfo; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDest; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xDestInfo; - bool m_bInChange; + TPropertyNamePair m_aNameMap; + css::uno::Reference< css::beans::XPropertySet> m_xSource; + css::uno::Reference< css::beans::XPropertySetInfo> m_xSourceInfo; + css::uno::Reference< css::beans::XPropertySet> m_xDest; + css::uno::Reference< css::beans::XPropertySetInfo> m_xDestInfo; + bool m_bInChange; OPropertyMediator(OPropertyMediator&) = delete; void operator =(OPropertyMediator&) = delete; protected: @@ -58,16 +58,16 @@ namespace rptui */ virtual void SAL_CALL disposing() override; public: - OPropertyMediator(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSource - ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDest + OPropertyMediator(const css::uno::Reference< css::beans::XPropertySet>& _xSource + ,const css::uno::Reference< css::beans::XPropertySet>& _xDest ,const TPropertyNamePair& _aNameMap ,bool _bReverse = false); - // ::com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XPropertyChangeListener + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XEventListener + virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override; /** stop the listening mode. */ diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index 9dc7148da01a..36d325f2e339 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -59,22 +59,22 @@ namespace utl namespace reportdesign { class OReportComponentProperties; - typedef cppu::PartialWeakComponentImplHelper< ::com::sun::star::report::XReportDefinition - , ::com::sun::star::document::XEventBroadcaster - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::frame::XModule - , ::com::sun::star::lang::XUnoTunnel - , ::com::sun::star::util::XNumberFormatsSupplier - , ::com::sun::star::frame::XTitle - , ::com::sun::star::frame::XTitleChangeBroadcaster - , ::com::sun::star::frame::XUntitledNumbers - , ::com::sun::star::document::XDocumentPropertiesSupplier - , ::com::sun::star::datatransfer::XTransferable - , ::com::sun::star::document::XUndoManagerSupplier + typedef cppu::PartialWeakComponentImplHelper< css::report::XReportDefinition + , css::document::XEventBroadcaster + , css::lang::XServiceInfo + , css::frame::XModule + , css::lang::XUnoTunnel + , css::util::XNumberFormatsSupplier + , css::frame::XTitle + , css::frame::XTitleChangeBroadcaster + , css::frame::XUntitledNumbers + , css::document::XDocumentPropertiesSupplier + , css::datatransfer::XTransferable + , css::document::XUndoManagerSupplier , SvxUnoDrawMSFactory > ReportDefinitionBase; - typedef ::cppu::PropertySetMixin< ::com::sun::star::report::XReportDefinition > ReportDefinitionPropertySet; + typedef ::cppu::PropertySetMixin< css::report::XReportDefinition > ReportDefinitionPropertySet; struct OReportDefinitionImpl; /** \class OReportDefinition Defines the implementation of a \interface com:::sun::star::report::XReportDefinition @@ -97,7 +97,7 @@ namespace reportdesign void setSection( const OUString& _sProperty ,const bool& _bOn ,const OUString& _sName - ,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member); + ,css::uno::Reference< css::report::XSection>& _member); template <typename T> void set( const OUString& _sProperty ,const T& _Value @@ -106,7 +106,7 @@ namespace reportdesign BoundListeners l; { ::osl::MutexGuard aGuard(m_aMutex); - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } l.notify(); @@ -119,7 +119,7 @@ namespace reportdesign BoundListeners l; { ::osl::MutexGuard aGuard(m_aMutex); - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } l.notify(); @@ -128,37 +128,30 @@ namespace reportdesign /// write a single XML stream into the package bool WriteThroughComponent( /// the component we export - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent> & xComponent, + const css::uno::Reference< css::lang::XComponent> & xComponent, const sal_Char* pStreamName, /// the stream name const sal_Char* pServiceName, /// service name of the component /// the argument (XInitialization) - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any> & rArguments, + const css::uno::Sequence< css::uno::Any> & rArguments, /// output descriptor - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rMediaDesc, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _xStorageToSaveTo); + const css::uno::Sequence< css::beans::PropertyValue> & rMediaDesc, + const css::uno::Reference< css::embed::XStorage >& _xStorageToSaveTo); /// write a single output stream /// (to be called either directly or by WriteThroughComponent(...)) bool WriteThroughComponent( - const ::com::sun::star::uno::Reference< - ::com::sun::star::io::XOutputStream> & xOutputStream, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent> & xComponent, + const css::uno::Reference< css::io::XOutputStream> & xOutputStream, + const css::uno::Reference< css::lang::XComponent> & xComponent, const sal_Char* pServiceName, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any> & rArguments, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rMediaDesc); + const css::uno::Sequence< css::uno::Any> & rArguments, + const css::uno::Sequence< css::beans::PropertyValue> & rMediaDesc); void notifyEvent(const OUString& _sEventName); void init(); void fillArgs(utl::MediaDescriptor& _aDescriptor); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > impl_getTitleHelper_throw(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XUntitledNumbers > impl_getUntitledHelper_throw(); + css::uno::Reference< css::frame::XTitle > impl_getTitleHelper_throw(); + css::uno::Reference< css::frame::XUntitledNumbers > impl_getUntitledHelper_throw(); /** loads the report definition from the given storage @precond @@ -166,8 +159,8 @@ namespace reportdesign @throws */ void impl_loadFromStorage_nolck_throw( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxStorage, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments + const css::uno::Reference< css::embed::XStorage >& _rxStorage, + const css::uno::Sequence< css::beans::PropertyValue >& _rArguments ); protected: @@ -177,17 +170,17 @@ namespace reportdesign */ virtual void SAL_CALL disposing() override; public: - explicit OReportDefinition(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext); - explicit OReportDefinition(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _xFactory - ,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _xShape); + explicit OReportDefinition(css::uno::Reference< css::uno::XComponentContext > const & _xContext); + explicit OReportDefinition(css::uno::Reference< css::uno::XComponentContext > const & _xContext + ,const css::uno::Reference< css::lang::XMultiServiceFactory > & _xFactory + ,css::uno::Reference< css::drawing::XShape >& _xShape); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext(); + css::uno::Reference< css::uno::XComponentContext > getContext(); /** return the SdrModel of the real model * @@ -195,63 +188,63 @@ namespace reportdesign */ std::shared_ptr<rptui::OReportModel> getSdrModel() const; - static std::shared_ptr<rptui::OReportModel> getSdrModel(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition); + static std::shared_ptr<rptui::OReportModel> getSdrModel(const css::uno::Reference< css::report::XReportDefinition >& _xReportDefinition); private: DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) - // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - // 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) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XReportDefinition - virtual OUString SAL_CALL getMimeType() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMimeType( const OUString& _mimetype ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getGroupKeepTogether() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGroupKeepTogether( ::sal_Int16 _groupkeeptogether ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getPageHeaderOption() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPageHeaderOption( ::sal_Int16 _pageheaderoption ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getPageFooterOption() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPageFooterOption( ::sal_Int16 _pagefooteroption ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCommand() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCommand( const OUString& _command ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCommandType() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCommandType( ::sal_Int32 _commandtype ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFilter() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFilter( const OUString& _filter ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getEscapeProcessing() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEscapeProcessing( sal_Bool _escapeprocessing ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getActiveConnection() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActiveConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _activeconnection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDataSourceName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataSourceName( const OUString& _datasourcename ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getReportHeaderOn() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReportHeaderOn( sal_Bool _reportheaderon ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getReportFooterOn() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReportFooterOn( sal_Bool _reportfooteron ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPageHeaderOn() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPageHeaderOn( sal_Bool _pageheaderon ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPageFooterOn() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPageFooterOn( sal_Bool _pagefooteron ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups > SAL_CALL getGroups() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getReportHeader() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getPageHeader() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getDetail() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getPageFooter() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getReportFooter() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventBroadcaster > SAL_CALL getEventBroadcaster( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableMimeTypes( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getMimeType() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMimeType( const OUString& _mimetype ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getGroupKeepTogether() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setGroupKeepTogether( ::sal_Int16 _groupkeeptogether ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getPageHeaderOption() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPageHeaderOption( ::sal_Int16 _pageheaderoption ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getPageFooterOption() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPageFooterOption( ::sal_Int16 _pagefooteroption ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCommand() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCommand( const OUString& _command ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCommandType() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCommandType( ::sal_Int32 _commandtype ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFilter() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFilter( const OUString& _filter ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getEscapeProcessing() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setEscapeProcessing( sal_Bool _escapeprocessing ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActiveConnection( const css::uno::Reference< css::sdbc::XConnection >& _activeconnection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDataSourceName() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDataSourceName( const OUString& _datasourcename ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getReportHeaderOn() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReportHeaderOn( sal_Bool _reportheaderon ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getReportFooterOn() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReportFooterOn( sal_Bool _reportfooteron ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getPageHeaderOn() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPageHeaderOn( sal_Bool _pageheaderon ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getPageFooterOn() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPageFooterOn( sal_Bool _pagefooteron ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XGroups > SAL_CALL getGroups() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XSection > SAL_CALL getReportHeader() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XSection > SAL_CALL getPageHeader() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XSection > SAL_CALL getDetail() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XSection > SAL_CALL getPageFooter() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XSection > SAL_CALL getReportFooter() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::document::XEventBroadcaster > SAL_CALL getEventBroadcaster( ) throw (css::lang::DisposedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableMimeTypes( ) throw (css::lang::DisposedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XReportComponent REPORTCOMPONENT_HEADER() @@ -260,147 +253,147 @@ namespace reportdesign SHAPE_HEADER() // XShapeDescriptor - virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType( ) throw (css::uno::RuntimeException, std::exception) override; //XFunctionsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > SAL_CALL getFunctions() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XFunctions > SAL_CALL getFunctions() throw (css::uno::RuntimeException, std::exception) override; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XCloseBroadcaster - virtual void SAL_CALL addCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( sal_Bool DeliverOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( sal_Bool DeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override; // XModel - virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL lockControllers( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlockControllers( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasControllersLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL getCurrentController( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getCurrentSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getURL( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lockControllers( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unlockControllers( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasControllersLocked( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection( ) throw (css::uno::RuntimeException, std::exception) override; // XStorageBasedDocument - virtual void SAL_CALL loadFromStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescriptor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::frame::DoubleInitializationException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL storeToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescriptor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL switchToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentStorage( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addStorageChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeStorageChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) throw (css::lang::IllegalArgumentException, css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL switchToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage( ) throw (css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XViewDataSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setViewData( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& Data ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getViewData( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setViewData( const css::uno::Reference< css::container::XIndexAccess >& Data ) throw (css::uno::RuntimeException, std::exception) override; // XLoadable - virtual void SAL_CALL initNew( ) throw (::com::sun::star::frame::DoubleInitializationException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL load( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::frame::DoubleInitializationException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initNew( ) throw (css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw (css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XVisualObject - virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( ::sal_Int64 nAspect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMapUnit( ::sal_Int64 nAspect ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, const css::awt::Size& aSize ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getVisualAreaSize( ::sal_Int64 nAspect ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMapUnit( ::sal_Int64 nAspect ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XModifiable2 - virtual sal_Bool SAL_CALL disableSetModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL enableSetModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSetModifiedEnabled( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL disableSetModified( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL enableSetModified( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isSetModifiedEnabled( ) throw (css::uno::RuntimeException, std::exception) override; // XModifiable - virtual sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setModified( sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // document::XEventBroadcaster - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XUIConfigurationManagerSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( ) throw (css::uno::RuntimeException, std::exception) override; // XDocumentSubStorageSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - // com::sun::star::lang::XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + // css::lang::XUnoTunnel + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // SvxUnoDrawMSFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // XStyleFamiliesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw (css::uno::RuntimeException, std::exception) override; // XModule - virtual void SAL_CALL setIdentifier( const OUString& Identifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getIdentifier( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setIdentifier( const OUString& Identifier ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getIdentifier( ) throw (css::uno::RuntimeException, std::exception) override; // XNumberFormatsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getNumberFormatSettings( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL getNumberFormats( ) throw (css::uno::RuntimeException, std::exception) override; // XTitle - virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) override; // XTitleChangeBroadcaster - virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XUntitledNumbers - virtual ::sal_Int32 SAL_CALL leaseNumber( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xComponent ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL releaseNumberForComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xComponent ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getUntitledPrefix( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getUntitledPrefix( ) throw (css::uno::RuntimeException, std::exception) override; // XDocumentPropertiesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > SAL_CALL getDocumentProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::document::XDocumentProperties > SAL_CALL getDocumentProperties( ) throw (css::uno::RuntimeException, std::exception) override; // XTransferable - virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw (css::uno::RuntimeException, std::exception) override; // XUndoManagerSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > SAL_CALL getUndoManager( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception) override; // comphelper::IEmbeddedHelper - virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const override; + virtual css::uno::Reference < css::embed::XStorage > getStorage() const override; virtual ::comphelper::EmbeddedObjectContainer& getEmbeddedObjectContainer() const override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler() const override; + virtual css::uno::Reference< css::task::XInteractionHandler > getInteractionHandler() const override; virtual bool isEnableSetModified() const override; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager2 > getUIConfigurationManager2( ) throw (::com::sun::star::uno::RuntimeException); + css::uno::Reference< css::ui::XUIConfigurationManager2 > getUIConfigurationManager2( ) throw (css::uno::RuntimeException); }; } // namespace reportdesign diff --git a/reportdesign/inc/ReportHelperDefines.hxx b/reportdesign/inc/ReportHelperDefines.hxx index 83aed870bbac..fdff014666a1 100644 --- a/reportdesign/inc/ReportHelperDefines.hxx +++ b/reportdesign/inc/ReportHelperDefines.hxx @@ -20,166 +20,166 @@ #define INCLUDED_REPORTDESIGN_INC_REPORTHELPERDEFINES_HXX #define REPORTCONTROLMODEL_HEADER() \ - virtual OUString SAL_CALL getDataField() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \ - virtual void SAL_CALL setDataField(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \ - virtual sal_Bool SAL_CALL getPrintWhenGroupChange() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \ - virtual void SAL_CALL setPrintWhenGroupChange(sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \ - virtual OUString SAL_CALL getConditionalPrintExpression() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \ - virtual void SAL_CALL setConditionalPrintExpression(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition > SAL_CALL createFormatCondition() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception) override; + virtual OUString SAL_CALL getDataField() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \ + virtual void SAL_CALL setDataField(const OUString & the_value) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, std::exception) override; \ + virtual sal_Bool SAL_CALL getPrintWhenGroupChange() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \ + virtual void SAL_CALL setPrintWhenGroupChange(sal_Bool the_value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \ + virtual OUString SAL_CALL getConditionalPrintExpression() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \ + virtual void SAL_CALL setConditionalPrintExpression(const OUString & the_value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \ + virtual css::uno::Reference< css::report::XFormatCondition > SAL_CALL createFormatCondition() throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; #define SHAPE_HEADER() \ - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw (::com::sun::star::uno::RuntimeException, std::exception) override; \ - virtual void SAL_CALL setPosition(const ::com::sun::star::awt::Point & aPosition) throw (::com::sun::star::uno::RuntimeException, std::exception) override; \ - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) override; \ - virtual void SAL_CALL setSize(const ::com::sun::star::awt::Size & aSize) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override; \ + virtual void SAL_CALL setPosition(const css::awt::Point & aPosition) throw (css::uno::RuntimeException, std::exception) override; \ + virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; \ + virtual void SAL_CALL setSize(const css::awt::Size & aSize) throw (css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) override; #define REPORTCOMPONENT_HEADER() \ - virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; \ - virtual void SAL_CALL setName(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException, std::exception) override; \ - virtual ::sal_Int32 SAL_CALL getHeight() throw (::com::sun::star::uno::RuntimeException, std::exception) override; \ - virtual void SAL_CALL setHeight(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException, std::exception) override; \ - virtual ::sal_Int32 SAL_CALL getPositionX() throw (::com::sun::star::uno::RuntimeException, std::exception) override; \ - virtual void SAL_CALL setPositionX(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; \ - virtual ::sal_Int32 SAL_CALL getPositionY() throw (::com::sun::star::uno::RuntimeException, std::exception) override; \ - virtual void SAL_CALL setPositionY(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; \ - virtual ::sal_Int32 SAL_CALL getWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) override; \ - virtual void SAL_CALL setWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException, std::exception) override; \ - virtual ::sal_Int16 SAL_CALL getControlBorder() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \ - virtual void SAL_CALL setControlBorder(::sal_Int16 the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \ - virtual ::sal_Int32 SAL_CALL getControlBorderColor() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \ - virtual void SAL_CALL setControlBorderColor(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \ - virtual sal_Bool SAL_CALL getPrintRepeatedValues() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \ - virtual void SAL_CALL setPrintRepeatedValues(sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \ - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; \ - virtual void SAL_CALL setMasterFields( const ::com::sun::star::uno::Sequence< OUString >& _masterfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; \ - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; \ - virtual void SAL_CALL setDetailFields( const ::com::sun::star::uno::Sequence< OUString >& _detailfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; \ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getSection() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; \ + virtual void SAL_CALL setName(const OUString & the_value) throw (css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) override; \ + virtual ::sal_Int32 SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override; \ + virtual void SAL_CALL setHeight(::sal_Int32 the_value) throw (css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) override; \ + virtual ::sal_Int32 SAL_CALL getPositionX() throw (css::uno::RuntimeException, std::exception) override; \ + virtual void SAL_CALL setPositionX(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override; \ + virtual ::sal_Int32 SAL_CALL getPositionY() throw (css::uno::RuntimeException, std::exception) override; \ + virtual void SAL_CALL setPositionY(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override; \ + virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; \ + virtual void SAL_CALL setWidth(::sal_Int32 the_value) throw (css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) override; \ + virtual ::sal_Int16 SAL_CALL getControlBorder() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \ + virtual void SAL_CALL setControlBorder(::sal_Int16 the_value) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, std::exception) override; \ + virtual ::sal_Int32 SAL_CALL getControlBorderColor() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \ + virtual void SAL_CALL setControlBorderColor(::sal_Int32 the_value) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, std::exception) override; \ + virtual sal_Bool SAL_CALL getPrintRepeatedValues() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \ + virtual void SAL_CALL setPrintRepeatedValues(sal_Bool the_value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \ + virtual css::uno::Sequence< OUString > SAL_CALL getMasterFields() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; \ + virtual void SAL_CALL setMasterFields( const css::uno::Sequence< OUString >& _masterfields ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; \ + virtual css::uno::Sequence< OUString > SAL_CALL getDetailFields() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; \ + virtual void SAL_CALL setDetailFields( const css::uno::Sequence< OUString >& _detailfields ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; \ + virtual css::uno::Reference< css::report::XSection > SAL_CALL getSection() throw (css::uno::RuntimeException, std::exception) override; #define REPORTCONTROLFORMAT_HEADER() \ - virtual ::sal_Int32 SAL_CALL getControlBackground() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setControlBackground( ::sal_Int32 _controlbackground ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual sal_Bool SAL_CALL getControlBackgroundTransparent() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setControlBackgroundTransparent( sal_Bool _controlbackgroundtransparent ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getParaAdjust() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setParaAdjust( ::sal_Int16 _paraadjust ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptor() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setFontDescriptor( const ::com::sun::star::awt::FontDescriptor& _fontdescriptor ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptorAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setFontDescriptorAsian( const ::com::sun::star::awt::FontDescriptor& _fontdescriptor ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptorComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setFontDescriptorComplex( const ::com::sun::star::awt::FontDescriptor& _fontdescriptor ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getControlTextEmphasis() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setControlTextEmphasis( ::sal_Int16 _controltextemphasis ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharEmphasis() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharEmphasis( ::sal_Int16 _charemphasis ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual sal_Bool SAL_CALL getCharCombineIsOn() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharCombineIsOn( sal_Bool _charcombineison ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual OUString SAL_CALL getCharCombinePrefix() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharCombinePrefix( const OUString& _charcombineprefix ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual OUString SAL_CALL getCharCombineSuffix() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharCombineSuffix( const OUString& _charcombinesuffix ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual sal_Bool SAL_CALL getCharHidden() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharHidden( sal_Bool _charhidden ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual sal_Bool SAL_CALL getCharShadowed() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharShadowed( sal_Bool _charshadowed ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual sal_Bool SAL_CALL getCharContoured() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharContoured( sal_Bool _charcontoured ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharCaseMap() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharCaseMap( ::sal_Int16 _charcasemap ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::com::sun::star::lang::Locale SAL_CALL getCharLocale() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharLocale( const ::com::sun::star::lang::Locale& _charlocale ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharEscapement() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharEscapement( ::sal_Int16 _charescapement ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int8 SAL_CALL getCharEscapementHeight() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharEscapementHeight( ::sal_Int8 _charescapementheight ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual sal_Bool SAL_CALL getCharAutoKerning() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharAutoKerning( sal_Bool _charautokerning ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharKerning() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharKerning( ::sal_Int16 _charkerning ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual sal_Bool SAL_CALL getCharFlash() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFlash( sal_Bool _charflash ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharRelief() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharRelief( ::sal_Int16 _charrelief ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual OUString SAL_CALL getCharFontName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontName( const OUString& _charfontname ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual OUString SAL_CALL getCharFontStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontStyleName( const OUString& _charfontstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharFontFamily() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontFamily( ::sal_Int16 _charfontfamily ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharFontCharSet() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontCharSet( ::sal_Int16 _charfontcharset ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharFontPitch() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontPitch( ::sal_Int16 _charfontpitch ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int32 SAL_CALL getCharColor() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharColor( ::sal_Int32 _charcolor ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int32 SAL_CALL getCharUnderlineColor() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharUnderlineColor( ::sal_Int32 _charunderlinecolor ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual float SAL_CALL getCharHeight() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharHeight( float _charheight ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharUnderline() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharUnderline( ::sal_Int16 _charunderline ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual float SAL_CALL getCharWeight() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharWeight( float _charweight ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::com::sun::star::awt::FontSlant SAL_CALL getCharPosture() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharPosture( ::com::sun::star::awt::FontSlant _charposture ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharStrikeout() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharStrikeout( ::sal_Int16 _charstrikeout ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual sal_Bool SAL_CALL getCharWordMode() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharWordMode( sal_Bool _charwordmode ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharRotation() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharRotation( ::sal_Int16 _charrotation ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharScaleWidth() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharScaleWidth( ::sal_Int16 _charscalewidth ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::com::sun::star::style::VerticalAlignment SAL_CALL getVerticalAlign() throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setVerticalAlign( ::com::sun::star::style::VerticalAlignment _paravertalignment ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual OUString SAL_CALL getHyperLinkURL() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setHyperLinkURL( const OUString& _hyperlinkurl ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual OUString SAL_CALL getHyperLinkTarget() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setHyperLinkTarget( const OUString& _hyperlinktarget ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual OUString SAL_CALL getHyperLinkName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setHyperLinkName( const OUString& _hyperlinkname ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual OUString SAL_CALL getVisitedCharStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setVisitedCharStyleName( const OUString& _visitedcharstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual OUString SAL_CALL getUnvisitedCharStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setUnvisitedCharStyleName( const OUString& _unvisitedcharstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual float SAL_CALL getCharHeightAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharHeightAsian( float _charheightasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual float SAL_CALL getCharWeightAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharWeightAsian( float _charweightasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual OUString SAL_CALL getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontNameAsian( const OUString& _charfontnameasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual OUString SAL_CALL getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontStyleNameAsian( const OUString& _charfontstylenameasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharFontFamilyAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontFamilyAsian( ::sal_Int16 _charfontfamilyasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharFontCharSetAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontCharSetAsian( ::sal_Int16 _charfontcharsetasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharFontPitchAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontPitchAsian( ::sal_Int16 _charfontpitchasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::com::sun::star::awt::FontSlant SAL_CALL getCharPostureAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharPostureAsian( ::com::sun::star::awt::FontSlant _charpostureasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::com::sun::star::lang::Locale SAL_CALL getCharLocaleAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharLocaleAsian( const ::com::sun::star::lang::Locale& _charlocaleasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual float SAL_CALL getCharHeightComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharHeightComplex( float _charheightcomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual float SAL_CALL getCharWeightComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharWeightComplex( float _charweightcomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual OUString SAL_CALL getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontNameComplex( const OUString& _charfontnamecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual OUString SAL_CALL getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontStyleNameComplex( const OUString& _charfontstylenamecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharFontFamilyComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontFamilyComplex( ::sal_Int16 _charfontfamilycomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharFontCharSetComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontCharSetComplex( ::sal_Int16 _charfontcharsetcomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::sal_Int16 SAL_CALL getCharFontPitchComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharFontPitchComplex( ::sal_Int16 _charfontpitchcomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::com::sun::star::awt::FontSlant SAL_CALL getCharPostureComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharPostureComplex( ::com::sun::star::awt::FontSlant _charposturecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual ::com::sun::star::lang::Locale SAL_CALL getCharLocaleComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\ - virtual void SAL_CALL setCharLocaleComplex( const ::com::sun::star::lang::Locale& _charlocalecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getControlBackground() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setControlBackground( ::sal_Int32 _controlbackground ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual sal_Bool SAL_CALL getControlBackgroundTransparent() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setControlBackgroundTransparent( sal_Bool _controlbackgroundtransparent ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getParaAdjust() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setParaAdjust( ::sal_Int16 _paraadjust ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual css::awt::FontDescriptor SAL_CALL getFontDescriptor() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setFontDescriptor( const css::awt::FontDescriptor& _fontdescriptor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual css::awt::FontDescriptor SAL_CALL getFontDescriptorAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setFontDescriptorAsian( const css::awt::FontDescriptor& _fontdescriptor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual css::awt::FontDescriptor SAL_CALL getFontDescriptorComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setFontDescriptorComplex( const css::awt::FontDescriptor& _fontdescriptor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getControlTextEmphasis() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setControlTextEmphasis( ::sal_Int16 _controltextemphasis ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharEmphasis() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharEmphasis( ::sal_Int16 _charemphasis ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual sal_Bool SAL_CALL getCharCombineIsOn() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharCombineIsOn( sal_Bool _charcombineison ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual OUString SAL_CALL getCharCombinePrefix() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharCombinePrefix( const OUString& _charcombineprefix ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual OUString SAL_CALL getCharCombineSuffix() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharCombineSuffix( const OUString& _charcombinesuffix ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual sal_Bool SAL_CALL getCharHidden() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharHidden( sal_Bool _charhidden ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual sal_Bool SAL_CALL getCharShadowed() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharShadowed( sal_Bool _charshadowed ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual sal_Bool SAL_CALL getCharContoured() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharContoured( sal_Bool _charcontoured ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharCaseMap() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharCaseMap( ::sal_Int16 _charcasemap ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual css::lang::Locale SAL_CALL getCharLocale() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharLocale( const css::lang::Locale& _charlocale ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharEscapement() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharEscapement( ::sal_Int16 _charescapement ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int8 SAL_CALL getCharEscapementHeight() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharEscapementHeight( ::sal_Int8 _charescapementheight ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual sal_Bool SAL_CALL getCharAutoKerning() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharAutoKerning( sal_Bool _charautokerning ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharKerning() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharKerning( ::sal_Int16 _charkerning ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual sal_Bool SAL_CALL getCharFlash() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFlash( sal_Bool _charflash ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharRelief() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharRelief( ::sal_Int16 _charrelief ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual OUString SAL_CALL getCharFontName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontName( const OUString& _charfontname ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual OUString SAL_CALL getCharFontStyleName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontStyleName( const OUString& _charfontstylename ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharFontFamily() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontFamily( ::sal_Int16 _charfontfamily ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharFontCharSet() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontCharSet( ::sal_Int16 _charfontcharset ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharFontPitch() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontPitch( ::sal_Int16 _charfontpitch ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int32 SAL_CALL getCharColor() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharColor( ::sal_Int32 _charcolor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int32 SAL_CALL getCharUnderlineColor() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharUnderlineColor( ::sal_Int32 _charunderlinecolor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual float SAL_CALL getCharHeight() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharHeight( float _charheight ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharUnderline() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharUnderline( ::sal_Int16 _charunderline ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual float SAL_CALL getCharWeight() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharWeight( float _charweight ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual css::awt::FontSlant SAL_CALL getCharPosture() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharPosture( css::awt::FontSlant _charposture ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharStrikeout() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharStrikeout( ::sal_Int16 _charstrikeout ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual sal_Bool SAL_CALL getCharWordMode() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharWordMode( sal_Bool _charwordmode ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharRotation() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharRotation( ::sal_Int16 _charrotation ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharScaleWidth() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharScaleWidth( ::sal_Int16 _charscalewidth ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual css::style::VerticalAlignment SAL_CALL getVerticalAlign() throw (css::beans::UnknownPropertyException,css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setVerticalAlign( css::style::VerticalAlignment _paravertalignment ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual OUString SAL_CALL getHyperLinkURL() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setHyperLinkURL( const OUString& _hyperlinkurl ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual OUString SAL_CALL getHyperLinkTarget() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setHyperLinkTarget( const OUString& _hyperlinktarget ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual OUString SAL_CALL getHyperLinkName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setHyperLinkName( const OUString& _hyperlinkname ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual OUString SAL_CALL getVisitedCharStyleName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setVisitedCharStyleName( const OUString& _visitedcharstylename ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual OUString SAL_CALL getUnvisitedCharStyleName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setUnvisitedCharStyleName( const OUString& _unvisitedcharstylename ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual float SAL_CALL getCharHeightAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharHeightAsian( float _charheightasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual float SAL_CALL getCharWeightAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharWeightAsian( float _charweightasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual OUString SAL_CALL getCharFontNameAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontNameAsian( const OUString& _charfontnameasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual OUString SAL_CALL getCharFontStyleNameAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontStyleNameAsian( const OUString& _charfontstylenameasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharFontFamilyAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontFamilyAsian( ::sal_Int16 _charfontfamilyasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharFontCharSetAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontCharSetAsian( ::sal_Int16 _charfontcharsetasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharFontPitchAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontPitchAsian( ::sal_Int16 _charfontpitchasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual css::awt::FontSlant SAL_CALL getCharPostureAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharPostureAsian( css::awt::FontSlant _charpostureasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual css::lang::Locale SAL_CALL getCharLocaleAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharLocaleAsian( const css::lang::Locale& _charlocaleasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual float SAL_CALL getCharHeightComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharHeightComplex( float _charheightcomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual float SAL_CALL getCharWeightComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharWeightComplex( float _charweightcomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual OUString SAL_CALL getCharFontNameComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontNameComplex( const OUString& _charfontnamecomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual OUString SAL_CALL getCharFontStyleNameComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontStyleNameComplex( const OUString& _charfontstylenamecomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharFontFamilyComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontFamilyComplex( ::sal_Int16 _charfontfamilycomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharFontCharSetComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontCharSetComplex( ::sal_Int16 _charfontcharsetcomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual ::sal_Int16 SAL_CALL getCharFontPitchComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharFontPitchComplex( ::sal_Int16 _charfontpitchcomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual css::awt::FontSlant SAL_CALL getCharPostureComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharPostureComplex( css::awt::FontSlant _charposturecomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual css::lang::Locale SAL_CALL getCharLocaleComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\ + virtual void SAL_CALL setCharLocaleComplex( const css::lang::Locale& _charlocalecomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; diff --git a/reportdesign/inc/ReportVisitor.hxx b/reportdesign/inc/ReportVisitor.hxx index 117eff296dc3..3752b52c35d4 100644 --- a/reportdesign/inc/ReportVisitor.hxx +++ b/reportdesign/inc/ReportVisitor.hxx @@ -28,20 +28,20 @@ namespace reportdesign class SAL_NO_VTABLE ITraverseReport { public: - virtual void traverseReport(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport) = 0; - virtual void traverseReportFunctions(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions>& _xFunctions) = 0; - virtual void traverseReportHeader(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0; - virtual void traverseReportFooter(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0; - virtual void traversePageHeader(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0; - virtual void traversePageFooter(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0; + virtual void traverseReport(const css::uno::Reference< css::report::XReportDefinition>& _xReport) = 0; + virtual void traverseReportFunctions(const css::uno::Reference< css::report::XFunctions>& _xFunctions) = 0; + virtual void traverseReportHeader(const css::uno::Reference< css::report::XSection>& _xSection) = 0; + virtual void traverseReportFooter(const css::uno::Reference< css::report::XSection>& _xSection) = 0; + virtual void traversePageHeader(const css::uno::Reference< css::report::XSection>& _xSection) = 0; + virtual void traversePageFooter(const css::uno::Reference< css::report::XSection>& _xSection) = 0; - virtual void traverseGroups(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups>& _xGroups) = 0; - virtual void traverseGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup) = 0; - virtual void traverseGroupFunctions(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions>& _xFunctions) = 0; - virtual void traverseGroupHeader(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0; - virtual void traverseGroupFooter(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0; + virtual void traverseGroups(const css::uno::Reference< css::report::XGroups>& _xGroups) = 0; + virtual void traverseGroup(const css::uno::Reference< css::report::XGroup>& _xGroup) = 0; + virtual void traverseGroupFunctions(const css::uno::Reference< css::report::XFunctions>& _xFunctions) = 0; + virtual void traverseGroupHeader(const css::uno::Reference< css::report::XSection>& _xSection) = 0; + virtual void traverseGroupFooter(const css::uno::Reference< css::report::XSection>& _xSection) = 0; - virtual void traverseDetail(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0; + virtual void traverseDetail(const css::uno::Reference< css::report::XSection>& _xSection) = 0; protected: ~ITraverseReport() {} @@ -52,8 +52,8 @@ namespace reportdesign ITraverseReport* m_pTraverseReport; public: OReportVisitor(ITraverseReport* _pTraverseReport); - void start(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReportDefinition); - void start(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup); + void start(const css::uno::Reference< css::report::XReportDefinition>& _xReportDefinition); + void start(const css::uno::Reference< css::report::XGroup>& _xGroup); }; } // namespace reportdesign diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index e964353bc284..869bae875cf7 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -80,11 +80,11 @@ namespace ControlModification static const ::sal_Int32 HEIGHT_GREATEST = (sal_Int32)10; } -class AnyConverter : public ::std::binary_function< OUString,::com::sun::star::uno::Any,::com::sun::star::uno::Any > +class AnyConverter : public ::std::binary_function< OUString,css::uno::Any,css::uno::Any > { public: virtual ~AnyConverter(){} - virtual ::com::sun::star::uno::Any operator() (const OUString& /*_sPropertyName*/,const ::com::sun::star::uno::Any& lhs) const + virtual css::uno::Any operator() (const OUString& /*_sPropertyName*/,const css::uno::Any& lhs) const { return lhs; } @@ -95,12 +95,12 @@ typedef std::map<OUString, TPropertyConverter> TPropertyNamePair; @param _nObjectId the object id */ REPORTDESIGN_DLLPUBLIC const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId); -REPORTDESIGN_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle> getUsedStyle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport); +REPORTDESIGN_DLLPUBLIC css::uno::Reference< css::style::XStyle> getUsedStyle(const css::uno::Reference< css::report::XReportDefinition>& _xReport); -template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const OUString& _sPropertyName) +template < typename T> T getStyleProperty(const css::uno::Reference< css::report::XReportDefinition>& _xReport,const OUString& _sPropertyName) { T nReturn = T(); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xProp(getUsedStyle(_xReport),::com::sun::star::uno::UNO_QUERY_THROW); + css::uno::Reference< css::beans::XPropertySet> xProp(getUsedStyle(_xReport),css::uno::UNO_QUERY_THROW); xProp->getPropertyValue(_sPropertyName) >>= nReturn; return nReturn; } diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index a87e7f4899a8..2d65adc5ec15 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -47,7 +47,7 @@ private: ::dbaui::DBSubComponentController* m_pController; ::reportdesign::OReportDefinition* m_pReportDefinition; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() override; + virtual css::uno::Reference< css::uno::XInterface > createUnoModel() override; OReportModel( const OReportModel& ) = delete; void operator=(const OReportModel& rSrcModel) = delete; @@ -71,20 +71,20 @@ public: inline void attachController( dbaui::DBSubComponentController& _rController ) { m_pController = &_rController; } void detachController(); - OReportPage* createNewPage(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); + OReportPage* createNewPage(const css::uno::Reference< css::report::XSection >& _xSection); /** returns the page which belongs to a section * * @param _xSection * @return The page or <NULL/> when no page could be found. */ - OReportPage* getPage(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); + OReportPage* getPage(const css::uno::Reference< css::report::XSection >& _xSection); /// returns the XReportDefinition which the OReportModel belongs to - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > + css::uno::Reference< css::report::XReportDefinition > getReportDefinition() const; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createShape(const OUString& aServiceSpecifier,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rShape,sal_Int32 nOrientation = -1); + css::uno::Reference< css::uno::XInterface > createShape(const OUString& aServiceSpecifier,css::uno::Reference< css::drawing::XShape >& _rShape,sal_Int32 nOrientation = -1); }; } diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index fe153aae23a0..6c2fcb332fea 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -72,17 +72,16 @@ public: typedef rtl::Reference<OPropertyMediator> TMediator; protected: - mutable TMediator m_xMediator; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> m_xPropertyChangeListener; - //mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> - mutable ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xReportComponent; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener> m_xContainerListener; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xSection; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xKeepShapeAlive; + mutable TMediator m_xMediator; + mutable css::uno::Reference< css::beans::XPropertyChangeListener> m_xPropertyChangeListener; + mutable css::uno::Reference< css::report::XReportComponent> m_xReportComponent; + css::uno::Reference< css::container::XContainerListener> m_xContainerListener; + css::uno::Reference< css::report::XSection> m_xSection; + css::uno::Reference< css::uno::XInterface > m_xKeepShapeAlive; OUString m_sComponentName; bool m_bIsListening; - OObjectBase(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); + OObjectBase(const css::uno::Reference< css::report::XReportComponent>& _xComponent); OObjectBase(const OUString& _sComponentName); virtual ~OObjectBase(); @@ -95,33 +94,33 @@ protected: /** called by instances of derived classes to implement their overriding of getUnoShape */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > getUnoShapeOf( SdrObject& _rSdrObject ); private: static void ensureSdrObjectOwnership( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxShape ); + const css::uno::Reference< css::uno::XInterface >& _rxShape ); public: void StartListening(); void EndListening(bool bRemoveListener = true); // PropertyChangeListener - virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException); + virtual void _propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException); virtual void initializeOle() {} bool supportsService( const OUString& _sServiceName ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const { return m_xReportComponent;} - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> getSection() const; + css::uno::Reference< css::report::XReportComponent> getReportComponent() const { return m_xReportComponent;} + virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent(); + css::uno::Reference< css::report::XSection> getSection() const; inline const OUString getServiceName() const { return m_sComponentName; } /** releases the reference to our UNO shape (m_xKeepShapeAlive) */ void releaseUnoShape() { m_xKeepShapeAlive.clear(); } - static SdrObject* createObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); - static sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); + static SdrObject* createObject(const css::uno::Reference< css::report::XReportComponent>& _xComponent); + static sal_uInt16 getObjectType(const css::uno::Reference< css::report::XReportComponent>& _xComponent); }; // OCustomShape @@ -132,13 +131,13 @@ class REPORTDESIGN_DLLPUBLIC OCustomShape: public SdrObjCustomShape , public OOb friend class DlgEdFactory; public: - static OCustomShape* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent ) + static OCustomShape* Create( const css::uno::Reference< css::report::XReportComponent>& _xComponent ) { return new OCustomShape( _xComponent ); } protected: - OCustomShape(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); + OCustomShape(const css::uno::Reference< css::report::XReportComponent>& _xComponent); OCustomShape(const OUString& _sComponentName); virtual void NbcMove( const Size& rSize ) override; @@ -153,14 +152,14 @@ public: virtual ~OCustomShape(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent() override; + virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape() override; + virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override; virtual sal_uInt16 GetObjIdentifier() const override; virtual sal_uInt32 GetObjInventor() const override; private: - virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxUnoShape ) override; + virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override; }; @@ -173,16 +172,16 @@ class REPORTDESIGN_DLLPUBLIC OOle2Obj: public SdrOle2Obj , public OObjectBase sal_uInt16 m_nType; bool m_bOnlyOnce; - void impl_createDataProvider_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel); - virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxUnoShape ) override; + void impl_createDataProvider_nothrow( const css::uno::Reference< css::frame::XModel>& _xModel); + virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override; public: - static OOle2Obj* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,sal_uInt16 _nType ) + static OOle2Obj* Create( const css::uno::Reference< css::report::XReportComponent>& _xComponent,sal_uInt16 _nType ) { return new OOle2Obj( _xComponent,_nType ); } protected: - OOle2Obj(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,sal_uInt16 _nType); + OOle2Obj(const css::uno::Reference< css::report::XReportComponent>& _xComponent,sal_uInt16 _nType); OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType); @@ -198,9 +197,9 @@ public: virtual ~OOle2Obj(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent() override; + virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape() override; + virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override; virtual sal_uInt16 GetObjIdentifier() const override; virtual sal_uInt32 GetObjInventor() const override; // Clone() should make a complete copy of the object. @@ -209,7 +208,7 @@ public: OOle2Obj& operator=(const OOle2Obj& rObj); - void initializeChart( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel); + void initializeChart( const css::uno::Reference< css::frame::XModel>& _xModel); }; @@ -226,7 +225,7 @@ protected: OUnoObject(const OUString& _sComponentName ,const OUString& rModelName ,sal_uInt16 _nObjectType); - OUnoObject( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent + OUnoObject( const css::uno::Reference< css::report::XReportComponent>& _xComponent ,const OUString& rModelName ,sal_uInt16 _nObjectType); @@ -242,18 +241,18 @@ protected: public: TYPEINFO_OVERRIDE(); - virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException) override; + virtual void _propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException) override; /** creates the m_xMediator when it doesn't already exist. @param _bReverse when set to <TRUE/> then the properties from the uno control will be copied into report control */ void CreateMediator(bool _bReverse = false); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent() override; + virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override; static OUString GetDefaultName(const OUnoObject* _pObj); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape() override; + virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override; virtual sal_uInt16 GetObjIdentifier() const override; virtual sal_uInt32 GetObjInventor() const override; virtual OUnoObject* Clone() const override; @@ -261,7 +260,7 @@ public: OUnoObject& operator=(const OUnoObject& rObj); private: - virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxUnoShape ) override; + virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override; void impl_setReportComponent_nothrow(); void impl_initializeModel_nothrow(); }; diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index 0a59e94dbd7b..7dc4dee86e30 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -37,7 +37,7 @@ class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage OReportPage& operator=(const OReportPage&) = delete; OReportModel& rModel; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; + css::uno::Reference< css::report::XSection > m_xSection; bool m_bSpecialInsertMode; std::vector<SdrObject*> m_aTemporaryObjectList; @@ -50,12 +50,12 @@ class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage virtual ~OReportPage(); protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() override; + virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override; public: TYPEINFO_OVERRIDE(); OReportPage( OReportModel& rModel - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + ,const css::uno::Reference< css::report::XSection >& _xSection ,bool bMasterPage = false ); @@ -68,12 +68,12 @@ public: /** returns the index inside the object list which belongs to the report component. @param _xObject the report component */ - sal_uLong getIndexOf(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject); + sal_uLong getIndexOf(const css::uno::Reference< css::report::XReportComponent >& _xObject); /** removes the SdrObject which belongs to the report component. @param _xObject the report component */ - void removeSdrObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject); + void removeSdrObject(const css::uno::Reference< css::report::XReportComponent >& _xObject); void setSpecialMode() {m_bSpecialInsertMode = true;} bool getSpecialMode() {return m_bSpecialInsertMode;} @@ -83,9 +83,9 @@ public: /** insert a new SdrObject which belongs to the report component. @param _xObject the report component */ - void insertObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject); + void insertObject(const css::uno::Reference< css::report::XReportComponent >& _xObject); - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection;} + css::uno::Reference< css::report::XSection > getSection() const { return m_xSection;} }; } #endif // INCLUDED_REPORTDESIGN_INC_RPTPAGE_HXX diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index bfb19abcd7cf..f19eed0124b9 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -60,22 +60,22 @@ namespace rptui */ class REPORTDESIGN_DLLPUBLIC OGroupHelper { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > m_xGroup; + css::uno::Reference< css::report::XGroup > m_xGroup; OGroupHelper(const OGroupHelper&) = delete; OGroupHelper& operator=(const OGroupHelper&) = delete; public: - OGroupHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup) + OGroupHelper(const css::uno::Reference< css::report::XGroup >& _xGroup) :m_xGroup(_xGroup) { } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getHeader() { return m_xGroup->getHeader(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getFooter() { return m_xGroup->getFooter(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > getGroup() { return m_xGroup; } + inline css::uno::Reference< css::report::XSection > getHeader() { return m_xGroup->getHeader(); } + inline css::uno::Reference< css::report::XSection > getFooter() { return m_xGroup->getFooter(); } + inline css::uno::Reference< css::report::XGroup > getGroup() { return m_xGroup; } inline bool getHeaderOn() { return m_xGroup->getHeaderOn(); } inline bool getFooterOn() { return m_xGroup->getFooterOn(); } - static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); + static ::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OGroupHelper> getMemberFunction(const css::uno::Reference< css::report::XSection >& _xSection); }; @@ -83,24 +83,24 @@ namespace rptui */ class REPORTDESIGN_DLLPUBLIC OReportHelper { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReport; + css::uno::Reference< css::report::XReportDefinition > m_xReport; public: - OReportHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReport) + OReportHelper(const css::uno::Reference< css::report::XReportDefinition >& _xReport) :m_xReport(_xReport) { } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getReportHeader() { return m_xReport->getReportHeader(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getReportFooter() { return m_xReport->getReportFooter(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageHeader() { return m_xReport->getPageHeader(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageFooter() { return m_xReport->getPageFooter(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getDetail() { return m_xReport->getDetail(); } + inline css::uno::Reference< css::report::XSection > getReportHeader() { return m_xReport->getReportHeader(); } + inline css::uno::Reference< css::report::XSection > getReportFooter() { return m_xReport->getReportFooter(); } + inline css::uno::Reference< css::report::XSection > getPageHeader() { return m_xReport->getPageHeader(); } + inline css::uno::Reference< css::report::XSection > getPageFooter() { return m_xReport->getPageFooter(); } + inline css::uno::Reference< css::report::XSection > getDetail() { return m_xReport->getDetail(); } inline bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); } inline bool getReportFooterOn() { return m_xReport->getReportFooterOn(); } inline bool getPageHeaderOn() { return m_xReport->getPageHeaderOn(); } inline bool getPageFooterOn() { return m_xReport->getPageFooterOn(); } - static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); + static ::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OReportHelper> getMemberFunction(const css::uno::Reference< css::report::XSection >& _xSection); }; @@ -172,21 +172,21 @@ namespace rptui OUndoContainerAction(OUndoContainerAction&) = delete; void operator =(OUndoContainerAction&) = delete; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > m_xElement; // object not owned by the action - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > m_xOwnElement; // object owned by the action - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > + css::uno::Reference< css::container::XIndexContainer > m_xContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > + css::uno::Reference< css::report::XSection > m_xSection; Action m_eAction; public: OUndoContainerAction(SdrModel& rMod ,Action _eAction - ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rContainer - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElem + ,const css::uno::Reference< css::container::XIndexContainer >& rContainer + ,const css::uno::Reference< css::uno::XInterface>& xElem ,sal_uInt16 _nCommentId); virtual ~OUndoContainerAction(); @@ -204,15 +204,15 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OUndoReportSectionAction : public OUndoContainerAction { OReportHelper m_aReportHelper; - ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > + ::std::mem_fun_t< css::uno::Reference< css::report::XSection > ,OReportHelper> m_pMemberFunction; public: OUndoReportSectionAction(SdrModel& rMod ,Action _eAction - ,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > + ,::std::mem_fun_t< css::uno::Reference< css::report::XSection > ,OReportHelper> _pMemberFunction - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReport - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElem + ,const css::uno::Reference< css::report::XReportDefinition >& _xReport + ,const css::uno::Reference< css::uno::XInterface>& xElem ,sal_uInt16 _nCommentId); protected: @@ -225,15 +225,15 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OUndoGroupSectionAction : public OUndoContainerAction { OGroupHelper m_aGroupHelper; - ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > + ::std::mem_fun_t< css::uno::Reference< css::report::XSection > ,OGroupHelper> m_pMemberFunction; public: OUndoGroupSectionAction(SdrModel& rMod ,Action _eAction - ,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > + ,::std::mem_fun_t< css::uno::Reference< css::report::XSection > ,OGroupHelper> _pMemberFunction - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElem + ,const css::uno::Reference< css::report::XGroup >& _xGroup + ,const css::uno::Reference< css::uno::XInterface>& xElem ,sal_uInt16 _nCommentId); protected: @@ -244,10 +244,10 @@ namespace rptui // ORptUndoPropertyAction class REPORTDESIGN_DLLPUBLIC ORptUndoPropertyAction: public OCommentUndoAction { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xObj; - OUString m_aPropertyName; - ::com::sun::star::uno::Any m_aNewValue; - ::com::sun::star::uno::Any m_aOldValue; + css::uno::Reference< css::beans::XPropertySet> m_xObj; + OUString m_aPropertyName; + css::uno::Any m_aNewValue; + css::uno::Any m_aOldValue; /** sets either the old value or the new value again at the property set. * @@ -255,10 +255,10 @@ namespace rptui */ void setProperty(bool _bOld); protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getObject(); + virtual css::uno::Reference< css::beans::XPropertySet> getObject(); public: - ORptUndoPropertyAction(SdrModel& rMod, const ::com::sun::star::beans::PropertyChangeEvent& evt); + ORptUndoPropertyAction(SdrModel& rMod, const css::beans::PropertyChangeEvent& evt); virtual void Undo() override; virtual void Redo() override; @@ -272,16 +272,16 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OUndoPropertyReportSectionAction : public ORptUndoPropertyAction { OReportHelper m_aReportHelper; - ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > + ::std::mem_fun_t< css::uno::Reference< css::report::XSection > ,OReportHelper> m_pMemberFunction; protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getObject() override; + virtual css::uno::Reference< css::beans::XPropertySet> getObject() override; public: OUndoPropertyReportSectionAction(SdrModel& rMod - ,const ::com::sun::star::beans::PropertyChangeEvent& evt - ,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > + ,const css::beans::PropertyChangeEvent& evt + ,::std::mem_fun_t< css::uno::Reference< css::report::XSection > ,OReportHelper> _pMemberFunction - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReport + ,const css::uno::Reference< css::report::XReportDefinition >& _xReport ); }; @@ -291,16 +291,16 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OUndoPropertyGroupSectionAction : public ORptUndoPropertyAction { OGroupHelper m_aGroupHelper; - ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > + ::std::mem_fun_t< css::uno::Reference< css::report::XSection > ,OGroupHelper> m_pMemberFunction; protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getObject() override; + virtual css::uno::Reference< css::beans::XPropertySet> getObject() override; public: OUndoPropertyGroupSectionAction(SdrModel& rMod - ,const ::com::sun::star::beans::PropertyChangeEvent& evt - ,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > + ,const css::beans::PropertyChangeEvent& evt + ,::std::mem_fun_t< css::uno::Reference< css::report::XSection > ,OGroupHelper> _pMemberFunction - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup + ,const css::uno::Reference< css::report::XGroup >& _xGroup ); }; diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx index 5d0a853ec164..d7cf5e5173b9 100644 --- a/reportdesign/inc/UndoEnv.hxx +++ b/reportdesign/inc/UndoEnv.hxx @@ -34,9 +34,9 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OXUndoEnvironment - : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::container::XContainerListener - , ::com::sun::star::util::XModifyListener + : public ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener + , css::container::XContainerListener + , css::util::XModifyListener > , public SfxListener { @@ -97,11 +97,11 @@ namespace rptui struct Accessor { friend class OReportModel; private: Accessor() { } }; void Clear(const Accessor& _r); - void AddElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); - void RemoveElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); + void AddElement(const css::uno::Reference< css::uno::XInterface>& Element); + void RemoveElement(const css::uno::Reference< css::uno::XInterface>& Element); - void AddSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection); - void RemoveSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection ); + void AddSection( const css::uno::Reference< css::report::XSection>& _xSection); + void RemoveSection( const css::uno::Reference< css::report::XSection>& _xSection ); /** removes the section from the page out of the undo env * * \param _pPage @@ -110,33 +110,33 @@ namespace rptui protected: // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override; // XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; void ModeChanged(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; private: - void TogglePropertyListening(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); + void TogglePropertyListening(const css::uno::Reference< css::uno::XInterface>& Element); void implSetModified(); - void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer, bool _bStartListening ); - void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ); + void switchListening( const css::uno::Reference< css::container::XIndexAccess >& _rxContainer, bool _bStartListening ); + void switchListening( const css::uno::Reference< css::uno::XInterface >& _rxObject, bool _bStartListening ); - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> >::const_iterator - getSection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild>& _xContainer) const; + ::std::vector< css::uno::Reference< css::container::XChild> >::const_iterator + getSection(const css::uno::Reference< css::container::XChild>& _xContainer) const; }; } diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index 1ad9ed3ab96b..c0c70c337d11 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -53,7 +53,7 @@ void SAL_CALL OFunctions::dispose() throw(uno::RuntimeException, std::exception) void SAL_CALL OFunctions::disposing() { - ::std::for_each(m_aFunctions.begin(),m_aFunctions.end(),::boost::mem_fn(&com::sun::star::report::XFunction::dispose)); + ::std::for_each(m_aFunctions.begin(),m_aFunctions.end(),::boost::mem_fn(&css::report::XFunction::dispose)); m_aFunctions.clear(); lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this ) ); m_aContainerListeners.disposeAndClear( aDisposeEvent ); diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index 92df9713f62b..bf218eade1cf 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -174,7 +174,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container void SAL_CALL OGroup::setGroupOn( ::sal_Int16 _groupon ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if ( _groupon < report::GroupOn::DEFAULT || _groupon > report::GroupOn::INTERVAL ) - throwIllegallArgumentException("com::sun::star::report::GroupOn" + throwIllegallArgumentException("css::report::GroupOn" ,*this ,1 ,m_xContext); @@ -201,7 +201,7 @@ void SAL_CALL OGroup::setGroupInterval( ::sal_Int32 _groupinterval ) throw (uno: void SAL_CALL OGroup::setKeepTogether( ::sal_Int16 _keeptogether ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if ( _keeptogether < report::KeepTogether::NO || _keeptogether > report::KeepTogether::WITH_FIRST_DETAIL ) - throwIllegallArgumentException("com::sun::star::report::KeepTogether" + throwIllegallArgumentException("css::report::KeepTogether" ,*this ,1 ,m_xContext); diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx index a50e5e6df7ca..30756c475fd4 100644 --- a/reportdesign/source/core/api/Groups.cxx +++ b/reportdesign/source/core/api/Groups.cxx @@ -52,7 +52,7 @@ void SAL_CALL OGroups::dispose() throw(uno::RuntimeException, std::exception) void SAL_CALL OGroups::disposing() { - ::std::for_each(m_aGroups.begin(),m_aGroups.end(),::boost::mem_fn(&com::sun::star::report::XGroup::dispose)); + ::std::for_each(m_aGroups.begin(),m_aGroups.end(),::boost::mem_fn(&css::report::XGroup::dispose)); m_aGroups.clear(); lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this ) ); m_aContainerListeners.disposeAndClear( aDisposeEvent ); diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx index 9c90a808fa1a..9c1e2e168a9e 100644 --- a/reportdesign/source/core/api/ReportControlModel.cxx +++ b/reportdesign/source/core/api/ReportControlModel.cxx @@ -24,7 +24,7 @@ namespace reportdesign using namespace com::sun::star; using namespace comphelper; -bool operator==( const ::com::sun::star::awt::FontDescriptor& _lhs, const ::com::sun::star::awt::FontDescriptor& _rhs ) +bool operator==( const css::awt::FontDescriptor& _lhs, const css::awt::FontDescriptor& _rhs ) { return ( _lhs.Name == _rhs.Name ) && ( _lhs.Height == _rhs.Height ) diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index f854fadb1a8f..bb9a5d85ed73 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -256,7 +256,7 @@ public: DECLARE_XINTERFACE( ) // XPropertySet - com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; @@ -785,7 +785,7 @@ void SAL_CALL OReportDefinition::setCaption( const OUString& _caption ) throw (u void SAL_CALL OReportDefinition::setGroupKeepTogether( ::sal_Int16 _groupkeeptogether ) throw (uno::RuntimeException, std::exception) { if ( _groupkeeptogether < report::GroupKeepTogether::PER_PAGE || _groupkeeptogether > report::GroupKeepTogether::PER_COLUMN ) - throwIllegallArgumentException("com::sun::star::report::GroupKeepTogether" + throwIllegallArgumentException("css::report::GroupKeepTogether" ,*this ,1 ,m_aProps->m_xContext); @@ -801,7 +801,7 @@ void SAL_CALL OReportDefinition::setGroupKeepTogether( ::sal_Int16 _groupkeeptog void SAL_CALL OReportDefinition::setPageHeaderOption( ::sal_Int16 _pageheaderoption ) throw (uno::RuntimeException, std::exception) { if ( _pageheaderoption < report::ReportPrintOption::ALL_PAGES || _pageheaderoption > report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER ) - throwIllegallArgumentException("com::sun::star::report::ReportPrintOption" + throwIllegallArgumentException("css::report::ReportPrintOption" ,*this ,1 ,m_aProps->m_xContext); @@ -817,7 +817,7 @@ void SAL_CALL OReportDefinition::setPageHeaderOption( ::sal_Int16 _pageheaderopt void SAL_CALL OReportDefinition::setPageFooterOption( ::sal_Int16 _pagefooteroption ) throw (uno::RuntimeException, std::exception) { if ( _pagefooteroption < report::ReportPrintOption::ALL_PAGES || _pagefooteroption > report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER ) - throwIllegallArgumentException("com::sun::star::report::ReportPrintOption" + throwIllegallArgumentException("css::report::ReportPrintOption" ,*this ,1 ,m_aProps->m_xContext); @@ -844,7 +844,7 @@ void SAL_CALL OReportDefinition::setCommand( const OUString& _command ) throw (u void SAL_CALL OReportDefinition::setCommandType( ::sal_Int32 _commandtype ) throw (uno::RuntimeException, std::exception) { if ( _commandtype < sdb::CommandType::TABLE || _commandtype > sdb::CommandType::COMMAND ) - throwIllegallArgumentException("com::sun::star::sdb::CommandType" + throwIllegallArgumentException("css::sdb::CommandType" ,*this ,1 ,m_aProps->m_xContext); @@ -1981,7 +1981,7 @@ uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableMimeTypes( ) return s_aList; } -// com::sun::star::XUnoTunnel +// css::XUnoTunnel sal_Int64 SAL_CALL OReportDefinition::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) { sal_Int64 nRet = 0; diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 3163c6f749cd..4f40df5c76ca 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -315,7 +315,7 @@ void OSection::checkNotPageHeaderFooter() void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if ( _forcenewpage < report::ForceNewPage::NONE || _forcenewpage > report::ForceNewPage::BEFORE_AFTER_SECTION ) - throwIllegallArgumentException("com::sun::star::report::ForceNewPage" + throwIllegallArgumentException("css::report::ForceNewPage" ,*this ,1 ,m_xContext); @@ -333,7 +333,7 @@ void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if ( _newroworcol < report::ForceNewPage::NONE || _newroworcol > report::ForceNewPage::BEFORE_AFTER_SECTION ) - throwIllegallArgumentException("com::sun::star::report::ForceNewPage" + throwIllegallArgumentException("css::report::ForceNewPage" ,*this ,1 ,m_xContext); @@ -578,7 +578,7 @@ sal_Bool SAL_CALL OSection::hasForms() throw (uno::RuntimeException, std::except } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 OSection::getSomething( const uno::Sequence< sal_Int8 > & rId ) throw (uno::RuntimeException, std::exception) { diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index ac5796ee4850..ec562862d27d 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -440,13 +440,13 @@ void SAL_CALL OShape::setZOrder( ::sal_Int32 _zorder ) throw (uno::RuntimeExcept set(PROPERTY_ZORDER,_zorder,m_nZOrder); } -sal_Bool SAL_CALL OShape::getOpaque() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OShape::getOpaque() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); return m_bOpaque; } -void SAL_CALL OShape::setOpaque( sal_Bool _opaque ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OShape::setOpaque( sal_Bool _opaque ) throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); set(PROPERTY_OPAQUE,_opaque,m_bOpaque); diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx index 23933b78e219..94ee95709733 100644 --- a/reportdesign/source/core/api/Tools.cxx +++ b/reportdesign/source/core/api/Tools.cxx @@ -43,7 +43,7 @@ uno::Reference< report::XSection> lcl_getSection(const uno::Reference< uno::XInt void throwIllegallArgumentException( const OUString& _sTypeName ,const uno::Reference< uno::XInterface >& ExceptionContext_ ,const ::sal_Int16& ArgumentPosition_ - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context_ + ,const css::uno::Reference< css::uno::XComponentContext >& Context_ ) { OUString sErrorMessage(RPT_RESSTRING(RID_STR_ERROR_WRONG_ARGUMENT,Context_->getServiceManager())); diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx index b1d65b1ab590..944055a19813 100644 --- a/reportdesign/source/core/inc/FixedLine.hxx +++ b/reportdesign/source/core/inc/FixedLine.hxx @@ -30,9 +30,9 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedLine > FixedLinePropertySet; - typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XFixedLine - ,com::sun::star::lang::XServiceInfo > FixedLineBase; + typedef ::cppu::PropertySetMixin< css::report::XFixedLine > FixedLinePropertySet; + typedef ::cppu::WeakComponentImplHelper< css::report::XFixedLine + ,css::lang::XServiceInfo > FixedLineBase; /** \class OFixedLine Defines the implementation of a \interface com:::sun::star::report::XFixedLine * \ingroup reportdesign_api @@ -44,8 +44,8 @@ namespace reportdesign { friend class OShapeHelper; OReportControlModel m_aProps; - ::com::sun::star::drawing::LineStyle m_LineStyle; - ::com::sun::star::drawing::LineDash m_LineDash; + css::drawing::LineStyle m_LineStyle; + css::drawing::LineDash m_LineDash; sal_Int32 m_nOrientation; ::sal_Int32 m_LineColor; ::sal_Int16 m_LineTransparence; @@ -62,7 +62,7 @@ namespace reportdesign BoundListeners l; { ::osl::MutexGuard aGuard(m_aMutex); - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } l.notify(); @@ -70,30 +70,30 @@ namespace reportdesign protected: virtual ~OFixedLine(); public: - explicit OFixedLine(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext); - explicit OFixedLine(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _xFactory - ,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _xShape + explicit OFixedLine(css::uno::Reference< css::uno::XComponentContext > const & _xContext); + explicit OFixedLine(css::uno::Reference< css::uno::XComponentContext > const & _xContext + ,const css::uno::Reference< css::lang::XMultiServiceFactory > & _xFactory + ,css::uno::Reference< css::drawing::XShape >& _xShape ,sal_Int32 _nOrientation); DECLARE_XINTERFACE( ) - // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); - // 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) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XReportComponent REPORTCOMPONENT_HEADER() @@ -102,64 +102,64 @@ namespace reportdesign SHAPE_HEADER() // XShapeDescriptor - virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType( ) throw (css::uno::RuntimeException, std::exception) override; // XReportControlModel REPORTCONTROLMODEL_HEADER() // XFixedLine - virtual ::sal_Int32 SAL_CALL getOrientation() throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOrientation( ::sal_Int32 _orientation ) throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::drawing::LineStyle SAL_CALL getLineStyle() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLineStyle( ::com::sun::star::drawing::LineStyle _linestyle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::drawing::LineDash SAL_CALL getLineDash() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLineDash( const ::com::sun::star::drawing::LineDash& _linedash ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getLineColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getLineTransparence() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLineTransparence( ::sal_Int16 _linetransparence ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getLineWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLineWidth( ::sal_Int32 _linewidth ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::report::XReportControlFormat + virtual ::sal_Int32 SAL_CALL getOrientation() throw (css::beans::UnknownPropertyException,css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setOrientation( ::sal_Int32 _orientation ) throw (css::beans::UnknownPropertyException,css::uno::RuntimeException, std::exception) override; + virtual css::drawing::LineStyle SAL_CALL getLineStyle() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLineStyle( css::drawing::LineStyle _linestyle ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::drawing::LineDash SAL_CALL getLineDash() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLineDash( const css::drawing::LineDash& _linedash ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getLineColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getLineTransparence() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLineTransparence( ::sal_Int16 _linetransparence ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getLineWidth() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLineWidth( ::sal_Int32 _linewidth ) throw (css::uno::RuntimeException, std::exception) override; + + // css::report::XReportControlFormat REPORTCONTROLFORMAT_HEADER() // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexContainer - virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; }; } #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FIXEDLINE_HXX diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx index 8d22c706bf01..b0cf3c6342c8 100644 --- a/reportdesign/source/core/inc/FixedText.hxx +++ b/reportdesign/source/core/inc/FixedText.hxx @@ -31,9 +31,9 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedText > FixedTextPropertySet; - typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XFixedText - ,com::sun::star::lang::XServiceInfo > FixedTextBase; + typedef ::cppu::PropertySetMixin< css::report::XFixedText > FixedTextPropertySet; + typedef ::cppu::WeakComponentImplHelper< css::report::XFixedText + ,css::lang::XServiceInfo > FixedTextBase; /** \class OFixedText Defines the implementation of a \interface com:::sun::star::report::XFixedText * \ingroup reportdesign_api @@ -59,7 +59,7 @@ namespace reportdesign ::osl::MutexGuard aGuard(m_aMutex); if ( _member != _Value ) { - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } } @@ -74,7 +74,7 @@ namespace reportdesign ::osl::MutexGuard aGuard(m_aMutex); if ( _member != _Value ) { - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } } @@ -83,29 +83,29 @@ namespace reportdesign protected: virtual ~OFixedText(); public: - explicit OFixedText(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext); - explicit OFixedText(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _xFactory - ,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _xShape); + explicit OFixedText(css::uno::Reference< css::uno::XComponentContext > const & _xContext); + explicit OFixedText(css::uno::Reference< css::uno::XComponentContext > const & _xContext + ,const css::uno::Reference< css::lang::XMultiServiceFactory > & _xFactory + ,css::uno::Reference< css::drawing::XShape >& _xShape); DECLARE_XINTERFACE( ) - // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); - // 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) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XReportComponent REPORTCOMPONENT_HEADER() @@ -113,53 +113,53 @@ namespace reportdesign SHAPE_HEADER() // XShapeDescriptor - virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType( ) throw (css::uno::RuntimeException, std::exception) override; // XReportControlModel REPORTCONTROLMODEL_HEADER() // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; // XFixedText - virtual OUString SAL_CALL getLabel() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLabel( const OUString& _label ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLabel() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLabel( const OUString& _label ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::report::XReportControlFormat + // css::report::XReportControlFormat REPORTCONTROLFORMAT_HEADER() // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexContainer - virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; }; } #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FIXEDTEXT_HXX diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx index 42bfbb337b59..a83aab8fb73c 100644 --- a/reportdesign/source/core/inc/FormatCondition.hxx +++ b/reportdesign/source/core/inc/FormatCondition.hxx @@ -29,9 +29,9 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFormatCondition > FormatConditionPropertySet; - typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XFormatCondition - ,com::sun::star::lang::XServiceInfo > FormatConditionBase; + typedef ::cppu::PropertySetMixin< css::report::XFormatCondition > FormatConditionPropertySet; + typedef ::cppu::WeakComponentImplHelper< css::report::XFormatCondition + ,css::lang::XServiceInfo > FormatConditionBase; /** \class OFormatCondition Defines the implementation of a \interface com:::sun::star::report::XFormatCondition * \ingroup reportdesign_api @@ -55,7 +55,7 @@ namespace reportdesign BoundListeners l; { ::osl::MutexGuard aGuard(m_aMutex); - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } l.notify(); @@ -67,7 +67,7 @@ namespace reportdesign BoundListeners l; { ::osl::MutexGuard aGuard(m_aMutex); - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } l.notify(); @@ -75,43 +75,43 @@ namespace reportdesign protected: virtual ~OFormatCondition(); public: - explicit OFormatCondition(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext + explicit OFormatCondition(css::uno::Reference< css::uno::XComponentContext > const & _xContext ); DECLARE_XINTERFACE( ) - // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); - // 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) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XFormatCondition - virtual sal_Bool SAL_CALL getEnabled() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormula( const OUString& _formula ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFormula( const OUString& _formula ) throw (css::uno::RuntimeException, std::exception) override; // XReportControlFormat REPORTCONTROLFORMAT_HEADER() // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx index 8e1b330e8c25..418eea09e4e4 100644 --- a/reportdesign/source/core/inc/FormattedField.hxx +++ b/reportdesign/source/core/inc/FormattedField.hxx @@ -29,9 +29,9 @@ #include "ReportHelperDefines.hxx" namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFormattedField > FormattedFieldPropertySet; - typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XFormattedField - ,com::sun::star::lang::XServiceInfo > FormattedFieldBase; + typedef ::cppu::PropertySetMixin< css::report::XFormattedField > FormattedFieldPropertySet; + typedef ::cppu::WeakComponentImplHelper< css::report::XFormattedField + ,css::lang::XServiceInfo > FormattedFieldBase; /** \class OFormattedField Defines the implementation of a \interface com:::sun::star::report::XFormattedField * \ingroup reportdesign_api @@ -44,9 +44,9 @@ namespace reportdesign friend class OShapeHelper; OReportControlModel m_aProps; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > + css::uno::Reference< css::util::XNumberFormatsSupplier > m_xFormatsSupplier; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction> m_xFunction; + css::uno::Reference< css::report::XFunction> m_xFunction; ::sal_Int32 m_nFormatKey; private: @@ -62,7 +62,7 @@ namespace reportdesign ::osl::MutexGuard aGuard(m_aMutex); if ( _member != _Value ) { - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } } @@ -77,7 +77,7 @@ namespace reportdesign ::osl::MutexGuard aGuard(m_aMutex); if ( _member != _Value ) { - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } } @@ -86,48 +86,48 @@ namespace reportdesign protected: virtual ~OFormattedField(); public: - explicit OFormattedField(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext); - explicit OFormattedField(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _xFactory - ,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _xShape); + explicit OFormattedField(css::uno::Reference< css::uno::XComponentContext > const & _xContext); + explicit OFormattedField(css::uno::Reference< css::uno::XComponentContext > const & _xContext + ,const css::uno::Reference< css::lang::XMultiServiceFactory > & _xFactory + ,css::uno::Reference< css::drawing::XShape >& _xShape); DECLARE_XINTERFACE( ) - // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); - // 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) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException, std::exception ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexContainer - virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XReportComponent REPORTCOMPONENT_HEADER() @@ -136,7 +136,7 @@ namespace reportdesign SHAPE_HEADER() // XShapeDescriptor - virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType( ) throw (css::uno::RuntimeException, std::exception) override; // XReportControlModel REPORTCONTROLMODEL_HEADER() @@ -145,28 +145,28 @@ namespace reportdesign REPORTCONTROLFORMAT_HEADER() // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; // XFormattedField - virtual ::sal_Int32 SAL_CALL getFormatKey() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormatKey(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > SAL_CALL getFormatsSupplier() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormatsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& _formatssupplier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getFormatKey() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFormatKey(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XNumberFormatsSupplier > SAL_CALL getFormatsSupplier() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFormatsSupplier( const css::uno::Reference< css::util::XNumberFormatsSupplier >& _formatssupplier ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; }; } #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FORMATTEDFIELD_HXX diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx index f99b0b8ab742..756877189aae 100644 --- a/reportdesign/source/core/inc/Function.hxx +++ b/reportdesign/source/core/inc/Function.hxx @@ -28,9 +28,9 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFunction > FunctionPropertySet; - typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XFunction - ,com::sun::star::lang::XServiceInfo > FunctionBase; + typedef ::cppu::PropertySetMixin< css::report::XFunction > FunctionPropertySet; + typedef ::cppu::WeakComponentImplHelper< css::report::XFunction + ,css::lang::XServiceInfo > FunctionBase; /** \class OFunction Defines the implementation of a \interface com:::sun::star::report::XFunction * \ingroup reportdesign_api @@ -40,9 +40,9 @@ namespace reportdesign public FunctionBase, public FunctionPropertySet { - com::sun::star::beans::Optional< OUString> m_sInitialFormula; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XFunctions > m_xParent; + css::beans::Optional< OUString> m_sInitialFormula; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::WeakReference< css::report::XFunctions > m_xParent; OUString m_sName; OUString m_sFormula; bool m_bPreEvaluated; @@ -58,7 +58,7 @@ namespace reportdesign BoundListeners l; { ::osl::MutexGuard aGuard(m_aMutex); - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } l.notify(); @@ -70,7 +70,7 @@ namespace reportdesign BoundListeners l; { ::osl::MutexGuard aGuard(m_aMutex); - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } l.notify(); @@ -78,53 +78,53 @@ namespace reportdesign protected: virtual ~OFunction(); public: - explicit OFunction(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext); + explicit OFunction(css::uno::Reference< css::uno::XComponentContext > const & _xContext); DECLARE_XINTERFACE( ) - // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); - // 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) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::report::XFunction: - virtual sal_Bool SAL_CALL getPreEvaluated() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPreEvaluated(sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDeepTraversing() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDeepTraversing(sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormula(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::beans::Optional< OUString> SAL_CALL getInitialFormula() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInitialFormula(const com::sun::star::beans::Optional< OUString> & the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::report::XFunction: + virtual sal_Bool SAL_CALL getPreEvaluated() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPreEvaluated(sal_Bool the_value) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getDeepTraversing() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDeepTraversing(sal_Bool the_value) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName(const OUString & the_value) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFormula(const OUString & the_value) throw (css::uno::RuntimeException, std::exception) override; + virtual css::beans::Optional< OUString> SAL_CALL getInitialFormula() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInitialFormula(const css::beans::Optional< OUString> & the_value) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; }; } #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FUNCTION_HXX diff --git a/reportdesign/source/core/inc/Functions.hxx b/reportdesign/source/core/inc/Functions.hxx index 3eb39f0c440a..a0b20c8cb435 100644 --- a/reportdesign/source/core/inc/Functions.hxx +++ b/reportdesign/source/core/inc/Functions.hxx @@ -29,7 +29,7 @@ namespace reportdesign { - typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XFunctions> FunctionsBase; + typedef ::cppu::WeakComponentImplHelper< css::report::XFunctions> FunctionsBase; /** \class OFunctions Defines the implementation of a \interface com:::sun::star::report::XFunctions * \ingroup reportdesign_api * @@ -37,11 +37,11 @@ namespace reportdesign class OFunctions : public comphelper::OBaseMutex, public FunctionsBase { - typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > > TFunctions; - ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XFunctionsSupplier > m_xParent; - TFunctions m_aFunctions; + typedef ::std::list< css::uno::Reference< css::report::XFunction > > TFunctions; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::WeakReference< css::report::XFunctionsSupplier > m_xParent; + TFunctions m_aFunctions; private: OFunctions& operator=(const OFunctions&) = delete; OFunctions(const OFunctions&) = delete; @@ -57,37 +57,37 @@ namespace reportdesign virtual void SAL_CALL disposing() override; public: - explicit OFunctions( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier >& _xParent - ,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context); + explicit OFunctions( const css::uno::Reference< css::report::XFunctionsSupplier >& _xParent + ,const css::uno::Reference< css::uno::XComponentContext >& context); // XFunctions // Methods - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > SAL_CALL createFunction( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XFunction > SAL_CALL createFunction( ) throw (css::uno::RuntimeException, std::exception) override; // XIndexContainer - virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx index 7335f12539e4..5beb160c4e57 100644 --- a/reportdesign/source/core/inc/Group.hxx +++ b/reportdesign/source/core/inc/Group.hxx @@ -31,9 +31,9 @@ namespace reportdesign { - typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XGroup - , ::com::sun::star::lang::XServiceInfo> GroupBase; - typedef ::cppu::PropertySetMixin< com::sun::star::report::XGroup> GroupPropertySet; + typedef ::cppu::WeakComponentImplHelper< css::report::XGroup + , css::lang::XServiceInfo> GroupBase; + typedef ::cppu::PropertySetMixin< css::report::XGroup> GroupPropertySet; /** \class OGroup Defines the implementation of a \interface com:::sun::star::report::XGroup * \ingroup reportdesign_api @@ -43,12 +43,12 @@ namespace reportdesign ,public GroupBase ,public GroupPropertySet { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroups > m_xParent; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xHeader; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xFooter; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > m_xFunctions; - ::rptshared::GroupProperties m_aProps; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::WeakReference< css::report::XGroups > m_xParent; + css::uno::Reference< css::report::XSection> m_xHeader; + css::uno::Reference< css::report::XSection> m_xFooter; + css::uno::Reference< css::report::XFunctions > m_xFunctions; + ::rptshared::GroupProperties m_aProps; private: OGroup& operator=(const OGroup&) = delete; @@ -63,7 +63,7 @@ namespace reportdesign ::osl::MutexGuard aGuard(m_aMutex); if ( _member != _Value ) { - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } } @@ -78,7 +78,7 @@ namespace reportdesign ::osl::MutexGuard aGuard(m_aMutex); if ( _member != _Value ) { - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } } @@ -87,7 +87,7 @@ namespace reportdesign void setSection( const OUString& _sProperty ,const bool& _bOn ,const OUString& _sName - ,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member); + ,css::uno::Reference< css::report::XSection>& _member); protected: // TODO: VirtualFunctionFinder: This is virtual function! @@ -99,68 +99,68 @@ namespace reportdesign virtual void SAL_CALL disposing() override; public: - OGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups >& _xParent - ,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context); + OGroup(const css::uno::Reference< css::report::XGroups >& _xParent + ,const css::uno::Reference< css::uno::XComponentContext >& context); DECLARE_XINTERFACE( ) - // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - - // 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) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XGroup - virtual sal_Bool SAL_CALL getSortAscending() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSortAscending( sal_Bool _sortascending ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getHeaderOn() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeaderOn( sal_Bool _headeron ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getFooterOn() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFooterOn( sal_Bool _footeron ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getHeader() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getFooter() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getGroupOn() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGroupOn( ::sal_Int16 _groupon ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getGroupInterval() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGroupInterval( ::sal_Int32 _groupinterval ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getKeepTogether() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setKeepTogether( ::sal_Int16 _keeptogether ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups > SAL_CALL getGroups() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getExpression() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setExpression( const OUString& _expression ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getStartNewColumn() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStartNewColumn( sal_Bool _startnewcolumn ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getResetPageNumber() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setResetPageNumber( sal_Bool _resetpagenumber ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getSortAscending() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSortAscending( sal_Bool _sortascending ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getHeaderOn() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHeaderOn( sal_Bool _headeron ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getFooterOn() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFooterOn( sal_Bool _footeron ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XSection > SAL_CALL getHeader() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XSection > SAL_CALL getFooter() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getGroupOn() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setGroupOn( ::sal_Int16 _groupon ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getGroupInterval() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setGroupInterval( ::sal_Int32 _groupinterval ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getKeepTogether() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setKeepTogether( ::sal_Int16 _keeptogether ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XGroups > SAL_CALL getGroups() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getExpression() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setExpression( const OUString& _expression ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getStartNewColumn() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setStartNewColumn( sal_Bool _startnewcolumn ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getResetPageNumber() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setResetPageNumber( sal_Bool _resetpagenumber ) throw (css::uno::RuntimeException, std::exception) override; //XFunctionsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > SAL_CALL getFunctions() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XFunctions > SAL_CALL getFunctions() throw (css::uno::RuntimeException, std::exception) override; // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext(){ return m_xContext; } + css::uno::Reference< css::uno::XComponentContext > getContext(){ return m_xContext; } }; } // namespace reportdesign diff --git a/reportdesign/source/core/inc/Groups.hxx b/reportdesign/source/core/inc/Groups.hxx index cf52c188d25d..44155ce1c113 100644 --- a/reportdesign/source/core/inc/Groups.hxx +++ b/reportdesign/source/core/inc/Groups.hxx @@ -28,7 +28,7 @@ namespace reportdesign { - typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XGroups> GroupsBase; + typedef ::cppu::WeakComponentImplHelper< css::report::XGroups> GroupsBase; /** \class OGroups Defines the implementation of a \interface com:::sun::star::report::XGroups * \ingroup reportdesign_api * @@ -36,11 +36,11 @@ namespace reportdesign class OGroups : public comphelper::OBaseMutex, public GroupsBase { - typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > > TGroups; - ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition > m_xParent; - TGroups m_aGroups; + typedef ::std::list< css::uno::Reference< css::report::XGroup > > TGroups; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::WeakReference< css::report::XReportDefinition > m_xParent; + TGroups m_aGroups; private: OGroups& operator=(const OGroups&) = delete; OGroups(const OGroups&) = delete; @@ -56,39 +56,39 @@ namespace reportdesign virtual void SAL_CALL disposing() override; public: - OGroups( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xParent - ,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context); + OGroups( const css::uno::Reference< css::report::XReportDefinition >& _xParent + ,const css::uno::Reference< css::uno::XComponentContext >& context); // XGroups // Attributes - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > SAL_CALL getReportDefinition() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XReportDefinition > SAL_CALL getReportDefinition() throw (css::uno::RuntimeException, std::exception) override; // Methods - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > SAL_CALL createGroup( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XGroup > SAL_CALL createGroup( ) throw (css::uno::RuntimeException, std::exception) override; // XIndexContainer - virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx index e5b24bd385cc..70b04cacfe53 100644 --- a/reportdesign/source/core/inc/ImageControl.hxx +++ b/reportdesign/source/core/inc/ImageControl.hxx @@ -29,9 +29,9 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XImageControl > ImageControlPropertySet; - typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XImageControl - ,com::sun::star::lang::XServiceInfo > ImageControlBase; + typedef ::cppu::PropertySetMixin< css::report::XImageControl > ImageControlPropertySet; + typedef ::cppu::WeakComponentImplHelper< css::report::XImageControl + ,css::lang::XServiceInfo > ImageControlBase; /** \class OImageControl Defines the implementation of a \interface com:::sun::star::report::XImageControl * \ingroup reportdesign_api @@ -57,7 +57,7 @@ namespace reportdesign BoundListeners l; { ::osl::MutexGuard aGuard(m_aMutex); - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } l.notify(); @@ -69,7 +69,7 @@ namespace reportdesign BoundListeners l; { ::osl::MutexGuard aGuard(m_aMutex); - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } l.notify(); @@ -77,29 +77,29 @@ namespace reportdesign protected: virtual ~OImageControl(); public: - explicit OImageControl(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext); - explicit OImageControl(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _xFactory - ,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _xShape); + explicit OImageControl(css::uno::Reference< css::uno::XComponentContext > const & _xContext); + explicit OImageControl(css::uno::Reference< css::uno::XComponentContext > const & _xContext + ,const css::uno::Reference< css::lang::XMultiServiceFactory > & _xFactory + ,css::uno::Reference< css::drawing::XShape >& _xShape); DECLARE_XINTERFACE( ) - // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); - // 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) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XReportComponent REPORTCOMPONENT_HEADER() @@ -107,7 +107,7 @@ namespace reportdesign SHAPE_HEADER() // XShapeDescriptor - virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType( ) throw (css::uno::RuntimeException, std::exception) override; // XReportControlModel REPORTCONTROLMODEL_HEADER() @@ -116,51 +116,51 @@ namespace reportdesign REPORTCONTROLFORMAT_HEADER() // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; // XImageControl - virtual OUString SAL_CALL getImageURL() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setImageURL( const OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPreserveIRI() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPreserveIRI( sal_Bool _preserveiri ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getScaleMode() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setScaleMode( ::sal_Int16 _scalemode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImageURL() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setImageURL( const OUString& _imageurl ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getPreserveIRI() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPreserveIRI( sal_Bool _preserveiri ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getScaleMode() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setScaleMode( ::sal_Int16 _scalemode ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XImageProducerSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer > SAL_CALL getImageProducer( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XImageProducer > SAL_CALL getImageProducer( ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexContainer - virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; }; } #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_IMAGECONTROL_HXX diff --git a/reportdesign/source/core/inc/ReportComponent.hxx b/reportdesign/source/core/inc/ReportComponent.hxx index d9ca539465f2..cfdd64d90081 100644 --- a/reportdesign/source/core/inc/ReportComponent.hxx +++ b/reportdesign/source/core/inc/ReportComponent.hxx @@ -37,19 +37,18 @@ namespace reportdesign class OReportComponentProperties { public: - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XChild > m_xParent; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - m_xFactory; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xShape; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxy; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xProperty; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > m_xTypeProvider; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > m_xUnoTunnel; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > m_xServiceInfo; - ::com::sun::star::uno::Sequence< OUString > m_aMasterFields; - ::com::sun::star::uno::Sequence< OUString > m_aDetailFields; - OUString m_sName; + css::uno::WeakReference< css::container::XChild > m_xParent; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; + css::uno::Reference< css::drawing::XShape > m_xShape; + css::uno::Reference< css::uno::XAggregation > m_xProxy; + css::uno::Reference< css::beans::XPropertySet > m_xProperty; + css::uno::Reference< css::lang::XTypeProvider > m_xTypeProvider; + css::uno::Reference< css::lang::XUnoTunnel > m_xUnoTunnel; + css::uno::Reference< css::lang::XServiceInfo > m_xServiceInfo; + css::uno::Sequence< OUString > m_aMasterFields; + css::uno::Sequence< OUString > m_aDetailFields; + OUString m_sName; ::sal_Int32 m_nHeight; ::sal_Int32 m_nWidth; ::sal_Int32 m_nPosX; @@ -58,7 +57,7 @@ namespace reportdesign ::sal_Int16 m_nBorder; bool m_bPrintRepeatedValues; - OReportComponentProperties(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext + OReportComponentProperties(css::uno::Reference< css::uno::XComponentContext > const & _xContext ) :m_xContext(_xContext) ,m_nHeight(0) @@ -71,8 +70,8 @@ namespace reportdesign {} ~OReportComponentProperties(); - void setShape(::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _xShape - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xTunnel + void setShape(css::uno::Reference< css::drawing::XShape >& _xShape + ,const css::uno::Reference< css::report::XReportComponent>& _xTunnel ,oslInterlockedCount& _rRefCount); }; } diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx index 391cc0884023..93255786d8cc 100644 --- a/reportdesign/source/core/inc/ReportControlModel.hxx +++ b/reportdesign/source/core/inc/ReportControlModel.hxx @@ -33,9 +33,9 @@ namespace reportdesign { - bool operator==( const ::com::sun::star::awt::FontDescriptor& _lhs, const ::com::sun::star::awt::FontDescriptor& _rhs ); + bool operator==( const css::awt::FontDescriptor& _lhs, const css::awt::FontDescriptor& _rhs ); - inline bool operator!=( const ::com::sun::star::awt::FontDescriptor& _lhs, const ::com::sun::star::awt::FontDescriptor& _rhs ) + inline bool operator!=( const css::awt::FontDescriptor& _lhs, const css::awt::FontDescriptor& _rhs ) { return !( _lhs == _rhs ); } @@ -43,26 +43,26 @@ namespace reportdesign struct OFormatProperties { ::sal_Int16 nAlign; - ::com::sun::star::awt::FontDescriptor aFontDescriptor; - ::com::sun::star::awt::FontDescriptor aAsianFontDescriptor; - ::com::sun::star::awt::FontDescriptor aComplexFontDescriptor; - ::com::sun::star::lang::Locale aCharLocale; - ::com::sun::star::lang::Locale aCharLocaleAsian; - ::com::sun::star::lang::Locale aCharLocaleComplex; + css::awt::FontDescriptor aFontDescriptor; + css::awt::FontDescriptor aAsianFontDescriptor; + css::awt::FontDescriptor aComplexFontDescriptor; + css::lang::Locale aCharLocale; + css::lang::Locale aCharLocaleAsian; + css::lang::Locale aCharLocaleComplex; ::sal_Int16 nFontEmphasisMark; ::sal_Int16 nFontRelief; ::sal_Int32 nTextColor; ::sal_Int32 nTextLineColor; ::sal_Int32 nCharUnderlineColor; ::sal_Int32 nBackgroundColor; - OUString sCharCombinePrefix; - OUString sCharCombineSuffix; - OUString sHyperLinkURL; - OUString sHyperLinkTarget; - OUString sHyperLinkName; - OUString sVisitedCharStyleName; - OUString sUnvisitedCharStyleName; - com::sun::star::style::VerticalAlignment aVerticalAlignment; + OUString sCharCombinePrefix; + OUString sCharCombineSuffix; + OUString sHyperLinkURL; + OUString sHyperLinkTarget; + OUString sHyperLinkName; + OUString sVisitedCharStyleName; + OUString sUnvisitedCharStyleName; + css::style::VerticalAlignment aVerticalAlignment; ::sal_Int16 nCharEscapement; ::sal_Int16 nCharCaseMap; ::sal_Int16 nCharKerning; @@ -85,8 +85,8 @@ namespace reportdesign ::cppu::OInterfaceContainerHelper aContainerListeners; OReportComponentProperties aComponent; OFormatProperties aFormatProperties; - ::com::sun::star::container::XContainer* m_pOwner; - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition> > + css::container::XContainer* m_pOwner; + ::std::vector< css::uno::Reference< css::report::XFormatCondition> > m_aFormatConditions; osl::Mutex& m_rMutex; OUString aDataField; @@ -94,8 +94,8 @@ namespace reportdesign bool bPrintWhenGroupChange; OReportControlModel(osl::Mutex& _rMutex - ,::com::sun::star::container::XContainer* _pOwner - ,::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext) + ,css::container::XContainer* _pOwner + ,css::uno::Reference< css::uno::XComponentContext > const & _xContext) :aContainerListeners(_rMutex) ,aComponent(_xContext) ,m_pOwner(_pOwner) @@ -104,24 +104,24 @@ namespace reportdesign {} // XContainer - void addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + void addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException); + void removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException); // XElementAccess - bool hasElements( ) throw (::com::sun::star::uno::RuntimeException); + bool hasElements( ) throw (css::uno::RuntimeException); // XIndexReplace - void replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException); // XIndexContainer - void insertByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - void removeByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException); + void removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException); // XIndexAccess - ::sal_Int32 getCount( ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::sal_Int32 getCount( ) throw (css::uno::RuntimeException); + css::uno::Any getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException); - static bool isInterfaceForbidden(const ::com::sun::star::uno::Type& _rType); + static bool isInterfaceForbidden(const css::uno::Type& _rType); }; } #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTCONTROLMODEL_HXX diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx index 8317c7fb82ad..bf096cd5331c 100644 --- a/reportdesign/source/core/inc/ReportDrawPage.hxx +++ b/reportdesign/source/core/inc/ReportDrawPage.hxx @@ -27,15 +27,15 @@ namespace reportdesign { class OReportDrawPage : public SvxDrawPage { - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XSection > m_xSection; + css::uno::WeakReference< css::report::XSection > m_xSection; OReportDrawPage(const OReportDrawPage&) = delete; void operator =(const OReportDrawPage&) = delete; protected: - virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ) + virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape > & xShape ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override; public: - OReportDrawPage(SdrPage* pPage,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); + OReportDrawPage(SdrPage* pPage,const css::uno::Reference< css::report::XSection >& _xSection); virtual ~OReportDrawPage() throw(){} }; } diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx index dd91f8c430c0..4f32db1b6d4c 100644 --- a/reportdesign/source/core/inc/ReportEngineJFree.hxx +++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx @@ -37,20 +37,20 @@ namespace reportdesign { - typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XReportEngine - ,com::sun::star::lang::XServiceInfo> ReportEngineBase; - typedef ::cppu::PropertySetMixin<com::sun::star::report::XReportEngine> ReportEnginePropertySet; + typedef ::cppu::WeakComponentImplHelper< css::report::XReportEngine + ,css::lang::XServiceInfo> ReportEngineBase; + typedef ::cppu::PropertySetMixin<css::report::XReportEngine> ReportEnginePropertySet; class OReportEngineJFree : public comphelper::OMutexAndBroadcastHelper, public ReportEngineBase, public ReportEnginePropertySet { - typedef ::std::multimap< OUString, ::com::sun::star::uno::Any , ::comphelper::UStringMixLess> TComponentMap; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReport; - ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> m_StatusIndicator; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; - ::sal_Int32 m_nMaxRows; + typedef ::std::multimap< OUString, css::uno::Any , ::comphelper::UStringMixLess> TComponentMap; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::report::XReportDefinition > m_xReport; + css::uno::Reference< css::task::XStatusIndicator> m_StatusIndicator; + css::uno::Reference< css::sdbc::XConnection > m_xActiveConnection; + ::sal_Int32 m_nMaxRows; private: OReportEngineJFree(const OReportEngineJFree&) = delete; OReportEngineJFree& operator=(const OReportEngineJFree&) = delete; @@ -61,7 +61,7 @@ namespace reportdesign BoundListeners l; { ::osl::MutexGuard aGuard(m_aMutex); - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } l.notify(); @@ -80,52 +80,52 @@ namespace reportdesign public: typedef rtl::Reference<OReportEngineJFree> TReportEngine; - OReportEngineJFree(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context); + OReportEngineJFree(const css::uno::Reference< css::uno::XComponentContext >& context); DECLARE_XINTERFACE( ) - // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); private: - // 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) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XReportEngine // Attributes - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > SAL_CALL getReportDefinition() throw (::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setReportDefinition( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _reportdefinition ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getActiveConnection() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActiveConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _activeconnection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > SAL_CALL getStatusIndicator() throw (::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setStatusIndicator( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >& _statusindicator ) throw (::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::sal_Int32 SAL_CALL getMaxRows() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMaxRows( ::sal_Int32 _MaxRows ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XReportDefinition > SAL_CALL getReportDefinition() throw (css::uno::RuntimeException, std::exception) override ; + virtual void SAL_CALL setReportDefinition( const css::uno::Reference< css::report::XReportDefinition >& _reportdefinition ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActiveConnection( const css::uno::Reference< css::sdbc::XConnection >& _activeconnection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator() throw (css::uno::RuntimeException, std::exception) override ; + virtual void SAL_CALL setStatusIndicator( const css::uno::Reference< css::task::XStatusIndicator >& _statusindicator ) throw (css::uno::RuntimeException, std::exception) override ; + virtual ::sal_Int32 SAL_CALL getMaxRows() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMaxRows( ::sal_Int32 _MaxRows ) throw (css::uno::RuntimeException, std::exception) override; // Methods - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL createDocumentModel( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL createDocumentAlive( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _frame ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override ; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL createDocumentAlive( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _frame ,bool _bHidden) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::util::URL SAL_CALL createDocument( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL interrupt( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< css::frame::XModel > SAL_CALL createDocumentModel( ) throw (css::lang::DisposedException, css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< css::frame::XModel > SAL_CALL createDocumentAlive( const css::uno::Reference< css::frame::XFrame >& _frame ) throw (css::lang::DisposedException, css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) override ; + css::uno::Reference< css::frame::XModel > SAL_CALL createDocumentAlive( const css::uno::Reference< css::frame::XFrame >& _frame ,bool _bHidden) throw (css::lang::DisposedException, css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) ; + virtual css::util::URL SAL_CALL createDocument( ) throw (css::lang::DisposedException, css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) override ; + virtual void SAL_CALL interrupt( ) throw (css::lang::DisposedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override ; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/ReportHelperImpl.hxx b/reportdesign/source/core/inc/ReportHelperImpl.hxx index 269d9396aa23..0575c81b6dea 100644 --- a/reportdesign/source/core/inc/ReportHelperImpl.hxx +++ b/reportdesign/source/core/inc/ReportHelperImpl.hxx @@ -18,7 +18,7 @@ */ #ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTHELPERIMPL_HXX #define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTHELPERIMPL_HXX -// ::com::sun::star::report::XReportComponent: +// css::report::XReportComponent: #define REPORTCOMPONENT_IMPL3(clazz,arg) \ OUString SAL_CALL clazz::getName() throw (uno::RuntimeException, std::exception) \ { \ @@ -109,48 +109,48 @@ void SAL_CALL clazz::setControlBorderColor( ::sal_Int32 _bordercolor ) throw (un } #define REPORTCOMPONENT_MASTERDETAIL(clazz,arg) \ -::com::sun::star::uno::Sequence< OUString > SAL_CALL clazz::getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) \ +css::uno::Sequence< OUString > SAL_CALL clazz::getMasterFields() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return (arg).m_aMasterFields; \ } \ -void SAL_CALL clazz::setMasterFields( const ::com::sun::star::uno::Sequence< OUString >& _masterfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setMasterFields( const css::uno::Sequence< OUString >& _masterfields ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ set(PROPERTY_MASTERFIELDS,_masterfields,(arg).m_aMasterFields); \ } \ -::com::sun::star::uno::Sequence< OUString > SAL_CALL clazz::getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +css::uno::Sequence< OUString > SAL_CALL clazz::getDetailFields() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return (arg).m_aDetailFields; \ } \ -void SAL_CALL clazz::setDetailFields( const ::com::sun::star::uno::Sequence< OUString >& _detailfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setDetailFields( const css::uno::Sequence< OUString >& _detailfields ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ set(PROPERTY_DETAILFIELDS,_detailfields,(arg).m_aDetailFields); \ } #define REPORTCOMPONENT_NOMASTERDETAIL(clazz) \ -::com::sun::star::uno::Sequence< OUString > SAL_CALL clazz::getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) \ +css::uno::Sequence< OUString > SAL_CALL clazz::getMasterFields() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) \ { \ - throw ::com::sun::star::beans::UnknownPropertyException();\ + throw css::beans::UnknownPropertyException();\ } \ -void SAL_CALL clazz::setMasterFields( const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setMasterFields( const css::uno::Sequence< OUString >& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ - throw ::com::sun::star::beans::UnknownPropertyException();\ + throw css::beans::UnknownPropertyException();\ } \ -::com::sun::star::uno::Sequence< OUString > SAL_CALL clazz::getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +css::uno::Sequence< OUString > SAL_CALL clazz::getDetailFields() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ - throw ::com::sun::star::beans::UnknownPropertyException();\ + throw css::beans::UnknownPropertyException();\ } \ -void SAL_CALL clazz::setDetailFields( const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setDetailFields( const css::uno::Sequence< OUString >& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ - throw ::com::sun::star::beans::UnknownPropertyException();\ + throw css::beans::UnknownPropertyException();\ } -// ::com::sun::star::report::XReportControlFormat: +// css::report::XReportControlFormat: #define REPORTCONTROLFORMAT_IMPL1(clazz,varName) \ -::sal_Int32 SAL_CALL clazz::getControlBackground() throw (::com::sun::star::beans::UnknownPropertyException, uno::RuntimeException, std::exception) \ +::sal_Int32 SAL_CALL clazz::getControlBackground() throw (css::beans::UnknownPropertyException, uno::RuntimeException, std::exception) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.m_bBackgroundTransparent ? COL_TRANSPARENT : varName.nBackgroundColor; \ @@ -469,7 +469,7 @@ void SAL_CALL clazz::setCharLocale(const lang::Locale & the_value) throw (uno::R || varName.aCharLocale.Country != the_value.Country \ || varName.aCharLocale.Variant != the_value.Variant ) \ { \ - prepareSet(PROPERTY_CHARLOCALE, ::com::sun::star::uno::makeAny(varName.aCharLocale), ::com::sun::star::uno::makeAny(the_value), &l); \ + prepareSet(PROPERTY_CHARLOCALE, css::uno::makeAny(varName.aCharLocale), css::uno::makeAny(the_value), &l); \ varName.aCharLocale = the_value; \ } \ } \ @@ -601,84 +601,84 @@ void SAL_CALL clazz::setCharKerning(::sal_Int16 the_value) throw (uno::RuntimeEx { \ set(PROPERTY_CHARKERNING,the_value,varName.nCharKerning); \ }\ -float SAL_CALL clazz::getCharHeightAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +float SAL_CALL clazz::getCharHeightAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aAsianFontDescriptor.Height; \ }\ -void SAL_CALL clazz::setCharHeightAsian( float the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharHeightAsian( float the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARHEIGHTASIAN,static_cast<sal_Int16>(the_value),varName.aAsianFontDescriptor.Height); \ }\ -float SAL_CALL clazz::getCharWeightAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +float SAL_CALL clazz::getCharWeightAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aAsianFontDescriptor.Weight; \ }\ -void SAL_CALL clazz::setCharWeightAsian( float the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharWeightAsian( float the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARWEIGHTASIAN,the_value,varName.aAsianFontDescriptor.Weight); \ }\ -OUString SAL_CALL clazz::getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +OUString SAL_CALL clazz::getCharFontNameAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aAsianFontDescriptor.Name; \ }\ -void SAL_CALL clazz::setCharFontNameAsian( const OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharFontNameAsian( const OUString& the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARFONTNAMEASIAN,the_value,varName.aAsianFontDescriptor.Name); \ }\ -OUString SAL_CALL clazz::getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +OUString SAL_CALL clazz::getCharFontStyleNameAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aAsianFontDescriptor.StyleName; \ }\ -void SAL_CALL clazz::setCharFontStyleNameAsian( const OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharFontStyleNameAsian( const OUString& the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARFONTSTYLENAMEASIAN,the_value,varName.aAsianFontDescriptor.StyleName); \ }\ -::sal_Int16 SAL_CALL clazz::getCharFontFamilyAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +::sal_Int16 SAL_CALL clazz::getCharFontFamilyAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aAsianFontDescriptor.Family; \ }\ -void SAL_CALL clazz::setCharFontFamilyAsian( ::sal_Int16 the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharFontFamilyAsian( ::sal_Int16 the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARFONTFAMILYASIAN,the_value,varName.aAsianFontDescriptor.Family); \ }\ -::sal_Int16 SAL_CALL clazz::getCharFontCharSetAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +::sal_Int16 SAL_CALL clazz::getCharFontCharSetAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aAsianFontDescriptor.CharSet; \ }\ -void SAL_CALL clazz::setCharFontCharSetAsian( ::sal_Int16 the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharFontCharSetAsian( ::sal_Int16 the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARFONTCHARSETASIAN,the_value,varName.aAsianFontDescriptor.CharSet); \ }\ -::sal_Int16 SAL_CALL clazz::getCharFontPitchAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +::sal_Int16 SAL_CALL clazz::getCharFontPitchAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aAsianFontDescriptor.Pitch; \ }\ -void SAL_CALL clazz::setCharFontPitchAsian( ::sal_Int16 the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharFontPitchAsian( ::sal_Int16 the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARFONTPITCHASIAN,the_value,varName.aAsianFontDescriptor.Pitch); \ }\ -::com::sun::star::awt::FontSlant SAL_CALL clazz::getCharPostureAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +css::awt::FontSlant SAL_CALL clazz::getCharPostureAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aAsianFontDescriptor.Slant; \ }\ -void SAL_CALL clazz::setCharPostureAsian( ::com::sun::star::awt::FontSlant the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharPostureAsian( css::awt::FontSlant the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARPOSTUREASIAN,the_value,varName.aAsianFontDescriptor.Slant); \ }\ -::com::sun::star::lang::Locale SAL_CALL clazz::getCharLocaleAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +css::lang::Locale SAL_CALL clazz::getCharLocaleAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aCharLocaleAsian; \ }\ -void SAL_CALL clazz::setCharLocaleAsian( const ::com::sun::star::lang::Locale& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharLocaleAsian( const css::lang::Locale& the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ BoundListeners l; \ { \ @@ -687,90 +687,90 @@ void SAL_CALL clazz::setCharLocaleAsian( const ::com::sun::star::lang::Locale& t || varName.aCharLocaleAsian.Country != the_value.Country \ || varName.aCharLocaleAsian.Variant != the_value.Variant ) \ { \ - prepareSet(PROPERTY_CHARLOCALEASIAN, ::com::sun::star::uno::makeAny(varName.aCharLocaleAsian), ::com::sun::star::uno::makeAny(the_value), &l); \ + prepareSet(PROPERTY_CHARLOCALEASIAN, css::uno::makeAny(varName.aCharLocaleAsian), css::uno::makeAny(the_value), &l); \ varName.aCharLocaleAsian = the_value; \ } \ } \ l.notify(); \ }\ -float SAL_CALL clazz::getCharHeightComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +float SAL_CALL clazz::getCharHeightComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aComplexFontDescriptor.Height; \ }\ -void SAL_CALL clazz::setCharHeightComplex( float the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharHeightComplex( float the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARHEIGHTCOMPLEX,static_cast<sal_Int16>(the_value),varName.aComplexFontDescriptor.Height); \ }\ -float SAL_CALL clazz::getCharWeightComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +float SAL_CALL clazz::getCharWeightComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aComplexFontDescriptor.Weight; \ }\ -void SAL_CALL clazz::setCharWeightComplex( float the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharWeightComplex( float the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARWEIGHTCOMPLEX,the_value,varName.aComplexFontDescriptor.Weight); \ }\ -OUString SAL_CALL clazz::getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +OUString SAL_CALL clazz::getCharFontNameComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aComplexFontDescriptor.Name; \ }\ -void SAL_CALL clazz::setCharFontNameComplex( const OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharFontNameComplex( const OUString& the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARFONTNAMECOMPLEX,the_value,varName.aComplexFontDescriptor.Name); \ }\ -OUString SAL_CALL clazz::getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +OUString SAL_CALL clazz::getCharFontStyleNameComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aComplexFontDescriptor.StyleName; \ }\ -void SAL_CALL clazz::setCharFontStyleNameComplex( const OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharFontStyleNameComplex( const OUString& the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARFONTSTYLENAMECOMPLEX,the_value,varName.aComplexFontDescriptor.StyleName); \ }\ -::sal_Int16 SAL_CALL clazz::getCharFontFamilyComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +::sal_Int16 SAL_CALL clazz::getCharFontFamilyComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aComplexFontDescriptor.Family; \ }\ -void SAL_CALL clazz::setCharFontFamilyComplex( ::sal_Int16 the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharFontFamilyComplex( ::sal_Int16 the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARFONTFAMILYCOMPLEX,the_value,varName.aComplexFontDescriptor.Family); \ }\ -::sal_Int16 SAL_CALL clazz::getCharFontCharSetComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +::sal_Int16 SAL_CALL clazz::getCharFontCharSetComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aComplexFontDescriptor.CharSet; \ }\ -void SAL_CALL clazz::setCharFontCharSetComplex( ::sal_Int16 the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharFontCharSetComplex( ::sal_Int16 the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARFONTCHARSETCOMPLEX,the_value,varName.aComplexFontDescriptor.CharSet); \ }\ -::sal_Int16 SAL_CALL clazz::getCharFontPitchComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +::sal_Int16 SAL_CALL clazz::getCharFontPitchComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aComplexFontDescriptor.Pitch; \ }\ -void SAL_CALL clazz::setCharFontPitchComplex( ::sal_Int16 the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharFontPitchComplex( ::sal_Int16 the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARFONTPITCHCOMPLEX,the_value,varName.aComplexFontDescriptor.Pitch); \ }\ -::com::sun::star::awt::FontSlant SAL_CALL clazz::getCharPostureComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +css::awt::FontSlant SAL_CALL clazz::getCharPostureComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aComplexFontDescriptor.Slant; \ }\ -void SAL_CALL clazz::setCharPostureComplex( ::com::sun::star::awt::FontSlant the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharPostureComplex( css::awt::FontSlant the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ set(PROPERTY_CHARPOSTURECOMPLEX,the_value,varName.aComplexFontDescriptor.Slant); \ }\ -::com::sun::star::lang::Locale SAL_CALL clazz::getCharLocaleComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +css::lang::Locale SAL_CALL clazz::getCharLocaleComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.aCharLocaleComplex; \ }\ -void SAL_CALL clazz::setCharLocaleComplex( const ::com::sun::star::lang::Locale& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ +void SAL_CALL clazz::setCharLocaleComplex( const css::lang::Locale& the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ { \ BoundListeners l; \ { \ @@ -779,7 +779,7 @@ void SAL_CALL clazz::setCharLocaleComplex( const ::com::sun::star::lang::Locale& || varName.aCharLocaleComplex.Country != the_value.Country \ || varName.aCharLocaleComplex.Variant != the_value.Variant ) \ { \ - prepareSet(PROPERTY_CHARLOCALECOMPLEX, ::com::sun::star::uno::makeAny(varName.aCharLocaleComplex), ::com::sun::star::uno::makeAny(the_value), &l); \ + prepareSet(PROPERTY_CHARLOCALECOMPLEX, css::uno::makeAny(varName.aCharLocaleComplex), css::uno::makeAny(the_value), &l); \ varName.aCharLocaleComplex = the_value; \ } \ } \ @@ -1127,153 +1127,153 @@ void SAL_CALL clazz::setCharPosture( awt::FontSlant /*_charposture*/ ) throw (be {\ throw beans::UnknownPropertyException();\ }\ - float SAL_CALL clazz::getCharHeightAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + float SAL_CALL clazz::getCharHeightAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharHeightAsian( float ) throw (beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharHeightAsian( float ) throw (beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - float SAL_CALL clazz::getCharWeightAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + float SAL_CALL clazz::getCharWeightAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharWeightAsian( float ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharWeightAsian( float ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - OUString SAL_CALL clazz::getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + OUString SAL_CALL clazz::getCharFontNameAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharFontNameAsian( const OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharFontNameAsian( const OUString& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - OUString SAL_CALL clazz::getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + OUString SAL_CALL clazz::getCharFontStyleNameAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharFontStyleNameAsian( const OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharFontStyleNameAsian( const OUString& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - ::sal_Int16 SAL_CALL clazz::getCharFontFamilyAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + ::sal_Int16 SAL_CALL clazz::getCharFontFamilyAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharFontFamilyAsian( ::sal_Int16 ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharFontFamilyAsian( ::sal_Int16 ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - ::sal_Int16 SAL_CALL clazz::getCharFontCharSetAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + ::sal_Int16 SAL_CALL clazz::getCharFontCharSetAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharFontCharSetAsian( ::sal_Int16 ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharFontCharSetAsian( ::sal_Int16 ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - ::sal_Int16 SAL_CALL clazz::getCharFontPitchAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + ::sal_Int16 SAL_CALL clazz::getCharFontPitchAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharFontPitchAsian( ::sal_Int16 ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharFontPitchAsian( ::sal_Int16 ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - ::com::sun::star::awt::FontSlant SAL_CALL clazz::getCharPostureAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + css::awt::FontSlant SAL_CALL clazz::getCharPostureAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharPostureAsian( ::com::sun::star::awt::FontSlant ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharPostureAsian( css::awt::FontSlant ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - ::com::sun::star::lang::Locale SAL_CALL clazz::getCharLocaleAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + css::lang::Locale SAL_CALL clazz::getCharLocaleAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharLocaleAsian( const ::com::sun::star::lang::Locale& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharLocaleAsian( const css::lang::Locale& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - float SAL_CALL clazz::getCharHeightComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + float SAL_CALL clazz::getCharHeightComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharHeightComplex( float ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharHeightComplex( float ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - float SAL_CALL clazz::getCharWeightComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + float SAL_CALL clazz::getCharWeightComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharWeightComplex( float ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharWeightComplex( float ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - OUString SAL_CALL clazz::getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + OUString SAL_CALL clazz::getCharFontNameComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharFontNameComplex( const OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharFontNameComplex( const OUString& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - OUString SAL_CALL clazz::getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + OUString SAL_CALL clazz::getCharFontStyleNameComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharFontStyleNameComplex( const OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharFontStyleNameComplex( const OUString& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - ::sal_Int16 SAL_CALL clazz::getCharFontFamilyComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + ::sal_Int16 SAL_CALL clazz::getCharFontFamilyComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharFontFamilyComplex( ::sal_Int16 ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharFontFamilyComplex( ::sal_Int16 ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - ::sal_Int16 SAL_CALL clazz::getCharFontCharSetComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + ::sal_Int16 SAL_CALL clazz::getCharFontCharSetComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharFontCharSetComplex( ::sal_Int16 ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharFontCharSetComplex( ::sal_Int16 ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - ::sal_Int16 SAL_CALL clazz::getCharFontPitchComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + ::sal_Int16 SAL_CALL clazz::getCharFontPitchComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharFontPitchComplex( ::sal_Int16 ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharFontPitchComplex( ::sal_Int16 ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - ::com::sun::star::awt::FontSlant SAL_CALL clazz::getCharPostureComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + css::awt::FontSlant SAL_CALL clazz::getCharPostureComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharPostureComplex( ::com::sun::star::awt::FontSlant ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharPostureComplex( css::awt::FontSlant ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - ::com::sun::star::lang::Locale SAL_CALL clazz::getCharLocaleComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + css::lang::Locale SAL_CALL clazz::getCharLocaleComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ }\ - void SAL_CALL clazz::setCharLocaleComplex( const ::com::sun::star::lang::Locale& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception)\ + void SAL_CALL clazz::setCharLocaleComplex( const css::lang::Locale& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\ {\ throw beans::UnknownPropertyException();\ } -// ::com::sun::star::report::XReportControlFormat: +// css::report::XReportControlFormat: #define REPORTCONTROLFORMAT_IMPL(clazz,varName) \ REPORTCONTROLFORMAT_IMPL1(clazz,varName) \ REPORTCONTROLFORMAT_IMPL2(clazz,varName) diff --git a/reportdesign/source/core/inc/RptObjectListener.hxx b/reportdesign/source/core/inc/RptObjectListener.hxx index cb085439b481..a51e82465cf9 100644 --- a/reportdesign/source/core/inc/RptObjectListener.hxx +++ b/reportdesign/source/core/inc/RptObjectListener.hxx @@ -32,7 +32,7 @@ class OObjectBase; // OObjectListener -typedef ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener > TPropertyChangeListenerHelper; +typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener > TPropertyChangeListenerHelper; class OObjectListener: public TPropertyChangeListenerHelper { @@ -46,10 +46,10 @@ public: OObjectListener(OObjectBase* _pObject); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override; }; } #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_RPTOBJECTLISTENER_HXX diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx index 7ed81c568b6d..e72e545bf4cd 100644 --- a/reportdesign/source/core/inc/Section.hxx +++ b/reportdesign/source/core/inc/Section.hxx @@ -37,31 +37,31 @@ namespace reportdesign { typedef ::cppu::WeakComponentImplHelper - < ::com::sun::star::report::XSection - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XUnoTunnel + < css::report::XSection + , css::lang::XServiceInfo + , css::lang::XUnoTunnel // SvxDrawPage forward - , ::com::sun::star::drawing::XDrawPage - , ::com::sun::star::drawing::XShapeGrouper + , css::drawing::XDrawPage + , css::drawing::XShapeGrouper // SvxFmDrawPage forward - , ::com::sun::star::form::XFormsSupplier2 + , css::form::XFormsSupplier2 > SectionBase; - typedef ::cppu::PropertySetMixin<com::sun::star::report::XSection> SectionPropertySet; + typedef ::cppu::PropertySetMixin<css::report::XSection> SectionPropertySet; class OSection : public comphelper::OMutexAndBroadcastHelper, public SectionBase, public SectionPropertySet { ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > m_xDrawPage; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGrouper > m_xDrawPage_ShapeGrouper; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormsSupplier2 > m_xDrawPage_FormSupplier; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > m_xDrawPage_Tunnel; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroup > m_xGroup; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition > m_xReportDefinition; - OUString m_sName; - OUString m_sConditionalPrintExpression; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage; + css::uno::Reference< css::drawing::XShapeGrouper > m_xDrawPage_ShapeGrouper; + css::uno::Reference< css::form::XFormsSupplier2 > m_xDrawPage_FormSupplier; + css::uno::Reference< css::lang::XUnoTunnel > m_xDrawPage_Tunnel; + css::uno::WeakReference< css::report::XGroup > m_xGroup; + css::uno::WeakReference< css::report::XReportDefinition > m_xReportDefinition; + OUString m_sName; + OUString m_sConditionalPrintExpression; ::sal_uInt32 m_nHeight; ::sal_Int32 m_nBackgroundColor; ::sal_Int16 m_nForceNewPage; @@ -86,7 +86,7 @@ namespace reportdesign ::osl::MutexGuard aGuard(m_aMutex); if ( _member != _Value ) { - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } } @@ -101,7 +101,7 @@ namespace reportdesign ::osl::MutexGuard aGuard(m_aMutex); if ( _member != _Value ) { - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } } @@ -128,108 +128,108 @@ namespace reportdesign typedef rtl::Reference<OSection> TSection; private: - OSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& xParentDef - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& xParentGroup - ,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context, - ::com::sun::star::uno::Sequence< OUString> const&); + OSection(const css::uno::Reference< css::report::XReportDefinition >& xParentDef + ,const css::uno::Reference< css::report::XGroup >& xParentGroup + ,const css::uno::Reference< css::uno::XComponentContext >& context, + css::uno::Sequence< OUString> const&); public: - static ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> - createOSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xParent - ,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context,bool _bPageSection=false); - static ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> - createOSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xParent - ,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context,bool _bPageSection=false); + static css::uno::Reference< css::report::XSection> + createOSection(const css::uno::Reference< css::report::XReportDefinition >& _xParent + ,const css::uno::Reference< css::uno::XComponentContext >& context,bool _bPageSection=false); + static css::uno::Reference< css::report::XSection> + createOSection(const css::uno::Reference< css::report::XGroup >& _xParent + ,const css::uno::Reference< css::uno::XComponentContext >& context,bool _bPageSection=false); DECLARE_XINTERFACE( ) - // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - // 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) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XSection - virtual sal_Bool SAL_CALL getVisible() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& _name ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_uInt32 SAL_CALL getHeight() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeight( ::sal_uInt32 _height ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getBackColor() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBackColor( ::sal_Int32 _backgroundcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBackTransparent() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBackTransparent( sal_Bool _backtransparent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getConditionalPrintExpression() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getForceNewPage() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setForceNewPage( ::sal_Int16 _forcenewpage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getNewRowOrCol() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getKeepTogether() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setKeepTogether( sal_Bool _keeptogether ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getCanGrow() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCanGrow( sal_Bool _cangrow ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getCanShrink() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCanShrink( sal_Bool _canshrink ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getRepeatSection() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRepeatSection( sal_Bool _repeatsection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > SAL_CALL getGroup() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > SAL_CALL getReportDefinition() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_uInt32 SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHeight( ::sal_uInt32 _height ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBackColor( ::sal_Int32 _backgroundcolor ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getBackTransparent() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBackTransparent( sal_Bool _backtransparent ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getConditionalPrintExpression() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getForceNewPage() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setForceNewPage( ::sal_Int16 _forcenewpage ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getNewRowOrCol() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getKeepTogether() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setKeepTogether( sal_Bool _keeptogether ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getCanGrow() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCanGrow( sal_Bool _cangrow ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getCanShrink() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCanShrink( sal_Bool _canshrink ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getRepeatSection() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRepeatSection( sal_Bool _repeatsection ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XGroup > SAL_CALL getGroup() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::report::XReportDefinition > SAL_CALL getReportDefinition() throw (css::uno::RuntimeException, std::exception) override; // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception) override; // XShapeGrouper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > SAL_CALL group( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ungroup( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup >& aGroup ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShapeGroup > SAL_CALL group( const css::uno::Reference< css::drawing::XShapes >& xShapes ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ungroup( const css::uno::Reference< css::drawing::XShapeGroup >& aGroup ) throw (css::uno::RuntimeException, std::exception) override; // XFormsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getForms() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getForms() throw (css::uno::RuntimeException, std::exception) override; // XFormsSupplier2 - virtual sal_Bool SAL_CALL hasForms() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasForms() throw (css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } - // com::sun::star::lang::XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - static OSection* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); - static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + // css::lang::XUnoTunnel + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + static OSection* getImplementation( const css::uno::Reference< css::uno::XInterface >& _rxComponent ); + static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); - void notifyElementAdded(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape); - void notifyElementRemoved(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape); + void notifyElementAdded(const css::uno::Reference< css::drawing::XShape >& xShape); + void notifyElementRemoved(const css::uno::Reference< css::drawing::XShape >& xShape); }; } #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_SECTION_HXX diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx index bf2ee923fa87..745ab5da95d9 100644 --- a/reportdesign/source/core/inc/Shape.hxx +++ b/reportdesign/source/core/inc/Shape.hxx @@ -31,9 +31,9 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XShape > ShapePropertySet; - typedef ::cppu::WeakComponentImplHelper< com::sun::star::report::XShape - ,com::sun::star::lang::XServiceInfo > ShapeBase; + typedef ::cppu::PropertySetMixin< css::report::XShape > ShapePropertySet; + typedef ::cppu::WeakComponentImplHelper< css::report::XShape + ,css::lang::XServiceInfo > ShapeBase; /** \class OShape Defines the implementation of a \interface com:::sun::star::report::XShape * \ingroup reportdesign_api @@ -46,15 +46,14 @@ namespace reportdesign friend class OShapeHelper; ::std::unique_ptr< ::comphelper::OPropertyArrayAggregationHelper> m_pAggHelper; OReportControlModel m_aProps; - com::sun::star::drawing::HomogenMatrix3 m_Transformation; + css::drawing::HomogenMatrix3 m_Transformation; sal_Int32 m_nZOrder; bool m_bOpaque; - OUString m_sServiceName; - OUString m_CustomShapeEngine; - OUString m_CustomShapeData; - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > - m_CustomShapeGeometry; + OUString m_sServiceName; + OUString m_CustomShapeEngine; + OUString m_CustomShapeData; + css::uno::Sequence< css::beans::PropertyValue > m_CustomShapeGeometry; private: OShape(const OShape&) = delete; @@ -67,7 +66,7 @@ namespace reportdesign BoundListeners l; { ::osl::MutexGuard aGuard(m_aMutex); - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } l.notify(); @@ -79,7 +78,7 @@ namespace reportdesign BoundListeners l; { ::osl::MutexGuard aGuard(m_aMutex); - prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l); + prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l); _member = _Value; } l.notify(); @@ -88,30 +87,30 @@ namespace reportdesign protected: virtual ~OShape(); public: - explicit OShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext); - explicit OShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _xFactory - ,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _xShape + explicit OShape(css::uno::Reference< css::uno::XComponentContext > const & _xContext); + explicit OShape(css::uno::Reference< css::uno::XComponentContext > const & _xContext + ,const css::uno::Reference< css::lang::XMultiServiceFactory > & _xFactory + ,css::uno::Reference< css::drawing::XShape >& _xShape ,const OUString& _sServiceName); DECLARE_XINTERFACE( ) - // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); - // 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) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::lang::XServiceInfo + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XReportComponent REPORTCOMPONENT_HEADER() @@ -119,18 +118,18 @@ namespace reportdesign // XShape SHAPE_HEADER() - virtual OUString SAL_CALL getCustomShapeEngine() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCustomShapeEngine( const OUString& _customshapeengine ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCustomShapeData() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCustomShapeData( const OUString& _customshapedata ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCustomShapeGeometry() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCustomShapeGeometry( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _customshapegeometry ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCustomShapeEngine() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCustomShapeEngine( const OUString& _customshapeengine ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCustomShapeData() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCustomShapeData( const OUString& _customshapedata ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCustomShapeGeometry() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCustomShapeGeometry( const css::uno::Sequence< css::beans::PropertyValue >& _customshapegeometry ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getOpaque() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOpaque( sal_Bool _opaque ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getOpaque() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setOpaque( sal_Bool _opaque ) throw (css::uno::RuntimeException, std::exception) override; // XShapeDescriptor - virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType( ) throw (css::uno::RuntimeException, std::exception) override; // XReportControlModel REPORTCONTROLMODEL_HEADER() @@ -138,47 +137,47 @@ namespace reportdesign // XReportControlFormat REPORTCONTROLFORMAT_HEADER() // XShape - virtual ::sal_Int32 SAL_CALL getZOrder() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setZOrder( ::sal_Int32 _zorder ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::drawing::HomogenMatrix3 SAL_CALL getTransformation() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTransformation( const ::com::sun::star::drawing::HomogenMatrix3& _transformation ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getZOrder() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setZOrder( ::sal_Int32 _zorder ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::drawing::HomogenMatrix3 SAL_CALL getTransformation() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTransformation( const css::drawing::HomogenMatrix3& _transformation ) throw (css::uno::RuntimeException, std::exception) override; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexContainer - virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; }; } #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_SHAPE_HXX diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx index d80581efaacf..e64bb93c3aec 100644 --- a/reportdesign/source/core/inc/Tools.hxx +++ b/reportdesign/source/core/inc/Tools.hxx @@ -35,7 +35,7 @@ namespace reportdesign { - template <class T> void lcl_createSectionIfNeeded(bool _bOn,const T& _xParent,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection/*in/out*/,bool _bPageSection = false) + template <class T> void lcl_createSectionIfNeeded(bool _bOn,const T& _xParent,css::uno::Reference< css::report::XSection>& _xSection/*in/out*/,bool _bPageSection = false) { if ( _bOn && !_xSection.is() ) _xSection = OSection::createOSection(_xParent,_xParent->getContext(),_bPageSection); @@ -48,7 +48,7 @@ namespace reportdesign * \param _xReportComponent A report component which is a child of the section. * \return The section where this report component resists in. */ - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> lcl_getSection(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); + css::uno::Reference< css::report::XSection> lcl_getSection(const css::uno::Reference< css::uno::XInterface>& _xReportComponent); /** throws an illegal argument exception. The message text is the resource RID_STR_ERROR_WRONG_ARGUMENT + the type as reference. * @@ -58,9 +58,9 @@ namespace reportdesign * \param Context_ The context to get the factory service. */ void throwIllegallArgumentException(const OUString& _sTypeName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& ExceptionContext_ + ,const css::uno::Reference< css::uno::XInterface >& ExceptionContext_ ,const ::sal_Int16& ArgumentPosition_ - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context_); + ,const css::uno::Reference< css::uno::XComponentContext >& Context_); /** clones the given object * @@ -69,22 +69,22 @@ namespace reportdesign * \param _sServiceName the service of the to be cloned object * \return the clone */ - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > cloneObject( - const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xReportComponent - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xFactory + css::uno::Reference< css::util::XCloneable > cloneObject( + const css::uno::Reference< css::report::XReportComponent>& _xReportComponent + ,const css::uno::Reference< css::lang::XMultiServiceFactory>& _xFactory ,const OUString& _sServiceName); class OShapeHelper { public: - template<typename T> static void setSize(const ::com::sun::star::awt::Size& aSize,T* _pShape) + template<typename T> static void setSize(const css::awt::Size& aSize,T* _pShape) { OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal width or height!"); ::osl::MutexGuard aGuard(_pShape->m_aMutex); if ( _pShape->m_aProps.aComponent.m_xShape.is() ) { - ::com::sun::star::awt::Size aOldSize = _pShape->m_aProps.aComponent.m_xShape->getSize(); + css::awt::Size aOldSize = _pShape->m_aProps.aComponent.m_xShape->getSize(); if ( aOldSize.Height != aSize.Height || aOldSize.Width != aSize.Width ) { _pShape->m_aProps.aComponent.m_nWidth = aOldSize.Width; @@ -95,29 +95,29 @@ namespace reportdesign _pShape->set(PROPERTY_WIDTH,aSize.Width,_pShape->m_aProps.aComponent.m_nWidth); _pShape->set(PROPERTY_HEIGHT,aSize.Height,_pShape->m_aProps.aComponent.m_nHeight); } - template<typename T> static ::com::sun::star::awt::Size getSize( T* _pShape ) + template<typename T> static css::awt::Size getSize( T* _pShape ) { ::osl::MutexGuard aGuard(_pShape->m_aMutex); if ( _pShape->m_aProps.aComponent.m_xShape.is() ) { - ::com::sun::star::awt::Size aSize = _pShape->m_aProps.aComponent.m_xShape->getSize(); + css::awt::Size aSize = _pShape->m_aProps.aComponent.m_xShape->getSize(); OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal width or height!"); return aSize; } - return ::com::sun::star::awt::Size(_pShape->m_aProps.aComponent.m_nWidth,_pShape->m_aProps.aComponent.m_nHeight); + return css::awt::Size(_pShape->m_aProps.aComponent.m_nWidth,_pShape->m_aProps.aComponent.m_nHeight); } - template<typename T> static void setPosition( const ::com::sun::star::awt::Point& _aPosition ,T* _pShape) + template<typename T> static void setPosition( const css::awt::Point& _aPosition ,T* _pShape) { // we know it is not allowed that the position in smaller 0, but in NbcMove() it will handled right. // only at 'Undo' it is possible to short set the position smaller 0 // OSL_ENSURE(_aPosition.X >= 0 && _aPosition.Y >= 0,"set to Illegal position!"); ::osl::MutexGuard aGuard(_pShape->m_aMutex); - ::com::sun::star::awt::Point aOldPos; + css::awt::Point aOldPos; aOldPos.X = _pShape->m_aProps.aComponent.m_nPosX; aOldPos.Y = _pShape->m_aProps.aComponent.m_nPosY; - ::com::sun::star::awt::Point aPosition(_aPosition); + css::awt::Point aPosition(_aPosition); if ( _pShape->m_aProps.aComponent.m_xShape.is() ) { aOldPos = _pShape->m_aProps.aComponent.m_xShape->getPosition(); @@ -131,29 +131,29 @@ namespace reportdesign _pShape->set(PROPERTY_POSITIONX,aPosition.X,aOldPos.X); _pShape->set(PROPERTY_POSITIONY,aPosition.Y,aOldPos.Y); } - template<typename T> static ::com::sun::star::awt::Point getPosition(T* _pShape) + template<typename T> static css::awt::Point getPosition(T* _pShape) { ::osl::MutexGuard aGuard(_pShape->m_aMutex); if ( _pShape->m_aProps.aComponent.m_xShape.is() ) { - ::com::sun::star::awt::Point aPosition = _pShape->m_aProps.aComponent.m_xShape->getPosition(); + css::awt::Point aPosition = _pShape->m_aProps.aComponent.m_xShape->getPosition(); return aPosition; } - return ::com::sun::star::awt::Point(_pShape->m_aProps.aComponent.m_nPosX,_pShape->m_aProps.aComponent.m_nPosY); + return css::awt::Point(_pShape->m_aProps.aComponent.m_nPosX,_pShape->m_aProps.aComponent.m_nPosY); } - template<typename T> static void setParent( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& Parent, T* _pShape) + template<typename T> static void setParent( const css::uno::Reference< css::uno::XInterface >& Parent, T* _pShape) { ::osl::MutexGuard aGuard(_pShape->m_aMutex); - _pShape->m_aProps.aComponent.m_xParent = ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild >(Parent,::com::sun::star::uno::UNO_QUERY); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild > xChild; + _pShape->m_aProps.aComponent.m_xParent = css::uno::Reference< css::container::XChild >(Parent,css::uno::UNO_QUERY); + css::uno::Reference< css::container::XChild > xChild; comphelper::query_aggregation(_pShape->m_aProps.aComponent.m_xProxy,xChild); if ( xChild.is() ) xChild->setParent(Parent); } - template<typename T> static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getParent( T* _pShape ) + template<typename T> static css::uno::Reference< css::uno::XInterface > getParent( T* _pShape ) { ::osl::MutexGuard aGuard(_pShape->m_aMutex); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild > xChild; + css::uno::Reference< css::container::XChild > xChild; comphelper::query_aggregation(_pShape->m_aProps.aComponent.m_xProxy,xChild); if ( xChild.is() ) return xChild->getParent(); diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx index cbd23f68d8c6..e1e6e82f16f9 100644 --- a/reportdesign/source/core/inc/conditionupdater.hxx +++ b/reportdesign/source/core/inc/conditionupdater.hxx @@ -42,14 +42,14 @@ namespace rptui ~ConditionUpdater(); /// notifies the object about the change of a property value, somewhere in the report definition - void notifyPropertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ); + void notifyPropertyChange( const css::beans::PropertyChangeEvent& _rEvent ); private: /// does late initializations, return whether or not successful bool impl_lateInit_nothrow(); void impl_adjustFormatConditions_nothrow( - const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel >& _rxRptControlModel, + const css::uno::Reference< css::report::XReportControlModel >& _rxRptControlModel, const OUString& _rOldDataSource, const OUString& _rNewDataSource ); diff --git a/reportdesign/source/core/inc/core_resource.hxx b/reportdesign/source/core/inc/core_resource.hxx index fe192bd338db..35063422c1dd 100644 --- a/reportdesign/source/core/inc/core_resource.hxx +++ b/reportdesign/source/core/inc/core_resource.hxx @@ -54,12 +54,12 @@ namespace reportdesign friend class EnsureDelete; protected: - static void ensureImplExists(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory >& _rM); + static void ensureImplExists(const css::uno::Reference< css::lang::XMultiComponentFactory >& _rM); public: /** loads the string with the specified resource id from the FormLayer resource file */ - static OUString loadString(sal_uInt16 _nResId,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory >& _rM); + static OUString loadString(sal_uInt16 _nResId,const css::uno::Reference< css::lang::XMultiComponentFactory >& _rM); }; diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index 718d95ed541e..0b6e558baf4b 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -153,7 +153,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt } } -void SAL_CALL OPropertyMediator::disposing( const ::com::sun::star::lang::EventObject& /*_rSource*/ ) throw (RuntimeException, std::exception) +void SAL_CALL OPropertyMediator::disposing( const css::lang::EventObject& /*_rSource*/ ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); disposing(); diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index d09b173ad89b..2f8e7b991c49 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -180,7 +180,7 @@ namespace class ParaAdjust : public AnyConverter { public: - virtual ::com::sun::star::uno::Any operator() (const OUString& _sPropertyName,const ::com::sun::star::uno::Any& lhs) const override + virtual css::uno::Any operator() (const OUString& _sPropertyName,const css::uno::Any& lhs) const override { uno::Any aRet; if (_sPropertyName == PROPERTY_PARAADJUST) diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx index bdb1ff9bb96c..efee1a77273c 100644 --- a/reportdesign/source/core/sdr/RptObjectListener.cxx +++ b/reportdesign/source/core/sdr/RptObjectListener.cxx @@ -41,14 +41,14 @@ OObjectListener::~OObjectListener() // XEventListener -void SAL_CALL OObjectListener::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OObjectListener::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception) { } // XPropertyChangeListener -void SAL_CALL OObjectListener::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OObjectListener::propertyChange( const css::beans::PropertyChangeEvent& evt ) throw( css::uno::RuntimeException, std::exception) { m_pObject->_propertyChange( evt ); } diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index efb934ec8c24..42a703a10978 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -68,7 +68,7 @@ namespace rptui } - void FormatNormalizer::notifyPropertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) + void FormatNormalizer::notifyPropertyChange( const css::beans::PropertyChangeEvent& _rEvent ) { if ( !impl_lateInit() ) return; @@ -85,7 +85,7 @@ namespace rptui } - void FormatNormalizer::notifyElementInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) + void FormatNormalizer::notifyElementInserted( const css::uno::Reference< css::uno::XInterface >& _rxElement ) { if ( !impl_lateInit() ) return; diff --git a/reportdesign/source/core/sdr/formatnormalizer.hxx b/reportdesign/source/core/sdr/formatnormalizer.hxx index d4da500ef177..63494188bd1f 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.hxx +++ b/reportdesign/source/core/sdr/formatnormalizer.hxx @@ -52,8 +52,8 @@ namespace rptui typedef ::std::vector< Field > FieldList; private: - const OReportModel& m_rModel; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReportDefinition; + const OReportModel& m_rModel; + css::uno::Reference< css::report::XReportDefinition > m_xReportDefinition; /// is our field list dirty? FieldList m_aFields; @@ -63,18 +63,18 @@ namespace rptui explicit FormatNormalizer( const OReportModel& _rModel ); ~FormatNormalizer(); - void notifyPropertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ); - void notifyElementInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ); + void notifyPropertyChange( const css::beans::PropertyChangeEvent& _rEvent ); + void notifyElementInserted( const css::uno::Reference< css::uno::XInterface >& _rxElement ); private: bool impl_lateInit(); void impl_onDefinitionPropertyChange( const OUString& _rChangedPropName ); - void impl_onFormattedProperttyChange( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormattedField >& _rxFormatted, const OUString& _rChangedPropName ); + void impl_onFormattedProperttyChange( const css::uno::Reference< css::report::XFormattedField >& _rxFormatted, const OUString& _rChangedPropName ); bool impl_ensureUpToDateFieldList_nothrow(); - void impl_adjustFormatToDataFieldType_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormattedField >& _rxFormatted ); + void impl_adjustFormatToDataFieldType_nothrow( const css::uno::Reference< css::report::XFormattedField >& _rxFormatted ); }; diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index ddcbc6ce31f8..b193f60b2b97 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -45,7 +45,7 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon { } -OUString SAL_CALL ORptTypeDetection::detect( Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (RuntimeException, std::exception) +OUString SAL_CALL ORptTypeDetection::detect( Sequence< css::beans::PropertyValue >& Descriptor ) throw (RuntimeException, std::exception) { ::comphelper::SequenceAsHashMap aTemp(Descriptor); diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index 0864d3e23ad0..78510efa6080 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -64,27 +64,27 @@ namespace rptxml { - class ORptTypeDetection : public ::cppu::WeakImplHelper< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo> + class ORptTypeDetection : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo> { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; public: - explicit ORptTypeDetection(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + explicit ORptTypeDetection(css::uno::Reference< css::uno::XComponentContext > const & xContext); // XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception ) override; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) override; // static methods - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ) + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ) { return OUString("com.sun.star.comp.report.ORptTypeDetection"); } - 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(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); - 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; }; } #endif diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx index d6a137738c17..274c49811f25 100644 --- a/reportdesign/source/filter/xml/xmlCell.hxx +++ b/reportdesign/source/filter/xml/xmlCell.hxx @@ -28,11 +28,11 @@ namespace rptxml class OXMLTable; class OXMLCell : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; + css::uno::Reference< css::report::XReportComponent > m_xComponent; OXMLTable* m_pContainer; OXMLCell* m_pCell; - OUString m_sStyleName; - OUString m_sText; + OUString m_sStyleName; + OUString m_sText; sal_Int32 m_nCurrentCount; bool m_bContainsShape; @@ -44,19 +44,19 @@ namespace rptxml OXMLCell( ORptFilter& rImport ,sal_uInt16 nPrfx ,const OUString& rLName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ,OXMLTable* _pContainer ,OXMLCell* _pCell = NULL); virtual ~OXMLCell(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void Characters( const OUString& rChars ) override; virtual void EndElement() override; - void setComponent(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent); + void setComponent(const css::uno::Reference< css::report::XReportComponent >& _xComponent); void setContainsShape(bool _bContainsShapes); }; diff --git a/reportdesign/source/filter/xml/xmlColumn.hxx b/reportdesign/source/filter/xml/xmlColumn.hxx index 8f6e31817ea6..62cc56124fb4 100644 --- a/reportdesign/source/filter/xml/xmlColumn.hxx +++ b/reportdesign/source/filter/xml/xmlColumn.hxx @@ -39,14 +39,14 @@ namespace rptxml OXMLRowColumn( ORptFilter& rImport ,sal_uInt16 nPrfx ,const OUString& rLName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ,OXMLTable* _pContainer ); virtual ~OXMLRowColumn(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; }; diff --git a/reportdesign/source/filter/xml/xmlComponent.hxx b/reportdesign/source/filter/xml/xmlComponent.hxx index 08ece11a572e..2b448b4942cf 100644 --- a/reportdesign/source/filter/xml/xmlComponent.hxx +++ b/reportdesign/source/filter/xml/xmlComponent.hxx @@ -29,7 +29,7 @@ namespace rptxml class OXMLComponent : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; + css::uno::Reference< css::report::XReportComponent > m_xComponent; OUString m_sName; OUString m_sTextStyleName; @@ -40,8 +40,8 @@ namespace rptxml OXMLComponent( ORptFilter& rImport , sal_uInt16 nPrfx ,const OUString& rLName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent + ,const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::report::XReportComponent >& _xComponent ); virtual ~OXMLComponent(); }; diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx index adc937912b8d..bdf2c3bce43e 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx @@ -27,7 +27,7 @@ namespace rptxml class ORptFilter; class OXMLCondPrtExpr : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xComponent; + css::uno::Reference< css::beans::XPropertySet > m_xComponent; OXMLCondPrtExpr(const OXMLCondPrtExpr&) = delete; void operator =(const OXMLCondPrtExpr&) = delete; public: @@ -35,8 +35,8 @@ namespace rptxml OXMLCondPrtExpr( ORptFilter& _rImport ,sal_uInt16 nPrfx ,const OUString& rLName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & _xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xComponent); + ,const css::uno::Reference< css::xml::sax::XAttributeList > & _xAttrList + ,const css::uno::Reference< css::beans::XPropertySet >& _xComponent); virtual ~OXMLCondPrtExpr(); // This method is called for all characters that are contained in the diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index 9caa83916df8..00d9a4eada65 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -80,7 +80,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport break; case XML_TOK_VALUE_TYPE: { - // needs to be translated into a ::com::sun::star::uno::Type + // needs to be translated into a css::uno::Type static std::map< OUString, css::uno::Type > s_aTypeNameMap; if (s_aTypeNameMap.empty()) { @@ -91,8 +91,8 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport s_aTypeNameMap[GetXMLToken( XML_STRING)] = cppu::UnoType<OUString>::get(); s_aTypeNameMap[GetXMLToken( XML_INT)] = cppu::UnoType<sal_Int32>::get(); s_aTypeNameMap[GetXMLToken( XML_SHORT)] = cppu::UnoType<sal_Int16>::get(); - s_aTypeNameMap[GetXMLToken( XML_DATE)] = cppu::UnoType<com::sun::star::util::Date>::get(); - s_aTypeNameMap[GetXMLToken( XML_TIME)] = cppu::UnoType<com::sun::star::util::Time>::get(); + s_aTypeNameMap[GetXMLToken( XML_DATE)] = cppu::UnoType<css::util::Date>::get(); + s_aTypeNameMap[GetXMLToken( XML_TIME)] = cppu::UnoType<css::util::Time>::get(); s_aTypeNameMap[GetXMLToken( XML_VOID)] = cppu::UnoType<void>::get(); } @@ -190,7 +190,7 @@ ORptFilter& OXMLControlProperty::GetOwnImport() return static_cast<ORptFilter&>(GetImport()); } -Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters) +Any OXMLControlProperty::convertString(const css::uno::Type& _rExpectedType, const OUString& _rReadCharacters) { Any aReturn; switch (_rExpectedType.getTypeClass()) @@ -246,9 +246,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe case TypeClass_STRUCT: { // recognized structs: - static ::com::sun::star::uno::Type s_aDateType = ::cppu::UnoType<com::sun::star::util::Date>::get(); - static ::com::sun::star::uno::Type s_aTimeType = ::cppu::UnoType<com::sun::star::util::Time>::get(); - static ::com::sun::star::uno::Type s_aDateTimeType = ::cppu::UnoType<com::sun::star::util::DateTime>::get(); + static css::uno::Type s_aDateType = ::cppu::UnoType<css::util::Date>::get(); + static css::uno::Type s_aTimeType = ::cppu::UnoType<css::util::Time>::get(); + static css::uno::Type s_aDateTimeType = ::cppu::UnoType<css::util::DateTime>::get(); sal_Int32 nType = 0; if ( _rExpectedType.equals(s_aDateType) ) nType = TYPE_DATE; @@ -286,10 +286,10 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe break; case TYPE_DATETIME: { - ::com::sun::star::util::Time aTime = implGetTime(nValue); - ::com::sun::star::util::Date aDate = implGetDate(nValue); + css::util::Time aTime = implGetTime(nValue); + css::util::Date aDate = implGetDate(nValue); - ::com::sun::star::util::DateTime aDateTime; + css::util::DateTime aDateTime; aDateTime.NanoSeconds = aTime.NanoSeconds; aDateTime.Seconds = aTime.Seconds; aDateTime.Minutes = aTime.Minutes; @@ -315,9 +315,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe return aReturn; } -::com::sun::star::util::Time OXMLControlProperty::implGetTime(double _nValue) +css::util::Time OXMLControlProperty::implGetTime(double _nValue) { - ::com::sun::star::util::Time aTime; + css::util::Time aTime; sal_uInt64 nIntValue = ::rtl::math::round(_nValue * 86400000000000.0); aTime.NanoSeconds = (sal_uInt16)( nIntValue % 1000000000 ); nIntValue /= 1000000000; @@ -332,10 +332,10 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe } -::com::sun::star::util::Date OXMLControlProperty::implGetDate(double _nValue) +css::util::Date OXMLControlProperty::implGetDate(double _nValue) { Date aToolsDate((sal_uInt32)_nValue); - ::com::sun::star::util::Date aDate; + css::util::Date aDate; ::utl::typeConvert(aToolsDate, aDate); return aDate; } diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx index cf67c7dea6c1..59f3a0debb3b 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.hxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx @@ -31,15 +31,15 @@ namespace rptxml class ORptFilter; class OXMLControlProperty : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xControl; - ::com::sun::star::beans::PropertyValue m_aSetting; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSequence; + css::uno::Reference< css::beans::XPropertySet > m_xControl; + css::beans::PropertyValue m_aSetting; + css::uno::Sequence< css::uno::Any> m_aSequence; OXMLControlProperty* m_pContainer; - ::com::sun::star::uno::Type m_aPropType; // the type of the property the instance imports currently + css::uno::Type m_aPropType; // the type of the property the instance imports currently bool m_bIsList; ORptFilter& GetOwnImport(); - static ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters); + static css::uno::Any convertString(const css::uno::Type& _rExpectedType, const OUString& _rReadCharacters); OXMLControlProperty(const OXMLControlProperty&) = delete; void operator =(const OXMLControlProperty&) = delete; public: @@ -47,14 +47,14 @@ namespace rptxml OXMLControlProperty( ORptFilter& rImport ,sal_uInt16 nPrfx ,const OUString& rLName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xControl + ,const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::beans::XPropertySet >& _xControl ,OXMLControlProperty* _pContainer = NULL); virtual ~OXMLControlProperty(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; @@ -68,8 +68,8 @@ namespace rptxml void addValue(const OUString& _sValue); private: - static ::com::sun::star::util::Time implGetTime(double _nValue); - static ::com::sun::star::util::Date implGetDate(double _nValue); + static css::util::Time implGetTime(double _nValue); + static css::util::Date implGetDate(double _nValue); }; } // namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index 5ddf94677ef4..222217032976 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -46,15 +46,15 @@ namespace rptxml { using namespace ::xmloff::token; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::document; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::report; -using namespace ::com::sun::star::io; -using namespace ::com::sun::star::xml::sax; +using namespace css::uno; +using namespace css::container; +using namespace css::lang; +using namespace css::beans; +using namespace css::document; +using namespace css::text; +using namespace css::report; +using namespace css::io; +using namespace css::xml::sax; // - ORptExport - @@ -184,13 +184,13 @@ public: ORptExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); // XExporter - virtual void SAL_CALL setSourceDocument( 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 setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; inline Reference<XReportDefinition> getReportDefinition() const { return m_xReportDefinition; } @@ -204,10 +204,10 @@ public: class ORptExportHelper { public: - static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + static OUString getImplementationName_Static( ) throw (css::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; /** Exports only content @@ -217,10 +217,10 @@ public: class ORptContentExportHelper { public: - static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + static OUString getImplementationName_Static( ) throw (css::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; /** Exports only styles @@ -230,10 +230,10 @@ public: class ORptStylesExportHelper { public: - static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + static OUString getImplementationName_Static( ) throw (css::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; /** Exports only meta data @@ -243,10 +243,10 @@ public: class ORptMetaExportHelper { public: - static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + static OUString getImplementationName_Static( ) throw (css::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; /** Exports all * \ingroup reportdesign_source_filter_xml @@ -255,10 +255,10 @@ public: class ODBFullExportHelper { public: - static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + static OUString getImplementationName_Static( ) throw (css::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; } // rptxml diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx index 62dd63b23e67..203159d34bd8 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx @@ -36,41 +36,41 @@ namespace rptxml OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum& _eNamespace,const xmloff::token::XMLTokenEnum& _eAttribute); -typedef ::cppu::WeakAggImplHelper3< ::com::sun::star::xml::sax::XDocumentHandler - , ::com::sun::star::lang::XInitialization - , ::com::sun::star::lang::XServiceInfo> ExportDocumentHandler_BASE; +typedef ::cppu::WeakAggImplHelper3< css::xml::sax::XDocumentHandler + , css::lang::XInitialization + , css::lang::XServiceInfo> ExportDocumentHandler_BASE; class ExportDocumentHandler : public ExportDocumentHandler_BASE { public: // XServiceInfo - static versions - 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::uno::XComponentContext >&); + 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::uno::XComponentContext >&); public: - explicit ExportDocumentHandler(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); + explicit ExportDocumentHandler(css::uno::Reference< css::uno::XComponentContext > const & context); private: // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::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; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) - // ::com::sun::star::xml::sax::XDocumentHandler: - virtual void SAL_CALL startDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; - virtual void SAL_CALL endDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; - virtual void SAL_CALL startElement(const OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; - virtual void SAL_CALL endElement(const OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; - virtual void SAL_CALL characters(const OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; - virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; - virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; - virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; + // css::xml::sax::XDocumentHandler: + virtual void SAL_CALL startDocument() throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endDocument() throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL startElement(const OUString & aName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endElement(const OUString & aName) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL characters(const OUString & aChars) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - 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; void exportTableRows(); private: @@ -79,16 +79,16 @@ private: virtual ~ExportDocumentHandler(); - ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xDelegatee; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxy; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > m_xTypeProvider; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > m_xServiceInfo; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xModel; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider > m_xDatabaseDataProvider; - ::com::sun::star::uno::Sequence< OUString > m_aColumns; - sal_Int32 m_nColumnCount; + ::osl::Mutex m_aMutex; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::xml::sax::XDocumentHandler > m_xDelegatee; + css::uno::Reference< css::uno::XAggregation > m_xProxy; + css::uno::Reference< css::lang::XTypeProvider > m_xTypeProvider; + css::uno::Reference< css::lang::XServiceInfo > m_xServiceInfo; + css::uno::Reference< css::chart2::XChartDocument > m_xModel; + css::uno::Reference< css::chart2::data::XDatabaseDataProvider > m_xDatabaseDataProvider; + css::uno::Sequence< OUString > m_aColumns; + sal_Int32 m_nColumnCount; bool m_bTableRowsStarted; bool m_bFirstRowExported; bool m_bExportChar; diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx index 9e0827579184..8dbc868b25cb 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.hxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx @@ -38,7 +38,7 @@ namespace rptxml protected: virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; private: OXMLFixedContent(const OXMLFixedContent&) = delete; OXMLFixedContent& operator =(const OXMLFixedContent&) = delete; diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.hxx b/reportdesign/source/filter/xml/xmlFormatCondition.hxx index 127e7c519f59..00d7d4535d39 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.hxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.hxx @@ -29,15 +29,15 @@ namespace rptxml { ORptFilter& m_rImport; OUString m_sStyleName; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition > m_xComponent; + css::uno::Reference< css::report::XFormatCondition > m_xComponent; OXMLFormatCondition(const OXMLFormatCondition&) = delete; void operator =(const OXMLFormatCondition&) = delete; public: OXMLFormatCondition( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition >& _xComponent + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::report::XFormatCondition >& _xComponent ); virtual ~OXMLFormatCondition(); virtual void EndElement() override; diff --git a/reportdesign/source/filter/xml/xmlFormattedField.hxx b/reportdesign/source/filter/xml/xmlFormattedField.hxx index d3ae6d7e5dd8..35dbc8f55255 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.hxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.hxx @@ -34,8 +34,8 @@ namespace rptxml OXMLFormattedField( ORptFilter& rImport ,sal_uInt16 nPrfx ,const OUString& rLName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormattedField >& _xComponent + ,const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::report::XFormattedField >& _xComponent ,OXMLTable* _pContainer ,bool _bPageCount); virtual ~OXMLFormattedField(); diff --git a/reportdesign/source/filter/xml/xmlFunction.hxx b/reportdesign/source/filter/xml/xmlFunction.hxx index 0c78d4726cb2..02cff22ea694 100644 --- a/reportdesign/source/filter/xml/xmlFunction.hxx +++ b/reportdesign/source/filter/xml/xmlFunction.hxx @@ -31,9 +31,9 @@ namespace rptxml class OXMLFunction : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > m_xFunctions; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > m_xFunction; - bool m_bAddToReport; + css::uno::Reference< css::report::XFunctions > m_xFunctions; + css::uno::Reference< css::report::XFunction > m_xFunction; + bool m_bAddToReport; ORptFilter& GetOwnImport(); @@ -44,8 +44,8 @@ namespace rptxml OXMLFunction( ORptFilter& rImport , sal_uInt16 nPrfx ,const OUString& rLName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier >& _xFunctions + ,const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::report::XFunctionsSupplier >& _xFunctions ,bool _bAddToReport = false ); virtual ~OXMLFunction(); diff --git a/reportdesign/source/filter/xml/xmlGroup.hxx b/reportdesign/source/filter/xml/xmlGroup.hxx index 9ebc34cb5a1c..33cc935c50b3 100644 --- a/reportdesign/source/filter/xml/xmlGroup.hxx +++ b/reportdesign/source/filter/xml/xmlGroup.hxx @@ -29,8 +29,8 @@ namespace rptxml class OXMLGroup : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups > m_xGroups; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > m_xGroup; + css::uno::Reference< css::report::XGroups > m_xGroups; + css::uno::Reference< css::report::XGroup > m_xGroup; ORptFilter& GetOwnImport(); @@ -41,13 +41,13 @@ namespace rptxml OXMLGroup( ORptFilter& rImport , sal_uInt16 nPrfx ,const OUString& rLName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); virtual ~OXMLGroup(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; }; diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 673114f6a419..e0774bedde95 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -86,7 +86,7 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 { XML_TOKEN_INVALID, 0 } }; - pHandler = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum, cppu::UnoType<com::sun::star::style::VerticalAlignment>::get()); + pHandler = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum, cppu::UnoType<css::style::VerticalAlignment>::get()); } break; case (XML_SD_TYPES_START+34): @@ -255,7 +255,7 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const OUString& _sStyleName, XMLPropStyleContext* pAutoStyle = const_cast<XMLPropStyleContext*>(dynamic_cast< const XMLPropStyleContext *>(_pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_TABLE_CELL,_sStyleName))); if ( pAutoStyle ) { - ::com::sun::star::awt::FontDescriptor aFont; + css::awt::FontDescriptor aFont; static comphelper::PropertyMapEntry const pMap[] = { {OUString(PROPERTY_FONTNAME), PROPERTY_ID_FONTNAME, cppu::UnoType<decltype(aFont.Name)>::get() ,PropertyAttribute::BOUND,0}, diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx index 152a25cd2430..20350762c4cc 100644 --- a/reportdesign/source/filter/xml/xmlHelper.hxx +++ b/reportdesign/source/filter/xml/xmlHelper.hxx @@ -66,8 +66,8 @@ namespace rptxml static const XMLPropertyMapEntry* GetRowStyleProps(); - static void copyStyleElements(const bool _bOld,const OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& _xProp); - static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet> createBorderPropertySet(); + static void copyStyleElements(const bool _bOld,const OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const css::uno::Reference< css::beans::XPropertySet>& _xProp); + static css::uno::Reference< css::beans::XPropertySet> createBorderPropertySet(); static SvXMLTokenMap* GetReportElemTokenMap(); static SvXMLTokenMap* GetSubDocumentElemTokenMap(); diff --git a/reportdesign/source/filter/xml/xmlImage.hxx b/reportdesign/source/filter/xml/xmlImage.hxx index 3acfe1d391d4..d4aa7b08a848 100644 --- a/reportdesign/source/filter/xml/xmlImage.hxx +++ b/reportdesign/source/filter/xml/xmlImage.hxx @@ -33,8 +33,8 @@ namespace rptxml OXMLImage( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XImageControl >& _xComponent + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::report::XImageControl >& _xComponent ,OXMLTable* _pContainer); virtual ~OXMLImage(); }; diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx index 72a06d069366..f79ea4921293 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx @@ -34,41 +34,41 @@ class SvXMLTokenMap; namespace rptxml { -typedef ::cppu::WeakAggImplHelper3< ::com::sun::star::xml::sax::XDocumentHandler - , ::com::sun::star::lang::XInitialization - , ::com::sun::star::lang::XServiceInfo> ImportDocumentHandler_BASE; +typedef ::cppu::WeakAggImplHelper3< css::xml::sax::XDocumentHandler + , css::lang::XInitialization + , css::lang::XServiceInfo> ImportDocumentHandler_BASE; class ImportDocumentHandler : public ImportDocumentHandler_BASE { public: // XServiceInfo - static versions - 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::uno::XComponentContext >&); + 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::uno::XComponentContext >&); public: - explicit ImportDocumentHandler(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); + explicit ImportDocumentHandler(css::uno::Reference< css::uno::XComponentContext > const & context); private: // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::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; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) - // ::com::sun::star::xml::sax::XDocumentHandler: - virtual void SAL_CALL startDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; - virtual void SAL_CALL endDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; - virtual void SAL_CALL startElement(const OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; - virtual void SAL_CALL endElement(const OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; - virtual void SAL_CALL characters(const OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; - virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; - virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; - virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override; + // css::xml::sax::XDocumentHandler: + virtual void SAL_CALL startDocument() throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endDocument() throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL startElement(const OUString & aName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endElement(const OUString & aName) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL characters(const OUString & aChars) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - 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; private: ImportDocumentHandler(ImportDocumentHandler &) = delete; @@ -76,20 +76,20 @@ private: virtual ~ImportDocumentHandler(); - ::osl::Mutex m_aMutex; - bool m_bImportedChart; - ::std::vector< OUString> m_aMasterFields; - ::std::vector< OUString> m_aDetailFields; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aArguments; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xDelegatee; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxy; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > m_xTypeProvider; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > m_xServiceInfo; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xModel; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider > m_xDatabaseDataProvider; + ::osl::Mutex m_aMutex; + bool m_bImportedChart; + ::std::vector< OUString> m_aMasterFields; + ::std::vector< OUString> m_aDetailFields; + css::uno::Sequence< css::beans::PropertyValue > m_aArguments; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::xml::sax::XDocumentHandler > m_xDelegatee; + css::uno::Reference< css::uno::XAggregation > m_xProxy; + css::uno::Reference< css::lang::XTypeProvider > m_xTypeProvider; + css::uno::Reference< css::lang::XServiceInfo > m_xServiceInfo; + css::uno::Reference< css::chart2::XChartDocument > m_xModel; + css::uno::Reference< css::chart2::data::XDatabaseDataProvider > m_xDatabaseDataProvider; - ::std::unique_ptr<SvXMLTokenMap> m_pReportElemTokenMap; + ::std::unique_ptr<SvXMLTokenMap> m_pReportElemTokenMap; }; } // namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlMasterFields.hxx b/reportdesign/source/filter/xml/xmlMasterFields.hxx index 81e161ca1f06..c1cf96f0c06d 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.hxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.hxx @@ -33,13 +33,13 @@ namespace rptxml OXMLMasterFields( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ,IMasterDetailFieds* _pReport); virtual ~OXMLMasterFields(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; }; diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx index 0a945258ac71..a1928c66876a 100644 --- a/reportdesign/source/filter/xml/xmlReport.hxx +++ b/reportdesign/source/filter/xml/xmlReport.hxx @@ -27,7 +27,7 @@ namespace rptxml class ORptFilter; class OXMLReport : public OXMLReportElementBase, public IMasterDetailFieds { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xComponent; + css::uno::Reference< css::report::XReportDefinition > m_xComponent; ::std::vector< OUString> m_aMasterFields; ::std::vector< OUString> m_aDetailFields; OXMLReport(const OXMLReport&) = delete; @@ -36,14 +36,14 @@ namespace rptxml OXMLReport( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xComponent + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::report::XReportDefinition >& _xComponent ,OXMLTable* _pContainer); virtual ~OXMLReport(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; diff --git a/reportdesign/source/filter/xml/xmlReportElement.hxx b/reportdesign/source/filter/xml/xmlReportElement.hxx index 211c39366455..9ee6201db555 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.hxx +++ b/reportdesign/source/filter/xml/xmlReportElement.hxx @@ -27,7 +27,7 @@ namespace rptxml class ORptFilter; class OXMLReportElement : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel > m_xComponent; + css::uno::Reference< css::report::XReportControlModel > m_xComponent; ORptFilter& GetOwnImport(); OXMLReportElement(const OXMLReportElement&) = delete; void operator =(const OXMLReportElement&) = delete; @@ -35,13 +35,13 @@ namespace rptxml OXMLReportElement( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel >& _xComponent); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::report::XReportControlModel >& _xComponent); virtual ~OXMLReportElement(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; }; } // namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx index c087dbd9015f..e4afcc636754 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx @@ -44,23 +44,23 @@ namespace rptxml protected: ORptFilter& m_rImport; OXMLTable* m_pContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; + css::uno::Reference< css::report::XReportComponent > m_xComponent; virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); public: OXMLReportElementBase( ORptFilter& rImport ,sal_uInt16 nPrfx ,const OUString& rLName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent + ,const css::uno::Reference< css::report::XReportComponent >& _xComponent ,OXMLTable* _pContainer); virtual ~OXMLReportElementBase(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; }; diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx index 00d296d209e5..b9ef8e160db0 100644 --- a/reportdesign/source/filter/xml/xmlSection.hxx +++ b/reportdesign/source/filter/xml/xmlSection.hxx @@ -29,7 +29,7 @@ namespace rptxml class OXMLSection : public SvXMLImportContext { private: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; + css::uno::Reference< css::report::XSection > m_xSection; ORptFilter& GetOwnImport(); OXMLSection(const OXMLSection&) = delete; @@ -39,14 +39,14 @@ namespace rptxml OXMLSection( ORptFilter& rImport ,sal_uInt16 nPrfx ,const OUString& rLName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + ,const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::report::XSection >& _xSection ,bool _bPageHeader = true); virtual ~OXMLSection(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; }; } // namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index b9ea2ab2a59b..6d419ac70344 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -61,18 +61,18 @@ namespace rptxml OControlStyleContext( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false ); virtual ~OControlStyleContext(); - virtual void FillPropertySet(const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ) override; + virtual void FillPropertySet(const css::uno::Reference< + css::beans::XPropertySet > & rPropSet ) override; virtual void SetDefaults() override; - void AddProperty(sal_Int16 nContextID, const com::sun::star::uno::Any& aValue); + void AddProperty(sal_Int16 nContextID, const css::uno::Any& aValue); }; class OReportStylesContext : public SvXMLStylesContext @@ -91,14 +91,10 @@ namespace rptxml mutable rtl::Reference < SvXMLImportPropertyMapper > m_xRowImpPropMapper; mutable rtl::Reference < SvXMLImportPropertyMapper > m_xTableImpPropMapper; - mutable ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > m_xCellStyles; - mutable ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > m_xColumnStyles; - mutable ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > m_xRowStyles; - mutable ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > m_xTableStyles; + mutable css::uno::Reference< css::container::XNameContainer > m_xCellStyles; + mutable css::uno::Reference< css::container::XNameContainer > m_xColumnStyles; + mutable css::uno::Reference< css::container::XNameContainer > m_xRowStyles; + mutable css::uno::Reference< css::container::XNameContainer > m_xTableStyles; ORptFilter& GetOwnImport() const { return m_rImport;} @@ -111,13 +107,12 @@ namespace rptxml sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; public: @@ -125,7 +120,7 @@ namespace rptxml OReportStylesContext( ORptFilter& rImport, sal_uInt16 nPrfx , const OUString& rLName , - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const bool bAutoStyles ); virtual ~OReportStylesContext(); @@ -133,8 +128,7 @@ namespace rptxml virtual rtl::Reference < SvXMLImportPropertyMapper > GetImportPropertyMapper( sal_uInt16 nFamily ) const override; - virtual ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > + virtual css::uno::Reference< css::container::XNameContainer > GetStylesContainer( sal_uInt16 nFamily ) const override; virtual OUString GetServiceName( sal_uInt16 nFamily ) const override; virtual sal_uInt16 GetFamily( const OUString& rFamily ) const override; diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx index 4ad2f58abfc8..1bbeb6d764b2 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.hxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx @@ -29,7 +29,7 @@ namespace rptxml class OXMLCell; class OXMLSubDocument : public OXMLReportElementBase, public IMasterDetailFieds { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xFake; + css::uno::Reference< css::report::XReportComponent> m_xFake; ::std::vector< OUString> m_aMasterFields; ::std::vector< OUString> m_aDetailFields; OXMLCell* m_pCellParent; @@ -41,13 +41,13 @@ namespace rptxml virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; public: OXMLSubDocument( ORptFilter& rImport ,sal_uInt16 nPrfx ,const OUString& rLName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent + ,const css::uno::Reference< css::report::XReportComponent >& _xComponent ,OXMLTable* _pContainer ,OXMLCell* _pCellParent); virtual ~OXMLSubDocument(); diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx index 553d3e763d62..596148d05d95 100644 --- a/reportdesign/source/filter/xml/xmlTable.hxx +++ b/reportdesign/source/filter/xml/xmlTable.hxx @@ -35,15 +35,15 @@ namespace rptxml sal_Int32 nHeight; sal_Int32 nColSpan; sal_Int32 nRowSpan; - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> > xElements; + ::std::vector< css::uno::Reference< css::report::XReportComponent> > xElements; TCell() : nWidth(0),nHeight(0),nColSpan(1),nRowSpan(1){} }; private: ::std::vector< ::std::vector<TCell> > m_aGrid; ::std::vector<sal_Int32> m_aHeight; ::std::vector<sal_Int32> m_aWidth; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; - OUString m_sStyleName; + css::uno::Reference< css::report::XSection > m_xSection; + OUString m_sStyleName; sal_Int32 m_nColSpan; sal_Int32 m_nRowSpan; sal_Int32 m_nRowIndex; @@ -57,14 +57,14 @@ namespace rptxml OXMLTable( ORptFilter& rImport ,sal_uInt16 nPrfx ,const OUString& rLName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + ,const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::report::XSection >& _xSection ); virtual ~OXMLTable(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; @@ -77,9 +77,9 @@ namespace rptxml void incrementRowIndex(); inline void incrementColumnIndex() { ++m_nColumnIndex; } - void addCell(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xElement); + void addCell(const css::uno::Reference< css::report::XReportComponent>& _xElement); - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection; } + inline css::uno::Reference< css::report::XSection > getSection() const { return m_xSection; } }; } // namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index b248addb81ef..8c86749cbb89 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -76,10 +76,11 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::report; using namespace ::com::sun::star::xml::sax; using namespace xmloff; +using namespace ::com::sun::star::util; + sal_Char const sXML_np__rpt[] = "_report"; sal_Char const sXML_np___rpt[] = "__report"; - using namespace ::com::sun::star::util; class RptMLMasterStylesContext_Impl: public XMLTextMasterStylesContext, private boost::noncopyable @@ -1011,7 +1012,7 @@ void ORptFilter::removeFunction(const OUString& _sFunctionName) m_aFunctions.erase(_sFunctionName); } -void ORptFilter::insertFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > & _xFunction) +void ORptFilter::insertFunction(const css::uno::Reference< css::report::XFunction > & _xFunction) { m_aFunctions.insert(TGroupFunctionMap::value_type(_xFunction->getName(),_xFunction)); } diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 3f0716b91243..1bf99cca2a9b 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -100,14 +100,14 @@ private: SvXMLImportContext* CreateStylesContext(const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, bool bIsAutoStyle ); SvXMLImportContext* CreateMetaContext(const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); SvXMLImportContext* CreateFontDeclsContext(const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); protected: // SvXMLImport virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual XMLShapeImportHelper* CreateShapeImport() override; @@ -119,18 +119,18 @@ public: // XFilter virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) override; - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); inline Reference<XReportDefinition> getReportDefinition() const { return m_xReportDefinition; } void FinishStyles(); virtual void SAL_CALL startDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; const SvXMLTokenMap& GetDocElemTokenMap() const; const SvXMLTokenMap& GetReportElemTokenMap() const; @@ -154,7 +154,7 @@ public: * * \param _xFunction */ - void insertFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > & _xFunction); + void insertFunction(const css::uno::Reference< css::report::XFunction > & _xFunction); void removeFunction(const OUString& _sFunctionName); inline const TGroupFunctionMap& getFunctions() const { return m_aFunctions; } @@ -168,10 +168,10 @@ public: class ORptImportHelper { public: - static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + static OUString getImplementationName_Static( ) throw (css::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; /** Imports only content @@ -181,10 +181,10 @@ public: class ORptContentImportHelper { public: - static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + static OUString getImplementationName_Static( ) throw (css::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; /** Imports only styles @@ -194,10 +194,10 @@ public: class ORptStylesImportHelper { public: - static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + static OUString getImplementationName_Static( ) throw (css::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; /** Imports only meta data @@ -207,10 +207,10 @@ public: class ORptMetaImportHelper { public: - static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); - static Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + static OUString getImplementationName_Static( ) throw (css::uno::RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create(css::uno::Reference< css::uno::XComponentContext > const & xContext); }; diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 9f4f284709f5..77eb178fea59 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -364,7 +364,7 @@ void OAddFieldWindow::Update() } // add the parameter columns to the list - uno::Reference< ::com::sun::star::sdbc::XRowSet > xRowSet(m_xRowSet,uno::UNO_QUERY); + uno::Reference< css::sdbc::XRowSet > xRowSet(m_xRowSet,uno::UNO_QUERY); Sequence< OUString > aParamNames( getParameterNames( xRowSet ) ); lcl_addToList( *m_pListBox, aParamNames ); @@ -461,7 +461,7 @@ void OAddFieldWindow::fillDescriptor(SvTreeListEntry* _pSelected,svx::ODataAcces } } -void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) { if ( m_pListBox.get() ) { @@ -480,7 +480,7 @@ void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent } } -void OAddFieldWindow::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void OAddFieldWindow::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception) { if ( m_pListBox.get() ) { @@ -490,7 +490,7 @@ void OAddFieldWindow::_elementRemoved( const container::ContainerEvent& /*_rEven } } -void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception) { } diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 19edfec72dbf..fa4eaab81508 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -122,17 +122,17 @@ namespace rptui /** sets the props at the control @param _xCondition the source */ - void setCondition(const com::sun::star::uno::Reference< com::sun::star::report::XFormatCondition >& _xCondition); + void setCondition(const css::uno::Reference< css::report::XFormatCondition >& _xCondition); /** fills from the control _xCondition the destination */ - void fillFormatCondition(const com::sun::star::uno::Reference< com::sun::star::report::XFormatCondition >& _xCondition); + void fillFormatCondition(const css::uno::Reference< css::report::XFormatCondition >& _xCondition); /** updates the toolbar _xCondition the destination */ - void updateToolbar(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat >& _xCondition); + void updateToolbar(const css::uno::Reference< css::report::XReportControlFormat >& _xCondition); /// tells the condition its new index within the dialog's condition array void setConditionIndex( size_t _nCondIndex, size_t _nCondCount ); diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index e4a6ba0689fe..dc1300a3a626 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -196,7 +196,7 @@ OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,con else { Date aCurrentDate( Date::SYSTEM ); - static ::com::sun::star::util::Date STANDARD_DB_DATE(30,12,1899); + static css::util::Date STANDARD_DB_DATE(30,12,1899); nValue = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDate(static_cast<sal_Int32>(aCurrentDate.GetDate())),STANDARD_DB_DATE); } diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 55068a62077a..98be66e4d957 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -47,7 +47,7 @@ FormulaDialog::FormulaDialog(vcl::Window* pParent , const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory , const std::shared_ptr< IFunctionManager >& _pFunctionMgr , const OUString& _sFormula - , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet + , const css::uno::Reference < css::beans::XPropertySet >& _xRowSet , svl::SharedStringPool& rStrPool ) : FormulaModalDialog( pParent, false,false,false,_pFunctionMgr.get(),this) ,m_aFunctionManager(_pFunctionMgr) diff --git a/reportdesign/source/ui/dlg/GroupExchange.hxx b/reportdesign/source/ui/dlg/GroupExchange.hxx index bd2e80eb52f4..ed28ccd51209 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.hxx +++ b/reportdesign/source/ui/dlg/GroupExchange.hxx @@ -29,9 +29,9 @@ namespace rptui */ class OGroupExchange : public TransferableHelper { - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aGroupRow; + css::uno::Sequence< css::uno::Any> m_aGroupRow; public: - explicit OGroupExchange(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& _aGroupRow); + explicit OGroupExchange(const css::uno::Sequence< css::uno::Any>& _aGroupRow); static SotClipboardFormatId getReportGroupId(); protected: diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index df31a063c177..92be5c040b01 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -88,11 +88,11 @@ public: explicit OFieldExpressionControlContainerListener(OFieldExpressionControl* pParent) : mpParent(pParent) {} // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; // XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; }; class OFieldExpressionControl : public ::svt::EditBrowseBox @@ -117,8 +117,8 @@ public: virtual void dispose() override; // XContainerListener - void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception); + void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception); virtual Size GetOptimalSize() const override; @@ -179,16 +179,16 @@ public: }; -void OFieldExpressionControlContainerListener::disposing(const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void OFieldExpressionControlContainerListener::disposing(const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) {} -void OFieldExpressionControlContainerListener::elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) +void OFieldExpressionControlContainerListener::elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) { mpParent->elementInserted(rEvent); } -void OFieldExpressionControlContainerListener::elementReplaced(const ::com::sun::star::container::ContainerEvent& ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void OFieldExpressionControlContainerListener::elementReplaced(const css::container::ContainerEvent& ) throw(css::uno::RuntimeException, std::exception) {} -void OFieldExpressionControlContainerListener::elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) +void OFieldExpressionControlContainerListener::elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) { mpParent->elementRemoved(rEvent); } @@ -275,7 +275,7 @@ void OFieldExpressionControl::StartDrag( sal_Int8 /*_nAction*/ , const Point& /* if( aClipboardList.getLength() ) { OGroupExchange* pData = new OGroupExchange(aClipboardList); - uno::Reference< ::com::sun::star::datatransfer::XTransferable> xRef = pData; + uno::Reference< css::datatransfer::XTransferable> xRef = pData; pData->StartDrag(this, DND_ACTION_MOVE ); } } @@ -840,7 +840,7 @@ void OFieldExpressionControl::copy() if( aClipboardList.getLength() ) { OGroupExchange* pData = new OGroupExchange(aClipboardList); - uno::Reference< ::com::sun::star::datatransfer::XTransferable> xRef = pData; + uno::Reference< css::datatransfer::XTransferable> xRef = pData; pData->CopyToClipboard(GetParent()); } } diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index f56678aa4489..76c8ba571f51 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -50,9 +50,9 @@ class OAddFieldWindow :public FloatingWindow , public ::comphelper::OContainerListener , public dbaui::OToolBoxHelper { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> m_xHoldAlive; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xRowSet; + css::uno::Reference< css::lang::XComponent> m_xHoldAlive; + css::uno::Reference< css::container::XNameAccess> m_xColumns; + css::uno::Reference< css::beans::XPropertySet > m_xRowSet; VclPtr<ToolBox> m_aActions; @@ -78,7 +78,7 @@ class OAddFieldWindow :public FloatingWindow void operator =(const OAddFieldWindow&) = delete; public: OAddFieldWindow(vcl::Window* pParent - , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xRowSet); + , const css::uno::Reference< css::beans::XPropertySet >& _xRowSet); virtual ~OAddFieldWindow(); virtual void dispose() override; @@ -91,9 +91,9 @@ public: inline bool GetEscapeProcessing() const { return m_bEscapeProcessing; } inline void SetCreateHdl(const Link<OAddFieldWindow&,void>& _aCreateLink) { m_aCreateLink = _aCreateLink; } - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() const; + css::uno::Reference< css::sdbc::XConnection> getConnection() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getSelectedFieldDescriptors(); + css::uno::Sequence< css::beans::PropertyValue > getSelectedFieldDescriptors(); /** will be called when the id of the image list needs to change. @param _eBitmapSet @@ -117,11 +117,11 @@ public: private: // FmXChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) override; // OContainerListener - virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; }; } // rptui diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index 180cc336d01f..211733394be1 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -78,9 +78,9 @@ namespace rptui VclPtr<ScrollBar> m_pCondScroll; ::rptui::OReportController& m_rController; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel > + css::uno::Reference< css::report::XReportControlModel > m_xFormatConditions; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel > + css::uno::Reference< css::report::XReportControlModel > m_xCopy; bool m_bDeletingCondition; @@ -89,7 +89,7 @@ namespace rptui public: ConditionalFormattingDialog( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel>& _xHoldAlive, + const css::uno::Reference< css::report::XReportControlModel>& _xHoldAlive, ::rptui::OReportController& _rController ); virtual ~ConditionalFormattingDialog(); diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx index f467b7d05c81..b9231593017e 100644 --- a/reportdesign/source/ui/inc/DataProviderHandler.hxx +++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx @@ -42,8 +42,8 @@ namespace rptui class OPropertyInfoService; - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::inspection::XPropertyHandler - , ::com::sun::star::lang::XServiceInfo> DataProviderHandler_Base; + typedef ::cppu::WeakComponentImplHelper< css::inspection::XPropertyHandler + , css::lang::XServiceInfo> DataProviderHandler_Base; class DataProviderHandler: private ::cppu::BaseMutex, @@ -51,40 +51,40 @@ namespace rptui { public: // XServiceInfo - static versions - 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::uno::XComponentContext >&); + 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::uno::XComponentContext >&); - explicit DataProviderHandler(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); + explicit DataProviderHandler(css::uno::Reference< css::uno::XComponentContext > const & context); private: // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::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; - - // ::com::sun::star::lang::XComponent: - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::inspection::XPropertyHandler: - virtual void SAL_CALL inspect(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Component) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & Listener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & _rxListener) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException, std::exception) override; - virtual sal_Bool SAL_CALL suspend(sal_Bool Suspend) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XComponent: + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw (css::uno::RuntimeException, std::exception) override; + + // css::inspection::XPropertyHandler: + virtual void SAL_CALL inspect(const css::uno::Reference< css::uno::XInterface > & Component) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const css::uno::Any & Value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& ControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const css::uno::Any & ControlValue) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual css::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const css::uno::Any & PropertyValue, const css::uno::Type & ControlValueType) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & Listener) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & _rxListener) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, css::uno::Any & out_Data, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::NullPointerException, std::exception) override; + virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const css::uno::Any & NewValue, const css::uno::Any & OldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override; + virtual sal_Bool SAL_CALL suspend(sal_Bool Suspend) throw (css::uno::RuntimeException, std::exception) override; protected: virtual ~DataProviderHandler() {} @@ -95,7 +95,7 @@ namespace rptui bool impl_dialogLinkedFields_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; bool impl_dialogChartType_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; - void impl_updateChartTitle_throw(const ::com::sun::star::uno::Any& _aValue); + void impl_updateChartTitle_throw(const css::uno::Any& _aValue); // override WeakComponentImplHelperBase::disposing() // This function is called upon disposing the component, @@ -103,15 +103,15 @@ namespace rptui // disposed, do it here. virtual void SAL_CALL disposing() override; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > m_xFormComponentHandler; /// delegatee - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider> m_xDataProvider; /// inspectee - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xFormComponent; /// inspectee - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xReportComponent; /// inspectee - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument> m_xChartModel; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > m_xMasterDetails; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::inspection::XPropertyHandler > m_xFormComponentHandler; /// delegatee + css::uno::Reference< css::chart2::data::XDatabaseDataProvider> m_xDataProvider; /// inspectee + css::uno::Reference< css::uno::XInterface > m_xFormComponent; /// inspectee + css::uno::Reference< css::report::XReportComponent > m_xReportComponent; /// inspectee + css::uno::Reference< css::chart2::XChartDocument> m_xChartModel; + css::uno::Reference< css::beans::XPropertyChangeListener > m_xMasterDetails; /// type converter, needed on various occasions - ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter; + css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter; ::std::unique_ptr< OPropertyInfoService > m_pInfoService; }; diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index 1fd0b58e669f..033c15955560 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -52,9 +52,9 @@ class ODateTimeDialog : public ModalDialog svt::ControlDependencyManager m_aTimeControlling; ::rptui::OReportController* m_pController; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> + css::uno::Reference< css::report::XSection> m_xHoldAlive; - ::com::sun::star::lang::Locale m_nLocale; + css::lang::Locale m_nLocale; /** returns the format string * @@ -63,10 +63,10 @@ class ODateTimeDialog : public ModalDialog * \param _bTime * \return */ - OUString getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats>& _xFormats,bool _bTime); + OUString getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const css::uno::Reference< css::util::XNumberFormats>& _xFormats,bool _bTime); /** returns the number format key - @param _nNumberFormatIndex the number format index @see com::sun::star::i18n::NumberFormatIndex + @param _nNumberFormatIndex the number format index @see css::i18n::NumberFormatIndex */ sal_Int32 getFormatKey(bool _bDate) const; @@ -78,7 +78,7 @@ class ODateTimeDialog : public ModalDialog void InsertEntry(sal_Int16 _nNumberFormatId); public: ODateTimeDialog( vcl::Window* pParent - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xHoldAlive + ,const css::uno::Reference< css::report::XSection>& _xHoldAlive ,::rptui::OReportController* _pController); virtual ~ODateTimeDialog(); virtual void dispose() override; diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx index 674dc88d4a85..c88e2d39775d 100644 --- a/reportdesign/source/ui/inc/DefaultInspection.hxx +++ b/reportdesign/source/ui/inc/DefaultInspection.hxx @@ -35,19 +35,19 @@ namespace rptui //= DefaultComponentInspectorModel - typedef ::cppu::WeakAggImplHelper3 < ::com::sun::star::inspection::XObjectInspectorModel - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XInitialization + typedef ::cppu::WeakAggImplHelper3 < css::inspection::XObjectInspectorModel + , css::lang::XServiceInfo + , css::lang::XInitialization > DefaultComponentInspectorModel_Base; class DefaultComponentInspectorModel : public DefaultComponentInspectorModel_Base { private: ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorModel > m_xComponent; /// delegatee + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::inspection::XObjectInspectorModel > m_xComponent; /// delegatee bool m_bConstructed; bool m_bHasHelpSection; - bool m_bIsReadOnly; + bool m_bIsReadOnly; sal_Int32 m_nMinHelpTextLines; sal_Int32 m_nMaxHelpTextLines; /// access to property meta data @@ -59,33 +59,33 @@ namespace rptui virtual ~DefaultComponentInspectorModel(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::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; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XObjectInspectorModel - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getHandlerFactories() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getHasHelpSection() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMinHelpTextLines() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMaxHelpTextLines() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getIsReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setIsReadOnly( sal_Bool _isreadonly ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getHandlerFactories() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getHasHelpSection() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMinHelpTextLines() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMaxHelpTextLines() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsReadOnly() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setIsReadOnly( sal_Bool _isreadonly ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) 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; public: // XServiceInfo - static versions - 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::uno::XComponentContext >&); + 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::uno::XComponentContext >&); public: - DefaultComponentInspectorModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + DefaultComponentInspectorModel( const css::uno::Reference< css::uno::XComponentContext >& _rxContext); protected: // Service constructors diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index 748f2f8d0f8a..2f30567452c2 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -60,7 +60,7 @@ namespace rptui private: VclPtr<SplitWindow> m_aSplitWin; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xReportComponent; + css::uno::Reference< css::uno::XInterface> m_xReportComponent; OReportController& m_rReportController; VclPtr<OScrollWindowHelper> m_aScrollWindow; VclPtr<vcl::Window> m_pTaskPane; @@ -92,7 +92,7 @@ namespace rptui public: ODesignView(vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&, + const css::uno::Reference< css::uno::XComponentContext >&, OReportController& _rController); virtual ~ODesignView(); virtual void dispose() override; @@ -160,7 +160,7 @@ namespace rptui If the section is <NULL/> nothing happens. If the position is grater than the current elements, the section will be appended. */ - void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + void addSection(const css::uno::Reference< css::report::XSection >& _xSection ,const OUString& _sColorEntry ,sal_uInt16 _nPosition = USHRT_MAX); @@ -196,20 +196,20 @@ namespace rptui /** triggers the property browser with the section @param _xReportComponent the report component */ - void showProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); - ::com::sun::star::uno::Any getCurrentlyShownProperty() const; + void showProperties( const css::uno::Reference< css::uno::XInterface>& _xReportComponent); + css::uno::Any getCurrentlyShownProperty() const; /** returns the current section or the detail section if no section was selected previously */ - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getCurrentSection() const; + css::uno::Reference< css::report::XSection > getCurrentSection() const; /** returns the current control report model or <NULL/> */ - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > getCurrentControlModel() const; + css::uno::Reference< css::report::XReportComponent > getCurrentControlModel() const; // IMarkedSection OSectionWindow* getMarkedSection(NearSectionAccess nsa = CURRENT) const override; - OSectionWindow* getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; + OSectionWindow* getSectionWindow(const css::uno::Reference< css::report::XSection>& _xSection) const; virtual void markSection(const sal_uInt16 _nPos) override; /** fills the positions of all collapsed sections. @@ -222,7 +222,7 @@ namespace rptui * * \param _aCollpasedSections The position of the sections which should be collapsed. */ - void collapseSections(const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections); + void collapseSections(const css::uno::Sequence< css::beans::PropertyValue>& _aCollpasedSections); OUString getCurrentPage() const; void setCurrentPage(const OUString& _sLastActivePage); @@ -237,8 +237,8 @@ namespace rptui @param _pSectionView the section where to set the marked flag @param _bMark the marked flag */ - void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,bool _bMark); - void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,bool _bMark); + void setMarked(const css::uno::Reference< css::report::XSection>& _xSection,bool _bMark); + void setMarked(const css::uno::Sequence< css::uno::Reference< css::report::XReportComponent> >& _xShape,bool _bMark); /** returns if the view handles the event by itself * @@ -256,7 +256,7 @@ namespace rptui /** fills the vector with all selected control models /param _rSelection The vector will be filled and will not be cleared before. */ - void fillControlModelSelection(::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& _rSelection) const; + void fillControlModelSelection(::std::vector< css::uno::Reference< css::uno::XInterface > >& _rSelection) const; /** calculates the zoom factor. @param _eType which kind of zoom is needed diff --git a/reportdesign/source/ui/inc/FixedTextColor.hxx b/reportdesign/source/ui/inc/FixedTextColor.hxx index a1df278f6071..d5692e5252b1 100644 --- a/reportdesign/source/ui/inc/FixedTextColor.hxx +++ b/reportdesign/source/ui/inc/FixedTextColor.hxx @@ -38,18 +38,18 @@ namespace rptui { const OReportController& m_rReportController; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer > getVclWindowPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFixedText >& _xComponent) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > getXControl(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFixedText >& _xFixedText) throw(::com::sun::star::uno::RuntimeException); + css::uno::Reference< css::awt::XVclWindowPeer > getVclWindowPeer(const css::uno::Reference< css::report::XFixedText >& _xComponent) throw(css::uno::RuntimeException); + css::uno::Reference< css::awt::XControl > getXControl(const css::uno::Reference< css::report::XFixedText >& _xFixedText) throw(css::uno::RuntimeException); - static void setPropertyTextColor(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nFormatKey); + static void setPropertyTextColor(const css::uno::Reference< css::awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nFormatKey); public: FixedTextColor(const OReportController & _aObserver); virtual ~FixedTextColor(); - void notifyPropertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) override; - void notifyElementInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) override; - void handle( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) override; + void notifyPropertyChange( const css::beans::PropertyChangeEvent& _rEvent ) override; + void notifyElementInserted( const css::uno::Reference< css::uno::XInterface >& _rxElement ) override; + void handle( const css::uno::Reference< css::uno::XInterface >& _rxElement ) override; }; diff --git a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx index b65cab4812bc..9a20b80cad44 100644 --- a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx +++ b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx @@ -37,10 +37,10 @@ namespace rptui const OReportController& m_rReportController; sal_Int32 m_nTextColor; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer > getVclWindowPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent) throw(::com::sun::star::uno::RuntimeException); + css::uno::Reference< css::awt::XVclWindowPeer > getVclWindowPeer(const css::uno::Reference< css::report::XReportComponent >& _xComponent) throw(css::uno::RuntimeException); - void setPlaceholderText( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); - void setPlaceholderText( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, const OUString& _rText ); + void setPlaceholderText( const css::uno::Reference< css::uno::XInterface >& _rxComponent ); + void setPlaceholderText( const css::uno::Reference< css::awt::XVclWindowPeer >& _xVclWindowPeer, const OUString& _rText ); sal_Int32 getTextColor(); @@ -48,9 +48,9 @@ namespace rptui FormattedFieldBeautifier(const OReportController & _aObserver); virtual ~FormattedFieldBeautifier(); - void notifyPropertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) override; - void notifyElementInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) override; - void handle( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) override; + void notifyPropertyChange( const css::beans::PropertyChangeEvent& _rEvent ) override; + void notifyElementInserted( const css::uno::Reference< css::uno::XInterface >& _rxElement ) override; + void handle( const css::uno::Reference< css::uno::XInterface >& _rxElement ) override; }; } // namespace rptui diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index c1af4dfdc59a..f8183cc07210 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -48,23 +48,23 @@ class FormulaDialog : public formula::FormulaModalDialog, std::shared_ptr< formula::IFunctionManager > m_aFunctionManager; formula::FormEditData* m_pFormulaData; VclPtr<OAddFieldWindow> m_pAddField; - ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > m_xRowSet; - ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFormulaParser> m_xParser; - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; + css::uno::Reference < css::beans::XPropertySet > m_xRowSet; + css::uno::Reference< css::report::meta::XFormulaParser> m_xParser; + css::uno::Reference< css::sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; VclPtr<formula::RefEdit> m_pEdit; - OUString m_sFormula; - sal_Int32 m_nStart; - sal_Int32 m_nEnd; + OUString m_sFormula; + sal_Int32 m_nStart; + sal_Int32 m_nEnd; - svl::SharedStringPool& mrStringPool; + svl::SharedStringPool& mrStringPool; DECL_LINK_TYPED( OnClickHdl, OAddFieldWindow&, void ); public: FormulaDialog( vcl::Window* pParent - , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xServiceFactory + , const css::uno::Reference< css::lang::XMultiServiceFactory>& _xServiceFactory , const std::shared_ptr< formula::IFunctionManager >& _pFunctionMgr , const OUString& _sFormula - , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet + , const css::uno::Reference < css::beans::XPropertySet >& _xRowSet , svl::SharedStringPool& rStrPool ); virtual ~FormulaDialog(); @@ -90,11 +90,11 @@ public: virtual OUString getCurrentFormula() const override; virtual formula::IFunctionManager* getFunctionManager() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> getFormulaParser() const override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const override; - virtual ::com::sun::star::table::CellAddress getReferencePosition() const override; + virtual css::uno::Reference< css::sheet::XFormulaParser> getFormulaParser() const override; + virtual css::uno::Reference< css::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const override; + virtual css::table::CellAddress getReferencePosition() const override; - virtual ::std::unique_ptr<formula::FormulaTokenArray> convertToTokenArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& _aTokenList) override; + virtual ::std::unique_ptr<formula::FormulaTokenArray> convertToTokenArray(const css::uno::Sequence< css::sheet::FormulaToken >& _aTokenList) override; // IControlReferenceHandler virtual void ShowReference(const OUString& _sRef) override; diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index 1213de498bd4..73142dd8f48f 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -38,28 +38,28 @@ class FunctionManager : public formula::IFunctionManager { typedef std::map< OUString, std::shared_ptr< FunctionDescription > > TFunctionsMap; typedef std::map< OUString, std::shared_ptr< FunctionCategory > > TCategoriesMap; - ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionManager> m_xMgr; + css::uno::Reference< css::report::meta::XFunctionManager> m_xMgr; mutable TCategoriesMap m_aCategories; mutable ::std::vector< TCategoriesMap::iterator > m_aCategoryIndex; mutable TFunctionsMap m_aFunctions; public: - FunctionManager(const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionManager>& _xMgr); + FunctionManager(const css::uno::Reference< css::report::meta::XFunctionManager>& _xMgr); virtual ~FunctionManager(); virtual sal_uInt32 getCount() const override; virtual const formula::IFunctionCategory* getCategory(sal_uInt32 nPos) const override; virtual void fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& _rLastRUFunctions) const override; virtual sal_Unicode getSingleToken(const EToken _eToken) const override; - std::shared_ptr< FunctionDescription > get(const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription>& _xFunctionDescription) const; + std::shared_ptr< FunctionDescription > get(const css::uno::Reference< css::report::meta::XFunctionDescription>& _xFunctionDescription) const; }; class FunctionDescription : public formula::IFunctionDescription { - ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FunctionArgument > m_aParameter; - ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription> m_xFunctionDescription; + css::uno::Sequence< css::sheet::FunctionArgument > m_aParameter; + css::uno::Reference< css::report::meta::XFunctionDescription> m_xFunctionDescription; const formula::IFunctionCategory* m_pFunctionCategory; public: - FunctionDescription(const formula::IFunctionCategory* _pFunctionCategory,const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription>& _xFunctionDescription); + FunctionDescription(const formula::IFunctionCategory* _pFunctionCategory,const css::uno::Reference< css::report::meta::XFunctionDescription>& _xFunctionDescription); virtual ~FunctionDescription(){} virtual OUString getFunctionName() const override ; @@ -80,12 +80,12 @@ public: class FunctionCategory : public formula::IFunctionCategory { mutable ::std::vector< std::shared_ptr< FunctionDescription > > m_aFunctions; - ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionCategory> m_xCategory; + css::uno::Reference< css::report::meta::XFunctionCategory> m_xCategory; sal_uInt32 m_nFunctionCount; sal_uInt32 m_nNumber; const FunctionManager* m_pFunctionManager; public: - FunctionCategory(const FunctionManager* _pFMgr,sal_uInt32 _nPos,const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionCategory>& _xCategory); + FunctionCategory(const FunctionManager* _pFMgr,sal_uInt32 _nPos,const css::uno::Reference< css::report::meta::XFunctionCategory>& _xCategory); virtual ~FunctionCategory() {} virtual sal_uInt32 getCount() const override; diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index fb0bfcf2649d..1bcc651b6099 100644 --- a/reportdesign/source/ui/inc/GeometryHandler.hxx +++ b/reportdesign/source/ui/inc/GeometryHandler.hxx @@ -44,10 +44,10 @@ namespace rptui struct DefaultFunction { - com::sun::star::beans::Optional< OUString> m_sInitialFormula; - OUString m_sName; - OUString m_sSearchString; - OUString m_sFormula; + css::beans::Optional< OUString> m_sInitialFormula; + OUString m_sName; + OUString m_sSearchString; + OUString m_sFormula; bool m_bPreEvaluated; bool m_bDeepTraversing; @@ -55,14 +55,14 @@ namespace rptui } ; class OPropertyInfoService; - typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction>, ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier> > TFunctionPair; + typedef ::std::pair< css::uno::Reference< css::report::XFunction>, css::uno::Reference< css::report::XFunctionsSupplier> > TFunctionPair; typedef ::std::multimap< OUString,TFunctionPair, ::comphelper::UStringMixLess > TFunctions; - typedef ::comphelper::OSimpleListenerContainer < ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::beans::PropertyChangeEvent + typedef ::comphelper::OSimpleListenerContainer < css::beans::XPropertyChangeListener + , css::beans::PropertyChangeEvent > PropertyChangeListeners; - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::inspection::XPropertyHandler - , ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::lang::XServiceInfo> GeometryHandler_Base; + typedef ::cppu::WeakComponentImplHelper< css::inspection::XPropertyHandler + , css::beans::XPropertyChangeListener + , css::lang::XServiceInfo> GeometryHandler_Base; class GeometryHandler: private ::cppu::BaseMutex, @@ -90,28 +90,28 @@ namespace rptui */ sal_uInt32 impl_getDataFieldType_throw(const OUString& _sDataField = OUString()) const; - ::com::sun::star::uno::Any getConstantValue(bool bToControlValue,sal_uInt16 nResId,const ::com::sun::star::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName ); - ::com::sun::star::beans::Property getProperty(const OUString & PropertyName); + css::uno::Any getConstantValue(bool bToControlValue,sal_uInt16 nResId,const css::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName ); + css::beans::Property getProperty(const OUString & PropertyName); static void implCreateListLikeControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory - ,::com::sun::star::inspection::LineDescriptor & out_Descriptor + const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory + ,css::inspection::LineDescriptor & out_Descriptor ,sal_uInt16 _nResId ,bool _bReadOnlyControl ,bool _bTrueIfListBoxFalseIfComboBox ); static void implCreateListLikeControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory - ,::com::sun::star::inspection::LineDescriptor & out_Descriptor + const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory + ,css::inspection::LineDescriptor & out_Descriptor ,const ::std::vector< OUString>& _aEntries ,bool _bReadOnlyControl ,bool _bTrueIfListBoxFalseIfComboBox ); - void checkPosAndSize( const ::com::sun::star::awt::Point& _aNewPos, - const ::com::sun::star::awt::Size& _aSize); + void checkPosAndSize( const css::awt::Point& _aNewPos, + const css::awt::Size& _aSize); - OUString impl_convertToFormula( const ::com::sun::star::uno::Any& _rControlValue ); + OUString impl_convertToFormula( const css::uno::Any& _rControlValue ); - void impl_initFieldList_nothrow( ::com::sun::star::uno::Sequence< OUString >& _rFieldNames ) const; + void impl_initFieldList_nothrow( css::uno::Sequence< OUString >& _rFieldNames ) const; /** Creates the function defined by the function template * @@ -180,7 +180,7 @@ namespace rptui * \param _rsNamePostfix the name postfix which can be used when the scope as name part is needed * \return the function supplier */ - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier> fillScope_throw(OUString& _rsNamePostfix); + css::uno::Reference< css::report::XFunctionsSupplier> fillScope_throw(OUString& _rsNamePostfix); /** checks if the given function is a default function we know. * @@ -192,7 +192,7 @@ namespace rptui */ bool isDefaultFunction(const OUString& _sQuotedFunction ,OUString& _Out_rDataField - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier>& _xFunctionsSupplier = ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier>() + ,const css::uno::Reference< css::report::XFunctionsSupplier>& _xFunctionsSupplier = css::uno::Reference< css::report::XFunctionsSupplier>() ,bool _bSet = false) const; /** checks if the given function is a default function we know. @@ -202,7 +202,7 @@ namespace rptui * \param _rsDefaultFunctionName * \return */ - bool impl_isDefaultFunction_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction>& _xFunction + bool impl_isDefaultFunction_nothrow( const css::uno::Reference< css::report::XFunction>& _xFunction ,OUString& _rDataField ,OUString& _rsDefaultFunctionName) const; @@ -232,46 +232,46 @@ namespace rptui // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override; public: // XServiceInfo - static versions - 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::uno::XComponentContext >&); + 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::uno::XComponentContext >&); public: - explicit GeometryHandler(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); + explicit GeometryHandler(css::uno::Reference< css::uno::XComponentContext > const & context); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::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; - - // ::com::sun::star::lang::XComponent: - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::inspection::XPropertyHandler: - virtual void SAL_CALL inspect(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Component) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, std::exception) override; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & Listener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & _rxListener) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException, std::exception) override; - virtual sal_Bool SAL_CALL suspend(sal_Bool Suspend) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XComponent: + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw (css::uno::RuntimeException, std::exception) override; + + // css::inspection::XPropertyHandler: + virtual void SAL_CALL inspect(const css::uno::Reference< css::uno::XInterface > & Component) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const css::uno::Any & Value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::beans::PropertyVetoException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& ControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const css::uno::Any & ControlValue) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual css::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const css::uno::Any & PropertyValue, const css::uno::Type & ControlValueType) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & Listener) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & _rxListener) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, css::uno::Any & out_Data, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::NullPointerException, std::exception) override; + virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const css::uno::Any & NewValue, const css::uno::Any & OldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override; + virtual sal_Bool SAL_CALL suspend(sal_Bool Suspend) throw (css::uno::RuntimeException, std::exception) override; protected: virtual ~GeometryHandler(); @@ -285,26 +285,26 @@ namespace rptui // disposed, do it here. virtual void SAL_CALL disposing() override; - PropertyChangeListeners m_aPropertyListeners; - ::com::sun::star::uno::Sequence< OUString > m_aFieldNames; - ::com::sun::star::uno::Sequence< OUString > m_aParamNames; - TFunctions m_aFunctionNames; - ::std::vector< DefaultFunction > m_aDefaultFunctions; - DefaultFunction m_aCounterFunction; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction> m_xFunction; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > m_xFormComponentHandler; /// delegatee - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xReportComponent; /// inspectee - mutable ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xRowSet; + PropertyChangeListeners m_aPropertyListeners; + css::uno::Sequence< OUString > m_aFieldNames; + css::uno::Sequence< OUString > m_aParamNames; + TFunctions m_aFunctionNames; + ::std::vector< DefaultFunction > m_aDefaultFunctions; + DefaultFunction m_aCounterFunction; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + mutable css::uno::Reference< css::report::XFunction> m_xFunction; + css::uno::Reference< css::inspection::XPropertyHandler > m_xFormComponentHandler; /// delegatee + css::uno::Reference< css::beans::XPropertySet > m_xReportComponent; /// inspectee + mutable css::uno::Reference< css::sdbc::XRowSet > m_xRowSet; /// type converter, needed on various occasions - ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter; + css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter; /// access to property meta data - ::std::unique_ptr< OPropertyInfoService > m_pInfoService; - mutable OUString m_sDefaultFunction; - mutable OUString m_sScope; - sal_uInt32 m_nDataFieldType; - mutable bool m_bNewFunction; - bool m_bIn; + ::std::unique_ptr< OPropertyInfoService > m_pInfoService; + mutable OUString m_sDefaultFunction; + mutable OUString m_sScope; + sal_uInt32 m_nDataFieldType; + mutable bool m_bNewFunction; + bool m_bIn; }; } // namespace rptui diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index c45c6a42f834..e1b7d7730b8e 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -75,12 +75,12 @@ class OGroupsSortingDialog : public FloatingWindow VclPtr<FixedText> m_pHelpWindow; VclPtr<OFieldExpressionControl> m_pFieldExpression; - ::rptui::OReportController* m_pController; + ::rptui::OReportController* m_pController; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pCurrentGroupListener; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups> m_xGroups; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; - bool m_bReadOnly; + css::uno::Reference< css::report::XGroups> m_xGroups; + css::uno::Reference< css::container::XNameAccess > m_xColumns; + bool m_bReadOnly; private: DECL_LINK_TYPED( OnControlFocusLost, Control&, void ); DECL_LINK_TYPED( OnControlFocusGot, Control&, void ); @@ -90,12 +90,12 @@ private: /** returns the groups @return the groups which now have to check which one changes */ - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups>& getGroups() { return m_xGroups; } + css::uno::Reference< css::report::XGroups>& getGroups() { return m_xGroups; } - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup> getGroup(sal_Int32 _nPos) + css::uno::Reference< css::report::XGroup> getGroup(sal_Int32 _nPos) { OSL_ENSURE(_nPos >= 0 && _nPos < m_xGroups->getCount(),"Invalid count!"); - return ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>(m_xGroups->getByIndex(_nPos),::com::sun::star::uno::UNO_QUERY); + return css::uno::Reference< css::report::XGroup>(m_xGroups->getByIndex(_nPos),css::uno::UNO_QUERY); } /** updates the listboxes with the new group properties @@ -124,7 +124,7 @@ private: /** display the group props @param _xGroup the group to display */ - void displayGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup); + void displayGroup(const css::uno::Reference< css::report::XGroup>& _xGroup); /** enables or disables the up and down button @param _nRow the row which will be active @@ -139,7 +139,7 @@ private: void operator =(OGroupsSortingDialog&) = delete; protected: // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException, std::exception) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException, std::exception) override; public: OGroupsSortingDialog( vcl::Window* pParent ,bool _bReadOnly diff --git a/reportdesign/source/ui/inc/IReportControllerObserver.hxx b/reportdesign/source/ui/inc/IReportControllerObserver.hxx index c5921dfc7afd..3d9f7e75c582 100644 --- a/reportdesign/source/ui/inc/IReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/IReportControllerObserver.hxx @@ -32,9 +32,9 @@ namespace rptui public: - virtual void notifyPropertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) = 0; - virtual void notifyElementInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) = 0; - virtual void handle( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) = 0; + virtual void notifyPropertyChange( const css::beans::PropertyChangeEvent& _rEvent ) = 0; + virtual void notifyElementInserted( const css::uno::Reference< css::uno::XInterface >& _rxElement ) = 0; + virtual void handle( const css::uno::Reference< css::uno::XInterface >& _rxElement ) = 0; }; } // namespace rptui diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx index 3ab966fcdca8..4f50f6e98f8e 100644 --- a/reportdesign/source/ui/inc/PageNumber.hxx +++ b/reportdesign/source/ui/inc/PageNumber.hxx @@ -46,15 +46,15 @@ class OPageNumberDialog : public ModalDialog VclPtr<CheckBox> m_pShowNumberOnFirstPage; - ::rptui::OReportController* m_pController; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition> - m_xHoldAlive; + ::rptui::OReportController* m_pController; + css::uno::Reference< css::report::XReportDefinition> + m_xHoldAlive; OPageNumberDialog(const OPageNumberDialog&) = delete; void operator =(const OPageNumberDialog&) = delete; public: OPageNumberDialog( vcl::Window* pParent - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xHoldAlive + ,const css::uno::Reference< css::report::XReportDefinition>& _xHoldAlive ,::rptui::OReportController* _pController); virtual ~OPageNumberDialog(); virtual void dispose() override; diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx index 0df31a508b32..97521de09513 100644 --- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx +++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx @@ -36,8 +36,8 @@ namespace rptui class OPropertyInfoService; - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::inspection::XPropertyHandler - , ::com::sun::star::lang::XServiceInfo> ReportComponentHandler_Base; + typedef ::cppu::WeakComponentImplHelper< css::inspection::XPropertyHandler + , css::lang::XServiceInfo> ReportComponentHandler_Base; class ReportComponentHandler: private ::cppu::BaseMutex, @@ -45,40 +45,40 @@ namespace rptui { public: // XServiceInfo - static versions - 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::uno::XComponentContext >&); + 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::uno::XComponentContext >&); public: - explicit ReportComponentHandler(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); + explicit ReportComponentHandler(css::uno::Reference< css::uno::XComponentContext > const & context); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::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; - - // ::com::sun::star::lang::XComponent: - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::inspection::XPropertyHandler: - virtual void SAL_CALL inspect(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Component) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & Listener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & _rxListener) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; - virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException, std::exception) override; - virtual sal_Bool SAL_CALL suspend(sal_Bool Suspend) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + + // css::lang::XComponent: + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw (css::uno::RuntimeException, std::exception) override; + + // css::inspection::XPropertyHandler: + virtual void SAL_CALL inspect(const css::uno::Reference< css::uno::XInterface > & Component) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const css::uno::Any & Value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& ControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const css::uno::Any & ControlValue) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual css::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const css::uno::Any & PropertyValue, const css::uno::Type & ControlValueType) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & Listener) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & _rxListener) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; + virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, css::uno::Any & out_Data, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::NullPointerException, std::exception) override; + virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const css::uno::Any & NewValue, const css::uno::Any & OldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override; + virtual sal_Bool SAL_CALL suspend(sal_Bool Suspend) throw (css::uno::RuntimeException, std::exception) override; protected: virtual ~ReportComponentHandler() {} @@ -94,11 +94,11 @@ namespace rptui // disposed, do it here. virtual void SAL_CALL disposing() override; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > m_xFormComponentHandler; /// delegatee - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xReportComponent; /// inspectee - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xFormComponent; /// inspectee - ::std::unique_ptr< OPropertyInfoService > m_pInfoService; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::inspection::XPropertyHandler > m_xFormComponentHandler; /// delegatee + css::uno::Reference< css::uno::XInterface > m_xReportComponent; /// inspectee + css::uno::Reference< css::uno::XInterface > m_xFormComponent; /// inspectee + ::std::unique_ptr< OPropertyInfoService > m_pInfoService; }; } // namespace rptui diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index bdba137cc168..092a2a2edab5 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -70,11 +70,11 @@ namespace rptui class OSectionWindow; typedef ::dbaui::DBSubComponentController OReportController_BASE; - typedef ::cppu::ImplHelper5 < ::com::sun::star::container::XContainerListener - , ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::view::XSelectionSupplier - , ::com::sun::star::util::XModeSelector - , ::com::sun::star::embed::XVisualObject + typedef ::cppu::ImplHelper5 < css::container::XContainerListener + , css::beans::XPropertyChangeListener + , css::view::XSelectionSupplier + , css::util::XModeSelector + , css::embed::XVisualObject > OReportController_Listener; class OReportController : public OReportController_BASE @@ -88,7 +88,7 @@ namespace rptui OModuleClient m_aModuleClient; ::cppu::OInterfaceContainerHelper m_aSelectionListeners; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> + css::uno::Sequence< css::beans::PropertyValue> m_aCollapsedSections; TransferableDataHelper m_aSystemClipboard; // content of the clipboard TransferableClipboardListener* @@ -99,33 +99,33 @@ namespace rptui ODesignView* getDesignView() const { return static_cast< ODesignView* >( getView() ); } - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReportDefinition; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportEngine > m_xReportEngine; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop2 > m_xFrameLoader; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xRowSet; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > m_xRowSetMediator; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the report's NumberFormatsSupplier - mutable ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xHoldAlive; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; - ::com::sun::star::awt::Size m_aVisualAreaSize; + css::uno::Reference< css::report::XReportDefinition > m_xReportDefinition; + css::uno::Reference< css::report::XReportEngine > m_xReportEngine; + css::uno::Reference< css::frame::XDesktop2 > m_xFrameLoader; + css::uno::Reference< css::sdbc::XRowSet > m_xRowSet; + css::uno::Reference< css::beans::XPropertyChangeListener > m_xRowSetMediator; + css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; // a number formatter working with the report's NumberFormatsSupplier + mutable css::uno::Reference< css::lang::XComponent > m_xHoldAlive; + mutable css::uno::Reference< css::container::XNameAccess > m_xColumns; + css::awt::Size m_aVisualAreaSize; std::shared_ptr<rptui::OReportModel> m_aReportModel; - OUString m_sName; /// name for the report definition - OUString m_sLastActivePage; /// last active property browser page - OUString m_sMode; /// the current mode of the controller + OUString m_sName; /// name for the report definition + OUString m_sLastActivePage; /// last active property browser page + OUString m_sMode; /// the current mode of the controller sal_Int32 m_nSplitPos; /// the position of the splitter sal_Int32 m_nPageNum; /// the page number from the restoreView call sal_Int32 m_nSelectionCount; ::sal_Int64 m_nAspect; sal_Int16 m_nZoomValue; SvxZoomType m_eZoomType; - bool m_bShowRuler; - bool m_bGridVisible; - bool m_bGridUse; - bool m_bShowProperties; - bool m_bGroupFloaterWasVisible; - bool m_bHelplinesMove; + bool m_bShowRuler; + bool m_bGridVisible; + bool m_bGridUse; + bool m_bShowProperties; + bool m_bGroupFloaterWasVisible; + bool m_bHelplinesMove; bool m_bChartEnabled; bool m_bChartEnabledAsked; bool m_bInGeneratePreview; @@ -136,7 +136,7 @@ namespace rptui * \param _xSection the section where to create the formatted field * \param _sFunction the function which will be set at the data field. */ - void createControl(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,const OUString& _sFunction ,sal_uInt16 _nObjectId = OBJ_DLG_FORMATTEDFIELD); + void createControl(const css::uno::Sequence< css::beans::PropertyValue >& _aArgs,const css::uno::Reference< css::report::XSection>& _xSection,const OUString& _sFunction ,sal_uInt16 _nObjectId = OBJ_DLG_FORMATTEDFIELD); /** switch the report header/footer sectionon off with undo or without depending on the given id. * * \param _nId Can either be SID_REPORTHEADER_WITHOUT_UNDO or SID_REPORTFOOTER_WITHOUT_UNDO or SID_REPORTHEADERFOOTER. @@ -154,7 +154,7 @@ namespace rptui * \param _bAppend * \param _aArgs The args which contains a element named PROPERTY_GROUP of type report::XGroup. */ - void modifyGroup(const bool _bAppend, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs); + void modifyGroup(const bool _bAppend, const css::uno::Sequence< css::beans::PropertyValue >& _aArgs); /** creates a group section. * @@ -162,7 +162,7 @@ namespace rptui * \param _bHeader true when it is a header otherwise it is a footer * \param _aArgs The args which contains a element named PROPERTY_GROUP of type report::XGroup. */ - void createGroupSection(const bool _bUndo,const bool _bHeader,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&_aArgs); + void createGroupSection(const bool _bUndo,const bool _bHeader,const css::uno::Sequence< css::beans::PropertyValue >&_aArgs); /** add or remove me as listener at the report definition * @@ -172,7 +172,7 @@ namespace rptui /** opens the common page dialog */ - void openPageDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection); + void openPageDialog(const css::uno::Reference< css::report::XSection>& _xSection); /** opens or hides the sorting and grouping dialog */ @@ -184,13 +184,13 @@ namespace rptui /** returns the position of the group inside the groups collection */ - sal_Int32 getGroupPosition(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup); + sal_Int32 getGroupPosition(const css::uno::Reference< css::report::XGroup >& _xGroup); /** calls propertyChanged when the header or footer is really turned on. @param _rEvent the group @param _bShow when <TRUE/> the header and footer will be shown otherwise not */ - void notifyGroupSections(const ::com::sun::star::container::ContainerEvent& _rEvent + void notifyGroupSections(const css::container::ContainerEvent& _rEvent ,bool _bShow); /** change the sections for a group @@ -199,7 +199,7 @@ namespace rptui @param _nGroupPos the position of the group inside the groups collection or the previous index when it was removed @param _bShow when <TRUE/> the header and footer will be shown otherwise not */ - void groupChange( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup + void groupChange( const css::uno::Reference< css::report::XGroup>& _xGroup ,const OUString& _sPropName ,sal_Int32 _nGroupPos ,bool _bShow); @@ -210,17 +210,17 @@ namespace rptui // open the help agent of report designer at start time void doOpenHelpAgent(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getXFrame(); + css::uno::Reference< css::frame::XFrame > getXFrame(); /** shrink a section @param _nUndoStrId the string id of the string which is shown in undo menu @param _nShrinkId ID of what you would like to shrink. */ - static void shrinkSectionBottom(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection); - static void shrinkSectionTop(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection); + static void shrinkSectionBottom(css::uno::Reference< css::report::XSection > _xSection); + static void shrinkSectionTop(css::uno::Reference< css::report::XSection > _xSection); public: - void shrinkSection(sal_uInt16 _nUndoStrId, ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection, sal_Int32 _nShrinkId); + void shrinkSection(sal_uInt16 _nUndoStrId, css::uno::Reference< css::report::XSection > _xSection, sal_Int32 _nShrinkId); /** opens the file open dialog to allow the user to select a image which will be * bound to a newly created image button. @@ -235,25 +235,25 @@ namespace rptui * * \param _aValue contains a XNameContainer */ - void createNewFunction(const ::com::sun::star::uno::Any& _aValue); + void createNewFunction(const css::uno::Any& _aValue); /** inserts a label - field pair into the current selected section * * \param aArgs */ - void addPairControls(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs); + void addPairControls(const css::uno::Sequence< css::beans::PropertyValue >& aArgs); /** inserts a label - field combination to show the page number and/or page count * * \param _aArgs */ - void createPageNumber(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs); + void createPageNumber(const css::uno::Sequence< css::beans::PropertyValue >& _aArgs); /** creates a formatted filed with TODAY() function and if set also an NOW() function * * \param _aArgs */ - void createDateTime(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs); + void createDateTime(const css::uno::Sequence< css::beans::PropertyValue >& _aArgs); /** gets the current section (SdrView) * @@ -290,14 +290,14 @@ namespace rptui virtual void impl_onModifyChanged() override; - virtual void onLoadedMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager ) override; + virtual void onLoadedMenu( const css::uno::Reference< css::frame::XLayoutManager >& _xLayoutManager ) override; virtual void impl_initialize( ) override; bool isUiVisible() const; /** creates a new default control for the currently set type when the modifier KEY_MOD1 was pressed * \param _aArgs must contain a properyvalue with name "KeyModifier" and value KEY_MOD1 when control should be created. */ - void createDefaultControl(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aArgs); + void createDefaultControl(const css::uno::Sequence< css::beans::PropertyValue>& _aArgs); /** fills the state for the feature request. @param _sProperty the property which should be filled in the value @@ -311,8 +311,8 @@ namespace rptui */ bool impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId ,const OUString& _sProperty - ,const ::com::sun::star::uno::Any& _aValue - ,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs); + ,const css::uno::Any& _aValue + ,const css::uno::Sequence< css::beans::PropertyValue >& _aArgs); void OnInvalidateClipboard(); DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void ); @@ -320,19 +320,19 @@ namespace rptui DECL_LINK_TYPED( OnOpenHelpAgent, void*, void ); // all the features which should be handled by this class virtual void describeSupportedFeatures() override; - // 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 dbaui::FeatureState GetState(sal_uInt16 nId) const override; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) override; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; - virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _rDefault ) const override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception, std::exception) override; + virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, css::uno::Any& _rDefault ) const override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override; private: virtual ~OReportController(); public: - OReportController(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & the_context); + OReportController(css::uno::Reference< css::uno::XComponentContext > const & the_context); DECL_LINK_TYPED( EventLstHdl, VclWindowEvent&, void ); DECL_LINK_TYPED( OnCreateHdl, OAddFieldWindow&, void); @@ -348,68 +348,68 @@ namespace rptui @param _xControlFormat the report control format */ static bool isFormatCommandEnabled(sal_uInt16 _nCommand - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xControlFormat); + ,const css::uno::Reference< css::report::XReportControlFormat>& _xControlFormat); virtual bool Construct(vcl::Window* pParent) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::frame::XController - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::frame::XController + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override; - // ::com::sun::star::lang::XComponent + // css::lang::XComponent virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // 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(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + 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(css::uno::Reference< css::uno::XComponentContext > const & xContext); - // ::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 ) override; - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::container::XContainerListener + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) 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) override; - virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) 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) override; + virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getSelection( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::frame::XController - 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 ) override; - virtual ::com::sun::star::uno::Any SAL_CALL getViewData() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL restoreViewData(const ::com::sun::star::uno::Any& Data) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::frame::XController + virtual sal_Bool SAL_CALL attachModel(const css::uno::Reference< css::frame::XModel > & xModel) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL restoreViewData(const css::uno::Any& Data) throw( css::uno::RuntimeException, std::exception ) override; /** gives access to the report definition * \return the report definition object, may be <NULL/> */ - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition> getReportDefinition() const { return m_xReportDefinition; } + inline css::uno::Reference< css::report::XReportDefinition> getReportDefinition() const { return m_xReportDefinition; } - // ::com::sun::star::frame::XController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::frame::XController + virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) override; // XTitle - virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException, std::exception) override; // XModeSelector - virtual void SAL_CALL setMode( const OUString& aMode ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual OUString SAL_CALL getMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual sal_Bool SAL_CALL supportsMode( const OUString& aMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) override ; + virtual void SAL_CALL setMode( const OUString& aMode ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override ; + virtual OUString SAL_CALL getMode( ) throw (css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes( ) throw (css::uno::RuntimeException, std::exception) override ; + virtual sal_Bool SAL_CALL supportsMode( const OUString& aMode ) throw (css::uno::RuntimeException, std::exception) override ; // XVisualObject - virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( ::sal_Int64 nAspect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMapUnit( ::sal_Int64 nAspect ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, const css::awt::Size& aSize ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getVisualAreaSize( ::sal_Int64 nAspect ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMapUnit( ::sal_Int64 nAspect ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; /** returns the current position of the splitter @@ -423,18 +423,18 @@ namespace rptui * * \return The model or <NULL/> if the model could not be created. */ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> executeReport(); + css::uno::Reference< css::frame::XModel> executeReport(); /** returns the RowSet which reflects the current settings of the report definition The caller is allowed to hold a reference to the RowSet - it is kept alive as long as the controller lives, and it's settings will follow the report definition's settings. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > getRowSet(); + css::uno::Reference< css::sdbc::XRowSet > getRowSet(); /** returns the number formatter */ - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getReportNumberFormatter() const { return m_xFormatter;} + css::uno::Reference< css::util::XNumberFormatter > getReportNumberFormatter() const { return m_xFormatter;} /** return the SdrModel of the real model * @@ -442,12 +442,12 @@ namespace rptui */ std::shared_ptr<rptui::OReportModel> getSdrModel() const { return m_aReportModel;} - inline ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext() const { return m_xContext; } + inline css::uno::Reference< css::uno::XComponentContext > getContext() const { return m_xContext; } inline sal_Int16 getZoomValue() const { return m_nZoomValue; } inline void resetZoomType() { m_eZoomType = SvxZoomType::PERCENT; } - // 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) override + // css::beans::XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -457,9 +457,9 @@ namespace rptui // cppu::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - OSectionWindow* getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; + OSectionWindow* getSectionWindow(const css::uno::Reference< css::report::XSection>& _xSection) const; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getColumns() const; + css::uno::Reference< css::container::XNameAccess > getColumns() const; OUString getColumnLabel_throw(const OUString& i_sColumnName) const; SfxUndoManager& getUndoManager() const; diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx index bffce880941c..d038de864929 100644 --- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx @@ -41,9 +41,9 @@ namespace rptui class OXReportControllerObserver - : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::container::XContainerListener - , ::com::sun::star::util::XModifyListener + : public ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener + , css::container::XContainerListener + , css::util::XModifyListener > { @@ -60,25 +60,25 @@ namespace rptui OXReportControllerObserver(const OReportController& _rController); // XPropertyChangeListener - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; // XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; - void AddElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); - void RemoveElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); + void AddElement(const css::uno::Reference< css::uno::XInterface>& Element); + void RemoveElement(const css::uno::Reference< css::uno::XInterface>& Element); - void AddSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection); - void RemoveSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection ); + void AddSection( const css::uno::Reference< css::report::XSection>& _xSection); + void RemoveSection( const css::uno::Reference< css::report::XSection>& _xSection ); /** Create an object ob OUndoEnvLock locks the undo possibility @@ -99,14 +99,14 @@ namespace rptui void Clear(); private: - void TogglePropertyListening(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); - void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer, bool _bStartListening ); - void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ); + void TogglePropertyListening(const css::uno::Reference< css::uno::XInterface>& Element); + void switchListening( const css::uno::Reference< css::container::XIndexAccess >& _rxContainer, bool _bStartListening ); + void switchListening( const css::uno::Reference< css::uno::XInterface >& _rxObject, bool _bStartListening ); DECL_LINK_TYPED(SettingsChanged, VclSimpleEvent&, void ); private: - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> >::const_iterator getSection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild>& _xContainer) const; + ::std::vector< css::uno::Reference< css::container::XChild> >::const_iterator getSection(const css::uno::Reference< css::container::XChild>& _xContainer) const; }; diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index 7eaf9f7c637d..3cc2db97fffb 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -46,10 +46,10 @@ namespace rptui OSectionView* m_pView; VclPtr<OSectionWindow> m_pParent; ::std::unique_ptr<DlgEdFunc> m_pFunc; - std::shared_ptr<OReportModel> m_pModel; + std::shared_ptr<OReportModel> m_pModel; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pMulti; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; + css::uno::Reference< css::report::XSection > m_xSection; sal_Int32 m_nPaintEntranceCount; DlgEdMode m_eMode; @@ -75,9 +75,9 @@ namespace rptui virtual void Resize() override; // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException) override; public: - OReportSection(OSectionWindow* _pParent,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); + OReportSection(OSectionWindow* _pParent,const css::uno::Reference< css::report::XSection >& _xSection); virtual ~OReportSection(); virtual void dispose() override; @@ -88,15 +88,15 @@ namespace rptui /** copies the current selection in this section @param _rAllreadyCopiedObjects This is an out/in put param which contains all already copied objects. */ - void Copy(::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rAllreadyCopiedObjects); + void Copy(css::uno::Sequence< css::beans::NamedValue >& _rAllreadyCopiedObjects); - void Copy(::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rAllreadyCopiedObjects,bool _bEraseAnddNoClone); + void Copy(css::uno::Sequence< css::beans::NamedValue >& _rAllreadyCopiedObjects,bool _bEraseAnddNoClone); /** paste a new control in this section @param _aAllreadyCopiedObjects objects to paste into the section. Only objects are pasted where the name is equal to the section name. @param _bForce If set to <TRUE/> than the objects will be copied into this section. The name is not compared in this case. */ - void Paste(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _aAllreadyCopiedObjects,bool _bForce = false); + void Paste(const css::uno::Sequence< css::beans::NamedValue >& _aAllreadyCopiedObjects,bool _bForce = false); /** Deletes the current selection in this section * @@ -116,7 +116,7 @@ namespace rptui inline OSectionWindow* getSectionWindow() const { return m_pParent; } inline OSectionView& getSectionView() const { return *m_pView; } inline OReportPage* getPage() const { return m_pPage; } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection; } + inline css::uno::Reference< css::report::XSection > getSection() const { return m_xSection; } DlgEdMode GetMode() const { return m_eMode; } void SetMode( DlgEdMode m_eMode ); @@ -129,12 +129,12 @@ namespace rptui /** returns the current control report model or <NULL/> */ - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > getCurrentControlModel() const; + css::uno::Reference< css::report::XReportComponent > getCurrentControlModel() const; /** fills the vector with all selected control models /param _rSelection The vector will be filled and will not be cleared before. */ - void fillControlModelSelection(::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& _rSelection) const; + void fillControlModelSelection(::std::vector< css::uno::Reference< css::uno::XInterface > >& _rSelection) const; /** creates a default object (custom shape) * diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index 52e470311d0c..eff9b1c2563b 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -62,7 +62,7 @@ namespace rptui protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException) override; public: OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView); virtual ~OReportWindow(); @@ -119,7 +119,7 @@ namespace rptui If the section is <NULL/> nothing happens. If the position is grater than the current elements, the section will be appended. */ - void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + void addSection(const css::uno::Reference< css::report::XSection >& _xSection ,const OUString& _sColorEntry ,sal_uInt16 _nPosition = USHRT_MAX); @@ -162,7 +162,7 @@ namespace rptui /** triggers the property browser with the report component or section @param _xReportComponent */ - void showProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xReportComponent); + void showProperties( const css::uno::Reference< css::report::XSection>& _xReportComponent); /** checks if the keycode is known by the child windows @param _rCode the keycode @@ -175,12 +175,12 @@ namespace rptui @param _bMark the marked flag */ void setMarked(OSectionView* _pSectionView, bool _bMark); - void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection, bool _bMark); - void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape, bool _bMark); + void setMarked(const css::uno::Reference< css::report::XSection>& _xSection, bool _bMark); + void setMarked(const css::uno::Sequence< css::uno::Reference< css::report::XReportComponent> >& _xShape, bool _bMark); // IMarkedSection OSectionWindow* getMarkedSection(NearSectionAccess nsa = CURRENT) const override; - OSectionWindow* getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; + OSectionWindow* getSectionWindow(const css::uno::Reference< css::report::XSection>& _xSection) const; virtual void markSection(const sal_uInt16 _nPos) override; @@ -194,7 +194,7 @@ namespace rptui * * \param _aCollpasedSections The position of the sections which should be collapsed. */ - void collapseSections(const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections); + void collapseSections(const css::uno::Sequence< css::beans::PropertyValue>& _aCollpasedSections); /** align all marked objects in all sections * @@ -213,7 +213,7 @@ namespace rptui /** fills the vector with all selected control models /param _rSelection The vector will be filled and will not be cleared before. */ - void fillControlModelSelection(::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& _rSelection) const; + void fillControlModelSelection(::std::vector< css::uno::Reference< css::uno::XInterface > >& _rSelection) const; /** calculates the zoom factor. @param _eType which kind of zoom is needed diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index 130300ce8ac2..0f1c4cf980bb 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx @@ -38,9 +38,9 @@ namespace rptui OSectionUndo(const OSectionUndo&) = delete; void operator =(const OSectionUndo&) = delete; protected: - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> > + ::std::vector< css::uno::Reference< css::drawing::XShape> > m_aControls; - ::std::vector< ::std::pair< OUString ,::com::sun::star::uno::Any> > + ::std::vector< ::std::pair< OUString ,css::uno::Any> > m_aValues; Action m_eAction; sal_uInt16 m_nSlot; @@ -49,7 +49,7 @@ namespace rptui virtual void implReInsert( ) = 0; virtual void implReRemove( ) = 0; - void collectControls(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); + void collectControls(const css::uno::Reference< css::report::XSection >& _xSection); public: TYPEINFO_OVERRIDE(); OSectionUndo( OReportModel& rMod @@ -67,7 +67,7 @@ namespace rptui class OReportSectionUndo : public OSectionUndo { OReportHelper m_aReportHelper; - ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > + ::std::mem_fun_t< css::uno::Reference< css::report::XSection > ,OReportHelper> m_pMemberFunction; void implReInsert( ) override; @@ -76,12 +76,12 @@ namespace rptui void operator =(const OReportSectionUndo&) = delete; public: TYPEINFO_OVERRIDE(); - //OReportSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + //OReportSectionUndo( const css::uno::Reference< css::report::XSection >& _xSection OReportSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot - ,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > + ,::std::mem_fun_t< css::uno::Reference< css::report::XSection > ,OReportHelper> _pMemberFunction - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReport + ,const css::uno::Reference< css::report::XReportDefinition >& _xReport ,Action _eAction ,sal_uInt16 nCommentID); virtual ~OReportSectionUndo(); @@ -92,7 +92,7 @@ namespace rptui class OGroupSectionUndo : public OSectionUndo { OGroupHelper m_aGroupHelper; - ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > + ::std::mem_fun_t< css::uno::Reference< css::report::XSection > ,OGroupHelper> m_pMemberFunction; mutable OUString m_sName; @@ -103,12 +103,12 @@ namespace rptui void operator =(const OGroupSectionUndo&) = delete; public: TYPEINFO_OVERRIDE(); - //OGroupSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + //OGroupSectionUndo( const css::uno::Reference< css::report::XSection >& _xSection OGroupSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot - ,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > + ,::std::mem_fun_t< css::uno::Reference< css::report::XSection > ,OGroupHelper> _pMemberFunction - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup + ,const css::uno::Reference< css::report::XGroup >& _xGroup ,Action _eAction ,sal_uInt16 nCommentID); @@ -120,8 +120,8 @@ namespace rptui */ class OGroupUndo : public OCommentUndoAction { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup> m_xGroup; ///<! the group for the undo redo action - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReportDefinition; ///<! the parent report definition + css::uno::Reference< css::report::XGroup> m_xGroup; ///<! the group for the undo redo action + css::uno::Reference< css::report::XReportDefinition > m_xReportDefinition; ///<! the parent report definition Action m_eAction; ///<! the current action sal_Int32 m_nLastPosition; ///<! the last position of the group @@ -132,8 +132,8 @@ namespace rptui OGroupUndo(OReportModel& rMod ,sal_uInt16 nCommentID ,Action _eAction - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition); + ,const css::uno::Reference< css::report::XGroup>& _xGroup + ,const css::uno::Reference< css::report::XReportDefinition >& _xReportDefinition); virtual void Undo() override; virtual void Redo() override; }; diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index 7b6ebd21be93..38f8777e308e 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -69,7 +69,7 @@ namespace rptui virtual void Resize() override; virtual bool Notify( NotifyEvent& rNEvt ) override; // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException, std::exception) override; public: OScrollWindowHelper( ODesignView* _pReportDesignView); virtual ~OScrollWindowHelper(); @@ -128,7 +128,7 @@ namespace rptui If the section is <NULL/> nothing happens. If the position is grater than the current elements, the section will be appended. */ - void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + void addSection(const css::uno::Reference< css::report::XSection >& _xSection ,const OUString& _sColorEntry ,sal_uInt16 _nPosition = USHRT_MAX); @@ -168,12 +168,12 @@ namespace rptui @param _bMark the marked flag */ void setMarked(OSectionView* _pSectionView, bool _bMark); - void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection, bool _bMark); - void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape, bool _bMark); + void setMarked(const css::uno::Reference< css::report::XSection>& _xSection, bool _bMark); + void setMarked(const css::uno::Sequence< css::uno::Reference< css::report::XReportComponent> >& _xShape, bool _bMark); // IMarkedSection OSectionWindow* getMarkedSection(NearSectionAccess nsa = CURRENT) const override; - OSectionWindow* getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; + OSectionWindow* getSectionWindow(const css::uno::Reference< css::report::XSection>& _xSection) const; virtual void markSection(const sal_uInt16 _nPos) override; @@ -187,7 +187,7 @@ namespace rptui * * \param _aCollpasedSections The position of the sections which should be collapsed. */ - void collapseSections(const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections); + void collapseSections(const css::uno::Sequence< css::beans::PropertyValue>& _aCollpasedSections); /** align all marked objects in all sections * @@ -206,7 +206,7 @@ namespace rptui /** fills the vector with all selected control models /param _rSelection The vector will be filled and will not be cleared before. */ - void fillControlModelSelection(::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& _rSelection) const; + void fillControlModelSelection(::std::vector< css::uno::Reference< css::uno::XInterface > >& _rSelection) const; /** calculates the zoom factor. @param _eType which kind of zoom is needed diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index fd3669426b93..2f170a346924 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -66,7 +66,7 @@ namespace rptui * \param _pIsSectionOn * @return sal_True when title was set otherwise FALSE */ - bool setGroupSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> _pGetSection, const ::std::mem_fun_t<bool, OGroupHelper>& _pIsSectionOn); + bool setGroupSectionTitle(const css::uno::Reference< css::report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OGroupHelper> _pGetSection, const ::std::mem_fun_t<bool, OGroupHelper>& _pIsSectionOn); /** set the title of the (report/page) header or footer * @@ -76,7 +76,7 @@ namespace rptui * \param _pIsSectionOn * @return sal_True when title was set otherwise FALSE */ - bool setReportSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool, OReportHelper>& _pIsSectionOn); + bool setReportSectionTitle(const css::uno::Reference< css::report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool, OReportHelper>& _pIsSectionOn); void ImplInitSettings(); DECL_LINK_TYPED(Collapsed, OColorListener&, void); @@ -90,11 +90,11 @@ namespace rptui virtual void Resize() override; protected: - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw (css::uno::RuntimeException, std::exception) override; public: OSectionWindow( OViewsWindow* _pParent - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + ,const css::uno::Reference< css::report::XSection >& _xSection ,const OUString& _sColorEntry); virtual ~OSectionWindow(); virtual void dispose() override; diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx index 1838d994a128..74e86a8e072c 100644 --- a/reportdesign/source/ui/inc/UITools.hxx +++ b/reportdesign/source/ui/inc/UITools.hxx @@ -51,14 +51,14 @@ namespace rptui @return returns the position of the group in the list, otherwise -1 */ template<typename T> sal_Int32 getPositionInIndexAccess( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _xCollection - ,const ::com::sun::star::uno::Reference< T >& _xSearch) + const css::uno::Reference< css::container::XIndexAccess >& _xCollection + ,const css::uno::Reference< T >& _xSearch) { sal_Int32 nCount = _xCollection->getCount(); sal_Int32 i = (nCount == 0) ? -1 : 0; for (;i<nCount ; ++i) { - ::com::sun::star::uno::Reference< T > xObject(_xCollection->getByIndex(i),::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< T > xObject(_xCollection->getByIndex(i),css::uno::UNO_QUERY); if ( xObject == _xSearch ) break; } @@ -68,7 +68,7 @@ namespace rptui /** set the name of the header and footer of the group by the expression appended by the localized name of the section @param _xGroup the group where the header/footer name is set by the expression of the group */ - void adjustSectionName(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup,sal_Int32 _nPos); + void adjustSectionName(const css::uno::Reference< css::report::XGroup >& _xGroup,sal_Int32 _nPos); /** add a listener for the properties size, left margin, right margin to the page style * @@ -76,22 +76,22 @@ namespace rptui * \param _pListener * \return */ - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> addStyleListener( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> addStyleListener( const css::uno::Reference< css::report::XReportDefinition >& _xReportDefinition ,::comphelper::OPropertyChangeListener* _pListener); /** opens the common character font dialog */ bool openCharDialog( - const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xReportControlFormat, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& _xWindow, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _out_rNewValues + const css::uno::Reference< css::report::XReportControlFormat>& _xReportControlFormat, + const css::uno::Reference< css::awt::XWindow>& _xWindow, + css::uno::Sequence< css::beans::NamedValue >& _out_rNewValues ); /** opens the area dialog for shapes */ bool openAreaDialog( - const ::com::sun::star::uno::Reference< ::com::sun::star::report::XShape >& _xShape - ,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& _xWindow + const css::uno::Reference< css::report::XShape >& _xShape + ,const css::uno::Reference< css::awt::XWindow>& _xWindow ); /** opens the formula dialog @@ -103,16 +103,16 @@ namespace rptui <TRUE/> if and only if the user successfully chose a clause */ bool openDialogFormula_nothrow( OUString& _in_out_rFormula - , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext - , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& _xWindow - , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet + , const css::uno::Reference< css::uno::XComponentContext >& _xContext + , const css::uno::Reference< css::awt::XWindow>& _xWindow + , const css::uno::Reference < css::beans::XPropertySet >& _xRowSet ); /** applies the character settings previously obtained via openCharDialog */ void applyCharacterSettings( - const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat >& _rxReportControlFormat, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rSettings + const css::uno::Reference< css::report::XReportControlFormat >& _rxReportControlFormat, + const css::uno::Sequence< css::beans::NamedValue >& _rSettings ); /** notifySystemWindow adds or remove the given window _pToRegister at the Systemwindow found when search _pWindow. @@ -154,8 +154,8 @@ namespace rptui /** retrieves the names of the parameters of the command which the given RowSet is bound to */ - ::com::sun::star::uno::Sequence< OUString > - getParameterNames( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet ); + css::uno::Sequence< OUString > + getParameterNames( const css::uno::Reference< css::sdbc::XRowSet >& _rxRowSet ); /** ensures that no control overlaps the given one. * diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 784a7bc04355..ee5ecf74d270 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -157,7 +157,7 @@ namespace rptui If the section is <NULL/> nothing happens. If the position is grater than the current elements, the section will be appended. */ - void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + void addSection(const css::uno::Reference< css::report::XSection >& _xSection ,const OUString& _sColorEntry ,sal_uInt16 _nPosition = USHRT_MAX); @@ -221,7 +221,7 @@ namespace rptui /** returns the report section window for the given xsection @param _xSection the section */ - OSectionWindow* getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; + OSectionWindow* getSectionWindow(const css::uno::Reference< css::report::XSection>& _xSection) const; /** checks if the keycode is known by the child windows @param _rCode the keycode @@ -234,8 +234,8 @@ namespace rptui @param _bMark the marked flag */ void setMarked(OSectionView* _pSectionView, bool _bMark); - void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection, bool _bMark); - void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape, bool _bMark); + void setMarked(const css::uno::Reference< css::report::XSection>& _xSection, bool _bMark); + void setMarked(const css::uno::Sequence< css::uno::Reference< css::report::XReportComponent> >& _xShape, bool _bMark); // IMarkedSection OSectionWindow* getMarkedSection(NearSectionAccess nsa = CURRENT) const override; @@ -309,7 +309,7 @@ namespace rptui * * \param _aCollpasedSections The position of the sections which should be collapsed. */ - void collapseSections(const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections); + void collapseSections(const css::uno::Sequence< css::beans::PropertyValue>& _aCollpasedSections); /** zoom the ruler and view windows */ @@ -320,7 +320,7 @@ namespace rptui /** fills the vector with all selected control models /param _rSelection The vector will be filled and will not be cleared before. */ - void fillControlModelSelection(::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& _rSelection) const; + void fillControlModelSelection(::std::vector< css::uno::Reference< css::uno::XInterface > >& _rSelection) const; }; } // rptui diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx index 4f7ada5bfb4b..e9965a2b8d0c 100644 --- a/reportdesign/source/ui/inc/dlgedclip.hxx +++ b/reportdesign/source/ui/inc/dlgedclip.hxx @@ -37,7 +37,7 @@ namespace rptui class OReportExchange : public TransferableHelper { public: - typedef ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > TSectionElements; + typedef css::uno::Sequence< css::beans::NamedValue > TSectionElements; /** Constructs a new exchange object with section elements * diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx index 45afea89ffb6..c230f17840e2 100644 --- a/reportdesign/source/ui/inc/dlgedfunc.hxx +++ b/reportdesign/source/ui/inc/dlgedfunc.hxx @@ -45,7 +45,7 @@ protected: OSectionView& m_rView; Timer aScrollTimer; Point m_aMDPos; - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> m_xOverlappingObj; + css::uno::Reference<css::uno::XInterface> m_xOverlappingObj; SdrObject * m_pOverlappingObj; sal_Int32 m_nOverlappedControlColor; sal_Int32 m_nOldColor; diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 4b8465056ef5..9f43de7cc73d 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -52,11 +52,11 @@ namespace rptui static OUString getPropertyTranslation(sal_Int32 _nId); static OString getPropertyHelpId(sal_Int32 _nId); static sal_uInt32 getPropertyUIFlags(sal_Int32 _nId); - static void getExcludeProperties(::std::vector< com::sun::star::beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler); + static void getExcludeProperties(::std::vector< css::beans::Property >& _rExcludeProperties,const css::uno::Reference< css::inspection::XPropertyHandler >& _xFormComponentHandler); static bool isComposable( const OUString& _rPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler + const css::uno::Reference< css::inspection::XPropertyHandler >& _xFormComponentHandler ); protected: diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index 6ef3f00cf823..05a5143918f2 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -45,22 +45,22 @@ class PropBrw : public DockingWindow , public SfxListener, public SfxBroadcaster { private: OModuleClient m_aModuleClient; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xInspectorContext; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xORB; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > + css::uno::Reference< css::frame::XFrame2 > m_xMeAsFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspector > + css::uno::Reference< css::inspection::XObjectInspector > m_xBrowserController; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > + css::uno::Reference< css::awt::XWindow > m_xBrowserComponentWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> + css::uno::Reference< css::uno::XInterface> m_xLastSection; /// is the previously displayed section - OUString m_sLastActivePage; + OUString m_sLastActivePage; VclPtr<ODesignView> m_pDesignView; OSectionView* m_pView; - bool m_bInitialStateChange; + bool m_bInitialStateChange; PropBrw(PropBrw&) = delete; void operator =(PropBrw&) = delete; @@ -69,24 +69,24 @@ protected: virtual void Resize() override; virtual bool Close() override; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > + css::uno::Sequence< css::uno::Reference< css::uno::XInterface> > CreateCompPropSet(const SdrMarkList& rMarkList); void implSetNewObject( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >& _aObjects = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >()); + const css::uno::Sequence< css::uno::Reference< css::uno::XInterface> >& _aObjects = css::uno::Sequence< css::uno::Reference< css::uno::XInterface> >()); static OUString GetHeadlineName( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >& _aObjects); + const css::uno::Sequence< css::uno::Reference< css::uno::XInterface> >& _aObjects); void implDetachController(); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> CreateComponentPair(OObjectBase* _pObj); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> CreateComponentPair( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xFormComponent - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); + css::uno::Reference< css::uno::XInterface> CreateComponentPair(OObjectBase* _pObj); + css::uno::Reference< css::uno::XInterface> CreateComponentPair( + const css::uno::Reference< css::uno::XInterface>& _xFormComponent + ,const css::uno::Reference< css::uno::XInterface>& _xReportComponent); DECL_LINK_TYPED( OnAsyncGetFocus, void*, void ); public: - PropBrw(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xORB + PropBrw(const css::uno::Reference< css::uno::XComponentContext >& _xORB ,Window* pParent ,ODesignView* _pDesignView); virtual ~PropBrw(); @@ -95,7 +95,7 @@ public: virtual void LoseFocus() override; void Update( OSectionView* m_pView ); - void Update( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); + void Update( const css::uno::Reference< css::uno::XInterface>& _xReportComponent); OUString getCurrentPage() const; void setCurrentPage(const OUString& _sLastActivePage); diff --git a/reportdesign/source/ui/inc/statusbarcontroller.hxx b/reportdesign/source/ui/inc/statusbarcontroller.hxx index 018dbdfad053..28a2ce27f551 100644 --- a/reportdesign/source/ui/inc/statusbarcontroller.hxx +++ b/reportdesign/source/ui/inc/statusbarcontroller.hxx @@ -27,7 +27,7 @@ class SfxStatusBarControl; namespace rptui { - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> OStatusbarController_BASE; + typedef ::cppu::ImplHelper1 < css::lang::XServiceInfo> OStatusbarController_BASE; class OStatusbarController : public ::svt::StatusbarController, public OStatusbarController_BASE { @@ -35,46 +35,46 @@ namespace rptui sal_uInt16 m_nSlotId; sal_uInt16 m_nId; public: - OStatusbarController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + OStatusbarController(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); - 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(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); + 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(css::uno::Reference< css::uno::XComponentContext > const & xContext); private: - void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; // XInterface DECLARE_XINTERFACE( ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // need by registration - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XStatusbarController - virtual sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, + virtual sal_Bool SAL_CALL mouseButtonDown( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL mouseMove( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL mouseButtonUp( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL command( const css::awt::Point& aPos, ::sal_Int32 nCommand, sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, - ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL paint( const css::uno::Reference< css::awt::XGraphics >& xGraphics, + const css::awt::Rectangle& rOutputRectangle, + ::sal_Int32 nStyle ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL doubleClick( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override; }; } #endif // DBAUI_STATUSBARCONTROLLER_HXX diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx index 70deb3d9d3fe..6d901df20a07 100644 --- a/reportdesign/source/ui/inc/toolboxcontroller.hxx +++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx @@ -33,8 +33,8 @@ class SfxToolBoxControl; namespace rptui { - typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::frame::XSubToolbarController> TToolboxController_BASE; + typedef ::cppu::ImplHelper2 < css::lang::XServiceInfo, + css::frame::XSubToolbarController> TToolboxController_BASE; typedef rtl::Reference<SfxToolBoxControl> TToolbarHelper; class OToolboxController : public ::svt::ToolboxController @@ -48,37 +48,37 @@ namespace rptui OToolboxController(const OToolboxController&) = delete; void operator =(const OToolboxController&) = delete; public: - OToolboxController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + OToolboxController(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); virtual ~OToolboxController(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // 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(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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(css::uno::Reference< css::uno::XComponentContext > const & xContext); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XToolbarController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override; // XSubToolbarController - virtual sal_Bool SAL_CALL opensSubToolbar( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSubToolbarName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateImage( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL opensSubToolbar( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSubToolbarName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateImage( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override; }; } // rptui diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index ff3e2ba03732..f838b3ee7453 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -142,13 +142,13 @@ namespace rptui return m_nMinHelpTextLines; } - sal_Bool SAL_CALL DefaultComponentInspectorModel::getIsReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL DefaultComponentInspectorModel::getIsReadOnly() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); return m_bIsReadOnly; } - void SAL_CALL DefaultComponentInspectorModel::setIsReadOnly( sal_Bool _isreadonly ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL DefaultComponentInspectorModel::setIsReadOnly( sal_Bool _isreadonly ) throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); m_bIsReadOnly = _isreadonly; diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index 1cf9fc769074..031f74a9669a 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -217,7 +217,7 @@ namespace rptui } - bool OPropertyInfoService::isComposable( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxFormComponentHandler ) + bool OPropertyInfoService::isComposable( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyHandler >& _rxFormComponentHandler ) { sal_Int32 nId = getPropertyId( _rPropertyName ); if ( nId != -1 ) @@ -230,7 +230,7 @@ namespace rptui } - void OPropertyInfoService::getExcludeProperties(::std::vector< beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler) + void OPropertyInfoService::getExcludeProperties(::std::vector< beans::Property >& _rExcludeProperties,const css::uno::Reference< css::inspection::XPropertyHandler >& _xFormComponentHandler) { uno::Sequence< beans::Property > aProps = _xFormComponentHandler->getSupportedProperties(); static const OUString pExcludeProperties[] = diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index e2f7854a0693..18e23e9dceb6 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -998,9 +998,9 @@ void setZoomFactor(const Fraction& _aZoom, vcl::Window& _rWindow) } bool openDialogFormula_nothrow( OUString& _in_out_rFormula - , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext + , const css::uno::Reference< css::uno::XComponentContext >& _xContext , const uno::Reference< awt::XWindow>& _xInspectorWindow - , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet + , const css::uno::Reference < css::beans::XPropertySet >& _xRowSet ) { OSL_PRECOND( _xInspectorWindow.is(), "openDialogFormula_nothrow: invalid parameters!" ); diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index a02814905d5d..dec013cbed3b 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -156,53 +156,53 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv } // XStatusbarController -sal_Bool SAL_CALL OStatusbarController::mouseButtonDown(const ::com::sun::star::awt::MouseEvent& _aEvent)throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OStatusbarController::mouseButtonDown(const css::awt::MouseEvent& _aEvent)throw (css::uno::RuntimeException, std::exception) { return m_rController.is() && m_rController->mouseButtonDown(_aEvent); } -sal_Bool SAL_CALL OStatusbarController::mouseMove( const ::com::sun::star::awt::MouseEvent& _aEvent)throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OStatusbarController::mouseMove( const css::awt::MouseEvent& _aEvent)throw (css::uno::RuntimeException, std::exception) { return m_rController.is() && m_rController->mouseMove(_aEvent); } -sal_Bool SAL_CALL OStatusbarController::mouseButtonUp( const ::com::sun::star::awt::MouseEvent& _aEvent)throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OStatusbarController::mouseButtonUp( const css::awt::MouseEvent& _aEvent)throw (css::uno::RuntimeException, std::exception) { return m_rController.is() && m_rController->mouseButtonUp(_aEvent); } void SAL_CALL OStatusbarController::command( - const ::com::sun::star::awt::Point& aPos, + const css::awt::Point& aPos, ::sal_Int32 nCommand, sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) -throw (::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Any& aData ) +throw (css::uno::RuntimeException, std::exception) { if ( m_rController.is() ) m_rController->command( aPos, nCommand, bMouseEvent, aData ); } void SAL_CALL OStatusbarController::paint( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, + const css::uno::Reference< css::awt::XGraphics >& xGraphics, + const css::awt::Rectangle& rOutputRectangle, ::sal_Int32 nStyle ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { if ( m_rController.is() ) m_rController->paint( xGraphics, rOutputRectangle, nStyle ); } void SAL_CALL OStatusbarController::click( - const ::com::sun::star::awt::Point& aPos ) -throw (::com::sun::star::uno::RuntimeException, std::exception) + const css::awt::Point& aPos ) +throw (css::uno::RuntimeException, std::exception) { if ( m_rController.is() ) m_rController->click( aPos ); } void SAL_CALL OStatusbarController::doubleClick( - const ::com::sun::star::awt::Point& aPos ) -throw (::com::sun::star::uno::RuntimeException, std::exception) + const css::awt::Point& aPos ) +throw (css::uno::RuntimeException, std::exception) { if ( m_rController.is() ) m_rController->doubleClick( aPos ); @@ -216,7 +216,7 @@ void SAL_CALL OStatusbarController::update() throw ( RuntimeException, std::exce } // XComponent -void SAL_CALL OStatusbarController::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OStatusbarController::dispose() throw (css::uno::RuntimeException, std::exception) { if ( m_rController.is() ) ::comphelper::disposeComponent( m_rController ); diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index edf712f0bf68..33323495360e 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -554,7 +554,7 @@ OSectionWindow* ODesignView::getMarkedSection(NearSectionAccess nsa) const return m_aScrollWindow->getMarkedSection(nsa); } -OSectionWindow* ODesignView::getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const +OSectionWindow* ODesignView::getSectionWindow(const css::uno::Reference< css::report::XSection>& _xSection) const { return m_aScrollWindow->getSectionWindow(_xSection); } diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index 05ccf2f84856..d159248a2279 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -118,7 +118,7 @@ namespace rptui } else { - com::sun::star::util::Color aColor2 = xSection->getBackColor(); + css::util::Color aColor2 = xSection->getBackColor(); Color aBackColor(aColor2); bIsDark = aBackColor.IsDark(); } diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 16ba46e9d97f..a3c08a7982a6 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -128,7 +128,7 @@ namespace rptui uno::Any aFontDescriptor = _xVclWindowPeer->getProperty(PROPERTY_FONTDESCRIPTOR); awt::FontDescriptor aFontDescriptorStructure; aFontDescriptor >>= aFontDescriptorStructure; - aFontDescriptorStructure.Slant = ::com::sun::star::awt::FontSlant_ITALIC; + aFontDescriptorStructure.Slant = css::awt::FontSlant_ITALIC; _xVclWindowPeer->setProperty(PROPERTY_FONTDESCRIPTOR, uno::makeAny(aFontDescriptorStructure)); } diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index c3334236dde2..2883912d1b4b 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -4076,23 +4076,23 @@ void SAL_CALL OReportController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHa impl_zoom_nothrow(); } } -void SAL_CALL OReportController::setMode( const OUString& aMode ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OReportController::setMode( const OUString& aMode ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); m_sMode = aMode; } -OUString SAL_CALL OReportController::getMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OReportController::getMode( ) throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); return m_sMode; } -::com::sun::star::uno::Sequence< OUString > SAL_CALL OReportController::getSupportedModes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL OReportController::getSupportedModes( ) throw (css::uno::RuntimeException, std::exception) { static const OUString s_sModes[] = { OUString("remote"), OUString("normal") }; return uno::Sequence< OUString> (&s_sModes[0],sizeof(s_sModes)/sizeof(s_sModes[0])); } -sal_Bool SAL_CALL OReportController::supportsMode( const OUString& aMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OReportController::supportsMode( const OUString& aMode ) throw (css::uno::RuntimeException, std::exception) { uno::Sequence< OUString> aModes = getSupportedModes(); const OUString* pIter = aModes.getConstArray(); @@ -4213,7 +4213,7 @@ void OReportController::impl_fillCustomShapeState_nothrow(const char* _pCustomSh } -OSectionWindow* OReportController::getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const +OSectionWindow* OReportController::getSectionWindow(const css::uno::Reference< css::report::XSection>& _xSection) const { if ( getDesignView() ) { diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index ecc306d1aac9..05e8aac73ad7 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -330,7 +330,7 @@ OSectionWindow* OReportWindow::getMarkedSection(NearSectionAccess nsa) const return m_aViewsWindow->getMarkedSection(nsa); } -OSectionWindow* OReportWindow::getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const +OSectionWindow* OReportWindow::getSectionWindow(const css::uno::Reference< css::report::XSection>& _xSection) const { return m_aViewsWindow->getSectionWindow(_xSection); } @@ -347,7 +347,7 @@ void OReportWindow::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsed m_aViewsWindow->fillCollapsedSections(_rCollapsedPositions); } -void OReportWindow::collapseSections(const uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections) +void OReportWindow::collapseSections(const uno::Sequence< css::beans::PropertyValue>& _aCollpasedSections) { m_aViewsWindow->collapseSections(_aCollpasedSections); diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index 71e2cddc8de1..2957c0d92e01 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -305,7 +305,7 @@ OSectionWindow* OScrollWindowHelper::getMarkedSection(NearSectionAccess nsa) con return m_aReportWindow->getMarkedSection(nsa); } -OSectionWindow* OScrollWindowHelper::getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const +OSectionWindow* OScrollWindowHelper::getSectionWindow(const css::uno::Reference< css::report::XSection>& _xSection) const { return m_aReportWindow->getSectionWindow(_xSection); } @@ -320,7 +320,7 @@ void OScrollWindowHelper::fillCollapsedSections(::std::vector<sal_uInt16>& _rCol m_aReportWindow->fillCollapsedSections(_rCollapsedPositions); } -void OScrollWindowHelper::collapseSections(const uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections) +void OScrollWindowHelper::collapseSections(const uno::Sequence< css::beans::PropertyValue>& _aCollpasedSections) { m_aReportWindow->collapseSections(_aCollpasedSections); } |