diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-01 15:32:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-02 08:20:11 +0200 |
| commit | de020fc9c3c67541067bc7e0b72ed41eae650288 (patch) | |
| tree | b4f3d4a10ad71c4d2c77b4ef2785de4cde19faaf /forms/source/component | |
| parent | Fix typos (diff) | |
| download | core-de020fc9c3c67541067bc7e0b72ed41eae650288.tar.gz core-de020fc9c3c67541067bc7e0b72ed41eae650288.zip | |
com::sun::star->css in forms/
Change-Id: I1c09e88f839bdf11c6ff809ec95769e8f729c7cd
Diffstat (limited to 'forms/source/component')
70 files changed, 1357 insertions, 1395 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 62fd0b6860fc..a4c88e2ef9ea 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -126,13 +126,13 @@ css::uno::Sequence<OUString> OButtonModel::getSupportedServiceNames() throw(std } -OUString OButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +OUString OButtonModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_COMMANDBUTTON); // old (non-sun) name for compatibility ! } -void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception) { OClickableImageBaseModel::write(_rxOutStream); @@ -153,7 +153,7 @@ void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) thr } -void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception) { OClickableImageBaseModel::read(_rxInStream); @@ -412,7 +412,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru // ActionListener -void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( css::uno::RuntimeException, std::exception) { // Asynchronous for css::util::URL-Button ImplSVEvent * n = Application::PostUserEvent( LINK(this, OButtonControl, OnClick) ); @@ -472,12 +472,12 @@ IMPL_LINK_NOARG_TYPED(OButtonControl, OnClick, void*, void) } } else - actionPerformed_Impl( false, ::com::sun::star::awt::MouseEvent() ); + actionPerformed_Impl( false, css::awt::MouseEvent() ); } } -void OButtonControl::actionPerformed_Impl( bool _bNotifyListener, const ::com::sun::star::awt::MouseEvent& _rEvt ) +void OButtonControl::actionPerformed_Impl( bool _bNotifyListener, const css::awt::MouseEvent& _rEvt ) { { sal_Int16 nFeatureId = -1; @@ -748,16 +748,16 @@ void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Referenc } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OButtonModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OButtonModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OButtonModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OButtonControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OButtonControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OButtonControl(component)); } diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index c6a3139b3c4b..1e6c43ec0764 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -40,7 +40,7 @@ struct ImplSVEvent; namespace frm { -typedef ::cppu::ImplHelper1 < ::com::sun::star::form::XReset +typedef ::cppu::ImplHelper1 < css::form::XReset > OButtonModel_Base; class OButtonModel :public OClickableImageBaseModel ,public OButtonModel_Base @@ -50,40 +50,40 @@ public: // UNO DECLARE_UNO3_AGG_DEFAULTS( OButtonModel, OClickableImageBaseModel ) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OButtonModel"); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; -// ::com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; +// css::io::XPersistObject + virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XReset - virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reset( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; // XPropertySet and friends - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; + css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) + throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; @@ -109,9 +109,9 @@ protected: // OButtonControl -typedef ::cppu::ImplHelper3 < ::com::sun::star::awt::XButton - , ::com::sun::star::awt::XActionListener - , ::com::sun::star::beans::XPropertyChangeListener +typedef ::cppu::ImplHelper3 < css::awt::XButton + , css::awt::XActionListener + , css::beans::XPropertyChangeListener > OButtonControl_BASE; class OButtonControl :public OButtonControl_BASE @@ -127,10 +127,10 @@ private: protected: // UNO binding - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: - OButtonControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + OButtonControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); virtual ~OButtonControl(); // XServiceInfo @@ -142,29 +142,29 @@ public: // UNO binding DECLARE_UNO3_AGG_DEFAULTS(OButtonControl, OClickableImageBaseControl) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XActionListener - virtual void SAL_CALL actionPerformed(const ::com::sun::star::awt::ActionEvent& rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actionPerformed(const css::awt::ActionEvent& rEvent) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XButton - virtual void SAL_CALL addActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLabel(const OUString& Label) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setActionCommand(const OUString& _rCommand) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addActionListener(const css::uno::Reference< css::awt::XActionListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeActionListener(const css::uno::Reference< css::awt::XActionListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLabel(const OUString& Label) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setActionCommand(const OUString& _rCommand) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XControl - virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - void SAL_CALL setDesignMode(sal_Bool bOn) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& _rxModel ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + void SAL_CALL setDesignMode(sal_Bool bOn) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // OFormNavigationHelper overriables @@ -174,11 +174,11 @@ protected: virtual bool isEnabled( sal_Int16 _nFeatureId ) const SAL_OVERRIDE; // XDispatchProviderInterception disambiguaiton - virtual void SAL_CALL registerDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL releaseDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OImageControl overridables - virtual void actionPerformed_Impl( bool bNotifyListener, const ::com::sun::star::awt::MouseEvent& _rEvt ) SAL_OVERRIDE; + virtual void actionPerformed_Impl( bool bNotifyListener, const css::awt::MouseEvent& _rEvt ) SAL_OVERRIDE; private: DECL_LINK_TYPED( OnClick, void*, void ); diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index d19405e4b430..cece340f6239 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -45,7 +45,7 @@ OCheckBoxControl::OCheckBoxControl(const Reference<XComponentContext>& _rxFactor } -css::uno::Sequence<OUString> SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) { css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -84,7 +84,7 @@ IMPLEMENT_DEFAULT_CLONING( OCheckBoxModel ) // XServiceInfo -css::uno::Sequence<OUString> SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) { css::uno::Sequence<OUString> aSupported = OReferenceValueComponent::getSupportedServiceNames(); @@ -270,16 +270,16 @@ bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OCheckBoxModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OCheckBoxModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OCheckBoxModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OCheckBoxControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OCheckBoxControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OCheckBoxControl(component)); } diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx index 1ce87f4e7ce0..1468cb06bb68 100644 --- a/forms/source/component/CheckBox.hxx +++ b/forms/source/component/CheckBox.hxx @@ -39,40 +39,39 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OCheckBoxModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; protected: virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OBoundControlModel overridables - virtual ::com::sun::star::uno::Any - translateDbColumnToControlValue( ) SAL_OVERRIDE; + virtual css::uno::Any translateDbColumnToControlValue( ) SAL_OVERRIDE; virtual bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE; }; class OCheckBoxControl : public OBoundControl { public: - OCheckBoxControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); + OCheckBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext); // XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OCheckBoxControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index aac57f6f8124..a1fc73b5a6d0 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -420,7 +420,7 @@ sal_Bool OGridColumn::convertFastPropertyValue( Any& rConvertedValue, Any& rOldV } -void OGridColumn::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) +void OGridColumn::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (css::uno::Exception, std::exception) { switch (nHandle) { diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index 008b6a1c411a..f352ba49f113 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -41,8 +41,8 @@ using namespace comphelper; namespace frm { -typedef ::cppu::WeakAggComponentImplHelper2 < ::com::sun::star::lang::XUnoTunnel - , ::com::sun::star::util::XCloneable > OGridColumn_BASE; +typedef ::cppu::WeakAggComponentImplHelper2 < css::lang::XUnoTunnel + , css::util::XCloneable > OGridColumn_BASE; class OGridColumn :public ::comphelper::OBaseMutex ,public OGridColumn_BASE ,public OPropertySetAggregationHelper @@ -50,15 +50,15 @@ class OGridColumn :public ::comphelper::OBaseMutex { protected: // [properties] - ::com::sun::star::uno::Any m_aWidth; // column width - ::com::sun::star::uno::Any m_aAlign; // column alignment - ::com::sun::star::uno::Any m_aHidden; // column hidden? + css::uno::Any m_aWidth; // column width + css::uno::Any m_aAlign; // column alignment + css::uno::Any m_aHidden; // column hidden? // [properties] - OUString m_aModelName; + OUString m_aModelName; // [properties] - OUString m_aLabel; // Column name + OUString m_aLabel; // Column name // [properties] public: @@ -68,47 +68,47 @@ public: // UNO binding DECLARE_UNO3_AGG_DEFAULTS(OGridControlModel, OGridColumn_BASE) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelImplementationId(); + static const css::uno::Sequence<sal_Int8>& getUnoTunnelImplementationId(); // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence<sal_Int8>& _rIdentifier) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& _rIdentifier) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject - void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream); - void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream); + void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream); + void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream); // XPropertySet virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE = 0; - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, - sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::lang::IllegalArgumentException) SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, + sal_Int32 nHandle, const css::uno::Any& rValue ) + throw(css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) SAL_OVERRIDE; using OPropertySetAggregationHelper::getFastPropertyValue; - // ::com::sun::star::beans::XPropertyState - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; + // css::beans::XPropertyState + virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; const OUString& getModelName() const { return m_aModelName; } protected: - static void clearAggregateProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property>& seqProps, bool bAllowDropDown); - static void setOwnProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property>& seqProps); + static void clearAggregateProperties(css::uno::Sequence< css::beans::Property>& seqProps, bool bAllowDropDown); + static void setOwnProperties(css::uno::Sequence< css::beans::Property>& seqProps); virtual OGridColumn* createCloneColumn() const = 0; }; @@ -122,12 +122,12 @@ public: ClassName(const css::uno::Reference<css::uno::XComponentContext>& _rContext ); \ ClassName(const ClassName* _pCloneFrom); \ \ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; \ \ virtual void fillProperties( \ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps, \ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps \ + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps, \ + css::uno::Sequence< css::beans::Property >& /* [out] */ _rAggregateProps \ ) const SAL_OVERRIDE; \ \ virtual OGridColumn* createCloneColumn() const SAL_OVERRIDE; \ @@ -143,9 +143,9 @@ ClassName::ClassName( const ClassName* _pCloneFrom ) \ :OGridColumn( _pCloneFrom ) \ { \ } \ -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> ClassName::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) \ +css::uno::Reference< css::beans::XPropertySetInfo> ClassName::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) \ { \ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); \ + css::uno::Reference< css::beans::XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); \ return xInfo; \ } \ ::cppu::IPropertyArrayHelper& ClassName::getInfoHelper() \ @@ -153,8 +153,8 @@ ClassName::ClassName( const ClassName* _pCloneFrom ) \ return *getArrayHelper(); \ } \ void ClassName::fillProperties( \ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps, \ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps \ + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps, \ + css::uno::Sequence< css::beans::Property >& /* [out] */ _rAggregateProps \ ) const \ { \ if (m_xAggregateSet.is()) \ diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 4897bb68c4fc..79157bd374b1 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -880,16 +880,16 @@ css::uno::Sequence<OUString> SAL_CALL OComboBoxControl::getSupportedServiceNames } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OComboBoxModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OComboBoxModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OComboBoxModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OComboBoxControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OComboBoxControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OComboBoxControl(component)); } diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx index e5348fc00240..454cf88c96a6 100644 --- a/forms/source/component/ComboBox.hxx +++ b/forms/source/component/ComboBox.hxx @@ -46,26 +46,26 @@ class OComboBoxModel ,public OEntryListHelper ,public OErrorBroadcaster { - CachedRowSet m_aListRowSet; // the row set to fill the list - ::com::sun::star::uno::Any m_aBoundColumn; // obsolete - OUString m_aListSource; - OUString m_aDefaultText; // DefaultText - ::com::sun::star::uno::Any m_aLastKnownValue; + CachedRowSet m_aListRowSet; // the row set to fill the list + css::uno::Any m_aBoundColumn; // obsolete + OUString m_aListSource; + OUString m_aDefaultText; // DefaultText + css::uno::Any m_aLastKnownValue; css::uno::Sequence<OUString> m_aDesignModeStringItems; // upon loading, in some cases we reset fill our string item list ourself. We don't want // to lose the user's items then, so we remember them here. - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter> m_xFormatter; + css::uno::Reference< css::util::XNumberFormatter> m_xFormatter; - ::com::sun::star::form::ListSourceType m_eListSourceType; // ListSource's type - bool m_bEmptyIsNull; // Empty string is interpreted as NULL + css::form::ListSourceType m_eListSourceType; // ListSource's type + bool m_bEmptyIsNull; // Empty string is interpreted as NULL ::std::unique_ptr< ::dbtools::FormattedColumnValue > m_pValueFormatter; protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: DECLARE_DEFAULT_LEAF_XTOR( OComboBoxModel ); @@ -73,59 +73,57 @@ public: virtual void SAL_CALL disposing() SAL_OVERRIDE; // OPropertySetHelper - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) + throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; // XLoadListener - virtual void SAL_CALL reloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OComboBoxModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // UNO DECLARE_UNO3_AGG_DEFAULTS(OComboBoxModel, OBoundControlModel) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; virtual void describeAggregateProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rAggregateProps ) const SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // prevent method hiding using OBoundControlModel::getFastPropertyValue; protected: // OBoundControlModel overridables - virtual ::com::sun::star::uno::Any - translateDbColumnToControlValue( ) SAL_OVERRIDE; + virtual css::uno::Any translateDbColumnToControlValue( ) SAL_OVERRIDE; virtual bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE; - virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ) SAL_OVERRIDE; + virtual void onConnectedDbColumn( const css::uno::Reference< css::uno::XInterface >& _rxForm ) SAL_OVERRIDE; virtual void onDisconnectedDbColumn() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - getDefaultForReset() const SAL_OVERRIDE; + virtual css::uno::Any getDefaultForReset() const SAL_OVERRIDE; virtual void resetNoBroadcast() SAL_OVERRIDE; @@ -144,14 +142,14 @@ protected: class OComboBoxControl : public OBoundControl { public: - OComboBoxControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); + OComboBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext); // XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OComboBoxControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index 469cb6c1e96d..ce765536bd28 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -178,7 +178,7 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co } -OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OCurrencyModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_CURRENCYFIELD); // old (non-sun) name for compatibility ! } @@ -237,16 +237,16 @@ void OCurrencyModel::resetNoBroadcast() } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OCurrencyModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OCurrencyModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OCurrencyModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OCurrencyControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OCurrencyControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OCurrencyControl(component)); } diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx index dc51cd899967..6e6d56b2b376 100644 --- a/forms/source/component/Currency.hxx +++ b/forms/source/component/Currency.hxx @@ -29,37 +29,35 @@ namespace frm class OCurrencyModel :public OEditBaseModel { - ::com::sun::star::uno::Any m_aSaveValue; + css::uno::Any m_aSaveValue; protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: DECLARE_DEFAULT_LEAF_XTOR( OCurrencyModel ); - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OCurrencyModel"); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::io::XPersistObject + // css::io::XPersistObject virtual OUString SAL_CALL getServiceName() throw ( ::com::sun ::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; protected: // OBoundControlModel overridables - virtual ::com::sun::star::uno::Any - translateDbColumnToControlValue( ) SAL_OVERRIDE; + virtual css::uno::Any translateDbColumnToControlValue( ) SAL_OVERRIDE; virtual bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - getDefaultForReset() const SAL_OVERRIDE; + virtual css::uno::Any getDefaultForReset() const SAL_OVERRIDE; virtual void resetNoBroadcast() SAL_OVERRIDE; @@ -72,11 +70,11 @@ protected: class OCurrencyControl: public OBoundControl { protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: - OCurrencyControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); - // ::com::sun::star::lang::XServiceInfo + OCurrencyControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext); + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OCurrencyControl"); } diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 56dd4a99fcd4..a4438c77b3de 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -174,7 +174,7 @@ public: EventObject* OFormSubmitResetThread::cloneEvent( const EventObject *pEvt ) const { - return new ::com::sun::star::awt::MouseEvent( *static_cast<const ::com::sun::star::awt::MouseEvent *>(pEvt) ); + return new css::awt::MouseEvent( *static_cast<const css::awt::MouseEvent *>(pEvt) ); } @@ -185,7 +185,7 @@ void OFormSubmitResetThread::processEvent( bool _bSubmit) { if (_bSubmit) - static_cast<ODatabaseForm *>(pCompImpl)->submit_impl(_rControl, *static_cast<const ::com::sun::star::awt::MouseEvent*>(_pEvt), true); + static_cast<ODatabaseForm *>(pCompImpl)->submit_impl(_rControl, *static_cast<const css::awt::MouseEvent*>(_pEvt), true); else static_cast<ODatabaseForm *>(pCompImpl)->reset_impl(true); } @@ -451,12 +451,12 @@ ODatabaseForm::~ODatabaseForm() // html tools -OUString ODatabaseForm::GetDataURLEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) +OUString ODatabaseForm::GetDataURLEncoded(const Reference<XControl>& SubmitButton, const css::awt::MouseEvent& MouseEvt) { return GetDataEncoded(true,SubmitButton,MouseEvt); } -OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) +OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XControl>& SubmitButton, const css::awt::MouseEvent& MouseEvt) { // Fill List of successful Controls HtmlSuccessfulObjList aSuccObjList; @@ -509,13 +509,13 @@ OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XContro // html tools -OUString ODatabaseForm::GetDataTextEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) +OUString ODatabaseForm::GetDataTextEncoded(const Reference<XControl>& SubmitButton, const css::awt::MouseEvent& MouseEvt) { return GetDataEncoded(false,SubmitButton,MouseEvt); } -Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt, OUString& rContentType) +Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XControl>& SubmitButton, const css::awt::MouseEvent& MouseEvt, OUString& rContentType) { // Create Parent @@ -578,7 +578,7 @@ namespace void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Reference<XPropertySet>& xComponentSet, const OUString& rNamePrefix, - const Reference<XControl>& rxSubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) + const Reference<XControl>& rxSubmitButton, const css::awt::MouseEvent& MouseEvt) { if (!xComponentSet.is()) return; @@ -907,7 +907,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc void ODatabaseForm::FillSuccessfulList( HtmlSuccessfulObjList& rList, - const Reference<XControl>& rxSubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt ) + const Reference<XControl>& rxSubmitButton, const css::awt::MouseEvent& MouseEvt ) { // Delete list rList.clear(); @@ -1798,7 +1798,7 @@ void ODatabaseForm::forwardedPropertyValue( sal_Int32 _nHandle ) } -// com::sun::star::beans::XPropertyState +// css::beans::XPropertyState PropertyState ODatabaseForm::getPropertyStateByHandle(sal_Int32 nHandle) { @@ -1911,7 +1911,7 @@ Any ODatabaseForm::getPropertyDefaultByHandle( sal_Int32 nHandle ) const } -// com::sun::star::form::XReset +// css::form::XReset void SAL_CALL ODatabaseForm::reset() throw( RuntimeException, std::exception ) { @@ -2085,10 +2085,10 @@ void SAL_CALL ODatabaseForm::removeResetListener(const Reference<XResetListener> } -// com::sun::star::form::XSubmit +// css::form::XSubmit void SAL_CALL ODatabaseForm::submit( const Reference<XControl>& Control, - const ::com::sun::star::awt::MouseEvent& MouseEvt ) throw( RuntimeException, std::exception ) + const css::awt::MouseEvent& MouseEvt ) throw( RuntimeException, std::exception ) { { ::osl::MutexGuard aGuard(m_aMutex); @@ -2148,7 +2148,7 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor } // if (xDisp.is()) } -void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com::sun::star::awt::MouseEvent& MouseEvt, bool _bAproveByListeners) +void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const css::awt::MouseEvent& MouseEvt, bool _bAproveByListeners) { if (_bAproveByListeners) @@ -2303,7 +2303,7 @@ void SAL_CALL ODatabaseForm::removeSubmitListener(const Reference<XSubmitListene } -// com::sun::star::sdbc::XSQLErrorBroadcaster +// css::sdbc::XSQLErrorBroadcaster void SAL_CALL ODatabaseForm::addSQLErrorListener(const Reference<XSQLErrorListener>& _rListener) throw( RuntimeException, std::exception ) { @@ -2345,7 +2345,7 @@ void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( Runt // smartXChild -void SAL_CALL ODatabaseForm::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw ( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ODatabaseForm::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw ( css::lang::NoSupportException, css::uno::RuntimeException, std::exception) { // SYNCHRONIZED -----> ::osl::ResettableMutexGuard aGuard(m_aMutex); @@ -2406,7 +2406,7 @@ void SAL_CALL ODatabaseForm::setParent(const css::uno::Reference<css::uno::XInte // smartXTabControllerModel -sal_Bool SAL_CALL ODatabaseForm::getGroupControl() throw(com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseForm::getGroupControl() throw(css::uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard(m_aMutex); @@ -2525,7 +2525,7 @@ void SAL_CALL ODatabaseForm::getGroupByName(const OUString& Name, Sequence< Refe } -// com::sun::star::lang::XEventListener +// css::lang::XEventListener void SAL_CALL ODatabaseForm::disposing(const EventObject& Source) throw( RuntimeException, std::exception ) { @@ -2550,7 +2550,7 @@ void SAL_CALL ODatabaseForm::disposing(const EventObject& Source) throw( Runtime // does the disposing come from the aggregate ? if (m_xAggregate.is()) { // no -> forward it - com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> xListener; + css::uno::Reference<css::lang::XEventListener> xListener; if (query_aggregation(m_xAggregate, xListener)) xListener->disposing(Source); } @@ -2566,7 +2566,7 @@ void ODatabaseForm::impl_createLoadTimer() } -// com::sun::star::form::XLoadListener +// css::form::XLoadListener void SAL_CALL ODatabaseForm::loaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { @@ -2637,7 +2637,7 @@ IMPL_LINK_NOARG_TYPED(ODatabaseForm, OnTimeout, Timer *, void) } -// com::sun::star::form::XLoadable +// css::form::XLoadable void SAL_CALL ODatabaseForm::load() throw( RuntimeException, std::exception ) { @@ -3002,7 +3002,7 @@ void SAL_CALL ODatabaseForm::removeLoadListener(const Reference<XLoadListener>& } -// com::sun::star::sdbc::XCloseable +// css::sdbc::XCloseable void SAL_CALL ODatabaseForm::close() throw( SQLException, RuntimeException, std::exception ) { // unload will close the aggregate @@ -3010,7 +3010,7 @@ void SAL_CALL ODatabaseForm::close() throw( SQLException, RuntimeException, std: } -// com::sun::star::sdbc::XRowSetListener +// css::sdbc::XRowSetListener void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& /*event*/) throw( RuntimeException, std::exception ) { @@ -3202,7 +3202,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) t } -// com::sun::star::sdb::XRowSetApproveBroadcaster +// css::sdb::XRowSetApproveBroadcaster void SAL_CALL ODatabaseForm::addRowSetApproveListener(const Reference<XRowSetApproveListener>& _rListener) throw( RuntimeException, std::exception ) { @@ -3264,7 +3264,7 @@ void SAL_CALL ODatabaseForm::removeParameterListener(const Reference<XDatabasePa } -// com::sun::star::sdb::XCompletedExecution +// css::sdb::XCompletedExecution void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException, std::exception) { @@ -3288,7 +3288,7 @@ void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractio } -// com::sun::star::sdbc::XRowSet +// css::sdbc::XRowSet void SAL_CALL ODatabaseForm::execute() throw( SQLException, RuntimeException, std::exception ) { @@ -3328,7 +3328,7 @@ void SAL_CALL ODatabaseForm::removeRowSetListener(const Reference<XRowSetListene } -// com::sun::star::sdbc::XResultSet +// css::sdbc::XResultSet sal_Bool SAL_CALL ODatabaseForm::next() throw( SQLException, RuntimeException, std::exception ) { @@ -3437,7 +3437,7 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL ODatabaseForm::getStatement() return m_xAggregateAsRowSet->getStatement(); } -// com::sun::star::sdbc::XResultSetUpdate +// css::sdbc::XResultSetUpdate // exceptions during insert update and delete will be forwarded to the errorlistener void SAL_CALL ODatabaseForm::insertRow() throw( SQLException, RuntimeException, std::exception ) @@ -3562,7 +3562,7 @@ void SAL_CALL ODatabaseForm::moveToCurrentRow() throw( SQLException, RuntimeExce xUpdate->moveToCurrentRow(); } -// com::sun::star::sdbcx::XDeleteRows +// css::sdbcx::XDeleteRows Sequence<sal_Int32> SAL_CALL ODatabaseForm::deleteRows(const Sequence<Any>& rows) throw( SQLException, RuntimeException, std::exception ) { @@ -3585,7 +3585,7 @@ Sequence<sal_Int32> SAL_CALL ODatabaseForm::deleteRows(const Sequence<Any>& rows return Sequence< sal_Int32 >(); } -// com::sun::star::sdbc::XParameters +// css::sdbc::XParameters void SAL_CALL ODatabaseForm::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw( SQLException, RuntimeException, std::exception ) { @@ -3653,19 +3653,19 @@ void SAL_CALL ODatabaseForm::setBytes(sal_Int32 parameterIndex, const Sequence< } -void SAL_CALL ODatabaseForm::setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setDate(sal_Int32 parameterIndex, const css::util::Date& x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setDate(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setTime(sal_Int32 parameterIndex, const css::util::Time& x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setTime(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setTimestamp(sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setTimestamp(parameterIndex, x); } @@ -3741,7 +3741,7 @@ void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) th OFormComponents::propertyChange( evt ); } -// com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo OUString SAL_CALL ODatabaseForm::getImplementationName_Static() { @@ -3783,7 +3783,7 @@ sal_Bool SAL_CALL ODatabaseForm::supportsService(const OUString& ServiceName) th return cppu::supportsService(this, ServiceName); } -// com::sun::star::io::XPersistObject +// css::io::XPersistObject const sal_uInt16 CYCLE = 0x0001; const sal_uInt16 DONTAPPLYFILTER = 0x0002; @@ -4038,7 +4038,7 @@ void SAL_CALL ODatabaseForm::errorOccured(const SQLErrorEvent& _rEvent) throw( R // "this was an error of one of my children" } -// com::sun::star::container::XNamed +// css::container::XNamed OUString SAL_CALL ODatabaseForm::getName() throw( RuntimeException, std::exception ) { OUString sReturn; diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index 2a5f1d7b7c68..8deeb00a95b1 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -119,34 +119,34 @@ typedef std::vector<HtmlSuccessfulObj> HtmlSuccessfulObjList; class OGroupManager; class OFormSubmitResetThread; -typedef ::cppu::ImplHelper12 < ::com::sun::star::form::XForm - , ::com::sun::star::awt::XTabControllerModel - , ::com::sun::star::form::XLoadListener - , ::com::sun::star::sdbc::XRowSetListener - , ::com::sun::star::sdb::XRowSetApproveListener - , ::com::sun::star::form::XDatabaseParameterBroadcaster2 - , ::com::sun::star::sdb::XSQLErrorListener - , ::com::sun::star::sdb::XSQLErrorBroadcaster - , ::com::sun::star::form::XReset - , ::com::sun::star::form::XSubmit - , ::com::sun::star::form::XLoadable - , ::com::sun::star::container::XNamed +typedef ::cppu::ImplHelper12 < css::form::XForm + , css::awt::XTabControllerModel + , css::form::XLoadListener + , css::sdbc::XRowSetListener + , css::sdb::XRowSetApproveListener + , css::form::XDatabaseParameterBroadcaster2 + , css::sdb::XSQLErrorListener + , css::sdb::XSQLErrorBroadcaster + , css::form::XReset + , css::form::XSubmit + , css::form::XLoadable + , css::container::XNamed > ODatabaseForm_BASE1; -typedef ::cppu::ImplHelper4 < ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::beans::XPropertyContainer - , ::com::sun::star::beans::XPropertyAccess - , ::com::sun::star::sdbc::XWarningsSupplier +typedef ::cppu::ImplHelper4 < css::lang::XServiceInfo + , css::beans::XPropertyContainer + , css::beans::XPropertyAccess + , css::sdbc::XWarningsSupplier > ODatabaseForm_BASE2; -typedef ::cppu::ImplHelper7< ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XRowSet, - ::com::sun::star::sdb::XCompletedExecution, - ::com::sun::star::sdb::XRowSetApproveBroadcaster, - ::com::sun::star::sdbc::XResultSetUpdate, - ::com::sun::star::sdbcx::XDeleteRows, - ::com::sun::star::sdbc::XParameters > ODatabaseForm_BASE3; +typedef ::cppu::ImplHelper7< css::sdbc::XCloseable, + css::sdbc::XRowSet, + css::sdb::XCompletedExecution, + css::sdb::XRowSetApproveBroadcaster, + css::sdbc::XResultSetUpdate, + css::sdbcx::XDeleteRows, + css::sdbc::XParameters > ODatabaseForm_BASE3; class ODatabaseForm :public OFormComponents @@ -167,15 +167,15 @@ class ODatabaseForm :public OFormComponents ::cppu::OInterfaceContainerHelper m_aErrorListeners; ResetListeners m_aResetListeners; ::osl::Mutex m_aResetSafety; - ::com::sun::star::uno::Any m_aCycle; - ::com::sun::star::uno::Any m_aIgnoreResult; // set when we are a subform and our master form positioned on a new row - ::com::sun::star::uno::Sequence< OUString > m_aMasterFields; - ::com::sun::star::uno::Sequence< OUString > m_aDetailFields; + css::uno::Any m_aCycle; + css::uno::Any m_aIgnoreResult; // set when we are a subform and our master form positioned on a new row + css::uno::Sequence< OUString > m_aMasterFields; + css::uno::Sequence< OUString > m_aDetailFields; // the object doin' most of the work - an SDB-rowset - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; + css::uno::Reference< css::uno::XAggregation> m_xAggregate; // same object, interface as member because of performance reasons - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet> m_xAggregateAsRowSet; + css::uno::Reference< css::sdbc::XRowSet> m_xAggregateAsRowSet; PropertyBagHelper m_aPropertyBagHelper; ::dbtools::WarningsContainer m_aWarnings; @@ -187,254 +187,254 @@ class ODatabaseForm :public OFormComponents Timer* m_pLoadTimer; OFormSubmitResetThread* m_pThread; - OUString m_sCurrentErrorContext; + OUString m_sCurrentErrorContext; // will be used as additional context information // when an exception is catched and forwarded to the listeners - sal_Int32 m_nResetsPending; + sal_Int32 m_nResetsPending; // <overwritten_properties> sal_Int32 m_nPrivileges; - bool m_bInsertOnly; + bool m_bInsertOnly; // </overwritten_properties> // <properties> - ::com::sun::star::uno::Any m_aControlBorderColorFocus; - ::com::sun::star::uno::Any m_aControlBorderColorMouse; - ::com::sun::star::uno::Any m_aControlBorderColorInvalid; - ::com::sun::star::uno::Any m_aDynamicControlBorder; + css::uno::Any m_aControlBorderColorFocus; + css::uno::Any m_aControlBorderColorMouse; + css::uno::Any m_aControlBorderColorInvalid; + css::uno::Any m_aDynamicControlBorder; OUString m_sName; OUString m_aTargetURL; OUString m_aTargetFrame; - ::com::sun::star::form::FormSubmitMethod m_eSubmitMethod; - ::com::sun::star::form::FormSubmitEncoding m_eSubmitEncoding; - ::com::sun::star::form::NavigationBarMode m_eNavigation; - bool m_bAllowInsert : 1; - bool m_bAllowUpdate : 1; - bool m_bAllowDelete : 1; + css::form::FormSubmitMethod m_eSubmitMethod; + css::form::FormSubmitEncoding m_eSubmitEncoding; + css::form::NavigationBarMode m_eNavigation; + bool m_bAllowInsert : 1; + bool m_bAllowUpdate : 1; + bool m_bAllowDelete : 1; // </properties> - bool m_bLoaded : 1; - bool m_bSubForm : 1; - bool m_bForwardingConnection : 1; // sal_True if we're setting the ActiveConnection on the aggregate - bool m_bSharingConnection : 1; // sal_True if the connection we're using is shared with out parent + bool m_bLoaded : 1; + bool m_bSubForm : 1; + bool m_bForwardingConnection : 1; // sal_True if we're setting the ActiveConnection on the aggregate + bool m_bSharingConnection : 1; // sal_True if the connection we're using is shared with out parent public: - ODatabaseForm(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + ODatabaseForm(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); ODatabaseForm( const ODatabaseForm& _cloneSource ); virtual ~ODatabaseForm(); // UNO binding DECLARE_UNO3_AGG_DEFAULTS(ODatabaseForm, OFormComponents) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::lang::XComponent + // css::lang::XComponent virtual void SAL_CALL disposing() SAL_OVERRIDE; // property handling - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException) SAL_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 ) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw(css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception ) SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void fire( sal_Int32 * pnHandles, const ::com::sun::star::uno::Any * pNewValues, const ::com::sun::star::uno::Any * pOldValues, sal_Int32 nCount, bool bVetoable ); + css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void fire( sal_Int32 * pnHandles, const css::uno::Any * pNewValues, const css::uno::Any * pOldValues, sal_Int32 nCount, bool bVetoable ); // IPropertyBagHelperContext virtual ::osl::Mutex& getMutex() SAL_OVERRIDE; virtual void describeFixedAndAggregateProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& _out_rFixedProperties, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& _out_rAggregateProperties + css::uno::Sequence< css::beans::Property >& _out_rFixedProperties, + css::uno::Sequence< css::beans::Property >& _out_rAggregateProperties ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > + virtual css::uno::Reference< css::beans::XMultiPropertySet > getPropertiesInterface() SAL_OVERRIDE; - // com::sun::star::beans::XPropertyState - virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle) SAL_OVERRIDE; + // css::beans::XPropertyState + virtual css::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle) SAL_OVERRIDE; virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const SAL_OVERRIDE; + virtual css::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const SAL_OVERRIDE; - // com::sun::star::sdbc::XSQLErrorBroadcaster - virtual void SAL_CALL addSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::sdbc::XSQLErrorBroadcaster + virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // com::sun::star::form::XForm + // css::form::XForm // nothing to implement - // com::sun::star::form::XReset - virtual void SAL_CALL reset() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::form::XSubmit - virtual void SAL_CALL submit(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& aControl, const ::com::sun::star::awt::MouseEvent& aMouseEvt) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addSubmitListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XSubmitListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSubmitListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XSubmitListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::container::XChild - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OFormComponents::getParent(); } - virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw ( :: com::sun::star::lang::NoSupportException , ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::container::XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setName(const OUString& aName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::awt::XTabControllerModel - virtual sal_Bool SAL_CALL getGroupControl() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setGroupControl(sal_Bool /*_bGroupControl*/) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL setControlModels(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rControls) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setGroup(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, const OUString& _rGroupName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getGroupCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL getGroup(sal_Int32 _nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rxGroup, OUString& _rName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL getGroupByName(const OUString& _rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rxGroup) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::form::XLoadListener - virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unloaded(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL reloading(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::form::XLoadable - virtual void SAL_CALL load() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unload() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL reload() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isLoaded() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addLoadListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeLoadListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::sdbc::XCloseable - virtual void SAL_CALL close() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::sdbc::XRowSetListener - virtual void SAL_CALL cursorMoved(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL rowChanged(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL rowSetChanged(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::sdb::XRowSetApproveListener - virtual sal_Bool SAL_CALL approveCursorMove(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL approveRowChange(const ::com::sun::star::sdb::RowChangeEvent& event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL approveRowSetChange(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::sdb::XRowSetApproveBroadcaster - virtual void SAL_CALL addRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::form::XReset + virtual void SAL_CALL reset() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::form::XSubmit + virtual void SAL_CALL submit(const css::uno::Reference< css::awt::XControl>& aControl, const css::awt::MouseEvent& aMouseEvt) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSubmitListener(const css::uno::Reference< css::form::XSubmitListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSubmitListener(const css::uno::Reference< css::form::XSubmitListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::container::XChild + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OFormComponents::getParent(); } + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw ( :: css::lang::NoSupportException , css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::container::XNamed + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::awt::XTabControllerModel + virtual sal_Bool SAL_CALL getGroupControl() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setGroupControl(sal_Bool /*_bGroupControl*/) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { } + virtual void SAL_CALL setControlModels(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rControls) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > SAL_CALL getControlModels() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setGroup(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rGroup, const OUString& _rGroupName) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getGroupCount() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL getGroup(sal_Int32 _nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rxGroup, OUString& _rName) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL getGroupByName(const OUString& _rName, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rxGroup) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::form::XLoadListener + virtual void SAL_CALL loaded(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unloaded(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::form::XLoadable + virtual void SAL_CALL load() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unload() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reload() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isLoaded() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addLoadListener(const css::uno::Reference< css::form::XLoadListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeLoadListener(const css::uno::Reference< css::form::XLoadListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XCloseable + virtual void SAL_CALL close() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XRowSetListener + virtual void SAL_CALL cursorMoved(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL rowChanged(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL rowSetChanged(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdb::XRowSetApproveListener + virtual sal_Bool SAL_CALL approveCursorMove(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL approveRowChange(const css::sdb::RowChangeEvent& event) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL approveRowSetChange(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdb::XRowSetApproveBroadcaster + virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // com::sun:star::form::XDatabaseParameterBroadcaster2 - virtual void SAL_CALL addDatabaseParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeDatabaseParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // com::sun:star::form::XDatabaseParameterBroadcaster - virtual void SAL_CALL addParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::sdbc::XRowSet - virtual void SAL_CALL execute() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addRowSetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSetListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeRowSetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSetListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::sdb::XCompletedExecution - virtual void SAL_CALL executeWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::sdbc::XResultSet - virtual sal_Bool SAL_CALL next() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isBeforeFirst() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAfterLast() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isFirst() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isLast() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL beforeFirst() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL afterLast() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL first() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL last() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL absolute(sal_Int32 row) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL relative(sal_Int32 rows) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL previous() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL refreshRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL rowUpdated() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL rowInserted() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL rowDeleted() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getStatement() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::sdbc::XResultSetUpdate - virtual void SAL_CALL insertRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL deleteRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancelRowUpdates() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL moveToInsertRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL moveToCurrentRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::sdbcx::XDeleteRows - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& rows) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::lang::XServiceInfo - static version + virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XRowSet + virtual void SAL_CALL execute() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdb::XCompletedExecution + virtual void SAL_CALL executeWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XResultSet + virtual sal_Bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isBeforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAfterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL beforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL afterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL absolute(sal_Int32 row) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL relative(sal_Int32 rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL previous() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL refreshRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL rowUpdated() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL rowInserted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL rowDeleted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getStatement() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XResultSetUpdate + virtual void SAL_CALL insertRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL deleteRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancelRowUpdates() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL moveToInsertRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL moveToCurrentRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbcx::XDeleteRows + virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const css::uno::Sequence< css::uno::Any>& rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::lang::XServiceInfo + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::lang::XServiceInfo - static version static OUString SAL_CALL getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); - - // com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::sdbc::XSQLErrorListener - virtual void SAL_CALL errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // com::sun::star::sdbc::XParameters - virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef>& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob>& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob>& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray>& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL clearParameters() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); + + // css::io::XPersistObject + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XSQLErrorListener + virtual void SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::sdbc::XParameters + virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const css::util::Date& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const css::util::Time& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const css::uno::Any& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clearParameters() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyContainer - virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) throw (css::beans::PropertyExistException, css::beans::IllegalTypeException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeProperty( const OUString& Name ) throw (css::beans::UnknownPropertyException, css::beans::NotRemoveableException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; using OPropertySetAggregationHelper::setPropertyValues; // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL clearWarnings( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getWarnings( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clearWarnings( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // OPropertySetAggregationHelper overridables @@ -446,24 +446,24 @@ protected: virtual void implRemoved(const css::uno::Reference<css::uno::XInterface>& _rxObject) SAL_OVERRIDE; // OPropertyChangeListener - virtual void _propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual void _propertyChanged( const css::beans::PropertyChangeEvent& ) throw(css::uno::RuntimeException) SAL_OVERRIDE; private: bool executeRowSet(::osl::ResettableMutexGuard& _rClearForNotifies, bool bMoveToFirst = true, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >()); + const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler = css::uno::Reference< css::task::XInteractionHandler >()); bool fillParameters(::osl::ResettableMutexGuard& _rClearForNotifies, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >()); + const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler = css::uno::Reference< css::task::XInteractionHandler >()); void updateParameterInfo(); bool hasValidParent() const; // impl methods void load_impl(bool bCausedByParentForm, bool bMoveToFirst = true, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >()) - throw(::com::sun::star::uno::RuntimeException, std::exception); + const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler = css::uno::Reference< css::task::XInteractionHandler >()) + throw(css::uno::RuntimeException, std::exception); void reload_impl(bool bMoveToFirst, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >()) - throw(::com::sun::star::uno::RuntimeException, std::exception); - void submit_impl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& Control, const ::com::sun::star::awt::MouseEvent& MouseEvt, bool _bAproveByListeners); + const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler = css::uno::Reference< css::task::XInteractionHandler >()) + throw(css::uno::RuntimeException, std::exception); + void submit_impl(const css::uno::Reference< css::awt::XControl>& Control, const css::awt::MouseEvent& MouseEvt, bool _bAproveByListeners); void reset_impl(bool _bAproveByListeners); bool implEnsureConnection(); @@ -471,16 +471,16 @@ private: // connection sharing /// checks if we can re-use (aka share) the connection of the given parent - bool canShareConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxParentProps ); + bool canShareConnection( const css::uno::Reference< css::beans::XPropertySet >& _rxParentProps ); /// starts sharing the connection with the parent - void doShareConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxParentProps ); + void doShareConnection( const css::uno::Reference< css::beans::XPropertySet >& _rxParentProps ); /// stops sharing the connection with the parent void stopSharingConnection( ); /// called when the connection which we share with our parent is being disposed - void disposingSharedConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn ); + void disposingSharedConnection( const css::uno::Reference< css::sdbc::XConnection >& _rxConn ); /// checks if we currently share our connection with our parent bool isSharingConnection( ) const { return m_bSharingConnection; } @@ -498,7 +498,7 @@ private: <TRUE/> if and only if the execution has been approved */ bool impl_approveRowChange_throw( - const ::com::sun::star::lang::EventObject& _rEvent, + const css::lang::EventObject& _rEvent, const bool _bAllowSQLException, ::osl::ClearableMutexGuard& _rGuard ); @@ -510,26 +510,26 @@ private: void restoreInsertOnlyState( ); // error handling - void onError(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent); - void onError(const ::com::sun::star::sdbc::SQLException&, const OUString& _rContextDescription); + void onError(const css::sdb::SQLErrorEvent& _rEvent); + void onError(const css::sdbc::SQLException&, const OUString& _rContextDescription); // html tools - OUString GetDataEncoded(bool _bURLEncoded,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); - OUString GetDataURLEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); - OUString GetDataTextEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); - ::com::sun::star::uno::Sequence<sal_Int8> GetDataMultiPartEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt, + OUString GetDataEncoded(bool _bURLEncoded,const css::uno::Reference< css::awt::XControl>& SubmitButton, const css::awt::MouseEvent& MouseEvt); + OUString GetDataURLEncoded(const css::uno::Reference< css::awt::XControl>& SubmitButton, const css::awt::MouseEvent& MouseEvt); + OUString GetDataTextEncoded(const css::uno::Reference< css::awt::XControl>& SubmitButton, const css::awt::MouseEvent& MouseEvt); + css::uno::Sequence<sal_Int8> GetDataMultiPartEncoded(const css::uno::Reference< css::awt::XControl>& SubmitButton, const css::awt::MouseEvent& MouseEvt, OUString& rContentType); - void AppendComponent(HtmlSuccessfulObjList& rList, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xComponentSet, const OUString& rNamePrefix, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& rxSubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); + void AppendComponent(HtmlSuccessfulObjList& rList, const css::uno::Reference< css::beans::XPropertySet>& xComponentSet, const OUString& rNamePrefix, + const css::uno::Reference< css::awt::XControl>& rxSubmitButton, const css::awt::MouseEvent& MouseEvt); - void FillSuccessfulList(HtmlSuccessfulObjList& rList, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& rxSubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); + void FillSuccessfulList(HtmlSuccessfulObjList& rList, const css::uno::Reference< css::awt::XControl>& rxSubmitButton, const css::awt::MouseEvent& MouseEvt); static void InsertTextPart(INetMIMEMessage& rParent, const OUString& rName, const OUString& rData); static bool InsertFilePart(INetMIMEMessage& rParent, const OUString& rName, const OUString& rFileName); static void Encode(OUString& rString); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection(); + css::uno::Reference< css::sdbc::XConnection > getConnection(); void impl_createLoadTimer(); diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx index a74e55629295..1c1f6c0bac31 100644 --- a/forms/source/component/Date.cxx +++ b/forms/source/component/Date.cxx @@ -145,7 +145,7 @@ css::uno::Sequence<OUString> SAL_CALL ODateModel::getSupportedServiceNames() thr } -OUString SAL_CALL ODateModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL ODateModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_DATEFIELD); // old (non-sun) name for compatibility ! } @@ -190,7 +190,7 @@ sal_Bool SAL_CALL ODateModel::convertFastPropertyValue(Any& _rConvertedValue, An } -void SAL_CALL ODateModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw ( ::com::sun::star::uno::Exception, std::exception) +void SAL_CALL ODateModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw ( css::uno::Exception, std::exception) { if (PROPERTY_ID_FORMATKEY == _nHandle) setFormatKeyPropertyValue(_rValue); @@ -311,16 +311,16 @@ Sequence< Type > ODateModel::getSupportedBindingTypes() } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_ODateModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_ODateModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::ODateModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_ODateControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_ODateControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::ODateControl(component)); } diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx index f54ac8495200..2e46601e9887 100644 --- a/forms/source/component/Date.hxx +++ b/forms/source/component/Date.hxx @@ -31,24 +31,24 @@ class ODateModel :public OEditBaseModel ,public OLimitedFormats { - ::com::sun::star::uno::Any m_aSaveValue; - bool m_bDateTimeField; + css::uno::Any m_aSaveValue; + bool m_bDateTimeField; protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: DECLARE_DEFAULT_LEAF_XTOR( ODateModel ); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::beans::XPropertySet - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, - sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::lang::IllegalArgumentException) SAL_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) SAL_OVERRIDE; + // css::beans::XPropertySet + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, + sal_Int32 nHandle, const css::uno::Any& rValue ) + throw(css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) SAL_OVERRIDE; // XServiceInfo OUString SAL_CALL getImplementationName() @@ -62,31 +62,28 @@ public: // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; protected: // OBoundControlModel overridables - virtual ::com::sun::star::uno::Any + virtual css::uno::Any translateDbColumnToControlValue( ) SAL_OVERRIDE; virtual bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any + virtual css::uno::Any translateControlValueToExternalValue( ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > + virtual css::uno::Sequence< css::uno::Type > getSupportedBindingTypes() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateExternalValueToControlValue( const ::com::sun::star::uno::Any& _rExternalValue ) const SAL_OVERRIDE; + virtual css::uno::Any translateExternalValueToControlValue( const css::uno::Any& _rExternalValue ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateControlValueToValidatableValue( ) const SAL_OVERRIDE; + virtual css::uno::Any translateControlValueToValidatableValue( ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - getDefaultForReset() const SAL_OVERRIDE; + virtual css::uno::Any getDefaultForReset() const SAL_OVERRIDE; virtual void resetNoBroadcast() SAL_OVERRIDE; - virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ) SAL_OVERRIDE; + virtual void onConnectedDbColumn( const css::uno::Reference< css::uno::XInterface >& _rxForm ) SAL_OVERRIDE; protected: virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -95,13 +92,13 @@ protected: class ODateControl: public OBoundControl { protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: - ODateControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + ODateControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); DECLARE_UNO3_AGG_DEFAULTS(ODateControl, OBoundControl) -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.ODateControl"); } diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index a135db3a7fa6..f63515849eba 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -116,13 +116,13 @@ OEditControl::~OEditControl() // XChangeBroadcaster -void OEditControl::addChangeListener(const Reference<XChangeListener>& l) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OEditControl::addChangeListener(const Reference<XChangeListener>& l) throw ( css::uno::RuntimeException, std::exception) { m_aChangeListeners.addInterface( l ); } -void OEditControl::removeChangeListener(const Reference<XChangeListener>& l) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OEditControl::removeChangeListener(const Reference<XChangeListener>& l) throw ( css::uno::RuntimeException, std::exception) { m_aChangeListeners.removeInterface( l ); } @@ -160,7 +160,7 @@ void OEditControl::disposing(const EventObject& Source) throw( RuntimeException, // XFocusListener -void OEditControl::focusGained( const FocusEvent& /*e*/ ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OEditControl::focusGained( const FocusEvent& /*e*/ ) throw ( css::uno::RuntimeException, std::exception) { Reference<XPropertySet> xSet(getModel(), UNO_QUERY); if (xSet.is()) @@ -168,7 +168,7 @@ void OEditControl::focusGained( const FocusEvent& /*e*/ ) throw ( ::com::sun::st } -void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( css::uno::RuntimeException, std::exception) { Reference<XPropertySet> xSet(getModel(), UNO_QUERY); if (xSet.is()) @@ -185,7 +185,7 @@ void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( ::com::sun::star // XKeyListener -void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OEditControl::keyPressed(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) { if( e.KeyCode != KEY_RETURN || e.Modifiers != 0 ) return; @@ -242,7 +242,7 @@ void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( } -void OEditControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OEditControl::keyReleased(const css::awt::KeyEvent& /*e*/) throw ( css::uno::RuntimeException, std::exception) { } @@ -255,7 +255,7 @@ IMPL_LINK_NOARG_TYPED(OEditControl, OnKeyPressed, void*, void) css::uno::Reference<css::uno::XInterface> xParent = xFComp->getParent(); Reference<XSubmit> xSubmit(xParent, UNO_QUERY); if (xSubmit.is()) - xSubmit->submit( Reference<XControl>(), ::com::sun::star::awt::MouseEvent() ); + xSubmit->submit( Reference<XControl>(), css::awt::MouseEvent() ); } @@ -319,7 +319,7 @@ void OEditModel::disposing() // XPersistObject -OUString SAL_CALL OEditModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OEditModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_EDIT); // old (non-sun) name for compatibility ! } @@ -526,7 +526,7 @@ void OEditModel::readAggregate( const Reference< XObjectInputStream >& _rxInStre } -void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) { Any aCurrentText; sal_Int16 nOldTextLen = 0; @@ -556,7 +556,7 @@ void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw } -void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) { OEditBaseModel::read(_rxInStream); @@ -728,16 +728,16 @@ Any OEditModel::getDefaultForReset() const } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OEditModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OEditModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OEditModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OEditControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OEditControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OEditControl(component)); } diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index 3f89f221efc9..c18402a7d45e 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -43,7 +43,7 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OEditModel ); protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; void enableFormattedWriteFake() { m_bWritingFormattedFake = true; } void disableFormattedWriteFake() { m_bWritingFormattedFake = false; } @@ -56,18 +56,18 @@ public: virtual void SAL_CALL disposing() SAL_OVERRIDE; // XPropertySet - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; // XPersistObject - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet using OBoundControlModel::getFastPropertyValue; // XReset - virtual void SAL_CALL reset( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reset( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo OUString SAL_CALL getImplementationName() @@ -78,10 +78,10 @@ public: // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; virtual void describeAggregateProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rAggregateProps ) const SAL_OVERRIDE; // XEventListener @@ -89,18 +89,16 @@ public: protected: // OControlModel overridables - virtual void writeAggregate( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& _rxOutStream ) const SAL_OVERRIDE; - virtual void readAggregate( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& _rxInStream ) SAL_OVERRIDE; + virtual void writeAggregate( const css::uno::Reference< css::io::XObjectOutputStream >& _rxOutStream ) const SAL_OVERRIDE; + virtual void readAggregate( const css::uno::Reference< css::io::XObjectInputStream >& _rxInStream ) SAL_OVERRIDE; // OBoundControlModel overridables - virtual ::com::sun::star::uno::Any - translateDbColumnToControlValue( ) SAL_OVERRIDE; + virtual css::uno::Any translateDbColumnToControlValue( ) SAL_OVERRIDE; virtual bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - getDefaultForReset() const SAL_OVERRIDE; + virtual css::uno::Any getDefaultForReset() const SAL_OVERRIDE; - virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ) SAL_OVERRIDE; + virtual void onConnectedDbColumn( const css::uno::Reference< css::uno::XInterface >& _rxForm ) SAL_OVERRIDE; virtual void onDisconnectedDbColumn() SAL_OVERRIDE; virtual bool approveDbColumnType( sal_Int32 _nColumnType ) SAL_OVERRIDE; @@ -119,9 +117,9 @@ private: //= OEditControl -typedef ::cppu::ImplHelper3< ::com::sun::star::awt::XFocusListener, - ::com::sun::star::awt::XKeyListener, - ::com::sun::star::form::XChangeBroadcaster > OEditControl_BASE; +typedef ::cppu::ImplHelper3< css::awt::XFocusListener, + css::awt::XKeyListener, + css::form::XChangeBroadcaster > OEditControl_BASE; class OEditControl : public OBoundControl ,public OEditControl_BASE @@ -133,41 +131,41 @@ class OEditControl : public OBoundControl ImplSVEvent * m_nKeyEvent; public: - OEditControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); + OEditControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext); virtual ~OEditControl(); DECLARE_UNO3_AGG_DEFAULTS(OEditControl, OBoundControl) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; -// ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; +// css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OEditControl"); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; -// ::com::sun::star::form::XChangeBroadcaster - virtual void SAL_CALL addChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; +// css::form::XChangeBroadcaster + virtual void SAL_CALL addChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; -// ::com::sun::star::awt::XFocusListener - virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; +// css::awt::XFocusListener + virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; -// ::com::sun::star::awt::XKeyListener - virtual void SAL_CALL keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL keyReleased(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; +// css::awt::XKeyListener + virtual void SAL_CALL keyPressed(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL keyReleased(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XControl - virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rxParent ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rxToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rxParent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: DECL_LINK_TYPED( OnKeyPressed, void*, void ); diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index e5858535411e..997f6dfd4d40 100644 --- a/forms/source/component/EditBase.cxx +++ b/forms/source/component/EditBase.cxx @@ -85,7 +85,7 @@ OEditBaseModel::~OEditBaseModel( ) // XPersist -void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) { OBoundControlModel::write(_rxOutStream); @@ -159,7 +159,7 @@ sal_uInt16 OEditBaseModel::getPersistenceFlags() const } -void OEditBaseModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OEditBaseModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) { OBoundControlModel::read(_rxInStream); ::osl::MutexGuard aGuard(m_aMutex); @@ -327,7 +327,7 @@ sal_Bool OEditBaseModel::convertFastPropertyValue( Any& rConvertedValue, Any& rO } -void OEditBaseModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( ::com::sun::star::uno::Exception, std::exception) +void OEditBaseModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( css::uno::Exception, std::exception) { switch (nHandle) { diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx index 0658490ed7e4..36b376c3ebbe 100644 --- a/forms/source/component/EditBase.hxx +++ b/forms/source/component/EditBase.hxx @@ -49,7 +49,7 @@ class OEditBaseModel : public OBoundControlModel protected: // [properties] for all EditingFields - ::com::sun::star::uno::Any m_aDefault; + css::uno::Any m_aDefault; OUString m_aDefaultText; // default value bool m_bEmptyIsNull : 1; // empty string will be interepreted as NULL when committing bool m_bFilterProposal : 1; // use a list of possible value in filtermode @@ -59,7 +59,7 @@ protected: public: OEditBaseModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, + const css::uno::Reference< css::uno::XComponentContext>& _rxFactory, const OUString& _rUnoControlModelTypeName, const OUString& _rDefault, const bool _bSupportExternalBinding, @@ -69,24 +69,24 @@ public: virtual ~OEditBaseModel(); // XPersistObject - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, - sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::lang::IllegalArgumentException) SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, + sal_Int32 nHandle, const css::uno::Any& rValue ) + throw(css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) SAL_OVERRIDE; using ::cppu::OPropertySetHelper::getFastPropertyValue; // XPropertyState - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; protected: // new properties common to all edit models should be handled with the following two methods - void SAL_CALL readCommonEditProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream); - void SAL_CALL writeCommonEditProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream); + void SAL_CALL readCommonEditProperties(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream); + void SAL_CALL writeCommonEditProperties(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream); void defaultCommonEditProperties(); virtual sal_uInt16 getPersistenceFlags() const; diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx index 3570a8458490..669c1a0db5e1 100644 --- a/forms/source/component/EventThread.cxx +++ b/forms/source/component/EventThread.cxx @@ -86,7 +86,7 @@ void OComponentEventThread::impl_clearEventQueue() m_aFlags.erase( m_aFlags.begin(), m_aFlags.end() ); } -void OComponentEventThread::disposing( const EventObject& evt ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OComponentEventThread::disposing( const EventObject& evt ) throw ( css::uno::RuntimeException, std::exception) { if( evt.Source == m_xComp ) { diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index b152c7322ec5..83ccfa2e698a 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -44,11 +44,11 @@ namespace frm typedef ::osl::Thread OComponentEventThread_TBASE; class OComponentEventThread :public OComponentEventThread_TBASE - ,public ::com::sun::star::lang::XEventListener + ,public css::lang::XEventListener ,public ::cppu::OWeakObject { typedef std::vector<css::lang::EventObject*> ThreadEvents; - typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter> > ThreadObjects; + typedef std::vector< css::uno::Reference< css::uno::XAdapter> > ThreadObjects; typedef std::vector<sal_Bool> ThreadBools; ::osl::Mutex m_aMutex; @@ -57,8 +57,8 @@ class OComponentEventThread ThreadObjects m_aControls; // Control for Submit ThreadBools m_aFlags; // Flags for Submit/Reset - ::cppu::OComponentHelper* m_pCompImpl; // Implementation of the Control - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> m_xComp; // ::com::sun::star::lang::XComponent of the Control + ::cppu::OComponentHelper* m_pCompImpl; // Implementation of the Control + css::uno::Reference< css::lang::XComponent> m_xComp; // css::lang::XComponent of the Control protected: @@ -68,7 +68,7 @@ protected: virtual void SAL_CALL onTerminated() SAL_OVERRIDE; // The following method is called to duplicate the Event while respecting it's type. - virtual ::com::sun::star::lang::EventObject* cloneEvent(const ::com::sun::star::lang::EventObject* _pEvt) const = 0; + virtual css::lang::EventObject* cloneEvent(const css::lang::EventObject* _pEvt) const = 0; // Edit an Event: // The mutex is not locked, but pCompImpl stays valid in any case. @@ -76,25 +76,25 @@ protected: // rControl is only set, if a Control has been passed in addEvent. // Because the Control is only held as a WeakRef, it can disappear in the meantime. virtual void processEvent( ::cppu::OComponentHelper* _pCompImpl, - const ::com::sun::star::lang::EventObject* _pEvt, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& _rControl, + const css::lang::EventObject* _pEvt, + const css::uno::Reference< css::awt::XControl>& _rControl, bool _bFlag) = 0; public: // UNO Anbindung DECLARE_UNO3_DEFAULTS(OComponentEventThread, OWeakObject) - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; OComponentEventThread(::cppu::OComponentHelper* pCompImpl); virtual ~OComponentEventThread(); - void addEvent( const ::com::sun::star::lang::EventObject* _pEvt, bool bFlag = false ); - void addEvent( const ::com::sun::star::lang::EventObject* _pEvt, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& rControl, + void addEvent( const css::lang::EventObject* _pEvt, bool bFlag = false ); + void addEvent( const css::lang::EventObject* _pEvt, const css::uno::Reference< css::awt::XControl>& rControl, bool bFlag = false ); - // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Resolve ambiguity: both OWeakObject and OObject have these memory operators void * SAL_CALL operator new( size_t size ) throw() { return osl::Thread::operator new(size); } diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index eb6dff10b7fc..abb292f4b7ac 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -154,7 +154,7 @@ void OFileControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) con } -void OFileControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception) +void OFileControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( css::uno::Exception, std::exception) { switch (nHandle) { @@ -190,13 +190,13 @@ void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps ) } -OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OFileControlModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_FILECONTROL); // old (non-sun) name for compatibility ! } -void OFileControlModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OFileControlModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) { OControlModel::write(_rxOutStream); @@ -210,7 +210,7 @@ void OFileControlModel::write(const Reference<css::io::XObjectOutputStream>& _rx } -void OFileControlModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OFileControlModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) { OControlModel::read(_rxInStream); ::osl::MutexGuard aGuard(m_aMutex); @@ -236,7 +236,7 @@ void OFileControlModel::read(const Reference<css::io::XObjectInputStream>& _rxIn } -void SAL_CALL OFileControlModel::reset() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OFileControlModel::reset() throw ( css::uno::RuntimeException, std::exception) { ::cppu::OInterfaceIteratorHelper aIter(m_aResetListeners); EventObject aEvt(static_cast<XWeak*>(this)); @@ -256,13 +256,13 @@ void SAL_CALL OFileControlModel::reset() throw ( ::com::sun::star::uno::RuntimeE } -void OFileControlModel::addResetListener(const Reference<XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OFileControlModel::addResetListener(const Reference<XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) { m_aResetListeners.addInterface(_rxListener); } -void OFileControlModel::removeResetListener(const Reference<XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OFileControlModel::removeResetListener(const Reference<XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) { m_aResetListeners.removeInterface(_rxListener); } @@ -280,9 +280,9 @@ void OFileControlModel::_reset() } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OFileControlModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OFileControlModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OFileControlModel(component)); } diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx index 23a27a062752..553c7a63923d 100644 --- a/forms/source/component/File.hxx +++ b/forms/source/component/File.hxx @@ -28,52 +28,52 @@ namespace frm class OFileControlModel :public OControlModel - ,public ::com::sun::star::form::XReset + ,public css::form::XReset { ::cppu::OInterfaceContainerHelper m_aResetListeners; OUString m_sDefaultValue; protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: DECLARE_DEFAULT_LEAF_XTOR( OFileControlModel ); DECLARE_UNO3_AGG_DEFAULTS(OFileControlModel, OControlModel) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OFileControlModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; // XPropertySet and friends - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) + throw(css::lang::IllegalArgumentException) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const SAL_OVERRIDE; + virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const SAL_OVERRIDE; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com ::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com ::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( ::com ::sun::star::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( ::com ::sun::star::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XReset - virtual void SAL_CALL reset() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reset() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; // prevent method hiding diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index bb1cb743a5ed..720750a37eef 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -600,7 +600,7 @@ namespace frm Reference< XVclWindowPeer > xVclWindow( getPeer(), UNO_QUERY ); if (xVclWindow.is()) { - OUString aRefText = ::comphelper::getString(com::sun::star::uno::Reference< XPropertySet > (getModel(), UNO_QUERY)->getPropertyValue(PROPERTY_REFVALUE)); + OUString aRefText = ::comphelper::getString(css::uno::Reference< XPropertySet > (getModel(), UNO_QUERY)->getPropertyValue(PROPERTY_REFVALUE)); Any aValue; if (aText == aRefText) aValue <<= (sal_Int32)TRISTATE_TRUE; @@ -662,7 +662,7 @@ namespace frm } - void SAL_CALL OFilterControl::insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL OFilterControl::insertText( const css::awt::Selection& rSel, const OUString& aText ) throw(css::uno::RuntimeException, std::exception) { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); if (xText.is()) @@ -690,7 +690,7 @@ namespace frm } - void SAL_CALL OFilterControl::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL OFilterControl::setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); if (xText.is()) @@ -698,9 +698,9 @@ namespace frm } - ::com::sun::star::awt::Selection SAL_CALL OFilterControl::getSelection() throw(::com::sun::star::uno::RuntimeException, std::exception) + css::awt::Selection SAL_CALL OFilterControl::getSelection() throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::awt::Selection aSel; + css::awt::Selection aSel; Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); if (xText.is()) aSel = xText->getSelection(); @@ -738,7 +738,7 @@ namespace frm } - void OFilterControl::displayException( const ::com::sun::star::sdb::SQLContext& _rExcept ) + void OFilterControl::displayException( const css::sdb::SQLContext& _rExcept ) { try { diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx index d75744875590..ebbb04a258ee 100644 --- a/forms/source/component/Filter.hxx +++ b/forms/source/component/Filter.hxx @@ -47,11 +47,11 @@ namespace frm // OFilterControl - typedef ::cppu::ImplHelper5 < ::com::sun::star::awt::XTextComponent - , ::com::sun::star::awt::XFocusListener - , ::com::sun::star::awt::XItemListener - , ::com::sun::star::form::XBoundComponent - , ::com::sun::star::lang::XInitialization + typedef ::cppu::ImplHelper5 < css::awt::XTextComponent + , css::awt::XFocusListener + , css::awt::XItemListener + , css::form::XBoundComponent + , css::lang::XInitialization > OFilterControl_BASE; class OFilterControl :public UnoControl @@ -60,89 +60,89 @@ namespace frm { TextListenerMultiplexer m_aTextListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xField; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMessageParent; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::beans::XPropertySet > m_xField; + css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; + css::uno::Reference< css::sdbc::XConnection > m_xConnection; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::Reference< css::awt::XWindow > m_xMessageParent; typedef std::unordered_map< OUString, OUString, OUStringHash > MapString2String; MapString2String m_aDisplayItemToValueItem; - OUString m_aText; + OUString m_aText; #if HAVE_FEATURE_DBCONNECTIVITY ::connectivity::OSQLParser m_aParser; #endif sal_Int16 m_nControlClass; // which kind of control do we use? - bool m_bFilterList : 1; - bool m_bMultiLine : 1; - bool m_bFilterListFilled : 1; + bool m_bFilterList : 1; + bool m_bMultiLine : 1; + bool m_bFilterListFilled : 1; private: void implInitFilterList(); - void initControlModel(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xControlModel); + void initControlModel(css::uno::Reference< css::beans::XPropertySet >& xControlModel); public: - OFilterControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); + OFilterControl( const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); DECLARE_UNO3_AGG_DEFAULTS(OFilterControl,OWeakAggObject) - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString GetComponentServiceName() SAL_OVERRIDE; - virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // ::com::sun::star::awt::XTextComponent - virtual void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setText( const OUString& aText ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Selection SAL_CALL getSelection() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isEditable() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setEditable( sal_Bool bEditable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setMaxTextLen( sal_Int16 nLength ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getMaxTextLen() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // ::com::sun::star::form::XBoundComponent - virtual void SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE {} - virtual void SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE {} - virtual sal_Bool SAL_CALL commit() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // ::com::sun::star::awt::XFocusListener - virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // ::com::sun::star::awt::XItemListener - virtual void SAL_CALL itemStateChanged(const ::com::sun::star::awt::ItemEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // ::com::sun::star::util::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) SAL_OVERRIDE; + virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit > & rxToolkit, const css::uno::Reference< css::awt::XWindowPeer > & rParentPeer ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + // css::lang::XComponent + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + // css::awt::XTextComponent + virtual void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setText( const OUString& aText ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL insertText( const css::awt::Selection& rSel, const OUString& aText ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getSelectedText() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setSelection( const css::awt::Selection& aSelection ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::awt::Selection SAL_CALL getSelection() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isEditable() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setEditable( sal_Bool bEditable ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setMaxTextLen( sal_Int16 nLength ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getMaxTextLen() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + // css::form::XBoundComponent + virtual void SAL_CALL addUpdateListener(const css::uno::Reference< css::form::XUpdateListener > & /*l*/) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE {} + virtual void SAL_CALL removeUpdateListener(const css::uno::Reference< css::form::XUpdateListener > & /*l*/) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE {} + virtual sal_Bool SAL_CALL commit() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + // css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + // css::awt::XFocusListener + virtual void SAL_CALL focusGained(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL focusLost(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + // css::awt::XItemListener + virtual void SAL_CALL itemStateChanged(const css::awt::ItemEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + // css::util::XInitialization + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // com::sun::star::lang::XServiceInfo - static version + // css::lang::XServiceInfo - static version static OUString SAL_CALL getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); protected: - virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ) SAL_OVERRIDE; - virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ) SAL_OVERRIDE; + virtual void PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc ) SAL_OVERRIDE; + virtual void ImplSetPeerProperty( const OUString& rPropName, const css::uno::Any& rVal ) SAL_OVERRIDE; bool ensureInitialized( ); - void displayException( const ::com::sun::star::sdb::SQLContext& _rExcept ); + void displayException( const css::sdb::SQLContext& _rExcept ); }; } // namespace frm diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx index bf3acda7bf16..01315f980a09 100644 --- a/forms/source/component/FixedText.cxx +++ b/forms/source/component/FixedText.cxx @@ -62,7 +62,7 @@ OFixedTextModel::~OFixedTextModel( ) IMPLEMENT_DEFAULT_CLONING( OFixedTextModel ) -css::uno::Sequence<OUString> SAL_CALL OFixedTextModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OFixedTextModel::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) { css::uno::Sequence<OUString> aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -110,9 +110,9 @@ void SAL_CALL OFixedTextModel::read(const Reference<XObjectInputStream>& _rxInSt } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OFixedTextModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OFixedTextModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OFixedTextModel(component)); } diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx index 0bbe9e746d87..2af6aca440a9 100644 --- a/forms/source/component/FixedText.hxx +++ b/forms/source/component/FixedText.hxx @@ -37,18 +37,18 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OFixedTextModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeAggregateProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; protected: diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index f2d0ac4aa368..6b653b478a18 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -237,7 +237,7 @@ Sequence< OUString > SAL_CALL OControl::getSupportedServiceNames_Static() throw( } // XEventListener -void SAL_CALL OControl::disposing(const com::sun::star::lang::EventObject& _rEvent) throw (RuntimeException, std::exception) +void SAL_CALL OControl::disposing(const css::lang::EventObject& _rEvent) throw (RuntimeException, std::exception) { Reference< XInterface > xAggAsIface; query_aggregation(m_xAggregate, xAggAsIface); @@ -245,7 +245,7 @@ void SAL_CALL OControl::disposing(const com::sun::star::lang::EventObject& _rEve // does the disposing come from the aggregate? if (xAggAsIface != Reference< XInterface >(_rEvent.Source, UNO_QUERY)) { // no -> forward it - Reference<com::sun::star::lang::XEventListener> xListener; + Reference<css::lang::XEventListener> xListener; if (query_aggregation(m_xAggregate, xListener)) xListener->disposing(_rEvent); } @@ -618,7 +618,7 @@ Reference< XInterface > SAL_CALL OControlModel::getParent() throw(RuntimeExcepti return m_xParent; } -void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent) throw(com::sun::star::lang::NoSupportException, RuntimeException, std::exception) +void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent) throw(css::lang::NoSupportException, RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); @@ -702,7 +702,7 @@ Sequence< OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() t } // XEventListener -void SAL_CALL OControlModel::disposing(const com::sun::star::lang::EventObject& _rSource) throw (RuntimeException, std::exception) +void SAL_CALL OControlModel::disposing(const css::lang::EventObject& _rSource) throw (RuntimeException, std::exception) { // release the parent if (_rSource.Source == m_xParent) @@ -712,7 +712,7 @@ void SAL_CALL OControlModel::disposing(const com::sun::star::lang::EventObject& } else { - Reference<com::sun::star::lang::XEventListener> xEvtLst; + Reference<css::lang::XEventListener> xEvtLst; if (query_aggregation(m_xAggregate, xEvtLst)) { osl::MutexGuard aGuard(m_aMutex); @@ -726,7 +726,7 @@ void OControlModel::disposing() { OPropertySetAggregationHelper::disposing(); - Reference<com::sun::star::lang::XComponent> xComp; + Reference<css::lang::XComponent> xComp; if (query_aggregation(m_xAggregate, xComp)) xComp->dispose(); @@ -794,7 +794,7 @@ void SAL_CALL OControlModel::write(const Reference<css::io::XObjectOutputStream> // EOIN! } -void OControlModel::read(const Reference<css::io::XObjectInputStream>& InStream) throw (::com::sun::star::io::IOException, RuntimeException, std::exception) +void OControlModel::read(const Reference<css::io::XObjectInputStream>& InStream) throw (css::io::IOException, RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); @@ -950,7 +950,7 @@ void OControlModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) con sal_Bool OControlModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) - throw (com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { bool bModified(false); switch (_nHandle) @@ -1370,7 +1370,7 @@ void OBoundControlModel::disposing() m_pAggPropMultiplexer->dispose(); // notify all our listeners - com::sun::star::lang::EventObject aEvt( static_cast< XWeak* >( this ) ); + css::lang::EventObject aEvt( static_cast< XWeak* >( this ) ); m_aUpdateListeners.disposeAndClear( aEvt ); m_aResetHelper.disposing(); @@ -1466,7 +1466,7 @@ void OBoundControlModel::doFormListening( const bool _bStart ) } // XChild -void SAL_CALL OBoundControlModel::setParent(const Reference<XInterface>& _rxParent) throw(com::sun::star::lang::NoSupportException, RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::setParent(const Reference<XInterface>& _rxParent) throw(css::lang::NoSupportException, RuntimeException, std::exception) { ControlModelLock aLock( *this ); FieldChangeNotifier aBoundFieldNotifier( aLock ); @@ -1493,7 +1493,7 @@ void SAL_CALL OBoundControlModel::setParent(const Reference<XInterface>& _rxPare } // XEventListener -void SAL_CALL OBoundControlModel::disposing(const com::sun::star::lang::EventObject& _rEvent) throw (RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::disposing(const css::lang::EventObject& _rEvent) throw (RuntimeException, std::exception) { ControlModelLock aLock( *this ); if ( _rEvent.Source == getField() ) @@ -1563,9 +1563,9 @@ void SAL_CALL OBoundControlModel::write( const Reference<css::io::XObjectOutputS void OBoundControlModel::defaultCommonProperties() { - Reference<com::sun::star::lang::XComponent> xComp(m_xLabelControl, UNO_QUERY); + Reference<css::lang::XComponent> xComp(m_xLabelControl, UNO_QUERY); if (xComp.is()) - xComp->removeEventListener(static_cast<com::sun::star::lang::XEventListener*>(static_cast<XPropertyChangeListener*>(this))); + xComp->removeEventListener(static_cast<css::lang::XEventListener*>(static_cast<XPropertyChangeListener*>(this))); m_xLabelControl = NULL; } @@ -1584,7 +1584,7 @@ void OBoundControlModel::readCommonProperties(const Reference<css::io::XObjectIn m_xLabelControl.set(xPersist, css::uno::UNO_QUERY); Reference< XComponent > xComp( m_xLabelControl, UNO_QUERY ); if (xComp.is()) - xComp->addEventListener(static_cast<com::sun::star::lang::XEventListener*>(static_cast<XPropertyChangeListener*>(this))); + xComp->addEventListener(static_cast<css::lang::XEventListener*>(static_cast<XPropertyChangeListener*>(this))); // read any other new common properties here // skip the remaining bytes xMark->jumpToMark(nMark); @@ -1656,7 +1656,7 @@ sal_Bool OBoundControlModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) - throw (com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { bool bModified(false); switch (_nHandle) @@ -1669,7 +1669,7 @@ sal_Bool OBoundControlModel::convertFastPropertyValue( break; case PROPERTY_ID_BOUNDFIELD: SAL_WARN("forms.component", "OBoundControlModel::convertFastPropertyValue: BoundField should be a read-only property !" ); - throw com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); case PROPERTY_ID_CONTROLLABEL: if (!_rValue.hasValue()) { // property set to void @@ -1723,11 +1723,11 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co break; case PROPERTY_ID_BOUNDFIELD: SAL_WARN("forms.component", "OBoundControlModel::setFastPropertyValue_NoBroadcast : BoundField should be a read-only property !"); - throw com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); case PROPERTY_ID_CONTROLLABEL: { if ( rValue.hasValue() && ( rValue.getValueTypeClass() != TypeClass_INTERFACE ) ) - throw com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); Reference< XInterface > xNewValue( rValue, UNO_QUERY ); if ( !xNewValue.is() ) { // set property to "void" @@ -1744,7 +1744,7 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co Reference< XChild > xAsChild ( xAsPropSet, UNO_QUERY ); if ( !xAsChild.is() || !xAsServiceInfo->supportsService( m_aLabelServiceName ) ) { - throw com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } // Check if we and the given model have a common ancestor (up to the forms collection) @@ -1774,13 +1774,13 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co if (xNewTopLevel != xMyTopLevel) { // the both objects don't belong to the same forms collection -> not acceptable - throw com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } m_xLabelControl = xAsPropSet; - Reference<com::sun::star::lang::XComponent> xComp(m_xLabelControl, UNO_QUERY); + Reference<css::lang::XComponent> xComp(m_xLabelControl, UNO_QUERY); if (xComp.is()) - xComp->addEventListener(static_cast<com::sun::star::lang::XEventListener*>(static_cast<XPropertyChangeListener*>(this))); + xComp->addEventListener(static_cast<css::lang::XEventListener*>(static_cast<XPropertyChangeListener*>(this))); } break; @@ -1939,7 +1939,7 @@ bool OBoundControlModel::connectToField(const Reference<XRowSet>& rForm) if (m_xCursor.is()) { Reference<XColumnsSupplier> xColumnsSupplier(m_xCursor, UNO_QUERY); - DBG_ASSERT(xColumnsSupplier.is(), "OBoundControlModel::connectToField : the row set should support the com::sun::star::sdb::ResultSet service !"); + DBG_ASSERT(xColumnsSupplier.is(), "OBoundControlModel::connectToField : the row set should support the css::sdb::ResultSet service !"); if (xColumnsSupplier.is()) { Reference<XNameAccess> xColumns(xColumnsSupplier->getColumns(), UNO_QUERY); @@ -2093,12 +2093,12 @@ void SAL_CALL OBoundControlModel::loaded( const EventObject& _rEvent ) throw(Run impl_connectDatabaseColumn_noNotify( false ); } -void SAL_CALL OBoundControlModel::unloaded( const com::sun::star::lang::EventObject& /*aEvent*/ ) throw(RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::unloaded( const css::lang::EventObject& /*aEvent*/ ) throw(RuntimeException, std::exception) { OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::unloaded: we should never reach this with an external value binding!" ); } -void SAL_CALL OBoundControlModel::reloading( const com::sun::star::lang::EventObject& /*aEvent*/ ) throw(RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::reloading( const css::lang::EventObject& /*aEvent*/ ) throw(RuntimeException, std::exception) { OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::reloading: we should never reach this with an external value binding!" ); if ( hasExternalValueBinding() ) @@ -2107,7 +2107,7 @@ void SAL_CALL OBoundControlModel::reloading( const com::sun::star::lang::EventOb m_bForwardValueChanges = false; } -void SAL_CALL OBoundControlModel::unloading(const com::sun::star::lang::EventObject& /*aEvent*/) throw(RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::unloading(const css::lang::EventObject& /*aEvent*/) throw(RuntimeException, std::exception) { ControlModelLock aLock( *this ); FieldChangeNotifier aBoundFieldNotifier( aLock ); @@ -2766,7 +2766,7 @@ sal_Bool SAL_CALL OBoundControlModel::isValid( ) throw (RuntimeException, std:: return m_bIsCurrentValueValid; } -::com::sun::star::uno::Any OBoundControlModel::getCurrentFormComponentValue() const +css::uno::Any OBoundControlModel::getCurrentFormComponentValue() const { if ( hasValidator() ) return translateControlValueToValidatableValue(); diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 8fde4d8a8534..2d2092edfd2e 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -58,24 +58,24 @@ using namespace dbtools; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::sdb; -using namespace ::com::sun::star::sdbc; -using namespace ::com::sun::star::sdbcx; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::form; -using namespace ::com::sun::star::awt; -using namespace ::com::sun::star::io; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::util; -using namespace ::com::sun::star::form::binding; +using namespace css::uno; +using namespace css::sdb; +using namespace css::sdbc; +using namespace css::sdbcx; +using namespace css::beans; +using namespace css::container; +using namespace css::form; +using namespace css::awt; +using namespace css::io; +using namespace css::lang; +using namespace css::util; +using namespace css::form::binding; namespace { - typedef com::sun::star::util::Date UNODate; - typedef com::sun::star::util::Time UNOTime; - typedef com::sun::star::util::DateTime UNODateTime; + typedef css::util::Date UNODate; + typedef css::util::Time UNOTime; + typedef css::util::DateTime UNODateTime; } namespace frm @@ -192,19 +192,19 @@ void OFormattedControl::disposing(const EventObject& _rSource) throw(RuntimeExce { OBoundControl::disposing(_rSource); } -void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OFormattedControl::keyPressed(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) { if( e.KeyCode != KEY_RETURN || e.Modifiers != 0 ) return; // Is the control located in a form with a Submit URL? - Reference<com::sun::star::beans::XPropertySet> xSet(getModel(), UNO_QUERY); + Reference<css::beans::XPropertySet> xSet(getModel(), UNO_QUERY); if( !xSet.is() ) return; Reference<XFormComponent> xFComp(xSet, UNO_QUERY); css::uno::Reference<css::uno::XInterface> xParent = xFComp->getParent(); if( !xParent.is() ) return; - Reference<com::sun::star::beans::XPropertySet> xFormSet(xParent, UNO_QUERY); + Reference<css::beans::XPropertySet> xFormSet(xParent, UNO_QUERY); if( !xFormSet.is() ) return; Any aTmp(xFormSet->getPropertyValue( PROPERTY_TARGET_URL )); @@ -215,7 +215,7 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr sal_Int32 nCount = xElements->getCount(); if( nCount > 1 ) { - Reference<com::sun::star::beans::XPropertySet> xFCSet; + Reference<css::beans::XPropertySet> xFCSet; for( sal_Int32 nIndex=0; nIndex < nCount; nIndex++ ) { // Any aElement(xElements->getByIndex(nIndex)); @@ -236,7 +236,7 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr OnKeyPressed) ); } -void OFormattedControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OFormattedControl::keyReleased(const css::awt::KeyEvent& /*e*/) throw ( css::uno::RuntimeException, std::exception) { } @@ -247,7 +247,7 @@ IMPL_LINK_NOARG_TYPED(OFormattedControl, OnKeyPressed, void*, void) css::uno::Reference<css::uno::XInterface> xParent = xFComp->getParent(); Reference<XSubmit> xSubmit(xParent, UNO_QUERY); if (xSubmit.is()) - xSubmit->submit( Reference<XControl> (), ::com::sun::star::awt::MouseEvent() ); + xSubmit->submit( Reference<XControl> (), css::awt::MouseEvent() ); } css::uno::Sequence<OUString> OFormattedControl::getSupportedServiceNames() throw(std::exception) @@ -260,7 +260,7 @@ css::uno::Sequence<OUString> OFormattedControl::getSupportedServiceNames() thro return aSupported; } -void OFormattedControl::setDesignMode(sal_Bool bOn) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OFormattedControl::setDesignMode(sal_Bool bOn) throw ( css::uno::RuntimeException, std::exception) { OBoundControl::setDesignMode(bOn); } @@ -346,7 +346,7 @@ Sequence< Type > OFormattedModel::_getTypes() } // XPersistObject -OUString SAL_CALL OFormattedModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OFormattedModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_EDIT); } @@ -382,7 +382,7 @@ void OFormattedModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const OEditBaseModel::getFastPropertyValue(rValue, nHandle); } -void OFormattedModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception) +void OFormattedModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( css::uno::Exception, std::exception) { OEditBaseModel::setFastPropertyValue_NoBroadcast(nHandle, rValue); } @@ -406,7 +406,7 @@ void OFormattedModel::setPropertyToDefaultByHandle(sal_Int32 nHandle) OEditBaseModel::setPropertyToDefaultByHandle(nHandle); } -void OFormattedModel::setPropertyToDefault(const OUString& aPropertyName) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException, std::exception ) +void OFormattedModel::setPropertyToDefault(const OUString& aPropertyName) throw( css::beans::UnknownPropertyException, RuntimeException, std::exception ) { OPropertyArrayAggregationHelper& rPH = m_aPropertyBagHelper.getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName( aPropertyName ); @@ -427,7 +427,7 @@ Any OFormattedModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const return OEditBaseModel::getPropertyDefaultByHandle(nHandle); } -Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName ) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException, std::exception ) +Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName ) throw( css::beans::UnknownPropertyException, RuntimeException, std::exception ) { OPropertyArrayAggregationHelper& rPH = m_aPropertyBagHelper.getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName( aPropertyName ); @@ -437,7 +437,7 @@ Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName return OEditBaseModel::getPropertyDefault(aPropertyName); } -void OFormattedModel::_propertyChanged( const com::sun::star::beans::PropertyChangeEvent& evt ) throw(RuntimeException, std::exception) +void OFormattedModel::_propertyChanged( const css::beans::PropertyChangeEvent& evt ) throw(RuntimeException, std::exception) { // TODO: check how this works with external bindings OSL_ENSURE( evt.Source == m_xAggregateSet, "OFormattedModel::_propertyChanged: where did this come from?" ); @@ -540,7 +540,7 @@ Reference< XNumberFormatsSupplier > OFormattedModel::calcDefaultFormatsSupplier( } // XBoundComponent -void OFormattedModel::loaded(const EventObject& rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OFormattedModel::loaded(const EventObject& rEvent) throw ( css::uno::RuntimeException, std::exception) { // HACK: our onConnectedDbColumn accesses our NumberFormatter which locks the solar mutex (as it doesn't have // an own one). To prevent deadlocks with other threads which may request a property from us in an @@ -653,7 +653,7 @@ void OFormattedModel::onDisconnectedDbColumn() m_aNullDate = DBTypeConversion::getStandardDate(); } -void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) { OEditBaseModel::write(_rxOutStream); _rxOutStream->writeShort(0x0003); @@ -685,7 +685,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) OUString sFormatDescription; LanguageType eFormatLanguage = LANGUAGE_DONTKNOW; static const char s_aLocaleProp[] = "Locale"; - Reference<com::sun::star::beans::XPropertySet> xFormat = xFormats->getByKey(nKey); + Reference<css::beans::XPropertySet> xFormat = xFormats->getByKey(nKey); if (hasProperty(s_aLocaleProp, xFormat)) { Any aLocale = xFormat->getPropertyValue(s_aLocaleProp); @@ -740,7 +740,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) } } -void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) { OEditBaseModel::read(_rxInStream); sal_uInt16 nVersion = _rxInStream->readShort(); @@ -1044,9 +1044,9 @@ void OFormattedModel::resetNoBroadcast() } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OFormattedControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OFormattedControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OFormattedControl(component)); } diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index 84132df1f478..f2f33bc526fd 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -38,9 +38,9 @@ class OFormattedModel // i.e. I just passed on the attributes of the field to which I am bound // (only valid if loaded) - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> m_xOriginalFormatter; - ::com::sun::star::util::Date m_aNullDate; - ::com::sun::star::uno::Any m_aSaveValue; + css::uno::Reference< css::util::XNumberFormatsSupplier> m_xOriginalFormatter; + css::util::Date m_aNullDate; + css::uno::Any m_aSaveValue; sal_Int32 m_nFieldType; sal_Int16 m_nKeyType; @@ -48,9 +48,9 @@ class OFormattedModel m_bNumeric : 1; // analogous for the TreatAsNumeric-property protected: - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> calcDefaultFormatsSupplier() const; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> calcFormFormatsSupplier() const; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> calcFormatsSupplier() const; + css::uno::Reference< css::util::XNumberFormatsSupplier> calcDefaultFormatsSupplier() const; + css::uno::Reference< css::util::XNumberFormatsSupplier> calcFormFormatsSupplier() const; + css::uno::Reference< css::util::XNumberFormatsSupplier> calcFormatsSupplier() const; DECLARE_DEFAULT_LEAF_XTOR( OFormattedModel ); @@ -61,10 +61,10 @@ class OFormattedModel DECLARE_UNO3_AGG_DEFAULTS( OFormattedModel, OEditBaseModel ) // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; // XAggregation - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; @@ -77,37 +77,37 @@ class OFormattedModel virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // XPersistObject - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, - sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::lang::IllegalArgumentException) SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, + sal_Int32 nHandle, const css::uno::Any& rValue ) + throw(css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) SAL_OVERRIDE; // XLoadListener - virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState void setPropertyToDefaultByHandle(sal_Int32 nHandle) SAL_OVERRIDE; - ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const SAL_OVERRIDE; + css::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const SAL_OVERRIDE; - void SAL_CALL setPropertyToDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setPropertyToDefault(const OUString& aPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; virtual void describeAggregateProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rAggregateProps ) const SAL_OVERRIDE; // XPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // prevent method hiding using OEditBaseModel::disposing; @@ -118,23 +118,23 @@ class OFormattedModel // as we have an own version handling for persistence // OBoundControlModel overridables - virtual ::com::sun::star::uno::Any + virtual css::uno::Any translateDbColumnToControlValue( ) SAL_OVERRIDE; virtual bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > + virtual css::uno::Sequence< css::uno::Type > getSupportedBindingTypes() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateExternalValueToControlValue( const ::com::sun::star::uno::Any& _rExternalValue ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any + virtual css::uno::Any + translateExternalValueToControlValue( const css::uno::Any& _rExternalValue ) const SAL_OVERRIDE; + virtual css::uno::Any translateControlValueToExternalValue( ) const SAL_OVERRIDE; virtual void onConnectedExternalValue( ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any + virtual css::uno::Any getDefaultForReset() const SAL_OVERRIDE; virtual void resetNoBroadcast() SAL_OVERRIDE; - virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ) SAL_OVERRIDE; + virtual void onConnectedDbColumn( const css::uno::Reference< css::uno::XInterface >& _rxForm ) SAL_OVERRIDE; virtual void onDisconnectedDbColumn() SAL_OVERRIDE; private: @@ -145,37 +145,37 @@ class OFormattedModel void updateFormatterNullDate(); }; - typedef ::cppu::ImplHelper1< ::com::sun::star::awt::XKeyListener> OFormattedControl_BASE; + typedef ::cppu::ImplHelper1< css::awt::XKeyListener> OFormattedControl_BASE; class OFormattedControl : public OBoundControl ,public OFormattedControl_BASE { ImplSVEvent * m_nKeyEvent; public: - OFormattedControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); + OFormattedControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext); virtual ~OFormattedControl(); DECLARE_UNO3_AGG_DEFAULTS(OFormattedControl, OBoundControl) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OFormattedControl"); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XKeyListener - virtual void SAL_CALL keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL keyReleased(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::awt::XKeyListener + virtual void SAL_CALL keyPressed(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL keyReleased(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XControl - virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::awt::XControl + virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // disambiguation using OBoundControl::disposing; diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index 463320c69334..eddaab89de4f 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -48,7 +48,7 @@ OFormattedFieldWrapper::OFormattedFieldWrapper(const Reference<XComponentContext { } -css::uno::Reference<css::uno::XInterface> OFormattedFieldWrapper::createFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, bool bActAsFormatted) +css::uno::Reference<css::uno::XInterface> OFormattedFieldWrapper::createFormattedFieldWrapper(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory, bool bActAsFormatted) { OFormattedFieldWrapper *pRef = new OFormattedFieldWrapper(_rxFactory); @@ -342,9 +342,9 @@ void OFormattedFieldWrapper::ensureAggregate() osl_atomic_decrement(&m_refCount); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OFormattedFieldWrapper_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OFormattedFieldWrapper_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { css::uno::Reference<css::uno::XInterface> inst( OFormattedFieldWrapper::createFormattedFieldWrapper(component, false)); @@ -352,9 +352,9 @@ com_sun_star_form_OFormattedFieldWrapper_get_implementation(::com::sun::star::un return inst.get(); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_forms_OFormattedFieldWrapper_ForcedFormatted_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_forms_OFormattedFieldWrapper_ForcedFormatted_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { css::uno::Reference<css::uno::XInterface> inst( OFormattedFieldWrapper::createFormattedFieldWrapper(component, true)); diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx index 388319dd34c7..5115700ba55a 100644 --- a/forms/source/component/FormattedFieldWrapper.hxx +++ b/forms/source/component/FormattedFieldWrapper.hxx @@ -32,24 +32,24 @@ class OEditModel; //= OFormattedFieldWrapper -typedef ::cppu::WeakAggImplHelper3 < ::com::sun::star::io::XPersistObject - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::util::XCloneable +typedef ::cppu::WeakAggImplHelper3 < css::io::XPersistObject + , css::lang::XServiceInfo + , css::util::XCloneable > OFormattedFieldWrapper_Base; class OFormattedFieldWrapper : public OFormattedFieldWrapper_Base { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext; + css::uno::Reference< css::uno::XComponentContext> m_xContext; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; + css::uno::Reference< css::uno::XAggregation> m_xAggregate; rtl::Reference< OEditModel > m_pEditPart; // if we act as formatted this is used to write the EditModel part - ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject> m_xFormattedPart; + css::uno::Reference< css::io::XPersistObject> m_xFormattedPart; private: - OFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + OFormattedFieldWrapper(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); protected: virtual ~OFormattedFieldWrapper(); @@ -59,24 +59,24 @@ public: // to read and write the FormattedModel part // if bActAsFormatted is false, the state is undetermined until somebody calls // ::read or does anything which requires a living aggregate - static css::uno::Reference<css::uno::XInterface> createFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, bool bActAsFormatted); + static css::uno::Reference<css::uno::XInterface> createFormattedFieldWrapper(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory, bool bActAsFormatted); // UNO DECLARE_UNO3_AGG_DEFAULTS(OFormattedFieldWrapper, OWeakAggObject) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// ensure we're in a defined state, which means a FormattedModel _OR_ an EditModel diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx index b31ab7993222..e2633fbd04cc 100644 --- a/forms/source/component/FormsCollection.hxx +++ b/forms/source/component/FormsCollection.hxx @@ -36,8 +36,8 @@ namespace frm // It can either represent the Context for Forms or be passed a Context. typedef ::cppu::OComponentHelper FormsCollectionComponentBase; -typedef ::cppu::ImplHelper2< ::com::sun::star::form::XForms - ,::com::sun::star::lang::XServiceInfo > OFormsCollection_BASE; +typedef ::cppu::ImplHelper2< css::form::XForms + ,css::lang::XServiceInfo > OFormsCollection_BASE; // else MSVC kills itself on some statements class OFormsCollection @@ -45,63 +45,63 @@ class OFormsCollection ,public OInterfaceContainer ,public OFormsCollection_BASE { - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; css::uno::Reference<css::uno::XInterface> m_xParent; // Parent public: - OFormsCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + OFormsCollection(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); OFormsCollection( const OFormsCollection& _cloneSource ); virtual ~OFormsCollection(); public: DECLARE_UNO3_AGG_DEFAULTS(OFormsCollection, FormsCollectionComponentBase) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; - // ::com::sun::star::container::XChild - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::container::XChild + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // prevent method hiding using OInterfaceContainer::disposing; // inheritance ambiguity - virtual com::sun::star::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OInterfaceContainer::getElementType(); } virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OInterfaceContainer::hasElements(); } - virtual com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& p1) + virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& p1) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OInterfaceContainer::getByName(p1); } - virtual com::sun::star::uno::Sequence<rtl::OUString> SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence<rtl::OUString> SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OInterfaceContainer::getElementNames(); } virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OInterfaceContainer::hasByName(p1); } - virtual void SAL_CALL replaceByName(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) + virtual void SAL_CALL replaceByName(const rtl::OUString& p1, const css::uno::Any& p2) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OInterfaceContainer::replaceByName(p1, p2); } - virtual void SAL_CALL insertByName(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) + virtual void SAL_CALL insertByName(const rtl::OUString& p1, const css::uno::Any& p2) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE @@ -112,16 +112,16 @@ public: { OInterfaceContainer::removeByName(p1); } virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OInterfaceContainer::getCount(); } - virtual com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 p1) + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 p1) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OInterfaceContainer::getByIndex(p1); } - virtual void SAL_CALL replaceByIndex(sal_Int32 p1, const com::sun::star::uno::Any& p2) + virtual void SAL_CALL replaceByIndex(sal_Int32 p1, const css::uno::Any& p2) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OInterfaceContainer::replaceByIndex(p1, p2); } - virtual void SAL_CALL insertByIndex(sal_Int32 p1, const com::sun::star::uno::Any& p2) + virtual void SAL_CALL insertByIndex(sal_Int32 p1, const css::uno::Any& p2) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE @@ -130,12 +130,12 @@ public: throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OInterfaceContainer::removeByIndex(p1); } - virtual com::sun::star::uno::Reference<com::sun::star::container::XEnumeration> SAL_CALL createEnumeration() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Reference<css::container::XEnumeration> SAL_CALL createEnumeration() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OInterfaceContainer::createEnumeration(); } - virtual void SAL_CALL registerScriptEvent(sal_Int32 p1, const com::sun::star::script::ScriptEventDescriptor& p2) + virtual void SAL_CALL registerScriptEvent(sal_Int32 p1, const css::script::ScriptEventDescriptor& p2) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OInterfaceContainer::registerScriptEvent(p1, p2); } - virtual void SAL_CALL registerScriptEvents(sal_Int32 p1, const com::sun::star::uno::Sequence<com::sun::star::script::ScriptEventDescriptor>& p2) + virtual void SAL_CALL registerScriptEvents(sal_Int32 p1, const css::uno::Sequence<css::script::ScriptEventDescriptor>& p2) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OInterfaceContainer::registerScriptEvents(p1, p2); } virtual void SAL_CALL revokeScriptEvent(sal_Int32 p1, const rtl::OUString& p2, const rtl::OUString& p3, const rtl::OUString& p4) @@ -150,32 +150,32 @@ public: virtual void SAL_CALL removeEntry(sal_Int32 p1) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OInterfaceContainer::removeEntry(p1); } - virtual com::sun::star::uno::Sequence<com::sun::star::script::ScriptEventDescriptor> SAL_CALL getScriptEvents(sal_Int32 p1) + virtual css::uno::Sequence<css::script::ScriptEventDescriptor> SAL_CALL getScriptEvents(sal_Int32 p1) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OInterfaceContainer::getScriptEvents(p1); } - virtual void SAL_CALL attach(sal_Int32 p1, const com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& p2, const com::sun::star::uno::Any& p3) + virtual void SAL_CALL attach(sal_Int32 p1, const css::uno::Reference<css::uno::XInterface>& p2, const css::uno::Any& p3) throw (css::lang::IllegalArgumentException, css::lang::ServiceNotRegisteredException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OInterfaceContainer::attach(p1, p2, p3); } - virtual void SAL_CALL detach(sal_Int32 p1, const com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& p2) + virtual void SAL_CALL detach(sal_Int32 p1, const css::uno::Reference<css::uno::XInterface>& p2) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OInterfaceContainer::detach(p1, p2); } - virtual void SAL_CALL addScriptListener(const com::sun::star::uno::Reference<com::sun::star::script::XScriptListener>& p1) + virtual void SAL_CALL addScriptListener(const css::uno::Reference<css::script::XScriptListener>& p1) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OInterfaceContainer::addScriptListener(p1); } - virtual void SAL_CALL removeScriptListener(const com::sun::star::uno::Reference<com::sun::star::script::XScriptListener>& p1) + virtual void SAL_CALL removeScriptListener(const css::uno::Reference<css::script::XScriptListener>& p1) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OInterfaceContainer::removeScriptListener(p1); } virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { FormsCollectionComponentBase::dispose(); } - virtual void SAL_CALL addEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { FormsCollectionComponentBase::addEventListener(p1); } - virtual void SAL_CALL removeEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { FormsCollectionComponentBase::removeEventListener(p1); } - virtual void SAL_CALL addContainerListener(const com::sun::star::uno::Reference<com::sun::star::container::XContainerListener>& p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addContainerListener(const css::uno::Reference<css::container::XContainerListener>& p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OInterfaceContainer::addContainerListener(p1); } - virtual void SAL_CALL removeContainerListener(const com::sun::star::uno::Reference<com::sun::star::container::XContainerListener>& p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeContainerListener(const css::uno::Reference<css::container::XContainerListener>& p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OInterfaceContainer::removeContainerListener(p1); } }; diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index e13f36bff017..1f128f18acfb 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -314,7 +314,7 @@ void OGridControlModel::removeSelectionChangeListener(const Reference< XSelectio } // XGridColumnFactory -Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType) throw ( :: css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; const Sequence< OUString >& rColumnTypes = frm::getColumnTypes(); @@ -341,13 +341,13 @@ Reference<XPropertySet> OGridControlModel::createColumnById(sal_Int32 nTypeId) } return xReturn; } -css::uno::Sequence<OUString> SAL_CALL OGridControlModel::getColumnTypes() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OGridControlModel::getColumnTypes() throw ( css::uno::RuntimeException, std::exception) { return frm::getColumnTypes(); } // XReset -void SAL_CALL OGridControlModel::reset() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OGridControlModel::reset() throw ( css::uno::RuntimeException, std::exception) { ::cppu::OInterfaceIteratorHelper aIter(m_aResetListeners); EventObject aEvt(static_cast<XWeak*>(this)); @@ -360,11 +360,11 @@ void SAL_CALL OGridControlModel::reset() throw ( ::com::sun::star::uno::RuntimeE m_aResetListeners.notifyEach( &XResetListener::resetted, aEvt ); } } -void SAL_CALL OGridControlModel::addResetListener(const Reference<XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OGridControlModel::addResetListener(const Reference<XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) { m_aResetListeners.addInterface(_rxListener); } -void SAL_CALL OGridControlModel::removeResetListener(const Reference<XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OGridControlModel::removeResetListener(const Reference<XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) { m_aResetListeners.removeInterface(_rxListener); } @@ -575,7 +575,7 @@ sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any& } return bModified; } -void OGridControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( ::com::sun::star::uno::Exception, std::exception) +void OGridControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( css::uno::Exception, std::exception) { switch (nHandle) { @@ -767,12 +767,12 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO } // XPersistObject -OUString SAL_CALL OGridControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OGridControlModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_GRID); // old (non-sun) name for compatibility! } -void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) { OControlModel::write(_rxOutStream); Reference<XMarkableStream> xMark(_rxOutStream, UNO_QUERY); @@ -864,7 +864,7 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream _rxOutStream->writeLong(getINT32(m_aBackgroundColor)); } -void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; OControlModel::read(_rxInStream); diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index 352154a7bf98..3242fdd4a47e 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -49,13 +49,13 @@ class OGridColumn; // OGridControlModel -typedef ::cppu::ImplHelper7 < ::com::sun::star::awt::XControlModel - , ::com::sun::star::form::XGridColumnFactory - , ::com::sun::star::form::XReset - , ::com::sun::star::view::XSelectionSupplier - , ::com::sun::star::sdb::XSQLErrorListener - , ::com::sun::star::sdb::XRowSetSupplier - , ::com::sun::star::sdb::XRowSetChangeBroadcaster +typedef ::cppu::ImplHelper7 < css::awt::XControlModel + , css::form::XGridColumnFactory + , css::form::XReset + , css::view::XSelectionSupplier + , css::sdb::XSQLErrorListener + , css::sdb::XRowSetSupplier + , css::sdb::XRowSetChangeBroadcaster > OGridControlModel_BASE; class OGridControlModel :public OControlModel @@ -69,16 +69,16 @@ class OGridControlModel :public OControlModel m_aRowSetChangeListeners; // [properties] - ::com::sun::star::uno::Any m_aRowHeight; // Row height - ::com::sun::star::uno::Any m_aTabStop; - ::com::sun::star::uno::Any m_aBackgroundColor; - ::com::sun::star::uno::Any m_aCursorColor; // transient - ::com::sun::star::uno::Any m_aBorderColor; + css::uno::Any m_aRowHeight; // Row height + css::uno::Any m_aTabStop; + css::uno::Any m_aBackgroundColor; + css::uno::Any m_aCursorColor; // transient + css::uno::Any m_aBorderColor; OUString m_aDefaultControl; OUString m_sHelpText; // [properties] - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSelection; + css::uno::Reference< css::beans::XPropertySet > m_xSelection; // [properties] OUString m_sHelpURL; // URL @@ -102,71 +102,71 @@ public: // UNO Binding DECLARE_UNO3_AGG_DEFAULTS(OGridControlModel, OControlModel) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChild - virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OGridControlModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XReset - virtual void SAL_CALL reset() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reset() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSelectionSupplier - virtual sal_Bool SAL_CALL select(const ::com::sun::star::uno::Any& aElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL select(const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getSelection() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XGridColumnFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> SAL_CALL createColumn(const OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getColumnTypes() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySet> SAL_CALL createColumn(const OUString& ColumnType) throw ( :: css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getColumnTypes() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, - sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::lang::IllegalArgumentException) SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, + sal_Int32 nHandle, const css::uno::Any& rValue ) + throw(css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) SAL_OVERRIDE; // XPropertyState - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; // XSQLErrorListener - virtual void SAL_CALL errorOccured( const ::com::sun::star::sdb::SQLErrorEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL errorOccured( const css::sdb::SQLErrorEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRowSetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > SAL_CALL getRowSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setRowSet( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xDataSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XRowSet > SAL_CALL getRowSet( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRowSet( const css::uno::Reference< css::sdbc::XRowSet >& xDataSource ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRowSetChangeBroadcaster - virtual void SAL_CALL addRowSetChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetChangeListener >& i_Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeRowSetChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetChangeListener >& i_Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addRowSetChangeListener( const css::uno::Reference< css::sdb::XRowSetChangeListener >& i_Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeRowSetChangeListener( const css::uno::Reference< css::sdb::XRowSetChangeListener >& i_Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; // prevent method hiding @@ -178,11 +178,11 @@ protected: protected: virtual void approveNewElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject, + const css::uno::Reference< css::beans::XPropertySet >& _rxObject, ElementDescription* _pElement ) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createColumnById(sal_Int32 nTypeId) const; + css::uno::Reference< css::beans::XPropertySet> createColumnById(sal_Int32 nTypeId) const; static OGridColumn* getColumnImplementation(const css::uno::Reference<css::uno::XInterface>& _rxIFace); @@ -192,12 +192,12 @@ protected: virtual void implRemoved(const css::uno::Reference<css::uno::XInterface>& _rxObject) SAL_OVERRIDE; virtual void implInserted( const ElementDescription* _pElement ) SAL_OVERRIDE; virtual void impl_replacedElement( - const ::com::sun::star::container::ContainerEvent& _rEvent, + const css::container::ContainerEvent& _rEvent, ::osl::ClearableMutexGuard& _rInstanceLock ) SAL_OVERRIDE; - void gotColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxColumn); - void lostColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxColumn); + void gotColumn(const css::uno::Reference< css::uno::XInterface >& _rxColumn); + void lostColumn(const css::uno::Reference< css::uno::XInterface >& _rxColumn); void cloneColumns( const OGridControlModel* _pOriginalContainer ); }; diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index e0991979a616..6408e216cb94 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -141,17 +141,17 @@ css::uno::Sequence<OUString> SAL_CALL OGroupBoxControl::getSupportedServiceNames } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OGroupBoxModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OGroupBoxModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OGroupBoxModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OGroupBoxControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OGroupBoxControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OGroupBoxControl(component)); } diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx index 1bad75a4cbf8..b3684df5ee59 100644 --- a/forms/source/component/GroupBox.hxx +++ b/forms/source/component/GroupBox.hxx @@ -37,18 +37,18 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OGroupBoxModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeAggregateProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rAggregateProps ) const SAL_OVERRIDE; protected: @@ -61,14 +61,14 @@ protected: class OGroupBoxControl : public OControl { public: - OGroupBoxControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + OGroupBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); // XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OGroupBoxControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index b8eedbd82f66..c255ede867da 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -270,7 +270,7 @@ void OGroupManager::removeFromGroupMap(const OUString& _sGroupName,const Referen _xSet->removePropertyChangeListener( PROPERTY_TABINDEX, this ); } -void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) throw ( css::uno::RuntimeException, std::exception) { Reference<XPropertySet> xSet(evt.Source, UNO_QUERY); @@ -301,7 +301,7 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro } // XContainerListener -void SAL_CALL OGroupManager::elementInserted(const ContainerEvent& Event) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OGroupManager::elementInserted(const ContainerEvent& Event) throw ( css::uno::RuntimeException, std::exception) { Reference< XPropertySet > xProps; Event.Element >>= xProps; @@ -309,7 +309,7 @@ void SAL_CALL OGroupManager::elementInserted(const ContainerEvent& Event) throw InsertElement( xProps ); } -void SAL_CALL OGroupManager::elementRemoved(const ContainerEvent& Event) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OGroupManager::elementRemoved(const ContainerEvent& Event) throw ( css::uno::RuntimeException, std::exception) { Reference<XPropertySet> xProps; Event.Element >>= xProps; @@ -317,7 +317,7 @@ void SAL_CALL OGroupManager::elementRemoved(const ContainerEvent& Event) throw ( RemoveElement( xProps ); } -void SAL_CALL OGroupManager::elementReplaced(const ContainerEvent& Event) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OGroupManager::elementReplaced(const ContainerEvent& Event) throw ( css::uno::RuntimeException, std::exception) { Reference<XPropertySet> xProps; Event.ReplacedElement >>= xProps; @@ -425,7 +425,7 @@ void OGroupManager::RemoveElement( const Reference<XPropertySet>& xSet ) removeFromGroupMap(sGroupName,xSet); } -OUString OGroupManager::GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent ) +OUString OGroupManager::GetGroupName( css::uno::Reference< css::beans::XPropertySet> xComponent ) { if (!xComponent.is()) return OUString(); diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx index bd4aeb3fa55f..42fc607a6961 100644 --- a/forms/source/component/GroupManager.hxx +++ b/forms/source/component/GroupManager.hxx @@ -89,22 +89,22 @@ namespace frm class OGroupComp { OUString m_aName; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xComponent; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> m_xControlModel; + css::uno::Reference< css::beans::XPropertySet> m_xComponent; + css::uno::Reference< css::awt::XControlModel> m_xControlModel; sal_Int32 m_nPos; sal_Int16 m_nTabIndex; friend class OGroupCompLess; public: - OGroupComp(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& rxElement, sal_Int32 nInsertPos ); + OGroupComp(const css::uno::Reference< css::beans::XPropertySet>& rxElement, sal_Int32 nInsertPos ); OGroupComp(const OGroupComp& _rSource); OGroupComp(); bool operator==( const OGroupComp& rComp ) const; - inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& GetComponent() const { return m_xComponent; } - inline const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& GetControlModel() const { return m_xControlModel; } + inline const css::uno::Reference< css::beans::XPropertySet>& GetComponent() const { return m_xComponent; } + inline const css::uno::Reference< css::awt::XControlModel>& GetControlModel() const { return m_xControlModel; } sal_Int32 GetPos() const { return m_nPos; } sal_Int16 GetTabIndex() const { return m_nTabIndex; } @@ -116,18 +116,18 @@ typedef std::vector<OGroupComp> OGroupCompArr; class OGroupComp; class OGroupCompAcc { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xComponent; + css::uno::Reference< css::beans::XPropertySet> m_xComponent; OGroupComp m_aGroupComp; friend class OGroupCompAccLess; public: - OGroupCompAcc(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& rxElement, const OGroupComp& _rGroupComp ); + OGroupCompAcc(const css::uno::Reference< css::beans::XPropertySet>& rxElement, const OGroupComp& _rGroupComp ); bool operator==( const OGroupCompAcc& rCompAcc ) const; - inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& GetComponent() const { return m_xComponent; } + inline const css::uno::Reference< css::beans::XPropertySet>& GetComponent() const { return m_xComponent; } const OGroupComp& GetGroupComponent() const { return m_aGroupComp; } }; @@ -148,12 +148,12 @@ public: bool operator==( const OGroup& rGroup ) const; OUString GetGroupName() const { return m_aGroupName; } - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> > GetControlModels() const; + css::uno::Sequence< css::uno::Reference< css::awt::XControlModel> > GetControlModels() const; - void InsertComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& rxElement ); - void RemoveComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& rxElement ); + void InsertComponent( const css::uno::Reference< css::beans::XPropertySet>& rxElement ); + void RemoveComponent( const css::uno::Reference< css::beans::XPropertySet>& rxElement ); sal_uInt16 Count() const { return sal::static_int_cast< sal_uInt16 >(m_aCompArray.size()); } - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& GetObject( sal_uInt16 nP ) const + const css::uno::Reference< css::beans::XPropertySet>& GetObject( sal_uInt16 nP ) const { return m_aCompArray[nP].GetComponent(); } }; @@ -161,42 +161,42 @@ typedef std::map<OUString, OGroup> OGroupArr; typedef std::vector<OGroupArr::iterator> OActiveGroups; -class OGroupManager : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::container::XContainerListener> +class OGroupManager : public ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener, css::container::XContainerListener> { OGroup* m_pCompGroup; // Sort all Components by TabIndices OGroupArr m_aGroupArr; // Sort all Components by group OActiveGroups m_aActiveGroupMap; // This map contains all indices of all groups with more than 1 element - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > + css::uno::Reference< css::container::XContainer > m_xContainer; // Helper functions - void InsertElement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& rxElement ); - void RemoveElement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& rxElement ); - void removeFromGroupMap(const OUString& _sGroupName,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSet); + void InsertElement( const css::uno::Reference< css::beans::XPropertySet>& rxElement ); + void RemoveElement( const css::uno::Reference< css::beans::XPropertySet>& rxElement ); + void removeFromGroupMap(const OUString& _sGroupName,const css::uno::Reference< css::beans::XPropertySet>& _xSet); public: - OGroupManager(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _rxContainer); + OGroupManager(const css::uno::Reference< css::container::XContainer >& _rxContainer); virtual ~OGroupManager(); -// ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; +// css::lang::XEventListener + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; -// ::com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; +// css::beans::XPropertyChangeListener + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; -// ::com::sun::star::container::XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& _rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& _rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& _rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; +// css::container::XContainerListener + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& _rEvent) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& _rEvent) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& _rEvent) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Other functions sal_Int32 getGroupCount(); - void getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup, OUString& Name); - void getGroupByName(const OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> > getControlModels(); + void getGroup(sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel> >& _rGroup, OUString& Name); + void getGroupByName(const OUString& Name, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel> >& _rGroup); + css::uno::Sequence< css::uno::Reference< css::awt::XControlModel> > getControlModels(); - static OUString GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent ); + static OUString GetGroupName( css::uno::Reference< css::beans::XPropertySet> xComponent ); }; diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index 78a0ea2b2cd2..2816bfdbb12e 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -74,7 +74,7 @@ void OHiddenModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const } -void OHiddenModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (com::sun::star::uno::Exception, std::exception) +void OHiddenModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (css::uno::Exception, std::exception) { switch (_nHandle) { @@ -118,7 +118,7 @@ void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) cons // XServiceInfo -css::uno::Sequence<OUString> SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OHiddenModel::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{ FRM_SUN_COMPONENT_HIDDENCONTROL, FRM_SUN_FORMCOMPONENT, @@ -163,9 +163,9 @@ void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStrea } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OHiddenModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OHiddenModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OHiddenModel(component)); } diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx index 223e31d08289..6f79d10a012d 100644 --- a/forms/source/component/Hidden.hxx +++ b/forms/source/component/Hidden.hxx @@ -35,30 +35,30 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OHiddenModel ); // OPropertySetHelper - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) + throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; // XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OHiddenModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; // prevent method hiding diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 5e02e96c4100..1bde517002f4 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -83,12 +83,12 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) END_DESCRIBE_PROPERTIES(); } -OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +OUString OImageButtonModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_IMAGEBUTTON); // old (non-sun) name for compatibility ! } -void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) { OControlModel::write(_rxOutStream); @@ -102,7 +102,7 @@ void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream writeHelpTextCompatibly(_rxOutStream); } -void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) { OControlModel::read(_rxInStream); @@ -185,7 +185,7 @@ Any SAL_CALL OImageButtonControl::queryAggregation(const Type& _rType) throw (Ru return aReturn; } -void OImageButtonControl::mousePressed(const awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OImageButtonControl::mousePressed(const awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -222,16 +222,16 @@ void SAL_CALL OImageButtonControl::mouseExited(const awt::MouseEvent& /*e*/) thr } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OImageButtonModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OImageButtonModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OImageButtonModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OImageButtonControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OImageButtonControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OImageButtonControl(component)); } diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx index 360795db3374..671e256ff8f7 100644 --- a/forms/source/component/ImageButton.hxx +++ b/forms/source/component/ImageButton.hxx @@ -33,37 +33,37 @@ class OImageButtonModel public: DECLARE_DEFAULT_LEAF_XTOR( OImageButtonModel ); -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OImageButtonModel"); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; -// ::com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; +// css::io::XPersistObject + virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; protected: virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -typedef ::cppu::ImplHelper1< ::com::sun::star::awt::XMouseListener> OImageButtonControl_BASE; +typedef ::cppu::ImplHelper1< css::awt::XMouseListener> OImageButtonControl_BASE; class OImageButtonControl : public OClickableImageBaseControl, public OImageButtonControl_BASE { protected: // UNO Binding - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: - OImageButtonControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + OImageButtonControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); // XServiceInfo OUString SAL_CALL getImplementationName() @@ -74,17 +74,17 @@ public: // UNO Binding DECLARE_UNO3_AGG_DEFAULTS(OImageButtonControl, OClickableImageBaseControl) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OControl::disposing(_rSource); } // XMouseListener - virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // prevent method hiding using OClickableImageBaseControl::disposing; diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index bb7384779734..f55d01023e19 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -242,7 +242,7 @@ void OImageControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) co } -void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception) +void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( css::uno::Exception, std::exception) { switch (nHandle) { @@ -345,13 +345,13 @@ void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [ } -OUString OImageControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +OUString OImageControlModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_IMAGECONTROL); // old (non-sun) name for compatibility ! } -void OImageControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OImageControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) { // Base class OBoundControlModel::write(_rxOutStream); @@ -365,7 +365,7 @@ void OImageControlModel::write(const Reference<XObjectOutputStream>& _rxOutStrea } -void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) { OBoundControlModel::read(_rxInStream); @@ -871,7 +871,7 @@ bool OImageControlControl::impl_isEmptyGraphics_nothrow() const // MouseListener -void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void OImageControlControl::mousePressed(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -986,16 +986,16 @@ void SAL_CALL OImageControlControl::mouseExited(const awt::MouseEvent& /*e*/) th } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OImageControlModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OImageControlModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OImageControlModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OImageControlControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OImageControlControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OImageControlControl(component)); } diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index bfe2ddd3eff8..df17da40be49 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -39,41 +39,41 @@ namespace frm // OImageControlModel -typedef ::cppu::ImplHelper2 < ::com::sun::star::form::XImageProducerSupplier - , ::com::sun::star::awt::XImageProducer +typedef ::cppu::ImplHelper2 < css::form::XImageProducerSupplier + , css::awt::XImageProducer > OImageControlModel_Base; class OImageControlModel :public OImageControlModel_Base ,public OBoundControlModel { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> m_xImageProducer; - ImageProducer* m_pImageProducer; - bool m_bExternalGraphic; - bool m_bReadOnly; - OUString m_sImageURL; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > - m_xGraphicObject; - OUString m_sDocumentURL; + css::uno::Reference< css::awt::XImageProducer> m_xImageProducer; + ImageProducer* m_pImageProducer; + bool m_bExternalGraphic; + bool m_bReadOnly; + OUString m_sImageURL; + css::uno::Reference< css::graphic::XGraphicObject > + m_xGraphicObject; + OUString m_sDocumentURL; protected: // UNO Anbindung - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; inline ImageProducer* GetImageProducer() { return m_pImageProducer; } public: DECLARE_DEFAULT_LEAF_XTOR( OImageControlModel ); - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) + throw(css::lang::IllegalArgumentException) SAL_OVERRIDE; // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OImageControlModel, OBoundControlModel) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo OUString SAL_CALL getImplementationName() @@ -86,24 +86,24 @@ public: virtual void SAL_CALL disposing() SAL_OVERRIDE; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XImageProducerSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> SAL_CALL getImageProducer() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XImageProducer> SAL_CALL getImageProducer() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XImageProducer - virtual void SAL_CALL addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL startProduction( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startProduction( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeAggregateProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rAggregateProps ) const SAL_OVERRIDE; virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; // prevent method hiding @@ -112,15 +112,13 @@ public: protected: // OBoundControlModel overridables - virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ) SAL_OVERRIDE; + virtual void onConnectedDbColumn( const css::uno::Reference< css::uno::XInterface >& _rxForm ) SAL_OVERRIDE; virtual void onDisconnectedDbColumn() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateDbColumnToControlValue( ) SAL_OVERRIDE; + virtual css::uno::Any translateDbColumnToControlValue( ) SAL_OVERRIDE; virtual bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - getControlValue( ) const SAL_OVERRIDE; - virtual void doSetControlValue( const ::com::sun::star::uno::Any& _rValue ) SAL_OVERRIDE; + virtual css::uno::Any getControlValue( ) const SAL_OVERRIDE; + virtual void doSetControlValue( const css::uno::Any& _rValue ) SAL_OVERRIDE; virtual bool approveDbColumnType(sal_Int32 _nColumnType) SAL_OVERRIDE; @@ -145,8 +143,8 @@ protected: DECL_LINK_TYPED( OnImageImportDone, ::Graphic*, void ); }; -typedef ::cppu::ImplHelper2 < ::com::sun::star::awt::XMouseListener - , ::com::sun::star::util::XModifyBroadcaster +typedef ::cppu::ImplHelper2 < css::awt::XMouseListener + , css::util::XModifyBroadcaster > OImageControlControl_Base; class OImageControlControl : public OBoundControl , public OImageControlControl_Base @@ -155,17 +153,17 @@ private: ::cppu::OInterfaceContainerHelper m_aModifyListeners; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: - OImageControlControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + OImageControlControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); // UNO DECLARE_UNO3_AGG_DEFAULTS( OImageControlControl, OBoundControl ) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo OUString SAL_CALL getImplementationName() @@ -175,14 +173,14 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // XMouseListener - virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index a48ec94352f2..24fe16fc18be 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -290,7 +290,7 @@ namespace frm } - void OListBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (com::sun::star::uno::Exception, std::exception) + void OListBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (css::uno::Exception, std::exception) { switch (_nHandle) { @@ -1630,7 +1630,7 @@ namespace frm Any OListBoxModel::getCurrentFormComponentValue() const { { - Reference< com::sun::star::form::validation::XValidator > vtor (const_cast<OListBoxModel*>(this)->getValidator()); + Reference< css::form::validation::XValidator > vtor (const_cast<OListBoxModel*>(this)->getValidator()); Reference< XValueBinding > extBinding (const_cast<OListBoxModel*>(this)->getValueBinding()); if ( vtor.is() && vtor == extBinding ) return translateControlValueToExternalValue(); @@ -2140,16 +2140,16 @@ namespace frm } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OListBoxModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OListBoxModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OListBoxModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OListBoxControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OListBoxControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OListBoxControl(component)); } diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index 8740da1394a5..7776d4c2153b 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -106,13 +106,13 @@ class OListBoxModel :public OBoundControlModel ::connectivity::ORowSetValue m_aSaveValue; // <properties> - ::com::sun::star::form::ListSourceType m_eListSourceType; // type der list source - ::com::sun::star::uno::Any m_aBoundColumn; + css::form::ListSourceType m_eListSourceType; // type der list source + css::uno::Any m_aBoundColumn; ValueList m_aListSourceValues; ValueList m_aBoundValues; // do not write directly; use setBoundValues() mutable ValueList m_aConvertedBoundValues; mutable sal_Int32 m_nConvertedBoundValuesType; - ::com::sun::star::uno::Sequence<sal_Int16> m_aDefaultSelectSeq; // DefaultSelected + css::uno::Sequence<sal_Int16> m_aDefaultSelectSeq; // DefaultSelected // </properties> mutable sal_Int16 m_nNULLPos; // position of the NULL value in our list @@ -121,7 +121,7 @@ class OListBoxModel :public OBoundControlModel private: ::connectivity::ORowSetValue getFirstSelectedValue() const; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: DECLARE_DEFAULT_LEAF_XTOR( OListBoxModel ); @@ -131,50 +131,50 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OListBoxModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OListBoxModel, OBoundControlModel) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; // OPropertySetHelper - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) + throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; protected: static const ::connectivity::ORowSetValue s_aEmptyValue; static const ::connectivity::ORowSetValue s_aEmptyStringValue; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; virtual void describeAggregateProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rAggregateProps ) const SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertyChangeListener - virtual void _propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& _rEvt ) throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + virtual void _propertyChanged( const css::beans::PropertyChangeEvent& _rEvt ) throw ( css::uno::RuntimeException ) SAL_OVERRIDE; // prevent method hiding using OBoundControlModel::getFastPropertyValue; @@ -182,27 +182,21 @@ protected: protected: // OBoundControlModel overridables - virtual ::com::sun::star::uno::Any - translateDbColumnToControlValue( ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > + virtual css::uno::Any translateDbColumnToControlValue( ) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > getSupportedBindingTypes() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateExternalValueToControlValue( const ::com::sun::star::uno::Any& _rExternalValue ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateControlValueToExternalValue( ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateControlValueToValidatableValue( ) const SAL_OVERRIDE; + virtual css::uno::Any translateExternalValueToControlValue( const css::uno::Any& _rExternalValue ) const SAL_OVERRIDE; + virtual css::uno::Any translateControlValueToExternalValue( ) const SAL_OVERRIDE; + virtual css::uno::Any translateControlValueToValidatableValue( ) const SAL_OVERRIDE; virtual bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE; - virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ) SAL_OVERRIDE; + virtual void onConnectedDbColumn( const css::uno::Reference< css::uno::XInterface >& _rxForm ) SAL_OVERRIDE; virtual void onDisconnectedDbColumn() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - getDefaultForReset() const SAL_OVERRIDE; + virtual css::uno::Any getDefaultForReset() const SAL_OVERRIDE; virtual void resetNoBroadcast() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - getCurrentFormComponentValue() const SAL_OVERRIDE; + virtual css::uno::Any getCurrentFormComponentValue() const SAL_OVERRIDE; // OEntryListHelper overridables virtual void stringItemListChanged( ControlModelLock& _rInstanceLock ) SAL_OVERRIDE; @@ -214,12 +208,12 @@ protected: virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; void init(); - ::com::sun::star::uno::Any getCurrentSingleValue() const; - ::com::sun::star::uno::Any getCurrentMultiValue() const; - ::com::sun::star::uno::Sequence< sal_Int16 > translateBindingValuesToControlValue( - const ::com::sun::star::uno::Sequence< const ::com::sun::star::uno::Any > &i_aValues) + css::uno::Any getCurrentSingleValue() const; + css::uno::Any getCurrentMultiValue() const; + css::uno::Sequence< sal_Int16 > translateBindingValuesToControlValue( + const css::uno::Sequence< const css::uno::Any > &i_aValues) const; - ::com::sun::star::uno::Sequence< sal_Int16 > translateDbValueToControlValue( + css::uno::Sequence< sal_Int16 > translateDbValueToControlValue( const ::connectivity::ORowSetValue &aValue) const; @@ -241,16 +235,16 @@ private: void convertBoundValues(sal_Int32 nType) const; - bool impl_hasBoundComponent() const { return m_nBoundColumnType != ::com::sun::star::sdbc::DataType::SQLNULL; } + bool impl_hasBoundComponent() const { return m_nBoundColumnType != css::sdbc::DataType::SQLNULL; } }; //= OListBoxControl -typedef ::cppu::ImplHelper4 < ::com::sun::star::awt::XFocusListener - , ::com::sun::star::awt::XItemListener - , ::com::sun::star::awt::XListBox - , ::com::sun::star::form::XChangeBroadcaster +typedef ::cppu::ImplHelper4 < css::awt::XFocusListener + , css::awt::XItemListener + , css::awt::XListBox + , css::form::XChangeBroadcaster > OListBoxControl_BASE; class OListBoxControl :public OBoundControl @@ -261,10 +255,10 @@ private: ::cppu::OInterfaceContainerHelper m_aChangeListeners; ::cppu::OInterfaceContainerHelper m_aItemListeners; - ::com::sun::star::uno::Any m_aCurrentSelection; + css::uno::Any m_aCurrentSelection; Idle m_aChangeIdle; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XListBox > + css::uno::Reference< css::awt::XListBox > m_xAggregateListBox; ::rtl::Reference< ::comphelper::AsyncEventNotifier > @@ -272,63 +266,63 @@ private: protected: // UNO Anbindung - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: - OListBoxControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + OListBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); virtual ~OListBoxControl(); // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OListBoxControl, OBoundControl) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OListBoxControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChangeBroadcaster - virtual void SAL_CALL addChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFocusListener - virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& _rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& _rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL focusGained(const css::awt::FocusEvent& _rEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL focusLost(const css::awt::FocusEvent& _rEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XItemListener - virtual void SAL_CALL itemStateChanged(const ::com::sun::star::awt::ItemEvent& _rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL itemStateChanged(const css::awt::ItemEvent& _rEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; // XListBox - virtual void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int16 SAL_CALL getItemCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getItem( ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int16 SAL_CALL getSelectedItemPos( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getSelectedItem( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL selectItemPos( ::sal_Int16 nPos, sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL selectItemsPos( const ::com::sun::star::uno::Sequence< ::sal_Int16 >& aPositions, sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isMutipleMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int16 SAL_CALL getDropDownLineCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 nLines ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL makeVisible( ::sal_Int16 nEntry ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL getItemCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getItem( ::sal_Int16 nPos ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getItems( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL getSelectedItemPos( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSelectedItem( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL selectItemPos( ::sal_Int16 nPos, sal_Bool bSelect ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL selectItemsPos( const css::uno::Sequence< ::sal_Int16 >& aPositions, sal_Bool bSelect ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isMutipleMode( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL getDropDownLineCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 nLines ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL makeVisible( ::sal_Int16 nEntry ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // IEventProcessor diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index 23e6e2e160d4..66e5ba281ca3 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -129,7 +129,7 @@ void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) con } -OUString SAL_CALL ONumericModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL ONumericModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_NUMERICFIELD); // old (non-sun) name for compatibility ! } @@ -187,16 +187,16 @@ void ONumericModel::resetNoBroadcast() } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_ONumericModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_ONumericModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::ONumericModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_ONumericControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_ONumericControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::ONumericControl(component)); } diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx index ad9e6fffb1f4..ed9d724eaa0e 100644 --- a/forms/source/component/Numeric.hxx +++ b/forms/source/component/Numeric.hxx @@ -30,35 +30,35 @@ class ONumericModel :public OEditBaseModel { private: - ::com::sun::star::uno::Any m_aSaveValue; + css::uno::Any m_aSaveValue; protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: DECLARE_DEFAULT_LEAF_XTOR( ONumericModel ); - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.ONumericModel"); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::io::XPersistObject + virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; protected: // OBoundControlModel overridables - virtual ::com::sun::star::uno::Any + virtual css::uno::Any translateDbColumnToControlValue( ) SAL_OVERRIDE; virtual bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any + virtual css::uno::Any getDefaultForReset() const SAL_OVERRIDE; virtual void resetNoBroadcast() SAL_OVERRIDE; @@ -69,12 +69,12 @@ protected: class ONumericControl: public OBoundControl { protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: - ONumericControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + ONumericControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.ONumericControl"); } diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index e4793a0754d5..5c21d7ee9efc 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -123,7 +123,7 @@ void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) con } -OUString SAL_CALL OPatternModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OPatternModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_PATTERNFIELD); // old (non-sun) name for compatibility ! } @@ -224,16 +224,16 @@ void OPatternModel::resetNoBroadcast() } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OPatternModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OPatternModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OPatternModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OPatternControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OPatternControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OPatternControl(component)); } diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx index a066f45bfc64..97d68100e6bf 100644 --- a/forms/source/component/Pattern.hxx +++ b/forms/source/component/Pattern.hxx @@ -34,41 +34,39 @@ class OPatternModel :public OEditBaseModel { private: - ::com::sun::star::uno::Any m_aLastKnownValue; + css::uno::Any m_aLastKnownValue; ::std::unique_ptr< ::dbtools::FormattedColumnValue > m_pFormattedValue; protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: DECLARE_DEFAULT_LEAF_XTOR( OPatternModel ); - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OPatternModel"); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::io::XPersistObject + virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; protected: // OBoundControlModel overridables - virtual ::com::sun::star::uno::Any - translateDbColumnToControlValue( ) SAL_OVERRIDE; + virtual css::uno::Any translateDbColumnToControlValue( ) SAL_OVERRIDE; virtual bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE; - virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ) SAL_OVERRIDE; + virtual void onConnectedDbColumn( const css::uno::Reference< css::uno::XInterface >& _rxForm ) SAL_OVERRIDE; virtual void onDisconnectedDbColumn() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - getDefaultForReset() const SAL_OVERRIDE; + virtual css::uno::Any getDefaultForReset() const SAL_OVERRIDE; virtual void resetNoBroadcast() SAL_OVERRIDE; protected: @@ -78,12 +76,12 @@ protected: class OPatternControl: public OBoundControl { protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: - OPatternControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + OPatternControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OPatternControl"); } diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 990100f7209d..6dbdd939842f 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -403,16 +403,16 @@ bool ORadioButtonModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_ORadioButtonModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_ORadioButtonModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::ORadioButtonModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_ORadioButtonControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_ORadioButtonControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::ORadioButtonControl(component)); } diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx index e6c843a8cb4e..7a409742f5d1 100644 --- a/forms/source/component/RadioButton.hxx +++ b/forms/source/component/RadioButton.hxx @@ -36,37 +36,35 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.ORadioButtonModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySetHelper - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; protected: // OBoundControlModel overridables - virtual ::com::sun::star::uno::Any - translateDbColumnToControlValue( ) SAL_OVERRIDE; + virtual css::uno::Any translateDbColumnToControlValue( ) SAL_OVERRIDE; virtual bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateExternalValueToControlValue( const ::com::sun::star::uno::Any& _rExternalValue ) const SAL_OVERRIDE; + virtual css::uno::Any translateExternalValueToControlValue( const css::uno::Any& _rExternalValue ) const SAL_OVERRIDE; protected: - void SetSiblingPropsTo(const OUString& rPropName, const ::com::sun::star::uno::Any& rValue); + void SetSiblingPropsTo(const OUString& rPropName, const css::uno::Any& rValue); virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -77,18 +75,18 @@ private: class ORadioButtonControl: public OBoundControl { public: - ORadioButtonControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + ORadioButtonControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); // XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.ORadioButtonControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // XControl - virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference<css::awt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<css::awt::XWindowPeer>& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL createPeer(const css::uno::Reference<css::awt::XToolkit>& Toolkit, const css::uno::Reference<css::awt::XWindowPeer>& Parent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index c866729ca333..f0a2d7b112db 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.cxx @@ -137,7 +137,7 @@ OTimeModel::~OTimeModel( ) IMPLEMENT_DEFAULT_CLONING( OTimeModel ) -OUString SAL_CALL OTimeModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OTimeModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_TIMEFIELD); // old (non-sun) name for compatibility ! } @@ -182,7 +182,7 @@ sal_Bool SAL_CALL OTimeModel::convertFastPropertyValue(Any& _rConvertedValue, An } -void SAL_CALL OTimeModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw ( ::com::sun::star::uno::Exception, std::exception) +void SAL_CALL OTimeModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw ( css::uno::Exception, std::exception) { if (PROPERTY_ID_FORMATKEY == _nHandle) setFormatKeyPropertyValue(_rValue); @@ -304,16 +304,16 @@ Sequence< Type > OTimeModel::getSupportedBindingTypes() } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OTimeModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OTimeModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OTimeModel(component)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_OTimeControl_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_OTimeControl_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OTimeControl(component)); } diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx index 25ea155c41ca..4fe59e7c1f61 100644 --- a/forms/source/component/Time.hxx +++ b/forms/source/component/Time.hxx @@ -32,26 +32,26 @@ class OTimeModel ,public OLimitedFormats { private: - ::com::sun::star::uno::Any m_aSaveValue; + css::uno::Any m_aSaveValue; bool m_bDateTimeField; protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: DECLARE_DEFAULT_LEAF_XTOR( OTimeModel ); // css::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::beans::XPropertySet - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, - sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::lang::IllegalArgumentException) SAL_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) SAL_OVERRIDE; + // css::beans::XPropertySet + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, + sal_Int32 nHandle, const css::uno::Any& rValue ) + throw(css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) SAL_OVERRIDE; - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OTimeModel"); } @@ -60,7 +60,7 @@ public: // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; // prevent method hiding @@ -68,25 +68,21 @@ public: protected: // OBoundControlModel overridables - virtual ::com::sun::star::uno::Any + virtual css::uno::Any translateDbColumnToControlValue( ) SAL_OVERRIDE; virtual bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > + virtual css::uno::Sequence< css::uno::Type > getSupportedBindingTypes() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateControlValueToExternalValue( ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateExternalValueToControlValue( const ::com::sun::star::uno::Any& _rExternalValue ) const SAL_OVERRIDE; + virtual css::uno::Any translateControlValueToExternalValue( ) const SAL_OVERRIDE; + virtual css::uno::Any translateExternalValueToControlValue( const css::uno::Any& _rExternalValue ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateControlValueToValidatableValue( ) const SAL_OVERRIDE; + virtual css::uno::Any translateControlValueToValidatableValue( ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - getDefaultForReset() const SAL_OVERRIDE; + virtual css::uno::Any getDefaultForReset() const SAL_OVERRIDE; virtual void resetNoBroadcast() SAL_OVERRIDE; - virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ) SAL_OVERRIDE; + virtual void onConnectedDbColumn( const css::uno::Reference< css::uno::XInterface >& _rxForm ) SAL_OVERRIDE; protected: virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -95,13 +91,13 @@ protected: class OTimeControl: public OBoundControl { protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; public: - OTimeControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + OTimeControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); DECLARE_UNO3_AGG_DEFAULTS(OTimeControl, OBoundControl) - // ::com::sun::star::lang::XServiceInfo + // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OTimeControl"); } diff --git a/forms/source/component/cachedrowset.hxx b/forms/source/component/cachedrowset.hxx index ebbe73a48da1..03dd635c724e 100644 --- a/forms/source/component/cachedrowset.hxx +++ b/forms/source/component/cachedrowset.hxx @@ -47,10 +47,10 @@ namespace frm the result set produced by the statement. The caller takes ownership of the given object. - @throws ::com::sun::star::sdbc::SQLException + @throws css::sdbc::SQLException if such an exception is thrown when executing the statement */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > + css::uno::Reference< css::sdbc::XResultSet > execute(); /// determines whether the row set properties are dirty, i.e. have changed since the last call to execute @@ -69,7 +69,7 @@ namespace frm void setCommand ( const OUString& _rCommand ); void setEscapeProcessing ( const bool _bEscapeProcessing ); - void setConnection ( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ); + void setConnection ( const css::uno::Reference< css::sdbc::XConnection >& _rxConnection ); private: ::std::unique_ptr< CachedRowSet_Data > m_pData; diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index 4732cda47197..1b852ddedc62 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -49,9 +49,9 @@ namespace frm // OClickableImageBaseModel - typedef ::cppu::ImplHelper3 < ::com::sun::star::form::XImageProducerSupplier - , ::com::sun::star::awt::XImageProducer - , ::com::sun::star::form::submission::XSubmissionSupplier + typedef ::cppu::ImplHelper3 < css::form::XImageProducerSupplier + , css::awt::XImageProducer + , css::form::submission::XSubmissionSupplier > OClickableImageBaseModel_Base; class OClickableImageBaseModel :public OClickableImageBaseModel_Base @@ -59,22 +59,22 @@ namespace frm ,public OPropertyChangeListener { protected: - ::com::sun::star::form::FormButtonType m_eButtonType; // Type of the button (push, submit, reset) + css::form::FormButtonType m_eButtonType; // Type of the button (push, submit, reset) OUString m_sTargetURL; // URL for the URL button OUString m_sTargetFrame; // TargetFrame to open // ImageProducer stuff - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> m_xProducer; + css::uno::Reference< css::awt::XImageProducer> m_xProducer; // Store the image in a graphic object to make it accesible via graphic cache using graphic ID. - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > m_xGraphicObject; - SfxMedium* m_pMedium; // Download medium - ImageProducer* m_pProducer; + css::uno::Reference< css::graphic::XGraphicObject > m_xGraphicObject; + SfxMedium* m_pMedium; // Download medium + ImageProducer* m_pProducer; bool m_bDispatchUrlInternal; // property: is not allowed to set : 1 bool m_bDownloading : 1; // Is a download in progress? bool m_bProdStarted : 1; // XSubmission stuff - ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmission > + css::uno::Reference< css::form::submission::XSubmission > m_xSubmissionDelegate; DECL_LINK_TYPED( DownloadDoneLink, void*, void ); @@ -86,13 +86,13 @@ namespace frm void DataAvailable(); void DownloadDone(); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; inline bool isDispatchUrlInternal() const { return m_bDispatchUrlInternal; } inline void setDispatchUrlInternal(bool _bDispatch) { m_bDispatchUrlInternal = _bDispatch; } public: OClickableImageBaseModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, + const css::uno::Reference< css::uno::XComponentContext>& _rxFactory, const OUString& _rUnoControlModelTypeName, const OUString& _rDefault ); @@ -101,41 +101,41 @@ namespace frm // UNO Binding DECLARE_UNO3_AGG_DEFAULTS(OClickableImageBaseModel, OControlModel) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; - // ::com::sun::star::form::XImageProducerSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> SAL_CALL getImageProducer() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_xProducer; } + // css::form::XImageProducerSupplier + virtual css::uno::Reference< css::awt::XImageProducer> SAL_CALL getImageProducer() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_xProducer; } // OPropertySetHelper - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) + throw(css::lang::IllegalArgumentException) SAL_OVERRIDE; using ::cppu::OPropertySetHelper::getFastPropertyValue; // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent&) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent&) throw(css::uno::RuntimeException) SAL_OVERRIDE; // XPropertyState - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; // XImageProducer - virtual void SAL_CALL addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL startProduction( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startProduction( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSubmissionSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmission > SAL_CALL getSubmission() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSubmission( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmission >& _submission ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::form::submission::XSubmission > SAL_CALL getSubmission() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSubmission( const css::uno::Reference< css::form::submission::XSubmission >& _submission ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener using OControlModel::disposing; @@ -166,9 +166,9 @@ namespace frm :GuardBase( _rModel.getMutex( OClickableImageBaseModel::GuardAccess() ) ) { if ( NULL == _rModel.getImageProducer( OClickableImageBaseModel::GuardAccess() ) ) - throw ::com::sun::star::lang::DisposedException( + throw css::lang::DisposedException( OUString(), - static_cast< ::com::sun::star::form::XImageProducerSupplier* >( &_rModel ) + static_cast< css::form::XImageProducerSupplier* >( &_rModel ) ); } }; @@ -176,9 +176,9 @@ namespace frm // OClickableImageBaseControl - typedef ::cppu::ImplHelper3 < ::com::sun::star::form::XApproveActionBroadcaster - , ::com::sun::star::form::submission::XSubmission - , ::com::sun::star::frame::XDispatchProviderInterception + typedef ::cppu::ImplHelper3 < css::form::XApproveActionBroadcaster + , css::form::submission::XSubmission + , css::frame::XDispatchProviderInterception > OClickableImageBaseControl_BASE; class OClickableImageBaseControl :public OClickableImageBaseControl_BASE @@ -198,45 +198,45 @@ namespace frm OUString m_aActionCommand; // XSubmission - virtual void SAL_CALL submit( ) throw (::com::sun::star::util::VetoException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL submitWithInteraction( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler ) throw (::com::sun::star::util::VetoException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addSubmissionVetoListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmissionVetoListener >& listener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSubmissionVetoListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmissionVetoListener >& listener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL submit( ) throw (css::util::VetoException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL submitWithInteraction( const css::uno::Reference< css::task::XInteractionHandler >& aHandler ) throw (css::util::VetoException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSubmissionVetoListener( const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSubmissionVetoListener( const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener using OControl::disposing; public: OClickableImageBaseControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, + const css::uno::Reference< css::uno::XComponentContext>& _rxFactory, const OUString& _aService); virtual ~OClickableImageBaseControl(); protected: // UNO Binding DECLARE_UNO3_AGG_DEFAULTS(OClickableImageBaseControl, OControl) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; - // ::com::sun::star::form::XApproveActionBroadcaster - virtual void SAL_CALL addApproveActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XApproveActionListener>& _rxListener) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeApproveActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XApproveActionListener>& _rxListener) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::form::XApproveActionBroadcaster + virtual void SAL_CALL addApproveActionListener(const css::uno::Reference< css::form::XApproveActionListener>& _rxListener) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeApproveActionListener(const css::uno::Reference< css::form::XApproveActionListener>& _rxListener) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDispatchProviderInterception - virtual void SAL_CALL registerDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL releaseDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void actionPerformed_Impl( bool bNotifyListener, const ::com::sun::star::awt::MouseEvent& rEvt ); + virtual void actionPerformed_Impl( bool bNotifyListener, const css::awt::MouseEvent& rEvt ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > _getTypes() SAL_OVERRIDE; + css::uno::Sequence< css::uno::Type > _getTypes() SAL_OVERRIDE; /** approves the action by calling the approve listeners @return <TRUE/> if and only if the action has <em>not</em> been cancelled by a listener @@ -251,8 +251,8 @@ namespace frm private: void implSubmit( - const ::com::sun::star::awt::MouseEvent& _rEvent, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler + const css::awt::MouseEvent& _rEvent, + const css::uno::Reference< css::task::XInteractionHandler >& aHandler ); }; @@ -261,13 +261,13 @@ namespace frm protected: // This method was called to duplicate the Event by taking its type into account - virtual ::com::sun::star::lang::EventObject* cloneEvent( const ::com::sun::star::lang::EventObject* _pEvt ) const SAL_OVERRIDE; + virtual css::lang::EventObject* cloneEvent( const css::lang::EventObject* _pEvt ) const SAL_OVERRIDE; // Process an Event. // The mutex is not locked, pCompImpl stays valid in any case virtual void processEvent( ::cppu::OComponentHelper *pCompImpl, - const ::com::sun::star::lang::EventObject*, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>&, + const css::lang::EventObject*, + const css::uno::Reference< css::awt::XControl>&, bool ) SAL_OVERRIDE; public: @@ -275,7 +275,7 @@ namespace frm OComponentEventThread( pControl ) {} - void addEvent() { ::com::sun::star::lang::EventObject aEvt; OComponentEventThread::addEvent( &aEvt ); } + void addEvent() { css::lang::EventObject aEvt; OComponentEventThread::addEvent( &aEvt ); } protected: using OComponentEventThread::addEvent; diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx index 2139d708bdb7..789dc0f5f095 100644 --- a/forms/source/component/entrylisthelper.cxx +++ b/forms/source/component/entrylisthelper.cxx @@ -295,7 +295,7 @@ namespace frm } - void OEntryListHelper::setNewStringItemList( const ::com::sun::star::uno::Any& _rValue, ControlModelLock& _rInstanceLock ) + void OEntryListHelper::setNewStringItemList( const css::uno::Any& _rValue, ControlModelLock& _rInstanceLock ) { OSL_PRECOND( !hasExternalListSource(), "OEntryListHelper::setNewStringItemList: this should never have survived convertNewListSourceProperty!" ); OSL_VERIFY( _rValue >>= m_aStringItems ); diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx index 1aeab31c5137..7f6c5c07be6c 100644 --- a/forms/source/component/entrylisthelper.hxx +++ b/forms/source/component/entrylisthelper.hxx @@ -39,9 +39,9 @@ namespace frm //= OEntryListHelper - typedef ::cppu::ImplHelper3 < ::com::sun::star::form::binding::XListEntrySink - , ::com::sun::star::form::binding::XListEntryListener - , ::com::sun::star::util::XRefreshable + typedef ::cppu::ImplHelper3 < css::form::binding::XListEntrySink + , css::form::binding::XListEntryListener + , css::util::XRefreshable > OEntryListHelper_BASE; class OEntryListHelper : public OEntryListHelper_BASE @@ -49,9 +49,9 @@ namespace frm private: OControlModel& m_rControlModel; - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > + css::uno::Reference< css::form::binding::XListEntrySource > m_xListSource; /// our external list source - ::com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > m_aStringItems; /// "overridden" StringItemList property value ::cppu::OInterfaceContainerHelper m_aRefreshListeners; @@ -63,7 +63,7 @@ namespace frm virtual ~OEntryListHelper( ); /// returns the current string item list - inline const ::com::sun::star::uno::Sequence< OUString >& + inline const css::uno::Sequence< OUString >& getStringItemList() const { return m_aStringItems; } /// determines whether we actually have an external list source @@ -75,14 +75,14 @@ namespace frm <TRUE/> if and only if the disposed object was our list source, and so the event was handled */ - bool handleDisposing( const ::com::sun::star::lang::EventObject& _rEvent ); + bool handleDisposing( const css::lang::EventObject& _rEvent ); /** to be called by derived classes' instances when they're being disposed */ void disposing( ); // prevent method hiding - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; /** helper for implementing convertFastPropertyValue( StringItemList ) @@ -90,9 +90,9 @@ namespace frm as convertFastPropertyValue.</p> */ bool convertNewListSourceProperty( - ::com::sun::star::uno::Any& _rConvertedValue, - ::com::sun::star::uno::Any& _rOldValue, - const ::com::sun::star::uno::Any& _rValue + css::uno::Any& _rConvertedValue, + css::uno::Any& _rOldValue, + const css::uno::Any& _rValue ); /** helper for implementing setFastPropertyValueNoBroadcast @@ -104,7 +104,7 @@ namespace frm not to be called when we have an external list source @see hasExternalListSource */ - void setNewStringItemList( const ::com::sun::star::uno::Any& _rValue, ControlModelLock& _rInstanceLock ); + void setNewStringItemList( const css::uno::Any& _rValue, ControlModelLock& _rInstanceLock ); /** announces that the list of entries has changed. @@ -131,19 +131,19 @@ namespace frm private: // XListEntrySink - virtual void SAL_CALL setListEntrySource( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > SAL_CALL getListEntrySource( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setListEntrySource( const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::form::binding::XListEntrySource > SAL_CALL getListEntrySource( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XListEntryListener - virtual void SAL_CALL entryChanged( const ::com::sun::star::form::binding::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL entryRangeInserted( const ::com::sun::star::form::binding::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL entryRangeRemoved( const ::com::sun::star::form::binding::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL allEntriesChanged( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL entryChanged( const css::form::binding::ListEntryEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL entryRangeInserted( const css::form::binding::ListEntryEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL entryRangeRemoved( const css::form::binding::ListEntryEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL allEntriesChanged( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addRefreshListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeRefreshListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL refresh() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: /** disconnects from the active external list source, if present @@ -157,7 +157,7 @@ namespace frm @see disconnectExternalListSource */ void connectExternalListSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource, + const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource, ControlModelLock& _rInstanceLock ); diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx index 2d1bfe4707d7..0e4330ed4db1 100644 --- a/forms/source/component/errorbroadcaster.cxx +++ b/forms/source/component/errorbroadcaster.cxx @@ -70,7 +70,7 @@ namespace frm } - void SAL_CALL OErrorBroadcaster::onError( const ::com::sun::star::sdb::SQLErrorEvent& _rError ) + void SAL_CALL OErrorBroadcaster::onError( const css::sdb::SQLErrorEvent& _rError ) { if ( m_aErrorListeners.getLength() ) { diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx index 519fb55423af..f5846af5c8d2 100644 --- a/forms/source/component/errorbroadcaster.hxx +++ b/forms/source/component/errorbroadcaster.hxx @@ -30,7 +30,7 @@ namespace frm { - typedef ::cppu::ImplHelper1 < ::com::sun::star::sdb::XSQLErrorBroadcaster + typedef ::cppu::ImplHelper1 < css::sdb::XSQLErrorBroadcaster > OErrorBroadcaster_BASE; class OErrorBroadcaster : public OErrorBroadcaster_BASE @@ -45,13 +45,13 @@ namespace frm void SAL_CALL disposing(); - void SAL_CALL onError( const ::com::sun::star::sdbc::SQLException& _rException, const OUString& _rContextDescription ); - void SAL_CALL onError( const ::com::sun::star::sdb::SQLErrorEvent& _rException ); + void SAL_CALL onError( const css::sdbc::SQLException& _rException, const OUString& _rContextDescription ); + void SAL_CALL onError( const css::sdb::SQLErrorEvent& _rException ); protected: // XSQLErrorBroadcaster - virtual void SAL_CALL addSQLErrorListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener >& _rListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSQLErrorListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener >& _rListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/findpos.cxx b/forms/source/component/findpos.cxx index 08c15dc1be7a..90f164dc7af3 100644 --- a/forms/source/component/findpos.cxx +++ b/forms/source/component/findpos.cxx @@ -33,7 +33,7 @@ namespace detail { sal_Int32 findPos( const OUString& aStr, - const ::com::sun::star::uno::Sequence< OUString >& rList) + const css::uno::Sequence< OUString >& rList) { const OUString* pStrList = rList.getConstArray(); const OUString* pResult = ::std::lower_bound( diff --git a/forms/source/component/findpos.hxx b/forms/source/component/findpos.hxx index 18e975544482..792f435d5bbc 100644 --- a/forms/source/component/findpos.hxx +++ b/forms/source/component/findpos.hxx @@ -29,7 +29,7 @@ namespace detail { sal_Int32 findPos( const OUString& aStr, - const ::com::sun::star::uno::Sequence< OUString >& rList); + const css::uno::Sequence< OUString >& rList); } diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 913a0a747678..3872abc01e05 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -37,13 +37,13 @@ class ImgProdLockBytes : public SvLockBytes { - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xStmRef; - ::com::sun::star::uno::Sequence<sal_Int8> maSeq; + css::uno::Reference< css::io::XInputStream > xStmRef; + css::uno::Sequence<sal_Int8> maSeq; public: ImgProdLockBytes( SvStream* pStm, bool bOwner ); - ImgProdLockBytes( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rStreamRef ); + ImgProdLockBytes( css::uno::Reference< css::io::XInputStream > & rStreamRef ); virtual ~ImgProdLockBytes(); virtual ErrCode ReadAt( sal_uInt64 nPos, void* pBuffer, sal_Size nCount, sal_Size * pRead ) const SAL_OVERRIDE; @@ -62,7 +62,7 @@ ImgProdLockBytes::ImgProdLockBytes( SvStream* pStm, bool bOwner ) : -ImgProdLockBytes::ImgProdLockBytes( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rStmRef ) : +ImgProdLockBytes::ImgProdLockBytes( css::uno::Reference< css::io::XInputStream > & rStmRef ) : xStmRef( rStmRef ) { if( xStmRef.is() ) @@ -72,7 +72,7 @@ ImgProdLockBytes::ImgProdLockBytes( ::com::sun::star::uno::Reference< ::com::sun do { - ::com::sun::star::uno::Sequence< sal_Int8 > aReadSeq; + css::uno::Sequence< sal_Int8 > aReadSeq; nRead = xStmRef->readSomeBytes( aReadSeq, nBytesToRead ); @@ -187,29 +187,29 @@ ImageProducer::~ImageProducer() mpStm = NULL; } -// ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any ImageProducer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +// css::uno::XInterface +css::uno::Any ImageProducer::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< ::com::sun::star::lang::XInitialization* >(this)), - (static_cast< ::com::sun::star::awt::XImageProducer* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, + (static_cast< css::lang::XInitialization* >(this)), + (static_cast< css::awt::XImageProducer* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } -void ImageProducer::addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) - throw(::com::sun::star::uno::RuntimeException, +void ImageProducer::addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) + throw(css::uno::RuntimeException, std::exception) { DBG_ASSERT( rxConsumer.is(), "::AddConsumer(...): No consumer referenced!" ); if( rxConsumer.is() ) - maConsList.push_back( new ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer > ( rxConsumer )); + maConsList.push_back( new css::uno::Reference< css::awt::XImageConsumer > ( rxConsumer )); } -void ImageProducer::removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void ImageProducer::removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) throw(css::uno::RuntimeException, std::exception) { ConsumerList_t::reverse_iterator riter = std::find(maConsList.rbegin(),maConsList.rend(),rxConsumer); @@ -253,7 +253,7 @@ void ImageProducer::SetImage( SvStream& rStm ) -void ImageProducer::setImage( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rInputStmRef ) +void ImageProducer::setImage( css::uno::Reference< css::io::XInputStream > & rInputStmRef ) { maURL.clear(); mpGraphic->Clear(); @@ -276,7 +276,7 @@ void ImageProducer::NewDataAvailable() -void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeException, std::exception) +void ImageProducer::startProduction() throw(css::uno::RuntimeException, std::exception) { if( !maConsList.empty() || maDoneHdl.IsSet() ) { @@ -311,7 +311,7 @@ void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeExcept for( ConsumerList_t::iterator iter = aTmp.begin(); iter != aTmp.end(); ++iter ) { (*iter)->init( 0, 0 ); - (*iter)->complete( ::com::sun::star::awt::ImageStatus::IMAGESTATUS_STATICIMAGEDONE, this ); + (*iter)->complete( css::awt::ImageStatus::IMAGESTATUS_STATICIMAGEDONE, this ); } if ( maDoneHdl.IsSet() ) @@ -356,7 +356,7 @@ void ImageProducer::ImplUpdateData( const Graphic& rGraphic ) // iterate through interfaces for( ConsumerList_t::iterator iter = aTmp.begin(); iter != aTmp.end(); ++iter ) - (*iter)->complete( ::com::sun::star::awt::ImageStatus::IMAGESTATUS_STATICIMAGEDONE, this ); + (*iter)->complete( css::awt::ImageStatus::IMAGESTATUS_STATICIMAGEDONE, this ); } } @@ -374,7 +374,7 @@ void ImageProducer::ImplInitConsumer( const Graphic& rGraphic ) sal_uInt32 nGMask = 0; sal_uInt32 nBMask = 0; sal_uInt32 nAMask = 0; - ::com::sun::star::uno::Sequence< sal_Int32 > aRGBPal; + css::uno::Sequence< sal_Int32 > aRGBPal; if( pBmpAcc->HasPalette() ) { @@ -382,7 +382,7 @@ void ImageProducer::ImplInitConsumer( const Graphic& rGraphic ) if( nPalCount ) { - aRGBPal = ::com::sun::star::uno::Sequence< sal_Int32 >( nPalCount + 1 ); + aRGBPal = css::uno::Sequence< sal_Int32 >( nPalCount + 1 ); sal_Int32* pTmp = aRGBPal.getArray(); @@ -468,7 +468,7 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) if( mnTransIndex < 256 ) { - ::com::sun::star::uno::Sequence<sal_Int8> aData( nPartWidth * nPartHeight ); + css::uno::Sequence<sal_Int8> aData( nPartWidth * nPartHeight ); sal_Int8* pTmp = aData.getArray(); for( long nY = nStartY; nY <= nEndY; nY++ ) @@ -489,7 +489,7 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) } else { - ::com::sun::star::uno::Sequence<sal_Int32> aData( nPartWidth * nPartHeight ); + css::uno::Sequence<sal_Int32> aData( nPartWidth * nPartHeight ); sal_Int32* pTmp = aData.getArray(); for( long nY = nStartY; nY <= nEndY; nY++ ) @@ -510,7 +510,7 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) } else { - ::com::sun::star::uno::Sequence<sal_Int32> aData( nPartWidth * nPartHeight ); + css::uno::Sequence<sal_Int32> aData( nPartWidth * nPartHeight ); const BitmapColor aWhite( pMskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); sal_Int32* pTmp = aData.getArray(); @@ -539,11 +539,11 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) } } -void ImageProducer::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) +void ImageProducer::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { if ( aArguments.getLength() == 1 ) { - ::com::sun::star::uno::Any aArg = aArguments.getConstArray()[0]; + css::uno::Any aArg = aArguments.getConstArray()[0]; OUString aURL; if ( aArg >>= aURL ) { @@ -552,9 +552,9 @@ void ImageProducer::initialize( const ::com::sun::star::uno::Sequence< ::com::su } } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_ImageProducer_get_implementation(::com::sun::star::uno::XComponentContext*, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_form_ImageProducer_get_implementation(css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new ImageProducer()); } diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx index 5dcafedf46c4..13bc740cbcaf 100644 --- a/forms/source/component/imgprod.hxx +++ b/forms/source/component/imgprod.hxx @@ -44,13 +44,13 @@ namespace com { namespace sun { namespace star { namespace io { }}}} -class ImageProducer : public ::com::sun::star::awt::XImageProducer, - public ::com::sun::star::lang::XInitialization, +class ImageProducer : public css::awt::XImageProducer, + public css::lang::XInitialization, public ::cppu::OWeakObject { private: - typedef boost::ptr_vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer > > ConsumerList_t; + typedef boost::ptr_vector< css::uno::Reference< css::awt::XImageConsumer > > ConsumerList_t; OUString maURL; ConsumerList_t maConsList; @@ -77,23 +77,23 @@ public: void SetDoneHdl( const Link<Graphic*,void>& i_rHdl ) { maDoneHdl = i_rHdl; } - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } - void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // MT: ??? - void setImage( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rStmRef ); + void setImage( css::uno::Reference< css::io::XInputStream > & rStmRef ); - // ::com::sun::star::awt::XImageProducer - void SAL_CALL addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) - throw(::com::sun::star::uno::RuntimeException, + // css::awt::XImageProducer + void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL startProduction( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL startProduction( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::lang::XInitialization - 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) SAL_OVERRIDE; + // css::lang::XInitialization + void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx index f36d0c2b3077..d289f0b344ec 100644 --- a/forms/source/component/navigationbar.hxx +++ b/forms/source/component/navigationbar.hxx @@ -36,7 +36,7 @@ namespace frm { - typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XControlModel + typedef ::cppu::ImplHelper1 < css::awt::XControlModel > ONavigationBarModel_BASE; class ONavigationBarModel @@ -46,22 +46,22 @@ namespace frm ,public ONavigationBarModel_BASE { // <properties> - ::com::sun::star::uno::Any m_aTabStop; - ::com::sun::star::uno::Any m_aBackgroundColor; + css::uno::Any m_aTabStop; + css::uno::Any m_aBackgroundColor; OUString m_sDefaultControl; OUString m_sHelpText; OUString m_sHelpURL; - sal_Int16 m_nIconSize; - sal_Int16 m_nBorder; - sal_Int32 m_nDelay; - bool m_bEnabled; - bool m_bEnableVisible; - bool m_bShowPosition; - bool m_bShowNavigation; - bool m_bShowActions; - bool m_bShowFilterSort; - sal_Int16 m_nWritingMode; - sal_Int16 m_nContextWritingMode; + sal_Int16 m_nIconSize; + sal_Int16 m_nBorder; + sal_Int32 m_nDelay; + bool m_bEnabled; + bool m_bEnableVisible; + bool m_bShowPosition; + bool m_bShowNavigation; + bool m_bShowActions; + bool m_bShowFilterSort; + sal_Int16 m_nWritingMode; + sal_Int16 m_nContextWritingMode; // </properties> public: @@ -69,16 +69,16 @@ namespace frm // XServiceInfo - static version static OUString SAL_CALL getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); protected: // UNO DECLARE_UNO3_AGG_DEFAULTS( ONavigationBarModel, OControlModel ) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider DECLARE_XTYPEPROVIDER() @@ -87,23 +87,23 @@ namespace frm virtual void SAL_CALL disposing() SAL_OVERRIDE; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, - sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::lang::IllegalArgumentException) SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, + sal_Int32 nHandle, const css::uno::Any& rValue ) + throw(css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) SAL_OVERRIDE; // XPropertyState - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; // prevent method hiding diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx index 7afdd98aa7c6..618f35430631 100644 --- a/forms/source/component/refvaluecomponent.hxx +++ b/forms/source/component/refvaluecomponent.hxx @@ -51,7 +51,7 @@ namespace frm protected: OReferenceValueComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, + const css::uno::Reference< css::uno::XComponentContext>& _rxFactory, const OUString& _rUnoControlModelTypeName, const OUString& _rDefault, bool _bSupportNoCheckRefValue = false @@ -60,30 +60,26 @@ namespace frm virtual ~OReferenceValueComponent(); // OPropertySet and friends - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) + throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; using ::cppu::OPropertySetHelper::getFastPropertyValue; // OBoundControlModel overridables - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > + virtual css::uno::Sequence< css::uno::Type > getSupportedBindingTypes() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateExternalValueToControlValue( const ::com::sun::star::uno::Any& _rExternalValue ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateControlValueToExternalValue( ) const SAL_OVERRIDE; + virtual css::uno::Any translateExternalValueToControlValue( const css::uno::Any& _rExternalValue ) const SAL_OVERRIDE; + virtual css::uno::Any translateControlValueToExternalValue( ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateControlValueToValidatableValue( ) const SAL_OVERRIDE; + virtual css::uno::Any translateControlValueToValidatableValue( ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - getDefaultForReset() const SAL_OVERRIDE; + virtual css::uno::Any getDefaultForReset() const SAL_OVERRIDE; }; diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index f52aebbddd77..d42be03570a2 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -303,9 +303,9 @@ namespace frm } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_forms_OScrollBarModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_forms_OScrollBarModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OScrollBarModel(component)); } diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx index a99b391e4d16..0fc4620d70f2 100644 --- a/forms/source/component/scrollbar.hxx +++ b/forms/source/component/scrollbar.hxx @@ -46,33 +46,29 @@ namespace frm virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const SAL_OVERRIDE; + virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; // OPropertySetHelper - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const SAL_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 ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) - throw ( ::com::sun::star::lang::IllegalArgumentException ) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& _rValue, sal_Int32 _nHandle ) const SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) + throw ( css::uno::Exception, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) + throw ( css::lang::IllegalArgumentException ) SAL_OVERRIDE; // OBoundControlModel - virtual ::com::sun::star::uno::Any - translateDbColumnToControlValue( ) SAL_OVERRIDE; + virtual css::uno::Any translateDbColumnToControlValue( ) SAL_OVERRIDE; virtual bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - getDefaultForReset() const SAL_OVERRIDE; + virtual css::uno::Any getDefaultForReset() const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > + virtual css::uno::Sequence< css::uno::Type > getSupportedBindingTypes() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateExternalValueToControlValue( const ::com::sun::star::uno::Any& _rExternalValue ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateControlValueToExternalValue( ) const SAL_OVERRIDE; + virtual css::uno::Any translateExternalValueToControlValue( const css::uno::Any& _rExternalValue ) const SAL_OVERRIDE; + virtual css::uno::Any translateControlValueToExternalValue( ) const SAL_OVERRIDE; // XCoponent and related helpers virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index 77ea31200aaa..577a8bfd72ab 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -257,9 +257,9 @@ namespace frm } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_forms_OSpinButtonModel_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_forms_OSpinButtonModel_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::OSpinButtonModel(component)); } diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx index e8642ce204f8..73aacd2a7dd5 100644 --- a/forms/source/component/spinbutton.hxx +++ b/forms/source/component/spinbutton.hxx @@ -47,33 +47,29 @@ namespace frm virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const SAL_OVERRIDE; + virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; // OPropertySetHelper - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const SAL_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 ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) - throw ( ::com::sun::star::lang::IllegalArgumentException ) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& _rValue, sal_Int32 _nHandle ) const SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) + throw ( css::uno::Exception, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) + throw ( css::lang::IllegalArgumentException ) SAL_OVERRIDE; // OBoundControlModel - virtual ::com::sun::star::uno::Any - translateDbColumnToControlValue( ) SAL_OVERRIDE; + virtual css::uno::Any translateDbColumnToControlValue( ) SAL_OVERRIDE; virtual bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - getDefaultForReset() const SAL_OVERRIDE; + virtual css::uno::Any getDefaultForReset() const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > + virtual css::uno::Sequence< css::uno::Type > getSupportedBindingTypes() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateExternalValueToControlValue( const ::com::sun::star::uno::Any& _rExternalValue ) const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any - translateControlValueToExternalValue( ) const SAL_OVERRIDE; + virtual css::uno::Any translateExternalValueToControlValue( const css::uno::Any& _rExternalValue ) const SAL_OVERRIDE; + virtual css::uno::Any translateControlValueToExternalValue( ) const SAL_OVERRIDE; // XCoponent and related helpers virtual void SAL_CALL disposing() SAL_OVERRIDE; |