diff options
Diffstat (limited to 'reportdesign/source/ui/inc')
30 files changed, 493 insertions, 493 deletions
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 |